@axway/axway-central-cli 2.1.0-rc.0 → 2.1.0

package/dist/common/CliConfigManager.js

@@ -48,9 +48,11 @@ class CliConfigManager {
 
   getAll() {
     return (0, _fsExtra.existsSync)(CliConfigManager.configFilePath) ? (0, _fsExtra.readJsonSync)(CliConfigManager.configFilePath) : {};
+  }
+
+  get(key) {
+    return this.getAll()[key];
   } // TODO
-  // get(key: CentralConfigKeys) {}
-  // TODO
   // set(key: CentralConfigKeys) {}
 
 

package/dist/common/CoreConfigController.js

@@ -7,11 +7,15 @@ exports.CoreConfigController = void 0;
 
 var _amplifyCliUtils = require("@axway/amplify-cli-utils");
 
+var _chalk = _interopRequireDefault(require("chalk"));
+
 var _snooplogg = _interopRequireDefault(require("snooplogg"));
 
-var _types = require("./types");
+var _basicPrompts = require("./basicPrompts");
+
+var _CliConfigManager = require("./CliConfigManager");
 
-var _utils = require("./utils");
+var _types = require("./types");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -32,23 +36,51 @@ class CoreConfigController {
     accountName,
     clientId
   } = {}) {
-    const devOpsClientId = clientId ? clientId : (await (0, _utils.getConfig)())[_types.ConfigTypes.CLIENT_ID] || _types.defaultClientId;
-    log(`getAuthInfo, using clientId = ${devOpsClientId}`);
+    const configCtrl = new _CliConfigManager.CliConfigManager();
+    const devOpsClientId = clientId ? clientId : configCtrl.get(_CliConfigManager.CliConfigKeys.CLIENT_ID) || _types.defaultClientId;
+    log(`getAuthInfo, using clientId = ${devOpsClientId}, accountName = ${accountName}`);
 
     if (!CoreConfigController.devOpsAccount || CoreConfigController.devOpsAccount.auth.clientId !== devOpsClientId) {
       log(`getAuthInfo, no cached devOpsAccount found, or clientId does not match`);
+      const baseUrl = configCtrl.get(_CliConfigManager.CliConfigKeys.BASE_URL);
+      const platform = configCtrl.get(_CliConfigManager.CliConfigKeys.PLATFORM); // environment defined by using central cli "platform" or "base-url" configs if set,
+      // otherwise its undefined (equals to prod)
+
+      const env = platform || (!baseUrl || baseUrl === _types.ProdBaseUrls.EU || baseUrl === _types.ProdBaseUrls.EU ? undefined : 'preprod');
+      log(`getAuthInfo, baseUrl = ${baseUrl}, platform = ${platform}, env = ${env}`);
       const {
         config,
         sdk
       } = (0, _amplifyCliUtils.initSDK)({
-        clientId: devOpsClientId
-      });
-      CoreConfigController.devOpsAccount = await sdk.auth.find(accountName || config.get('auth.defaultAccount'));
+        clientId: devOpsClientId,
+        env
+      }); // TODO: filtering by the clientId will not be needed when https://jira.axway.com/browse/APIGOV-20702 is fixed
+
+      const list = (await sdk.auth.list()).filter(a => a.auth.clientId === devOpsClientId);
+      log(`getAuthInfo, matching accounts found: ${list.length}`);
+
+      if (list.length > 1) {
+        // try to find the default one
+        const defaultAccount = list.find(a => a.name === accountName || a.name === config.get('auth.defaultAccount'));
+
+        if (defaultAccount) {
+          CoreConfigController.devOpsAccount = await sdk.auth.find(defaultAccount.name);
+        } else if (!accountName) {
+          const selectedName = await (0, _basicPrompts.askList)({
+            msg: 'Multiple authenticated accounts found, please select which one you want to use',
+            choices: Array.from(new Set(list.map(a => a.name)))
+          });
+          console.log((0, _chalk.default)`{grey If you always want to use "${selectedName}" account by default, run: axway config set auth.defaultAccount ${selectedName}}\n`);
+          CoreConfigController.devOpsAccount = await sdk.auth.find(selectedName);
+        }
+      } else if (list.length === 1) {
+        CoreConfigController.devOpsAccount = await sdk.auth.find(accountName || list[0].name);
+      }
 
       if (!CoreConfigController.devOpsAccount) {
         // TODO: piece of old logic here, move throwing out of the method?
         log(`getAuthInfo, no devOpsAccount set after all, throwing 401`);
-        const title = accountName ? `Account "${accountName}" cannot be found` : 'Unauthenticated';
+        const title = accountName ? `Account "${accountName}" cannot be found` : 'No authenticated accounts found.';
         const err = new Error(title);
         err.errors = [{
           status: 401,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axway/axway-central-cli",
-	"version": "2.1.0-rc.0",
+	"version": "2.1.0",
 	"description": "Manage APIs, services and publish to the Unified Catalog",
 	"homepage": "https://platform.axway.com",
 	"author": {
@@ -40,7 +40,7 @@
 		"name": "central"
 	},
 	"dependencies": {
-		"@axway/amplify-cli-utils": "next",
+		"@axway/amplify-cli-utils": "5.0.0",
 		"chalk": "^4.1.2",
 		"cli-kit": "^1.14.1",
 		"dayjs": "^1.10.7",
@@ -118,4 +118,4 @@
 	"resolutions": {
 		"**/lodash": "4.17.21"
 	}
-}
+}