@rockcarver/frodo-lib 1.0.0 → 2.0.0-2

package/cjs/ops/ConnectionProfileOps.js

@@ -4,18 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.addNewServiceAccount = addNewServiceAccount;
+exports.default = void 0;
 exports.deleteConnectionProfile = deleteConnectionProfile;
-exports.describeConnectionProfile = describeConnectionProfile;
 exports.getConnectionProfile = getConnectionProfile;
 exports.getConnectionProfileByHost = getConnectionProfileByHost;
 exports.getConnectionProfilesPath = getConnectionProfilesPath;
 exports.initConnectionProfiles = initConnectionProfiles;
-exports.listConnectionProfiles = listConnectionProfiles;
 exports.saveConnectionProfile = saveConnectionProfile;
 var _fs = _interopRequireDefault(require("fs"));
 var _os = _interopRequireDefault(require("os"));
 var _path = _interopRequireDefault(require("path"));
-var state = _interopRequireWildcard(require("../shared/State"));
 var _DataProtection = _interopRequireDefault(require("./utils/DataProtection"));
 var _Console = require("./utils/Console");
 var _StaticStorage = require("../storage/StaticStorage");
@@ -23,17 +21,125 @@ var _JoseOps = require("./JoseOps");
 var _ServiceAccountOps = require("./cloud/ServiceAccountOps");
 var _ExportImportUtils = require("./utils/ExportImportUtils");
 var _OpsUtils = require("./utils/OpsUtils");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-var crypto = new _DataProtection.default();
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+class ConnectionProfileOps {
+  constructor(state) {
+    this.state = state;
+  }
+
+  /**
+   * Get connection profiles file name
+   * @returns {string} connection profiles file name
+   */
+  getConnectionProfilesPath() {
+    return getConnectionProfilesPath({
+      state: this.state
+    });
+  }
+
+  /**
+   * Find connection profiles
+   * @param {ConnectionsFileInterface} connectionProfiles connection profile object
+   * @param {string} host host url or unique substring
+   * @returns {SecureConnectionProfileInterface[]} Array of connection profiles
+   */
+  findConnectionProfiles(connectionProfiles, host) {
+    return findConnectionProfiles({
+      connectionProfiles,
+      host
+    });
+  }
+
+  /**
+   * Initialize connection profiles
+   *
+   * This method is called from app.ts and runs before any of the message handlers are registered.
+   * Therefore none of the Console message functions will produce any output.
+   */
+  initConnectionProfiles() {
+    var _this = this;
+    return _asyncToGenerator(function* () {
+      initConnectionProfiles({
+        state: _this.state
+      });
+    })();
+  }
+
+  /**
+   * Get connection profile by host
+   * @param {String} host host tenant host url or unique substring
+   * @returns {Object} connection profile or null
+   */
+  getConnectionProfileByHost(host) {
+    var _this2 = this;
+    return _asyncToGenerator(function* () {
+      return getConnectionProfileByHost({
+        host,
+        state: _this2.state
+      });
+    })();
+  }
+
+  /**
+   * Get connection profile
+   * @returns {Object} connection profile or null
+   */
+  getConnectionProfile() {
+    var _this3 = this;
+    return _asyncToGenerator(function* () {
+      return getConnectionProfile({
+        state: _this3.state
+      });
+    })();
+  }
+
+  /**
+   * Save connection profile
+   * @param {string} host host url for new profiles or unique substring for existing profiles
+   * @returns {Promise<boolean>} true if the operation succeeded, false otherwise
+   */
+  saveConnectionProfile(host) {
+    var _this4 = this;
+    return _asyncToGenerator(function* () {
+      return saveConnectionProfile({
+        host,
+        state: _this4.state
+      });
+    })();
+  }
+
+  /**
+   * Delete connection profile
+   * @param {string} host host tenant host url or unique substring
+   */
+  deleteConnectionProfile(host) {
+    deleteConnectionProfile({
+      host,
+      state: this.state
+    });
+  }
+
+  /**
+   * Create a new service account using auto-generated parameters
+   * @returns {Promise<IdObjectSkeletonInterface>} A promise resolving to a service account object
+   */
+  addNewServiceAccount() {
+    var _this5 = this;
+    return _asyncToGenerator(function* () {
+      return addNewServiceAccount({
+        state: _this5.state
+      });
+    })();
+  }
+}
+exports.default = ConnectionProfileOps;
 var fileOptions = {
   indentation: 4
 };
@@ -42,9 +148,13 @@ var newProfileFilename = 'Connections.json';
 
 /**
  * Get connection profiles file name
+ * @param {State} state library state
  * @returns {String} connection profiles file name
  */
