Update identities to master

.travis.yml

@@ -8,6 +8,7 @@ matrix:
         - env: SYSTEST=embedded,proxy,web FC_TASK=systest
         - env: SYSTEST=hlf FC_TASK=systest
         - env: SYSTEST=hlfv1_tls FC_TASK=systest
+        # - env: SYSTEST=e2e FC_TASK=systest
 dist: trusty
 addons:
     apt:

.travis/before-install.sh

@@ -99,8 +99,8 @@ then
     if [ "${FC_TASK}" != "docs" ]; then
 #        echo "ABORT_BUILD=true" > ${DIR}/build.cfg
 #        echo "ABORT_CODE=0" >> ${DIR}/build.cfg
-        echo 'Docs only build - no pointing bothering with anything more'
-        exit 0
+        echo 'Docs only build'
+#        exit 0
     fi
 
 else

.travis/deploy.sh

@@ -34,6 +34,12 @@ if [[ "${TRAVIS_REPO_SLUG}" != hyperledger* ]]; then
     exit 0
 fi
 
+# Check that if this is not a tagged build, then we only deploy master.
+if [ "${TRAVIS_TAG}" = "" -a "${TRAVIS_BRANCH}" != "master" ]; then
+    echo Not executing as not building a tag and not building from master
+    exit 0
+fi
+
 # are we building the docs?
 if [ "${DOCS}" != "" ]; then
   if [ -z "${TRAVIS_TAG}" ]; then

.travis/script.sh

@@ -45,6 +45,12 @@ if [ "${DOCS}" != "" ]; then
        npm run linkcheck:unstable
     fi
 
+# Are we running playground e2e tests?
+elif [ "${SYSTEST}" = "e2e" ]; then
+
+    # Run the playground e2e tests.
+    cd "${DIR}/packages/composer-playground"
+    npm run e2e:main
 
 # Are we running system tests?
 elif [ "${SYSTEST}" != "" ]; then

contrib-notes/release-process/playground-validation.md

@@ -67,7 +67,9 @@ Start with the basic sample network loaded
  - Import/replace button should bring up the Import/replace modal
     - Should have access to all samples
     - All samples should import 
-
+ - Add file button should bring up add file modal
+    - Should be able to add query file from disk
+
 ### Define Page (File-Editor)
 This page is the main file editor page, where it is possible to edit resources. We need to ensure that the linking between the side navigation menu and the file editor is consistent, that validation errors report correctly for each file type and that file specific edit options are enabled. 
 
@@ -115,6 +117,10 @@ Select ACL file
  - Reverse change to resource field
  - Error message should disappear
 
+Add a query file - a dummy file can be found at composer/packages/composer-playground/e2e/data/files/importQuery.qry
+ - It should become the focal item and contents should show in the editor
+ - Edit the file to cause a breakage, it should show an error message under the editor. Repair the file and the error message should disappear.
+
 Select the main model file and delete it
  - Deploy button should not be active
  - ACL file navigation menu should be shown in error (via red indicators)

lerna.json

@@ -3,6 +3,6 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.9.1",
+  "version": "0.9.2",
   "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.1",
