Delete portalId/defaultPortal if account is present

packages/cms-lib/lib/__tests__/config.js

@@ -808,7 +808,6 @@ describe('lib/config', () => {
               },
               "authType": "oauth2",
               "name": "OAUTH2",
-              "portalId": 2223,
             }
           `);
         });
@@ -942,14 +941,11 @@ describe('lib/config', () => {
           setConfig(CONFIG);
         });
 
-        it('supports both defaultPortal and defaultAccount', () => {
+        it('supports defaultAccount', () => {
           updateDefaultAccount(LEGACY_ACCOUNTS[0].portalId);
           expect(getConfig().defaultAccount).toEqual(
             LEGACY_ACCOUNTS[0].portalId
           );
-          expect(getConfig().defaultPortal).toEqual(
-            LEGACY_ACCOUNTS[0].portalId
-          );
         });
       });
     });

packages/cms-lib/lib/config.js

@@ -37,6 +37,7 @@ const setConfig = updatedConfig => {
 const getConfigAccounts = config => {
   const __config = config || getConfig();
   if (!__config) return;
+
   return __config.accounts || __config.portals;
 };
 
@@ -417,11 +418,19 @@ const getEnv = nameOrId => {
   return env;
 };
 
-const getAccountConfig = accountId =>
-  getConfigAccounts(getAndLoadConfigIfNeeded()).find(
+const getAccountConfig = accountId => {
+  const account = getConfigAccounts(getAndLoadConfigIfNeeded()).find(
     account => account.accountId === accountId || account.portalId === accountId
   );
 
+  if (account && account.portalId) {
+    account.accountId = account.accountId || account.portalId;
+    delete account.portalId;
+  }
+
+  return account;
+};
+
 /*
  * Returns a accountId from the config if it exists, else returns null
  */
@@ -529,6 +538,7 @@ const updateAccountConfig = configOptions => {
       accounts = [nextAccountConfig];
     }
   }
+
   return nextAccountConfig;
 };
 
@@ -546,12 +556,10 @@ const updateDefaultAccount = defaultAccount => {
   }
 
   const config = getAndLoadConfigIfNeeded();
-  if (config.defaultAccount) {
-    config.defaultAccount = defaultAccount;
-  }
-  // Keep for backcompat
+  config.defaultAccount = defaultAccount;
+
   if (config.defaultPortal) {
-    config.defaultPortal = defaultAccount;
+    delete config.defaultPortal;
   }
 
   setDefaultConfigPathIfUnset();