Business network now can check against regitry for identityIssue (#3401)

Signed-off-by: awjh-ibm <andrew.hurt1@ibm.com>

Author: awjh-ibm

packages/composer-client/lib/businessnetworkconnection.js

@@ -803,11 +803,28 @@ class BusinessNetworkConnection extends EventEmitter {
             })
             .then((exists) => {
                 if (exists) {
-                    return this.connection.createIdentity(this.securityContext, identityName, options);
+                    if (this.connection.registryCheckRequired()) {
+                        return this.getIdentityRegistry()
+                            .then((registry) => {
+                                return registry.getAll();
+                            })
+                            .then((ids) => {
+                                ids = ids.map((el) => {
+                                    return el.name;
+                                });
+
+                                if (ids.includes(identityName)) {
+                                    throw new Error(`Identity with name ${identityName} already exists in ${this.getBusinessNetwork().getName()}`);
+                                }
+                            });
+                    }
                 } else {
                     throw new Error(`Participant '${participant.getFullyQualifiedIdentifier()}' does not exist `);
                 }
             })
+            .then(() => {
+                return this.connection.createIdentity(this.securityContext, identityName, options);
+            })
             .then((identity) => {
                 return this.submitTransaction(transaction)
                     .then(() => {

packages/composer-client/test/businessnetworkconnection.js

@@ -68,6 +68,7 @@ describe('BusinessNetworkConnection', () => {
         mockConnection = sinon.createStubInstance(Connection);
         mockSecurityContext.getConnection.returns(mockConnection);
         mockBusinessNetworkDefinition = sinon.createStubInstance(BusinessNetworkDefinition);
+        mockBusinessNetworkDefinition.getName.returns('super-doge-network');
         businessNetworkConnection = new BusinessNetworkConnection();
         businessNetworkConnection.businessNetwork = mockBusinessNetworkDefinition;
         modelManager = new ModelManager();
@@ -1146,6 +1147,45 @@ describe('BusinessNetworkConnection', () => {
                 });
         });
 
+        it('should throw an error if the identity exists in the registry and connection is requires registry check', () => {
+            mockConnection.registryCheckRequired.returns(true);
+
+            let identityRegistry = sinon.createStubInstance(IdentityRegistry);
+            identityRegistry.getAll.resolves([{name: 'dogeid1'}]);
+            sandbox.stub(IdentityRegistry, 'getIdentityRegistry').resolves(identityRegistry);
+
+            return businessNetworkConnection.issueIdentity('org.acme.sample.SampleParticipant#dogeid1', 'dogeid1')
+            .catch((error) => {
+                error.should.match(/Identity with name dogeid1 already exists in super-doge-network/);
+            });
+        });
+
+        it('should submit a request to the chaincode if the identity does not exist in the registry and connection is WebConnection', () => {
+            mockConnection.registryCheckRequired.returns(true);
+
+            let identityRegistry = sinon.createStubInstance(IdentityRegistry);
+            identityRegistry.getAll.resolves([{name: 'dogeid0'}]);
+            sandbox.stub(IdentityRegistry, 'getIdentityRegistry').resolves(identityRegistry);
+
+            sandbox.stub(businessNetworkConnection, 'submitTransaction').resolves();
+
+            return businessNetworkConnection.issueIdentity('org.acme.sample.SampleParticipant#dogeid1', 'dogeid1')
+            .then((result) => {
+                sinon.assert.calledOnce(mockConnection.createIdentity);
+                sinon.assert.calledWith(mockConnection.createIdentity, mockSecurityContext, 'dogeid1');
+                sinon.assert.calledOnce(businessNetworkConnection.submitTransaction);
+                const tx = businessNetworkConnection.submitTransaction.args[0][0];
+                tx.instanceOf('org.hyperledger.composer.system.IssueIdentity').should.be.true;
+                tx.participant.isRelationship().should.be.true;
+                tx.participant.getFullyQualifiedIdentifier().should.equal('org.acme.sample.SampleParticipant#dogeid1');
+                tx.identityName.should.equal('dogeid1');
+                result.should.deep.equal({
+                    userID : 'dogeid1',
+                    userSecret : 'suchsecret'
+                });
+            });
+        });
+
         it('should submit a request to the chaincode for a fully qualified identifier', () => {
             sandbox.stub(businessNetworkConnection, 'submitTransaction').resolves();
             return businessNetworkConnection.issueIdentity('org.acme.sample.SampleParticipant#dogeid1', 'dogeid1')

packages/composer-common/lib/connection.js

@@ -588,6 +588,14 @@ class Connection extends EventEmitter {
         throw new Error('abstract function called');
     }
 
+    /**
+     * Return whether a registry check is required before executing createIdentity to prevent duplicates.
+     * @return {boolean} false.
+     */
+    registryCheckRequired() {
+        return false;
+    }
+
     /**
      * Create a new identity for the specified user ID.
      * @param {SecurityContext} securityContext The participant's security context.

packages/composer-common/test/connection.js

@@ -576,6 +576,12 @@ describe('Connection', () => {
 
     });
 
+    describe('#registryCheckRequired', () => {
+        it('should return false', () => {
+            connection.registryCheckRequired().should.deep.equal(false);
+        });
+    });
+
     describe('#createIdentity', () => {
 
         it('should call _createIdentity and handle no error', () => {

packages/composer-connector-embedded/lib/embeddedconnection.js

@@ -373,6 +373,14 @@ class EmbeddedConnection extends Connection {
             });
     }
 
+    /**
+     * Return whether a registry check is required before executing createIdentity to prevent duplicates.
+     * @return {boolean} true.
+     */
+    registryCheckRequired() {
+        return true;
+    }
+
     /**
      * Create a new identity for the specified name.
      * @param {SecurityContext} securityContext The participant's security context.

packages/composer-connector-embedded/test/embeddedconnection.js

@@ -440,6 +440,12 @@ describe('EmbeddedConnection', () => {
 
     });
 
+    describe('#registryCheckRequired', () => {
+        it('should return true', () => {
+            connection.registryCheckRequired().should.deep.equal(true);
+        });
+    });
+
     describe('#createIdentity', () => {
 
         let mockIdentitiesDataCollection;

packages/composer-connector-web/lib/webconnection.js

@@ -350,6 +350,14 @@ class WebConnection extends Connection {
             });
     }
 
+    /**
+     * Return whether a registry check is required before executing createIdentity to prevent duplicates.
+     * @return {boolean} true.
+     */
+    registryCheckRequired() {
+        return true;
+    }
+
     /**
      * Create a new identity for the specified name.
      * @param {SecurityContext} securityContext The participant's security context.

packages/composer-connector-web/test/webconnection.js

@@ -464,6 +464,12 @@ describe('WebConnection', () => {
 
     });
 
+    describe('#registryCheckRequired', () => {
+        it('should return true', () => {
+            connection.registryCheckRequired().should.deep.equal(true);
+        });
+    });
+
     describe('#createIdentity', () => {
 
         let mockIdentitiesDataCollection;