+  "version": "0.9.2",
   "main": "index.js",
   "private": true,
   "scripts": {

packages/composer-admin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-admin",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "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.1",
-    "composer-connector-hlf": "^0.9.1",
-    "composer-connector-hlfv1": "^0.9.1"
+    "composer-common": "^0.9.2",
+    "composer-connector-hlf": "^0.9.2",
+    "composer-connector-hlfv1": "^0.9.2"
   },
   "license-check-config": {
     "src": [

packages/composer-admin/test/data/businessnetwork/models/mozart.cto

@@ -103,7 +103,7 @@ asset Business identified by sbi {
 /**
  * An abstract transaction type for animal movements
  */
-abstract transaction AnimalMovement identified by transactionId {
+abstract transaction AnimalMovement {
   o String transactionId
   o String[] logs optional
     --> Animal animal

packages/composer-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-cli",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "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.1",
-    "composer-client": "^0.9.1",
-    "composer-common": "^0.9.1",
-    "composer-rest-server": "^0.9.1",
+    "composer-admin": "^0.9.2",
+    "composer-client": "^0.9.2",
+    "composer-common": "^0.9.2",
+    "composer-rest-server": "^0.9.2",
     "homedir": "^0.6.0",
     "npm-paths": "^0.1.3",
     "nunjucks": "^3.0.0",

packages/composer-client/lib/businessnetworkconnection.js

@@ -552,13 +552,30 @@ class BusinessNetworkConnection extends EventEmitter {
             throw new Error('userID not specified');
         }
         let participantFQI;
+        let participantId;
+        let participantType;
         if (participant instanceof Resource) {
             participantFQI = participant.getFullyQualifiedIdentifier();
+            participantId = participant.getIdentifier();
+            participantType = participant.getFullyQualifiedType();
         } else {
             participantFQI = participant;
+            participantId = participantFQI.substring(participantFQI.lastIndexOf('#') + 1);
+            participantType = participantFQI.substr(0, participantFQI.lastIndexOf('#'));
         }
+
         Util.securityCheck(this.securityContext);
-        return this.connection.createIdentity(this.securityContext, userID, options)
+        return this.getParticipantRegistry(participantType)
+            .then((participantRegistry) => {
+                return participantRegistry.exists(participantId);
+            })
+            .then((exists) => {
+                if (exists) {
+                    return this.connection.createIdentity(this.securityContext, userID, options);
+                } else {
+                    throw new Error(`Participant '${participantFQI}' does not exist `);
+                }
+            })
             .then((identity) => {
                 return Util.invokeChainCode(this.securityContext, 'addParticipantIdentity', [participantFQI, userID])
                     .then(() => {

packages/composer-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-client",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "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.1",
-    "composer-connector-hlf": "^0.9.1",
-    "composer-connector-hlfv1": "^0.9.1",
+    "composer-common": "^0.9.2",
+    "composer-connector-hlf": "^0.9.2",
+    "composer-connector-hlfv1": "^0.9.2",
     "uuid": "^3.0.1"
   },
   "devDependencies": {

packages/composer-client/test/businessnetworkconnection.js

@@ -55,6 +55,7 @@ describe('BusinessNetworkConnection', () => {
     let mockQueryFile;
     let mockFactory;
     let mockSerializer;
+    let mockParticipantRegistry;
 
     beforeEach(() => {
         sandbox = sinon.sandbox.create();
@@ -74,6 +75,7 @@ describe('BusinessNetworkConnection', () => {
         mockSerializer = sinon.createStubInstance(Serializer);
         businessNetworkConnection.businessNetwork.getSerializer.returns(mockSerializer);
         businessNetworkConnection.securityContext = mockSecurityContext;
+        mockParticipantRegistry = sinon.createStubInstance(ParticipantRegistry);
         delete process.env.COMPOSER_CONFIG;
     });
 
@@ -868,6 +870,11 @@ describe('BusinessNetworkConnection', () => {
                 userID: 'dogeid1',
                 userSecret: 'suchsecret'
             });
+
+            mockParticipantRegistry.exists.resolves(true);
+            businessNetworkConnection.getParticipantRegistry = () => {
+                return Promise.resolve(mockParticipantRegistry);
+            };
         });
 
         it('should throw if participant not specified', () => {
@@ -931,6 +938,15 @@ describe('BusinessNetworkConnection', () => {
                 });
         });
 
+        it('should throw if participant does not exist', () => {
+            sandbox.stub(Util, 'invokeChainCode').resolves();
+            mockParticipantRegistry.exists.resolves(false);
+
+            return businessNetworkConnection.issueIdentity('org.doge.Doge#DOGE_1', 'dogeid1')
+                .catch((error) => {
+                    error.should.match(/does not exist /);
+                });
+        });
     });
 
     describe('#revokeIdentity', () => {

packages/composer-common/api.txt

@@ -26,11 +26,11 @@ class BusinessNetworkMetadata {
 }
 class Factory {
    + void constructor(ModelManager) 
-   + Resource newResource(string,string,string,Object,boolean,string) throws TypeNotFoundException
-   + Resource newConcept(string,string,Object,boolean,string) throws TypeNotFoundException
+   + Resource newResource(string,string,string,Object,boolean,string,boolean) throws TypeNotFoundException
+   + Resource newConcept(string,string,Object,boolean,string,boolean) throws TypeNotFoundException
    + Relationship newRelationship(string,string,string) throws TypeNotFoundException
-   + Resource newTransaction(string,string,string,Object,string) 
-   + Resource newEvent(string,string,string,Object,string) 
+   + Resource newTransaction(string,string,string,Object,string,boolean) 
+   + Resource newEvent(string,string,string,Object,string,boolean) 
 }
 class FileWallet extends Wallet {
    + string getHomeDirectory() 

packages/composer-common/changelog.txt

@@ -11,6 +11,8 @@
 #
 # Note that the latest public API is documented using JSDocs and is available in api.txt.
 #
+Version 0.9.2 {60327250ee4f059647020f8aee5ed67b} 2017-07-06
+- Added includeOptionalFields option to Factory.newXXX functions
 
 Version 0.9.0 {d0b9ae5179276e20604874624fe9529d} 2017-06-23
 - Removed useless toJSON methods everywhere

packages/composer-common/lib/businessnetworkdefinition.js

@@ -532,7 +532,7 @@ class BusinessNetworkDefinition {
             }
         }
 
-         // grab the query.qry
+         // grab the queries.qry
         const queryPath = fsPath.resolve(path, 'queries.qry');
         if(fs.existsSync(queryPath)) {
             let queryContents = fs.readFileSync( queryPath, ENCODING);

packages/composer-common/lib/codegen/fromcto/loopback/loopbackvisitor.js

@@ -326,7 +326,7 @@ class LoopbackVisitor {
 
         // Add information from the class declaration into the composer section.
         if (jsonSchema.options && jsonSchema.options.composer) {
-            jsonSchema.options.composer.namespace = classDeclaration.getModelFile().getNamespace();
+            jsonSchema.options.composer.namespace = classDeclaration.getNamespace();
             jsonSchema.options.composer.name = classDeclaration.getName();
             jsonSchema.options.composer.fqn = classDeclaration.getFullyQualifiedName();
         }