[FAB-6568] Fabric-Samples - update fabcar

Update the fabcar sample with an easier flow
Remove hardcoded fields in the invoke program

Change-Id: I9a06cdd317c2afec80720ac7d728d38fc62c6f63
Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
Signed-off-by: Nick Gaski <ngaski@us.ibm.com>

basic-network/docker-compose.yml

@@ -14,9 +14,11 @@ services:
  environment:
  - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server
  - FABRIC_CA_SERVER_CA_NAME=ca.example.com
+ - FABRIC_CA_SERVER_CA_CERTFILE=/etc/hyperledger/fabric-ca-server-config/ca.org1.example.com-cert.pem
+ - FABRIC_CA_SERVER_CA_KEYFILE=/etc/hyperledger/fabric-ca-server-config/4239aa0dcd76daeeb8ba0cda701851d14504d31aad1b2ddddbac6a57365e497c_sk
  ports:
  - "7054:7054"
- command: sh -c 'fabric-ca-server start --ca.certfile /etc/hyperledger/fabric-ca-server-config/org1.example.com-cert.pem --ca.keyfile /etc/hyperledger/fabric-ca-server-config/a22daf356b2aab5792ea53e35f66fccef1d7f1aa2b3a2b92dbfbf96a448ea26a_sk -b admin:adminpw -d'
+ command: sh -c 'fabric-ca-server start -b admin:adminpw -d'
  volumes:
  - ./crypto-config/peerOrganizations/org1.example.com/ca/:/etc/hyperledger/fabric-ca-server-config
  container_name: ca.example.com

fabcar/enrollAdmin.js

@@ -0,0 +1,75 @@
+'use strict';
+/*
+* Copyright IBM Corp All Rights Reserved
+*
+* SPDX-License-Identifier: Apache-2.0
+*/
+/*
+ * Enroll the admin user
+ */
+
+var Fabric_Client = require('fabric-client');
+var Fabric_CA_Client = require('fabric-ca-client');
+
+var path = require('path');
+var util = require('util');
+var os = require('os');
+
+//
+var fabric_client = new Fabric_Client();
+var fabric_ca_client = null;
+var admin_user = null;
+var member_user = null;
+var store_path = path.join(__dirname, 'hfc-key-store');
+console.log(' Store path:'+store_path);
+
+// create the key value store as defined in the fabric-client/config/default.json 'key-value-store' setting
+Fabric_Client.newDefaultKeyValueStore({ path: store_path
+}).then((state_store) => {
+ // assign the store to the fabric client
+ fabric_client.setStateStore(state_store);
+ var crypto_suite = Fabric_Client.newCryptoSuite();
+ // use the same location for the state store (where the users' certificate are kept)
+ // and the crypto store (where the users' keys are kept)
+ var crypto_store = Fabric_Client.newCryptoKeyStore({path: store_path});
+ crypto_suite.setCryptoKeyStore(crypto_store);
+ fabric_client.setCryptoSuite(crypto_suite);
+ var tlsOptions = {
+ trustedRoots: [],
+ verify: false
+ };
+ // be sure to change the http to https when the CA is running TLS enabled
+ fabric_ca_client = new Fabric_CA_Client('http://localhost:7054', tlsOptions , 'ca.example.com', crypto_suite);
+
+ // first check to see if the admin is already enrolled
+ return fabric_client.getUserContext('admin', true);
+}).then((user_from_store) => {
+ if (user_from_store && user_from_store.isEnrolled()) {
+ console.log('Successfully loaded admin from persistence');
+ admin_user = user_from_store;
+ return null;
+ } else {
+ // need to enroll it with CA server
+ return fabric_ca_client.enroll({
+ enrollmentID: 'admin',
+ enrollmentSecret: 'adminpw'
+ }).then((enrollment) => {
+ console.log('Successfully enrolled admin user "admin"');
+ return fabric_client.createUser(
+ {username: 'admin',
+ mspid: 'Org1MSP',
+ cryptoContent: { privateKeyPEM: enrollment.key.toBytes(), signedCertPEM: enrollment.certificate }
+ });
+ }).then((user) => {
+ admin_user = user;
+ return fabric_client.setUserContext(admin_user);
+ }).catch((err) => {
+ console.error('Failed to enroll and persist admin. Error: ' + err.stack ? err.stack : err);
+ throw new Error('Failed to enroll admin');
+ });
+ }
+}).then(() => {
+ console.log('Assigned the admin user to the fabric client ::' + admin_user.toString());
+}).catch((err) => {
+ console.error('Failed to enroll admin: ' + err);
+});