Feature system acls

lerna.json

@@ -3,6 +3,6 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.9.3",
+  "version": "0.10.0",
   "hoist": true
 }

package.json

@@ -9,7 +9,7 @@
   },
   "name": "composer",
   "description": "You must install [Lerna](https://lernajs.io) to build this multi-package repository.",
-  "version": "0.9.3",
+  "version": "0.10.0",
   "main": "index.js",
   "private": true,
   "scripts": {

packages/composer-admin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-admin",
-  "version": "0.9.3",
+  "version": "0.10.0",
   "description": "Hyperledger Composer Admin, code that manages business networks deployed to Hyperledger Fabric",
   "engines": {
     "node": ">=6",
@@ -42,9 +42,9 @@
     "sinon-as-promised": "^4.0.2"
   },
   "dependencies": {
-    "composer-common": "0.9.3",
-    "composer-connector-hlf": "0.9.3",
-    "composer-connector-hlfv1": "0.9.3"
+    "composer-common": "0.10.0",
+    "composer-connector-hlf": "0.10.0",
+    "composer-connector-hlfv1": "0.10.0"
   },
   "license-check-config": {
     "src": [

packages/composer-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-cli",
-  "version": "0.9.3",
+  "version": "0.10.0",
   "description": "Hyperledger Composer command line interfaces (CLIs)",
   "engines": {
     "node": ">=6",
@@ -42,10 +42,10 @@
   "dependencies": {
     "chalk": "^1.1.3",
     "cli-table": "^0.3.1",
-    "composer-admin": "0.9.3",
-    "composer-client": "0.9.3",
-    "composer-common": "0.9.3",
-    "composer-rest-server": "0.9.3",
+    "composer-admin": "0.10.0",
+    "composer-client": "0.10.0",
+    "composer-common": "0.10.0",
+    "composer-rest-server": "0.10.0",
     "homedir": "^0.6.0",
     "npm-paths": "^0.1.3",
     "nunjucks": "^3.0.0",

packages/composer-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-client",
-  "version": "0.9.3",
+  "version": "0.10.0",
   "description": "The node.js client library for Hyperledger Composer, a development framework for Hyperledger Fabric",
   "engines": {
     "node": ">=6",
@@ -42,9 +42,9 @@
     "logError": true
   },
   "dependencies": {
-    "composer-common": "0.9.3",
-    "composer-connector-hlf": "0.9.3",
-    "composer-connector-hlfv1": "0.9.3",
+    "composer-common": "0.10.0",
+    "composer-connector-hlf": "0.10.0",
+    "composer-connector-hlfv1": "0.10.0",
     "uuid": "^3.0.1"
   },
   "devDependencies": {

packages/composer-common/index.js

@@ -56,6 +56,9 @@ module.exports.BaseModelException = require('./lib/introspect/basemodelexception
 module.exports.BusinessNetworkDefinition = require('./lib/businessnetworkdefinition');
 module.exports.BusinessNetworkMetadata = require('./lib/businessnetworkmetadata');
 module.exports.ClassDeclaration = require('./lib/introspect/classdeclaration');
+module.exports.EnumDeclaration = require('./lib/introspect/enumdeclaration');
+module.exports.EnumValueDeclaration = require('./lib/introspect/enumvaluedeclaration');
+module.exports.Field = require('./lib/introspect/field');
 module.exports.CodeGen = require('./lib/codegen/codegen.js');
 module.exports.ComboConnectionProfileStore = require('./lib/comboconnectionprofilestore');
 module.exports.Concept = require('./lib/model/concept');

packages/composer-common/lib/introspect/classdeclaration.js

@@ -308,6 +308,16 @@ class ClassDeclaration {
         return false;
     }
 
+     /**
+      * Returns true if this class can be pointed to by a relationship in a
+      * system model
+      *
+      * @return {boolean} true if the class may be pointed to by a relationship
+      */
+    isSystemRelationshipTarget() {
+        return this.isRelationshipTarget();
+    }
+
     /**
      * Returns true if this class can be pointed to by a relationship in a
      * system model

packages/composer-common/lib/modelmanager.js

@@ -23,23 +23,7 @@ const TypeNotFoundException = require('./typenotfoundexception');
 // const ENCODING = 'utf8';
 
 const LOG = require('./log/logger').getLog('ModelManager');
-const SYSTEM_MODEL_CONTENTS = `
-    namespace org.hyperledger.composer.system
-
-    abstract asset Asset {  }
-
-    abstract participant Participant {   }
-
-    abstract transaction Transaction identified by transactionId{
-      o String transactionId
-      o DateTime timestamp
-    }
-
-    abstract event Event identified by eventId{
-      o String eventId
-      o DateTime timestamp
-    }
-`;
+const SYSTEM_MODEL_CONTENTS = require('./systemModel');
 
 /**
  * <p>

packages/composer-common/lib/system.cto

@@ -4,7 +4,7 @@ abstract asset Asset {  }
 
 abstract participant Participant {   }
 
-abstract transaction Transaction {
+abstract transaction Transaction identified by transactionId{
   o String transactionId
   o DateTime timestamp
 }
@@ -14,8 +14,10 @@ abstract event Event identified by eventId{
   o DateTime timestamp
 }
 
-asset Registry identified by registryID {
-  o String registryID
+abstract asset Registry identified by registryId {
+  o String registryId
+  o String name 
+  o String type 
 }
 
 asset AssetRegistry extends Registry {
@@ -34,10 +36,6 @@ asset IdentityRegistry extends Registry {
 
 }
 
-asset Identity identified by userID {
-  o String userID
-  o DateTime issued
-  --> Participant participant
-  o Boolean activated
-  o Boolean revoked
+asset Network identified by networkId {
+  o String networkId
 }

packages/composer-common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-common",
-  "version": "0.9.3",
+  "version": "0.10.0",
   "description": "Hyperledger Composer Common, code that is common across client, admin and runtime.",
   "engines": {
     "node": ">=6",

packages/composer-common/test/codegen/loopbackvisitor.js

@@ -70,7 +70,7 @@ describe('LoopbackVisitor', () => {
 
                     // Check that the Loopback model files were generated, and extract the
                     // generated schemas from the stub writer.
-                    let expectedFiles;
+                    let expectedFiles, expectedTypes;
                     if (namespaces) {
                         expectedFiles = [
                             'org.acme.base.SimpleAsset.json',
@@ -84,21 +84,47 @@ describe('LoopbackVisitor', () => {
                             'org.acme.base.Bloke.json',
                             'org.acme.base.UnitedStatesAddress.json'
                         ];
+                        expectedTypes = [
+                            'org_acme_base_SimpleAsset',
+                            'org_acme_base_BaseAsset',
+                            'org_acme_base_DerivedAsset',
+                            'org_acme_base_DerivedDerivedAsset',
+                            'org_acme_base_MyBasicTransaction',
+                            'org_acme_base_MyTransaction',
+                            'org_acme_base_MyTransactionEx',
+                            'org_acme_base_Person',
+                            'org_acme_base_Bloke',
+                            'org_acme_base_UnitedStatesAddress'
+                        ];
                     } else {
                         expectedFiles = [
                             'SimpleAsset.json',
                             'BaseAsset.json',
                             'DerivedAsset.json',
                             'DerivedDerivedAsset.json',
                             'MyBasicTransaction.json',
-                            'MyTransaction.json',
                             'MyTransactionEx.json',
                             'Person.json',
                             'Bloke.json',
                             'UnitedStatesAddress.json'
                         ];
+                        expectedTypes = [
+                            'SimpleAsset',
+                            'BaseAsset',
+                            'DerivedAsset',
+                            'DerivedDerivedAsset',
+                            'MyBasicTransaction',
+                            'MyTransactionEx',
+                            'Person',
+                            'Bloke',
+                            'UnitedStatesAddress'
+                        ];
                     }
-                    schemas.should.have.lengthOf(expectedFiles.length);
+                    // For every element of the expected files, does the schema array contain it?
+                    expectedTypes.filter((elem) => {
+                        return schemas.some((s) => { return s.name === elem; });
+
+                    }).should.have.lengthOf(expectedFiles.length);
 
                     expectedFiles.forEach((expectedFile) => {
                         sinon.assert.calledWith(mockFileWriter.openFile, expectedFile);
@@ -853,7 +879,7 @@ describe('LoopbackVisitor', () => {
                     }
                     `);
                     const schemas = modelFile.accept(visitor, { fileWriter: mockFileWriter });
-                    schemas.should.deep.equal([{
+                    schemas.should.deep.include.members([{
                         acls: [],
                         // base: 'PersistedModel',
                         description: 'A concept named MyConcept',
@@ -910,7 +936,7 @@ describe('LoopbackVisitor', () => {
                         o MyAsset asset
                     }`);
                     const schemas = modelManager.accept(visitor, { fileWriter: mockFileWriter });
-                    schemas.should.deep.equal([
+                    schemas.should.deep.include.members([
                         {
                             name: namespaces ? 'org_acme_base_MyAsset' : 'MyAsset',
                             description: 'An asset named MyAsset',
@@ -1012,7 +1038,9 @@ describe('LoopbackVisitor', () => {
                         o MyAsset asset
                     }`);
                     const schemas = modelManager.accept(visitor, { fileWriter: mockFileWriter });
-                    schemas.should.deep.equal([
+
+
+                    schemas.should.include.deep.members([
                         {
                             name: namespaces ? 'org_acme_base_MyInlineAsset' : 'MyInlineAsset',
                             description: 'An asset named MyInlineAsset',

packages/composer-connector-embedded/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-connector-embedded",
-  "version": "0.9.3",
+  "version": "0.10.0",
   "description": "The embedded client connector for Hyperledger Composer",
   "engines": {
     "node": ">=6",
@@ -52,9 +52,9 @@
     "watchify": "^3.7.0"
   },
   "dependencies": {
-    "composer-common": "0.9.3",
-    "composer-runtime": "0.9.3",
-    "composer-runtime-embedded": "0.9.3"
+    "composer-common": "0.10.0",
+    "composer-runtime": "0.10.0",
+    "composer-runtime-embedded": "0.10.0"
   },
   "nyc": {
     "exclude": [

packages/composer-connector-hlf/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-connector-hlf",
-  "version": "0.9.3",
+  "version": "0.10.0",
   "description": "The Hyperledger Fabric Client connector for Hyperledger Composer",
   "engines": {
     "node": ">=6",
@@ -40,8 +40,8 @@
     "logError": true
   },
   "dependencies": {
-    "composer-common": "0.9.3",
-    "composer-runtime-hlf": "0.9.3",
+    "composer-common": "0.10.0",
+    "composer-runtime-hlf": "0.10.0",
     "fs-extra": "^1.0.0",
     "hfc": "^0.6.5",
     "semver": "^5.3.0",

packages/composer-connector-hlfv1/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-connector-hlfv1",
-  "version": "0.9.3",
+  "version": "0.10.0",
   "description": "The Hyperledger Fabric v1.x Client connector for Hyperledger Composer",
   "engines": {
     "node": ">=6",
@@ -40,8 +40,8 @@
     "logError": true
   },
   "dependencies": {
-    "composer-common": "0.9.3",
-    "composer-runtime-hlfv1": "0.9.3",
+    "composer-common": "0.10.0",
+    "composer-runtime-hlfv1": "0.10.0",
     "fabric-ca-client": "^1.0.0",
     "fabric-client": "^1.0.0",
     "fs-extra": "^1.0.0",

packages/composer-connector-proxy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-connector-proxy",
-  "version": "0.9.3",
+  "version": "0.10.0",
   "description": "The proxying client connector for Hyperledger Composer",
   "engines": {
     "node": ">=6",
@@ -54,7 +54,7 @@
     "watchify": "^3.7.0"
   },
   "dependencies": {
-    "composer-common": "0.9.3",
+    "composer-common": "0.10.0",
     "socket.io-client": "^1.7.3"
   },
   "nyc": {

packages/composer-connector-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-connector-server",
-  "version": "0.9.3",
+  "version": "0.10.0",
   "description": "The remote connector server for Hyperledger Composer",
   "engines": {
     "node": ">=6",
@@ -44,10 +44,10 @@
     "logError": true
   },
   "dependencies": {
-    "composer-common": "0.9.3",
-    "composer-connector-embedded": "0.9.3",
-    "composer-connector-hlf": "0.9.3",
-    "composer-connector-hlfv1": "0.9.3",
+    "composer-common": "0.10.0",
+    "composer-connector-embedded": "0.10.0",
+    "composer-connector-hlf": "0.10.0",
+    "composer-connector-hlfv1": "0.10.0",
     "serializerr": "^1.0.3",
     "socket.io": "^1.7.3",
     "uuid": "^3.0.1",

packages/composer-connector-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-connector-web",
-  "version": "0.9.3",
+  "version": "0.10.0",
   "description": "The web client connector for Hyperledger Composer",
   "engines": {
     "node": ">=6",
@@ -62,9 +62,9 @@
     "watchify": "^3.7.0"
   },
   "dependencies": {
-    "composer-common": "0.9.3",
-    "composer-runtime": "0.9.3",
-    "composer-runtime-web": "0.9.3",
+    "composer-common": "0.10.0",
+    "composer-runtime": "0.10.0",
+    "composer-runtime-web": "0.10.0",
     "uuid": "^3.0.1"
   }
 }