- added optional username for secure context

Author: dshuffma-ibm

README.md

@@ -291,30 +291,42 @@ Ex:
 - Chaincode functions are dependent on actually be found inside your Go chaincode
 - My advise is to build your chaincode off of the Marble Application one.  This way you get the basic CRUD functions below:
 
-### chaincode.read(name, [callback])
+### chaincode.read(name, [username], [callback])
 Read variable named name from chaincode state. 
 This will call the `Query()` function in the Go chaincode, therefore the `Query()` function needs to exists in the cc. 
 The variable name will be passed as `arg[0]` to `Query()`. 
+The `username` parameter should be the desired secure context username that has already been registered against the selected peer. 
+If left `null` the SDK will use a known username for the selected peer. (this is only relevant in a permissioned network)
 
-### chaincode.query(args, [callback])
+### chaincode.query(args, [username], [callback])
 This will call the query function with custom input arguments. 
 Usually "args" is an array of strings. 
+The `username` parameter should be the desired secure context username that has already been registered against the selected peer. 
+If left `null` the SDK will use a known username for the selected peer. (this is only relevant in a permissioned network)
 
-### chaincode.write(name, val, [callback])
+### chaincode.write(name, val, [username], [callback])
 Write 'val' to variable named 'name'. This will call the `write()` function in the Go chaincode, therefore the `write()` function needs to exists in the cc.
+The `username` parameter should be the desired secure context username that has already been registered against the selected peer. 
+If left `null` the SDK will use a known username for the selected peer. (this is only relevant in a permissioned network)
 
-### chaincode.remove(name, [callback])
+### chaincode.remove(name, [username], [callback])
 Delete variable named 'name'. This will call the `delete()` function in the Go chaincode, therefore the `delete()` function needs to exists in the cc.
+The `username` parameter should be the desired secure context username that has already been registered against the selected peer. 
+If left `null` the SDK will use a known username for the selected peer. (this is only relevant in a permissioned network)
 
-### chaincode.deploy(func, args, [save_path], [callback])
+### chaincode.deploy(func, args, [save_path], [username], [callback])
 Deploy the chaincode. 
 Call GoLang function named 'func' and feed it 'args'.
 Optionally save [Chaincode Summary File](#ccsf) to 'save_path'. 
 Usualy "args" is an array of strings.
+The `username` parameter should be the desired secure context username that has already been registered against the selected peer. 
+If left `null` the SDK will use a known username for the selected peer. (this is only relevant in a permissioned network)
 
-### chaincode.CUSTOM_FUNCTION_NAME(args, [callback])
+### chaincode.CUSTOM_FUNCTION_NAME(args, [username], [callback])
 Will invoke your Go function CUSTOM_FUNCTION_NAME and pass it 'arg'. 
 Usualy "args" is an array of strings.
+The `username` parameter should be the desired secure context username that has already been registered against the selected peer. 
+If left `null` the SDK will use a known username for the selected peer. (this is only relevant in a permissioned network)
 
 ***
 ***

index.js

@@ -448,8 +448,11 @@ ibc.prototype.block_stats =  function(id, cb){
 //read() - read generic variable from chaincode state
 //============================================================================================================================
 function read(name, username, cb){
-	if(typeof username === 'function' || (username == null && cb == null)) {
-		cb = username; 														//cb is in 2nd param OR null use known username
+	if(typeof username === 'function'){ 									//if cb is in 2nd param use known username
+		cb = username;
+		username = ibc.chaincode.details.peers[ibc.selectedPeer].user;
+	}
+	if(username == null) {													//if username not provided, use known valid one
 		username = ibc.chaincode.details.peers[ibc.selectedPeer].user;
 	}
 
@@ -485,10 +488,14 @@ function read(name, username, cb){
 //query() - read generic variable from chaincode state
 //============================================================================================================================
 function query(args, username, cb){
-	if(typeof username === 'function' || (username == null && cb == null)) {
-		cb = username; 														//cb is in 2nd param OR null use known username
+	if(typeof username === 'function'){ 									//if cb is in 2nd param use known username
+		cb = username;
 		username = ibc.chaincode.details.peers[ibc.selectedPeer].user;
 	}
+	if(username == null) {													//if username not provided, use known valid one
+		username = ibc.chaincode.details.peers[ibc.selectedPeer].user;
+	}
+	
 	var options = {
 		path: '/devops/query'
 	};
@@ -521,10 +528,14 @@ function query(args, username, cb){
 //write() - write generic variable to chaincode state
 //============================================================================================================================
 function write(name, val, username, cb){
-	if(typeof username === 'function' || (username == null && cb == null)) {
-		cb = username; 														//cb is in 2nd param OR null use known username
+	if(typeof username === 'function'){ 									//if cb is in 2nd param use known username
+		cb = username;
 		username = ibc.chaincode.details.peers[ibc.selectedPeer].user;
 	}
+	if(username == null) {													//if username not provided, use known valid one
+		username = ibc.chaincode.details.peers[ibc.selectedPeer].user;
+	}
+	
 	var options = {
 		path: '/devops/invoke'
 	};
@@ -558,10 +569,14 @@ function write(name, val, username, cb){
 //remove() - delete a generic variable from chaincode state
 //============================================================================================================================
 function remove(name, username, cb){
-	if(typeof username === 'function' || (username == null && cb == null)) {
-		cb = username; 														//cb is in 2nd param OR null use known username
+	if(typeof username === 'function'){ 									//if cb is in 2nd param use known username
+		cb = username;
 		username = ibc.chaincode.details.peers[ibc.selectedPeer].user;
 	}
+	if(username == null) {													//if username not provided, use known valid one
+		username = ibc.chaincode.details.peers[ibc.selectedPeer].user;
+	}
+	
 	var options = {
 		path: '/devops/invoke'
 	};
@@ -626,10 +641,14 @@ ibc.prototype.register = function(index, enrollID, enrollSecret, cb) {
 //deploy() - deploy chaincode and call a cc function
 //============================================================================================================================
 function deploy(func, args, save_path, username, cb){
-	if(typeof username === 'function' || (username == null && cb == null)) {
-		cb = username; 															//cb is in 2nd param OR null use known username
+	if(typeof username === 'function'){ 									//if cb is in 2nd param use known username
+		cb = username;
+		username = ibc.chaincode.details.peers[ibc.selectedPeer].user;
+	}
+	if(username == null) {													//if username not provided, use known valid one
 		username = ibc.chaincode.details.peers[ibc.selectedPeer].user;
 	}
+	
 	console.log('[ibc-js] Deploying Chaincode - Starting');
 	console.log('[ibc-js] \tfunction:', func, ', arg:', args);
 	console.log('\n\n\t Waiting...');											//this can take awhile
@@ -728,10 +747,14 @@ function build_chaincode_func(name){
 		console.log('[ibc-js] Found cc function: ', name);
 		ibc.chaincode.details.func.push(name);
 		ibc.chaincode[name] = function(args, username, cb){							//create the function in the chaincode obj
-			if(typeof username === 'function' || (username == null && cb == null)) {
-				cb = username; 														//cb is in 2nd param OR null use known username
+			if(typeof username === 'function'){ 									//if cb is in 2nd param use known username
+				cb = username;
+				username = ibc.chaincode.details.peers[ibc.selectedPeer].user;
+			}
+			if(username == null) {													//if username not provided, use known valid one
 				username = ibc.chaincode.details.peers[ibc.selectedPeer].user;
 			}
+	
 			var options = {path: '/devops/invoke'};
 			var body = {
 					chaincodeSpec: {