change references to public key, acl property ref (#4065)

Playground docs incorrectly refer to public key, should be private key
Changed tests to specify certificate rather than public key
ACL reference incorrectly says you can control access to a property of an asset.

Signed-off-by: Dave Kelsey <[email protected]>

Author: davek-at-ibm

packages/composer-common/test/connectionmanager.js

@@ -62,7 +62,7 @@ describe('ConnectionManager', () => {
     describe('#importIdentity', () => {
 
         it('should throw as abstract', async () => {
-            await connectionManager.importIdentity('profile', { connect: 'options' }, 'bob1', 'public key', 'private key')
+            await connectionManager.importIdentity('profile', { connect: 'options' }, 'bob1', 'certificate', 'private key')
                 .should.be.rejectedWith(/abstract function called/);
         });
 

packages/composer-connector-proxy/test/proxyconnectionmanager.js

@@ -144,19 +144,19 @@ describe('ProxyConnectionManager', () => {
         });
 
         it('should send a importIdentity call to the connector server', () => {
-            mockSocket.emit.withArgs('/api/connectionManagerImportIdentity', connectionProfile, connectionOptions, 'bob1', 'public key', 'private key', sinon.match.func).yields(null);
+            mockSocket.emit.withArgs('/api/connectionManagerImportIdentity', connectionProfile, connectionOptions, 'bob1', 'certificate', 'private key', sinon.match.func).yields(null);
             sinon.stub(ProxyConnectionManager, 'createConnection').returns(mockConnection);
-            return connectionManager.importIdentity(connectionProfile, connectionOptions, 'bob1', 'public key', 'private key')
+            return connectionManager.importIdentity(connectionProfile, connectionOptions, 'bob1', 'certificate', 'private key')
                 .then(() => {
                     sinon.assert.calledOnce(mockSocket.emit);
-                    sinon.assert.calledWith(mockSocket.emit, '/api/connectionManagerImportIdentity', connectionProfile, connectionOptions, 'bob1', 'public key', 'private key', sinon.match.func);
+                    sinon.assert.calledWith(mockSocket.emit, '/api/connectionManagerImportIdentity', connectionProfile, connectionOptions, 'bob1', 'certificate', 'private key', sinon.match.func);
                     sinon.assert.calledTwice(mockSocket.on);
                 });
         });
 
         it('should handle an error from the connector server', () => {
-            mockSocket.emit.withArgs('/api/connectionManagerImportIdentity', connectionProfile, connectionOptions, 'bob1', 'public key', 'private key', sinon.match.func).yields(serializedError);
-            return connectionManager.importIdentity(connectionProfile, connectionOptions, 'bob1', 'public key', 'private key')
+            mockSocket.emit.withArgs('/api/connectionManagerImportIdentity', connectionProfile, connectionOptions, 'bob1', 'certificate', 'private key', sinon.match.func).yields(serializedError);
+            return connectionManager.importIdentity(connectionProfile, connectionOptions, 'bob1', 'certificate', 'private key')
                 .should.be.rejectedWith(TypeError, /such type error/);
         });
 

packages/composer-connector-server/test/connectorserver.js

@@ -327,10 +327,10 @@ describe('ConnectorServer', () => {
             mockConnectionProfileManager.getConnectionManagerByType.withArgs(connectionType).resolves(mockConnectionManager);
             mockConnectionManager.importIdentity.resolves();
             const cb = sinon.stub();
-            return connectorServer.connectionManagerImportIdentity(connectionProfile, connectionOptions, 'bob1', 'public key', 'private key', cb)
+            return connectorServer.connectionManagerImportIdentity(connectionProfile, connectionOptions, 'bob1', 'certificate', 'private key', cb)
                 .then(() => {
                     sinon.assert.calledOnce(mockConnectionManager.importIdentity);
-                    sinon.assert.calledWith(mockConnectionManager.importIdentity, connectionProfile, connectionOptions, 'bob1', 'public key', 'private key');
+                    sinon.assert.calledWith(mockConnectionManager.importIdentity, connectionProfile, connectionOptions, 'bob1', 'certificate', 'private key');
                     sinon.assert.calledOnce(cb);
                     sinon.assert.calledWith(cb, null);
                 });
@@ -340,7 +340,7 @@ describe('ConnectorServer', () => {
             mockConnectionProfileManager.getConnectionManagerByType.withArgs(connectionType).resolves(mockConnectionManager);
             mockConnectionManager.importIdentity.rejects(new Error('import error'));
             const cb = sinon.stub();
-            return connectorServer.connectionManagerImportIdentity(connectionProfile, connectionOptions, 'bob1', 'public key', 'private key', cb)
+            return connectorServer.connectionManagerImportIdentity(connectionProfile, connectionOptions, 'bob1', 'certificate', 'private key', cb)
                 .then(() => {
                     sinon.assert.calledOnce(cb);
                     const serializedError = cb.args[0][0];
@@ -356,10 +356,10 @@ describe('ConnectorServer', () => {
             const cb = sinon.stub();
             mockBusinessNetworkCardStore.getWallet.returns('CORRECT');
             connectionOptions.wallet='WRONG';
-            return connectorServer.connectionManagerImportIdentity(connectionProfile, connectionOptions, 'bob1', 'public key', 'private key', cb)
+            return connectorServer.connectionManagerImportIdentity(connectionProfile, connectionOptions, 'bob1', 'certificate', 'private key', cb)
                 .then(() => {
                     sinon.assert.calledWith(mockBusinessNetworkCardStore.getWallet,connectionOptions.cardName);
-                    sinon.assert.calledWith(mockConnectionManager.importIdentity,connectionProfile, sinon.match({wallet:'CORRECT'}), 'bob1', 'public key', 'private key');
+                    sinon.assert.calledWith(mockConnectionManager.importIdentity,connectionProfile, sinon.match({wallet:'CORRECT'}), 'bob1', 'certificate', 'private key');
                 });
         });
 

packages/composer-website/jekylldocs/managing/id-cards-playground.md

@@ -101,7 +101,7 @@ Importing and exporting business network cards is the simplest way to grant acce
 
 2. On the **My Wallet** page, click the **Export** icon on the business network card you wish to export. The business network card should download as a `.card` file.
 
-_Please note_: If you export a business network card that has never been used, for example to send to a new participant, it will contain the enrollment ID and enrollment secret required to obtain the certificate and public key which are then used to identify participants. Alternatively, if you export a business network card that has been used before, it will already contain the certificate and public key.
+_Please note_: If you export a business network card that has never been used, for example to send to a new participant, it will contain the enrollment ID and enrollment secret required to obtain the certificate and private key which are then used to identify participants. Alternatively, if you export a business network card that has been used before, it will already contain the certificate and private key.
 
 **Important**: Exported identity cards should be handled with care since they contain unprotected credentials. For example, you should never send identity cards via email or other unencrypted means of communication.
 

packages/composer-website/jekylldocs/reference/acl_language.md

@@ -106,7 +106,7 @@ ACL rules are defined in a file called `permissions.acl` in the root of the busi
 
 ## Access Control Rule Grammar
 
-There are two types of ACL rules: simple ACL rules and conditional ACL rules. Simple rules are used to control access to a namespace, asset or property of an asset by a participant type or participant instance.
+There are two types of ACL rules: simple ACL rules and conditional ACL rules. Simple rules are used to control access to a namespace or asset by a participant type or participant instance.
 
 For example, the rule below states that any instance of the `org.example.SampleParticipant` type can perform ALL operations on all instances of `org.example.SampleAsset`.