@salesforce/core 2.35.2 → 2.35.3

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.35.3](https://github.com/forcedotcom/sfdx-core/compare/v2.35.2...v2.35.3) (2022-02-23)
+
+### Bug Fixes
+
+- always try to clean up aliases and configs ([cd0adc4](https://github.com/forcedotcom/sfdx-core/commit/cd0adc456978f27fc2d44cbcb61632925edcccd9))
+
 ### [2.35.2](https://github.com/forcedotcom/sfdx-core/compare/v2.35.1...v2.35.2) (2022-02-16)
 
 ### Bug Fixes

package/lib/org.js

@@ -644,35 +644,33 @@ class Org extends kit_1.AsyncCreatable {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     async removeUsers(throwWhenRemoveFails) {
         this.logger.debug(`Removing users associate with org: ${this.getOrgId()}`);
-        const config = await this.retrieveOrgUsersConfig();
+        const [config, authInfos, aliases] = await Promise.all([
+            this.retrieveOrgUsersConfig(),
+            this.readUserAuthFiles(),
+            aliases_1.Aliases.create(aliases_1.Aliases.getDefaultOptions()),
+        ]);
         this.logger.debug(`using path for org users: ${config.getPath()}`);
-        if (await config.exists()) {
-            const authInfos = await this.readUserAuthFiles();
-            const aliases = await aliases_1.Aliases.create(aliases_1.Aliases.getDefaultOptions());
-            this.logger.info(`Cleaning up usernames in org: ${this.getOrgId()}`);
-            for (const auth of authInfos) {
-                const username = auth.getFields().username;
-                const aliasKeys = (username && aliases.getKeysByValue(username)) || [];
-                aliases.unsetAll(aliasKeys);
-                let orgForUser;
-                if (username === this.getUsername()) {
-                    orgForUser = this;
-                }
-                else {
-                    const info = await authInfo_1.AuthInfo.create({ username });
-                    const connection = await connection_1.Connection.create({ authInfo: info });
-                    orgForUser = await Org.create({ connection });
-                }
-                const orgType = this.isDevHubOrg() ? config_1.Config.DEFAULT_DEV_HUB_USERNAME : config_1.Config.DEFAULT_USERNAME;
-                const configInfo = orgForUser.configAggregator.getInfo(orgType);
-                if ((configInfo.value === username || aliasKeys.includes(configInfo.value)) &&
-                    (configInfo.isGlobal() || configInfo.isLocal())) {
-                    await config_1.Config.update(configInfo.isGlobal(), orgType, undefined);
-                }
-                await orgForUser.removeAuth();
-            }
-            await aliases.write();
-        }
+        this.logger.info(`Cleaning up usernames in org: ${this.getOrgId()}`);
+        await Promise.all(authInfos
+            .map((auth) => auth.getFields().username)
+            .map(async (username) => {
+            const aliasKeys = (username && aliases.getKeysByValue(username)) || [];
+            aliases.unsetAll(aliasKeys);
+            const orgForUser = username === this.getUsername()
+                ? this
+                : await Org.create({
+                    connection: await connection_1.Connection.create({ authInfo: await authInfo_1.AuthInfo.create({ username }) }),
+                });
+            const orgType = this.isDevHubOrg() ? config_1.Config.DEFAULT_DEV_HUB_USERNAME : config_1.Config.DEFAULT_USERNAME;
+            const configInfo = orgForUser.configAggregator.getInfo(orgType);
+            const needsConfigUpdate = (configInfo.isGlobal() || configInfo.isLocal()) &&
+                (configInfo.value === username || aliasKeys.includes(configInfo.value));
+            return [
+                orgForUser.removeAuth(),
+                needsConfigUpdate ? config_1.Config.update(configInfo.isGlobal(), orgType, undefined) : undefined,
+            ].filter(Boolean);
+        }));
+        await aliases.write();
     }
     /**
      * Remove an associate sandbox config.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "2.35.2",
+  "version": "2.35.3",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",