-function getConnectionProfilesPath() {
+function getConnectionProfilesPath(_ref) {
+  var {
+    state
+  } = _ref;
   return state.getConnectionProfilesPath() || process.env[_StaticStorage.FRODO_CONNECTION_PROFILES_PATH_KEY] || "".concat(_os.default.homedir(), "/.frodo/").concat(newProfileFilename);
 }
 
@@ -52,9 +162,14 @@ function getConnectionProfilesPath() {
  * Find connection profiles
  * @param {ConnectionsFileInterface} connectionProfiles connection profile object
  * @param {string} host host url or unique substring
+ * @param {State} state library state
  * @returns {SecureConnectionProfileInterface[]} Array of connection profiles
  */
-function findConnectionProfiles(connectionProfiles, host) {
+function findConnectionProfiles(_ref2) {
+  var {
+    connectionProfiles,
+    host
+  } = _ref2;
   var profiles = [];
   for (var tenant in connectionProfiles) {
     (0, _Console.debugMessage)("ConnectionProfileOps.findConnectionProfiles: tenant=".concat(tenant));
@@ -68,39 +183,6 @@ function findConnectionProfiles(connectionProfiles, host) {
   return profiles;
 }
 
-/**
- * List connection profiles
- * @param {boolean} long Long list format with details
- */
-function listConnectionProfiles() {
-  var long = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-  var filename = getConnectionProfilesPath();
-  try {
-    var data = _fs.default.readFileSync(filename, 'utf8');
-    var connectionsData = JSON.parse(data);
-    if (Object.keys(connectionsData).length < 1) {
-      (0, _Console.printMessage)("No connections defined yet in ".concat(filename), 'info');
-    } else {
-      if (long) {
-        var table = (0, _Console.createTable)(['Host', 'Service Account', 'Username', 'Log API Key']);
-        Object.keys(connectionsData).forEach(c => {
-          table.push([c, connectionsData[c].svcacctName || connectionsData[c].svcacctId, connectionsData[c].username, connectionsData[c].logApiKey]);
-        });
-        (0, _Console.printMessage)(table.toString(), 'data');
-      } else {
-        Object.keys(connectionsData).forEach(c => {
-          (0, _Console.printMessage)("".concat(c), 'data');
-        });
-        // getUniqueNames(5, Object.keys(connectionsData));
-      }
-
-      (0, _Console.printMessage)('Any unique substring of a saved host can be used as the value for host parameter in all commands', 'info');
-    }
-  } catch (e) {
-    (0, _Console.printMessage)("No connections found in ".concat(filename, " (").concat(e.message, ")"), 'error');
-  }
-}
-
 /**
  * Migrate from .frodorc to Connections.json
  */
@@ -126,19 +208,27 @@ function migrateFromLegacyProfile() {
  *
  * This method is called from app.ts and runs before any of the message handlers are registered.
  * Therefore none of the Console message functions will produce any output.
+ * @param {State} state library state
  */
-function initConnectionProfiles() {
+function initConnectionProfiles(_x) {
   return _initConnectionProfiles.apply(this, arguments);
 }
 /**
  * Get connection profile by host
  * @param {String} host host tenant host url or unique substring
+ * @param {State} state library state
  * @returns {Object} connection profile or null
  */
 function _initConnectionProfiles() {
-  _initConnectionProfiles = _asyncToGenerator(function* () {
+  _initConnectionProfiles = _asyncToGenerator(function* (_ref3) {
+    var {
+      state
+    } = _ref3;
+    var dataProtection = new _DataProtection.default(state.getMasterKeyPath());
     // create connections.json file if it doesn't exist
-    var filename = getConnectionProfilesPath();
+    var filename = getConnectionProfilesPath({
+      state
+    });
     var folderName = _path.default.dirname(filename);
     if (!_fs.default.existsSync(folderName)) {
       _fs.default.mkdirSync(folderName, {
@@ -157,17 +247,17 @@ function _initConnectionProfiles() {
       for (var conn of Object.keys(connectionsData)) {
         if (connectionsData[conn]['password']) {
           convert = true;
-          connectionsData[conn].encodedPassword = yield crypto.encrypt(connectionsData[conn]['password']);
+          connectionsData[conn].encodedPassword = yield dataProtection.encrypt(connectionsData[conn]['password']);
           delete connectionsData[conn]['password'];
         }
         if (connectionsData[conn]['logApiSecret']) {
           convert = true;
-          connectionsData[conn].encodedLogApiSecret = yield crypto.encrypt(connectionsData[conn]['logApiSecret']);
+          connectionsData[conn].encodedLogApiSecret = yield dataProtection.encrypt(connectionsData[conn]['logApiSecret']);
           delete connectionsData[conn]['logApiSecret'];
         }
         if (connectionsData[conn]['svcacctJwk']) {
           convert = true;
-          connectionsData[conn].encodedSvcacctJwk = yield crypto.encrypt(connectionsData[conn]['svcacctJwk']);
+          connectionsData[conn].encodedSvcacctJwk = yield dataProtection.encrypt(connectionsData[conn]['svcacctJwk']);
           delete connectionsData[conn]['svcacctJwk'];
         }
       }
@@ -178,7 +268,7 @@ function _initConnectionProfiles() {
   });
   return _initConnectionProfiles.apply(this, arguments);
 }
-function getConnectionProfileByHost(_x) {
+function getConnectionProfileByHost(_x2) {
   return _getConnectionProfileByHost.apply(this, arguments);
 }
 /**
@@ -186,11 +276,21 @@ function getConnectionProfileByHost(_x) {
  * @returns {Object} connection profile or null
  */
 function _getConnectionProfileByHost() {
-  _getConnectionProfileByHost = _asyncToGenerator(function* (host) {
+  _getConnectionProfileByHost = _asyncToGenerator(function* (_ref4) {
+    var {
+      host,
+      state
+    } = _ref4;
     try {
-      var filename = getConnectionProfilesPath();
+      var dataProtection = new _DataProtection.default(state.getMasterKeyPath());
+      var filename = getConnectionProfilesPath({
+        state
+      });
       var connectionsData = JSON.parse(_fs.default.readFileSync(filename, 'utf8'));
-      var profiles = findConnectionProfiles(connectionsData, host);
+      var profiles = findConnectionProfiles({
+        connectionProfiles: connectionsData,
+        host
+      });
       if (profiles.length == 0) {
         (0, _Console.printMessage)("Profile for ".concat(host, " not found. Please specify credentials on command line"), 'error');
         return null;
@@ -206,14 +306,14 @@ function _getConnectionProfileByHost() {
       return {
         tenant: profiles[0].tenant,
         username: profiles[0].username ? profiles[0].username : null,
-        password: profiles[0].encodedPassword ? yield crypto.decrypt(profiles[0].encodedPassword) : null,
+        password: profiles[0].encodedPassword ? yield dataProtection.decrypt(profiles[0].encodedPassword) : null,
         logApiKey: profiles[0].logApiKey ? profiles[0].logApiKey : null,
-        logApiSecret: profiles[0].encodedLogApiSecret ? yield crypto.decrypt(profiles[0].encodedLogApiSecret) : null,
+        logApiSecret: profiles[0].encodedLogApiSecret ? yield dataProtection.decrypt(profiles[0].encodedLogApiSecret) : null,
         authenticationService: profiles[0].authenticationService ? profiles[0].authenticationService : null,
         authenticationHeaderOverrides: profiles[0].authenticationHeaderOverrides ? profiles[0].authenticationHeaderOverrides : {},
         svcacctName: profiles[0].svcacctName ? profiles[0].svcacctName : null,
         svcacctId: profiles[0].svcacctId ? profiles[0].svcacctId : null,
-        svcacctJwk: profiles[0].encodedSvcacctJwk ? yield crypto.decrypt(profiles[0].encodedSvcacctJwk) : null
+        svcacctJwk: profiles[0].encodedSvcacctJwk ? yield dataProtection.decrypt(profiles[0].encodedSvcacctJwk) : null
       };
     } catch (e) {
       (0, _Console.printMessage)("Can not read saved connection info, please specify credentials on command line: ".concat(e), 'error');
@@ -222,7 +322,7 @@ function _getConnectionProfileByHost() {
   });
   return _getConnectionProfileByHost.apply(this, arguments);
 }
-function getConnectionProfile() {
+function getConnectionProfile(_x3) {
   return _getConnectionProfile.apply(this, arguments);
 }
 /**
@@ -231,12 +331,18 @@ function getConnectionProfile() {
  * @returns {Promise<boolean>} true if the operation succeeded, false otherwise
  */
 function _getConnectionProfile() {
-  _getConnectionProfile = _asyncToGenerator(function* () {
-    return getConnectionProfileByHost(state.getHost());
+  _getConnectionProfile = _asyncToGenerator(function* (_ref5) {
+    var {
+      state
+    } = _ref5;
+    return getConnectionProfileByHost({
+      host: state.getHost(),
+      state
+    });
   });
   return _getConnectionProfile.apply(this, arguments);
 }
-function saveConnectionProfile(_x2) {
+function saveConnectionProfile(_x4) {
   return _saveConnectionProfile.apply(this, arguments);
 }
 /**
@@ -244,9 +350,16 @@ function saveConnectionProfile(_x2) {
  * @param {String} host host tenant host url or unique substring
  */
 function _saveConnectionProfile() {
-  _saveConnectionProfile = _asyncToGenerator(function* (host) {
+  _saveConnectionProfile = _asyncToGenerator(function* (_ref6) {
+    var {
+      host,
+      state
+    } = _ref6;
     (0, _Console.debugMessage)("ConnectionProfileOps.saveConnectionProfile: start");
-    var filename = getConnectionProfilesPath();
+    var dataProtection = new _DataProtection.default(state.getMasterKeyPath());
+    var filename = getConnectionProfilesPath({
+      state
+    });
     (0, _Console.debugMessage)("Saving connection profile in ".concat(filename));
     var profiles = {};
     var profile = {
@@ -258,7 +371,10 @@ function _saveConnectionProfile() {
       profiles = JSON.parse(data);
 
       // find tenant
-      var found = findConnectionProfiles(profiles, host);
+      var found = findConnectionProfiles({
+        connectionProfiles: profiles,
+        host
+      });
 
       // replace tenant in session with real tenant url if necessary
       if (found.length === 1) {
@@ -285,21 +401,27 @@ function _saveConnectionProfile() {
 
     // user account
     if (state.getUsername()) profile.username = state.getUsername();
-    if (state.getPassword()) profile.encodedPassword = yield crypto.encrypt(state.getPassword());
+    if (state.getPassword()) profile.encodedPassword = yield dataProtection.encrypt(state.getPassword());
 
     // log API
     if (state.getLogApiKey()) profile.logApiKey = state.getLogApiKey();
-    if (state.getLogApiSecret()) profile.encodedLogApiSecret = yield crypto.encrypt(state.getLogApiSecret());
+    if (state.getLogApiSecret()) profile.encodedLogApiSecret = yield dataProtection.encrypt(state.getLogApiSecret());
 
     // service account
     if (state.getServiceAccountId()) {
       profile.svcacctId = state.getServiceAccountId();
-      profile.svcacctName = (yield (0, _ServiceAccountOps.getServiceAccount)(state.getServiceAccountId())).name;
+      profile.svcacctName = (yield (0, _ServiceAccountOps.getServiceAccount)({
+        serviceAccountId: state.getServiceAccountId(),
+        state
+      })).name;
     }
-    if (state.getServiceAccountJwk()) profile.encodedSvcacctJwk = yield crypto.encrypt(state.getServiceAccountJwk());
+    if (state.getServiceAccountJwk()) profile.encodedSvcacctJwk = yield dataProtection.encrypt(state.getServiceAccountJwk());
     // update existing service account profile
     if (profile.svcacctId && !profile.svcacctName) {
-      profile.svcacctName = (yield (0, _ServiceAccountOps.getServiceAccount)(profile.svcacctId)).name;
+      profile.svcacctName = (yield (0, _ServiceAccountOps.getServiceAccount)({
+        serviceAccountId: profile.svcacctId,
+        state
+      })).name;
       (0, _Console.debugMessage)("ConnectionProfileOps.saveConnectionProfile: added missing service account name");
     }
 
@@ -327,21 +449,35 @@ function _saveConnectionProfile() {
     }, {});
 
     // save profiles
-    (0, _ExportImportUtils.saveJsonToFile)(orderedProfiles, filename, false);
+    (0, _ExportImportUtils.saveJsonToFile)({
+      data: orderedProfiles,
+      filename,
+      includeMeta: false,
+      state
+    });
     (0, _Console.verboseMessage)("Saved connection profile ".concat(state.getHost(), " in ").concat(filename));
     (0, _Console.debugMessage)("ConnectionProfileOps.saveConnectionProfile: end [true]");
     return true;
   });
   return _saveConnectionProfile.apply(this, arguments);
 }
-function deleteConnectionProfile(host) {
-  var filename = getConnectionProfilesPath();
+function deleteConnectionProfile(_ref7) {
+  var {
+    host,
+    state
+  } = _ref7;
+  var filename = getConnectionProfilesPath({
+    state
+  });
   var connectionsData = {};
   _fs.default.stat(filename, err => {
     if (err == null) {
       var data = _fs.default.readFileSync(filename, 'utf8');
       connectionsData = JSON.parse(data);
-      var profiles = findConnectionProfiles(connectionsData, host);
+      var profiles = findConnectionProfiles({
+        connectionProfiles: connectionsData,
+        host
+      });
       if (profiles.length == 1) {
         delete connectionsData[profiles[0].tenant];
         _fs.default.writeFileSync(filename, JSON.stringify(connectionsData, null, 2));
@@ -366,79 +502,18 @@ function deleteConnectionProfile(host) {
   });
 }
 
-/**
- * Describe connection profile
- * @param {string} host Host URL or unique substring
- * @param {boolean} showSecrets Whether secrets should be shown in clear text or not
- */
-function describeConnectionProfile(_x3, _x4) {
-  return _describeConnectionProfile.apply(this, arguments);
-}
 /**
  * Create a new service account using auto-generated parameters
  * @returns {Promise<IdObjectSkeletonInterface>} A promise resolving to a service account object
  */
-function _describeConnectionProfile() {
-  _describeConnectionProfile = _asyncToGenerator(function* (host, showSecrets) {
-    (0, _Console.debugMessage)("ConnectionProfileOps.describeConnectionProfile: start");
-    var profile = yield getConnectionProfileByHost(host);
-    if (profile) {
-      (0, _Console.debugMessage)(profile);
-      var present = '[present]';
-      var jwk = profile.svcacctJwk;
-      if (!showSecrets) {
-        if (profile.password) profile.password = present;
-        if (profile.logApiSecret) profile.logApiSecret = present;
-        if (profile.svcacctJwk) profile['svcacctJwk'] = present;
-      }
-      if (!profile.username) {
-        delete profile.username;
-        delete profile.password;
-      }
-      if (!profile.logApiKey) {
-        delete profile.logApiKey;
-        delete profile.logApiSecret;
-      }
-      if (!profile.svcacctId) {
-        delete profile.svcacctId;
-        delete profile.svcacctJwk;
-        delete profile.svcacctName;
-      }
-      if (showSecrets && jwk) {
-        profile['svcacctJwk'] = 'see below';
-      }
-      if (!profile.authenticationService) {
-        delete profile.authenticationService;
-      }
-      var keyMap = {
-        tenant: 'Host',
-        username: 'Username',
-        password: 'Password',
-        logApiKey: 'Log API Key',
-        logApiSecret: 'Log API Secret',
-        authenticationService: 'Authentication Service',
-        authenticationHeaderOverrides: 'Authentication Header Overrides',
-        svcacctName: 'Service Account Name',
-        svcacctId: 'Service Account Id',
-        svcacctJwk: 'Service Account JWK'
-      };
-      var table = (0, _Console.createObjectTable)(profile, keyMap);
-      (0, _Console.printMessage)(table.toString(), 'data');
-      if (showSecrets && jwk) {
-        (0, _Console.printMessage)(jwk, 'data');
-      }
-    } else {
-      (0, _Console.printMessage)("No connection profile ".concat(host, " found"));
-    }
-    (0, _Console.debugMessage)("ConnectionProfileOps.describeConnectionProfile: end");
-  });
-  return _describeConnectionProfile.apply(this, arguments);
-}
-function addNewServiceAccount() {
+function addNewServiceAccount(_x5) {
   return _addNewServiceAccount.apply(this, arguments);
 }
 function _addNewServiceAccount() {
-  _addNewServiceAccount = _asyncToGenerator(function* () {
+  _addNewServiceAccount = _asyncToGenerator(function* (_ref8) {
+    var {
+      state
+    } = _ref8;
     (0, _Console.debugMessage)("ConnectionProfileOps.addNewServiceAccount: start");
     var name = "Frodo-SA-".concat(new Date().getTime());
     (0, _Console.debugMessage)("ConnectionProfileOps.addNewServiceAccount: name=".concat(name, "..."));
@@ -447,7 +522,14 @@ function _addNewServiceAccount() {
     var jwkPrivate = yield (0, _JoseOps.createJwkRsa)();
     var jwkPublic = yield (0, _JoseOps.getJwkRsaPublic)(jwkPrivate);
     var jwks = (0, _JoseOps.createJwks)(jwkPublic);
-    var sa = yield (0, _ServiceAccountOps.createServiceAccount)(name, description, 'Active', scope, jwks);
+    var sa = yield (0, _ServiceAccountOps.createServiceAccount)({
+      name,
+      description,
+      accountStatus: 'Active',
+      scopes: scope,
+      jwks,
+      state
+    });
     (0, _Console.debugMessage)("ConnectionProfileOps.addNewServiceAccount: id=".concat(sa._id));
     state.setServiceAccountId(sa._id);
     state.setServiceAccountJwk(jwkPrivate);