@salesforce/core 3.7.5 → 3.7.8

package/lib/messages.js

@@ -13,7 +13,7 @@ const path = require("path");
 const util = require("util");
 const ts_types_1 = require("@salesforce/ts-types");
 const kit_1 = require("@salesforce/kit");
-const sfdxError_1 = require("./sfdxError");
+const sfError_1 = require("./sfError");
 class Key {
     constructor(packageName, bundleName) {
         this.packageName = packageName;
@@ -57,7 +57,7 @@ const markdownLoader = (filePath, fileContents) => {
             }
         }
         else {
-            // use error instead of SfdxError because messages.js should have no internal dependencies.
+            // use error instead of SfError because messages.js should have no internal dependencies.
             throw new Error(`Invalid markdown message file: ${filePath}\nThe line "# <key>" must be immediately followed by the message on a new line.`);
         }
     }
@@ -217,7 +217,7 @@ class Messages {
             if (!fileContents || fileContents.trim().length === 0) {
                 // messages.js should have no internal dependencies.
                 const error = new Error(`Invalid message file: ${filePath}. No content.`);
-                error.name = 'SfdxError';
+                error.name = 'SfError';
                 throw error;
             }
             const map = parser(filePath, fileContents);
@@ -438,25 +438,68 @@ class Messages {
      * @param key The key of the error message.
      * @param tokens The error message tokens.
      * @param actionTokens The action messages tokens.
-     * @param exitCodeOrCause The exit code which will be used by SfdxCommand or he underlying error that caused this error to be raised.
+     * @param exitCodeOrCause The exit code which will be used by SfdxCommand or the underlying error that caused this error to be raised.
      * @param cause The underlying error that caused this error to be raised.
      */
     createError(key, tokens = [], actionTokens = [], exitCodeOrCause, cause) {
+        const structuredMessage = this.formatMessageContents('error', key, tokens, actionTokens);
+        return new sfError_1.SfError(structuredMessage.message, structuredMessage.name, structuredMessage.actions, exitCodeOrCause, cause);
+    }
+    /**
+     * Convenience method to create warning using message labels.
+     *
+     * `warning.name` will be the upper-cased key, remove prefixed `warning.` and will always end in Warning.
+     * `warning.actions` will be loaded using `${key}.actions` if available.
+     *
+     * @param key The key of the warning message.
+     * @param tokens The warning message tokens.
+     * @param actionTokens The action messages tokens.
+     */
+    createWarning(key, tokens = [], actionTokens = []) {
+        return this.formatMessageContents('warning', key, tokens, actionTokens);
+    }
+    /**
+     * Convenience method to create info using message labels.
+     *
+     * `info.name` will be the upper-cased key, remove prefixed `info.` and will always end in Info.
+     * `info.actions` will be loaded using `${key}.actions` if available.
+     *
+     * @param key The key of the warning message.
+     * @param tokens The warning message tokens.
+     * @param actionTokens The action messages tokens.
+     */
+    createInfo(key, tokens = [], actionTokens = []) {
+        return this.formatMessageContents('info', key, tokens, actionTokens);
+    }
+    /**
+     * Formats message contents given a message type, key, tokens and actions tokens
+     *
+     * `<type>.name` will be the upper-cased key, remove prefixed `<type>.` and will always end in 'Error | Warning | Info.
+     * `<type>.actions` will be loaded using `${key}.actions` if available.
+     *
+     * @param type The type of the message set must 'error' | 'warning' | 'info'.
+     * @param key The key of the warning message.
+     * @param tokens The warning message tokens.
+     * @param actionTokens The action messages tokens.
+     */
+    formatMessageContents(type, key, tokens = [], actionTokens = []) {
+        const label = (0, kit_1.upperFirst)(type);
+        const labelRegExp = new RegExp(`${label}$`);
+        const searchValue = type === 'error' ? /^error.*\./ : new RegExp(`^${type}.`);
         // Convert key to name:
-        //     'myMessage' -> `MyMessageError`
+        //     'myMessage' -> `MyMessageWarning`
         //     'myMessageError' -> `MyMessageError`
-        //     'error.myMessage' -> `MyMessageError`
-        //     'errors.myMessage' -> `MyMessageError`
-        const errName = `${(0, kit_1.upperFirst)(key.replace(/^errors*\./, ''))}${/Error$/.exec(key) ? '' : 'Error'}`;
-        const errMessage = this.getMessage(key, tokens);
-        let errActions;
+        //     'warning.myMessage' -> `MyMessageWarning`
+        const name = `${(0, kit_1.upperFirst)(key.replace(searchValue, ''))}${labelRegExp.exec(key) ? '' : label}`;
+        const message = this.getMessage(key, tokens);
+        let actions;
         try {
-            errActions = this.getMessageWithMap(`${key}.actions`, actionTokens, this.messages);
+            actions = this.getMessageWithMap(`${key}.actions`, actionTokens, this.messages);
         }
         catch (e) {
             /* just ignore if actions aren't found */
         }
-        return new sfdxError_1.SfdxError(errMessage, errName, errActions, exitCodeOrCause, cause);
+        return { message, name, actions };
     }
     getMessageWithMap(key, tokens = [], map) {
         // Allow nested keys for better grouping

package/lib/org/authInfo.d.ts

@@ -253,7 +253,7 @@ export declare class AuthInfo extends AsyncOptionalCreatable<AuthInfo.Options> {
      *
      * @param options Options to be used for creating an OAuth2 instance.
      *
-     * **Throws** *{@link SfdxError}{ name: 'NamedOrgNotFoundError' }* Org information does not exist.
+     * **Throws** *{@link SfError}{ name: 'NamedOrgNotFoundError' }* Org information does not exist.
      * @returns {Promise<AuthInfo>}
      */
     private initAuthOptions;

package/lib/org/authInfo.js

@@ -1,16 +1,16 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AuthInfo = exports.DEFAULT_CONNECTED_APP_INFO = void 0;
 /*
  * Copyright (c) 2020, salesforce.com, inc.
  * All rights reserved.
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AuthInfo = exports.DEFAULT_CONNECTED_APP_INFO = void 0;
-/* eslint-disable @typescript-eslint/ban-ts-comment */
 const crypto_1 = require("crypto");
 const path_1 = require("path");
 const os = require("os");
+const fs = require("fs");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const jsforce_1 = require("jsforce");
@@ -19,8 +19,7 @@ const jwt = require("jsonwebtoken");
 const config_1 = require("../config/config");
 const configAggregator_1 = require("../config/configAggregator");
 const logger_1 = require("../logger");
-const sfdxError_1 = require("../sfdxError");
-const fs_1 = require("../util/fs");
+const sfError_1 = require("../sfError");
 const sfdc_1 = require("../util/sfdc");
 const globalInfo_1 = require("../globalInfo");
 const messages_1 = require("../messages");
@@ -237,7 +236,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
     static parseSfdxAuthUrl(sfdxAuthUrl) {
         const match = sfdxAuthUrl.match(/^force:\/\/([a-zA-Z0-9._-]+):([a-zA-Z0-9._-]*):([a-zA-Z0-9._-]+={0,2})@([a-zA-Z0-9._-]+)/);
         if (!match) {
-            throw new sfdxError_1.SfdxError('Invalid SFDX auth URL. Must be in the format "force://<clientId>:<clientSecret>:<refreshToken>@<instanceUrl>".  Note that the SFDX auth URL uses the "force" protocol, and not "http" or "https".  Also note that the "instanceUrl" inside the SFDX auth URL doesn\'t include the protocol ("https://").', 'INVALID_SFDX_AUTH_URL');
+            throw new sfError_1.SfError('Invalid SFDX auth URL. Must be in the format "force://<clientId>:<clientSecret>:<refreshToken>@<instanceUrl>".  Note that the SFDX auth URL uses the "force" protocol, and not "http" or "https".  Also note that the "instanceUrl" inside the SFDX auth URL doesn\'t include the protocol ("https://").', 'INVALID_SFDX_AUTH_URL');
         }
         const [, clientId, clientSecret, refreshToken, loginUrl] = match;
         return {
@@ -490,7 +489,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      *
      * @param options Options to be used for creating an OAuth2 instance.
      *
-     * **Throws** *{@link SfdxError}{ name: 'NamedOrgNotFoundError' }* Org information does not exist.
+     * **Throws** *{@link SfError}{ name: 'NamedOrgNotFoundError' }* Org information does not exist.
      * @returns {Promise<AuthInfo>}
      */
     async initAuthOptions(options) {
@@ -585,7 +584,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
     }
     // Build OAuth config for a JWT auth flow
     async buildJwtConfig(options) {
-        const privateKeyContents = await fs_1.fs.readFile((0, ts_types_1.ensure)(options.privateKey), 'utf8');
+        const privateKeyContents = await fs.promises.readFile((0, ts_types_1.ensure)(options.privateKey), 'utf8');
         const { loginUrl = sfdcUrl_1.SfdcUrl.PRODUCTION } = options;
         const url = new sfdcUrl_1.SfdcUrl(loginUrl);
         const createdOrgInstance = (0, ts_types_1.getString)(options, 'createdOrgInstance', '').trim().toLowerCase();
@@ -769,7 +768,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         catch (err) {
             errorMsg = `${bodyAsString}`;
         }
-        throw new sfdxError_1.SfdxError(errorMsg);
+        throw new sfError_1.SfError(errorMsg);
     }
 }
 exports.AuthInfo = AuthInfo;

package/lib/org/authRemover.d.ts

@@ -39,8 +39,8 @@ export declare class AuthRemover extends AsyncOptionalCreatable {
     removeAllAuths(): Promise<void>;
     /**
      * Finds authorization files for username/alias in the global .sfdx folder
-     * **Throws** *{@link SfdxError}{ name: 'TargetOrgNotSetError' }* if no target-org
-     * **Throws** *{@link SfdxError}{ name: 'NamedOrgNotFoundError' }* if specified user is not found
+     * **Throws** *{@link SfError}{ name: 'TargetOrgNotSetError' }* if no target-org
+     * **Throws** *{@link SfError}{ name: 'NamedOrgNotFoundError' }* if specified user is not found
      *
      * @param usernameOrAlias username or alias of the auth you want to find, defaults to the configured target-org
      * @returns {Promise<SfOrg>}

package/lib/org/authRemover.js

@@ -66,8 +66,8 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
     }
     /**
      * Finds authorization files for username/alias in the global .sfdx folder
-     * **Throws** *{@link SfdxError}{ name: 'TargetOrgNotSetError' }* if no target-org
-     * **Throws** *{@link SfdxError}{ name: 'NamedOrgNotFoundError' }* if specified user is not found
+     * **Throws** *{@link SfError}{ name: 'TargetOrgNotSetError' }* if no target-org
+     * **Throws** *{@link SfError}{ name: 'NamedOrgNotFoundError' }* if specified user is not found
      *
      * @param usernameOrAlias username or alias of the auth you want to find, defaults to the configured target-org
      * @returns {Promise<SfOrg>}

package/lib/org/connection.d.ts

@@ -4,8 +4,8 @@ import { JsonCollection, JsonMap, Optional } from '@salesforce/ts-types';
 import { Connection as JSForceConnection, ConnectionConfig, HttpRequest, QueryOptions, QueryResult, Record, Schema } from 'jsforce';
 import { Tooling as JSForceTooling } from 'jsforce/lib/api/tooling';
 import { StreamPromise } from 'jsforce/lib/util/promise';
-import { AuthFields, AuthInfo } from '../org/authInfo';
 import { ConfigAggregator } from '../config/configAggregator';
+import { AuthFields, AuthInfo } from './authInfo';
 export declare const SFDX_HTTP_HEADERS: {
     'content-type': string;
     'user-agent': string;
@@ -123,7 +123,7 @@ export declare class Connection<S extends Schema = Schema> extends JSForceConnec
     /**
      * Set the API version for all connection requests.
      *
-     * **Throws** *{@link SfdxError}{ name: 'IncorrectAPIVersionError' }* Incorrect API version.
+     * **Throws** *{@link SfError}{ name: 'IncorrectAPIVersionError' }* Incorrect API version.
      *
      * @param version The API version.
      */
@@ -171,6 +171,11 @@ export declare class Connection<S extends Schema = Schema> extends JSForceConnec
      * @param options The query options.
      */
     singleRecordQuery<T extends Record>(soql: string, options?: SingleRecordQueryOptions): Promise<T>;
+    /**
+     * Executes a get request on the baseUrl to force an auth refresh
+     * Useful for the raw methods (request, requestRaw) that use the accessToken directly and don't handle refreshes
+     */
+    refreshAuth(): Promise<void>;
     private loadInstanceApiVersion;
 }
 export declare const SingleRecordQueryErrors: {

package/lib/org/connection.js

@@ -17,7 +17,7 @@ const tooling_1 = require("jsforce/lib/api/tooling");
 const myDomainResolver_1 = require("../status/myDomainResolver");
 const configAggregator_1 = require("../config/configAggregator");
 const logger_1 = require("../logger");
-const sfdxError_1 = require("../sfdxError");
+const sfError_1 = require("../sfError");
 const sfdc_1 = require("../util/sfdc");
 const messages_1 = require("../messages");
 const lifecycleEvents_1 = require("../lifecycleEvents");
@@ -138,6 +138,7 @@ class Connection extends jsforce_1.Connection {
         delete options.rest;
         if (rest) {
             this.logger.debug('deploy with REST');
+            await this.refreshAuth();
             const headers = {
                 Authorization: this && `OAuth ${this.accessToken}`,
                 'Sforce-Call-Options': 'client=sfdx-core',
@@ -273,7 +274,7 @@ class Connection extends jsforce_1.Connection {
     /**
      * Set the API version for all connection requests.
      *
-     * **Throws** *{@link SfdxError}{ name: 'IncorrectAPIVersionError' }* Incorrect API version.
+     * **Throws** *{@link SfError}{ name: 'IncorrectAPIVersionError' }* Incorrect API version.
      *
      * @param version The API version.
      */
@@ -356,15 +357,27 @@ class Connection extends jsforce_1.Connection {
     }) {
         const result = options.tooling ? await this.tooling.query(soql) : await this.query(soql);
         if (result.totalSize === 0) {
-            throw new sfdxError_1.SfdxError(`No record found for ${soql}`, exports.SingleRecordQueryErrors.NoRecords);
+            throw new sfError_1.SfError(`No record found for ${soql}`, exports.SingleRecordQueryErrors.NoRecords);
         }
         if (result.totalSize > 1) {
-            throw new sfdxError_1.SfdxError(options.returnChoicesOnMultiple
+            throw new sfError_1.SfError(options.returnChoicesOnMultiple
                 ? `Multiple records found. ${result.records.map((item) => item[options.choiceField]).join(',')}`
                 : 'The query returned more than 1 record', exports.SingleRecordQueryErrors.MultipleRecords);
         }
         return result.records[0];
     }
+    /**
+     * Executes a get request on the baseUrl to force an auth refresh
+     * Useful for the raw methods (request, requestRaw) that use the accessToken directly and don't handle refreshes
+     */
+    async refreshAuth() {
+        this.logger.debug('Refreshing auth for org.');
+        const requestInfo = {
+            url: this.baseUrl(),
+            method: 'GET',
+        };
+        await this.request(requestInfo);
+    }
     async loadInstanceApiVersion() {
         const authFileFields = this.options.authInfo.getFields();
         const lastCheckedDateString = authFileFields.instanceApiVersionLastRetrieved;

package/lib/org/org.d.ts

@@ -5,6 +5,7 @@ import { OrgUsersConfig } from '../config/orgUsersConfig';
 import { SandboxOrgConfig } from '../config/sandboxOrgConfig';
 import { Connection } from './connection';
 import { AuthFields, AuthInfo } from './authInfo';
+import { ScratchOrgCreateOptions, ScratchOrgCreateResult } from './scratchOrgCreate';
 export declare type OrganizationInformation = {
     Name: string;
     InstanceName: string;
@@ -63,6 +64,7 @@ export declare type SandboxRequest = {
     SourceId?: string;
     Description?: string;
 };
+export declare type ScratchOrgRequest = Pick<ScratchOrgCreateOptions, 'connectedAppConsumerKey' | 'durationDays' | 'nonamespace' | 'noancestors' | 'wait' | 'retry' | 'apiversion' | 'definitionjson' | 'definitionfile' | 'orgConfig' | 'clientSecret'>;
 /**
  * Provides a way to manage a locally authenticated Org.
  *
@@ -111,6 +113,14 @@ export declare class Org extends AsyncOptionalCreatable<Org.Options> {
         wait?: Duration;
         interval?: Duration;
     }): Promise<SandboxProcessObject>;
+    /**
+     * Creates a scratchOrg
+     * 'this' needs to be a valid dev-hub
+     *
+     * @param {options} ScratchOrgCreateOptions
+     * @returns {ScratchOrgCreateResult}
+     */
+    scratchOrgCreate(options: ScratchOrgRequest): Promise<ScratchOrgCreateResult>;
     /**
      * Clean all data files in the org's data path. Usually <workspace>/.sfdx/orgs/<username>.
      *
@@ -138,9 +148,9 @@ export declare class Org extends AsyncOptionalCreatable<Org.Options> {
     /**
      * Check that this org is a scratch org by asking the dev hub if it knows about it.
      *
-     * **Throws** *{@link SfdxError}{ name: 'NotADevHubError' }* Not a Dev Hub.
+     * **Throws** *{@link SfError}{ name: 'NotADevHubError' }* Not a Dev Hub.
      *
-     * **Throws** *{@link SfdxError}{ name: 'NoResultsError' }* No results.
+     * **Throws** *{@link SfError}{ name: 'NoResultsError' }* No results.
      *
      * @param devHubUsernameOrAlias The username or alias of the dev hub org.
      */
@@ -243,7 +253,7 @@ export declare class Org extends AsyncOptionalCreatable<Org.Options> {
     /**
      * Removes a username from the user config for this object. For convenience `this` object is returned.
      *
-     * **Throws** *{@link SfdxError}{ name: 'MissingAuthInfoError' }* Auth info is missing.
+     * **Throws** *{@link SfError}{ name: 'MissingAuthInfoError' }* Auth info is missing.
      *
      * @param {AuthInfo | string} auth The AuthInfo containing the username to remove.
      */
@@ -295,12 +305,12 @@ export declare class Org extends AsyncOptionalCreatable<Org.Options> {
      */
     protected init(): Promise<void>;
     /**
-     * **Throws** *{@link SfdxError}{ name: 'NotSupportedError' }* Throws an unsupported error.
+     * **Throws** *{@link SfError}{ name: 'NotSupportedError' }* Throws an unsupported error.
      */
     protected getDefaultOptions(): Org.Options;
     private queryProduction;
-    private destorySandbox;
-    private destoryScratchOrg;
+    private destroySandbox;
+    private destroyScratchOrg;
     /**
      * this method will delete the sandbox org from the production org and clean up any local files
      *

package/lib/org/org.js

@@ -8,6 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Org = exports.SandboxEvents = exports.OrgTypes = void 0;
 const path_1 = require("path");
+const fs = require("fs");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const config_1 = require("../config/config");
@@ -15,16 +16,16 @@ const configAggregator_1 = require("../config/configAggregator");
 const orgUsersConfig_1 = require("../config/orgUsersConfig");
 const sandboxOrgConfig_1 = require("../config/sandboxOrgConfig");
 const global_1 = require("../global");
+const lifecycleEvents_1 = require("../lifecycleEvents");
 const logger_1 = require("../logger");
-const sfdxError_1 = require("../sfdxError");
-const fs_1 = require("../util/fs");
+const sfError_1 = require("../sfError");
 const sfdc_1 = require("../util/sfdc");
-const globalInfo_1 = require("../globalInfo");
-const messages_1 = require("../messages");
-const lifecycleEvents_1 = require("../lifecycleEvents");
 const webOAuthServer_1 = require("../webOAuthServer");
+const messages_1 = require("../messages");
+const globalInfo_1 = require("../globalInfo");
 const connection_1 = require("./connection");
 const authInfo_1 = require("./authInfo");
+const scratchOrgCreate_1 = require("./scratchOrgCreate");
 const orgConfigProperties_1 = require("./orgConfigProperties");
 messages_1.Messages.importMessagesDirectory(__dirname);
 const messages = messages_1.Messages.load('@salesforce/core', 'org', [
@@ -114,6 +115,16 @@ class Org extends kit_1.AsyncOptionalCreatable {
             pollInterval,
         });
     }
+    /**
+     * Creates a scratchOrg
+     * 'this' needs to be a valid dev-hub
+     *
+     * @param {options} ScratchOrgCreateOptions
+     * @returns {ScratchOrgCreateResult}
+     */
+    async scratchOrgCreate(options) {
+        return (0, scratchOrgCreate_1.scratchOrgCreate)({ ...options, hubOrg: this });
+    }
     /**
      * Clean all data files in the org's data path. Usually <workspace>/.sfdx/orgs/<username>.
      *
@@ -136,7 +147,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
             }
             throw err;
         }
-        return this.manageDelete(async () => await fs_1.fs.remove(dataPath), dataPath, throwWhenRemoveFails);
+        return this.manageDelete(async () => await fs.promises.rmdir(dataPath), dataPath, throwWhenRemoveFails);
     }
     /**
      * @ignore
@@ -176,9 +187,9 @@ class Org extends kit_1.AsyncOptionalCreatable {
     /**
      * Check that this org is a scratch org by asking the dev hub if it knows about it.
      *
-     * **Throws** *{@link SfdxError}{ name: 'NotADevHubError' }* Not a Dev Hub.
+     * **Throws** *{@link SfError}{ name: 'NotADevHubError' }* Not a Dev Hub.
      *
-     * **Throws** *{@link SfdxError}{ name: 'NoResultsError' }* No results.
+     * **Throws** *{@link SfError}{ name: 'NoResultsError' }* No results.
      *
      * @param devHubUsernameOrAlias The username or alias of the dev hub org.
      */
@@ -194,7 +205,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
         try {
             const results = await devHubConnection.query(DEV_HUB_SOQL);
             if ((0, ts_types_1.getNumber)(results, 'records.length') !== 1) {
-                throw new sfdxError_1.SfdxError('No results', 'NoResultsError');
+                throw new sfError_1.SfError('No results', 'NoResultsError');
             }
         }
         catch (err) {
@@ -429,7 +440,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
      */
     async addUsername(auth) {
         if (!auth) {
-            throw new sfdxError_1.SfdxError('Missing auth info', 'MissingAuthInfo');
+            throw new sfError_1.SfError('Missing auth info', 'MissingAuthInfo');
         }
         const authInfo = (0, ts_types_1.isString)(auth) ? await authInfo_1.AuthInfo.create({ username: auth }) : auth;
         this.logger.debug(`adding username ${authInfo.getFields().username}`);
@@ -439,7 +450,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
         // needs config refactoring to improve
         const usernames = contents.usernames || [];
         if (!(0, ts_types_1.isArray)(usernames)) {
-            throw new sfdxError_1.SfdxError('Usernames is not an array', 'UnexpectedDataFormat');
+            throw new sfError_1.SfError('Usernames is not an array', 'UnexpectedDataFormat');
         }
         let shouldUpdate = false;
         const thisUsername = (0, ts_types_1.ensure)(this.getUsername());
@@ -461,13 +472,13 @@ class Org extends kit_1.AsyncOptionalCreatable {
     /**
      * Removes a username from the user config for this object. For convenience `this` object is returned.
      *
-     * **Throws** *{@link SfdxError}{ name: 'MissingAuthInfoError' }* Auth info is missing.
+     * **Throws** *{@link SfError}{ name: 'MissingAuthInfoError' }* Auth info is missing.
      *
      * @param {AuthInfo | string} auth The AuthInfo containing the username to remove.
      */
     async removeUsername(auth) {
         if (!auth) {
-            throw new sfdxError_1.SfdxError('Missing auth info', 'MissingAuthInfoError');
+            throw new sfError_1.SfError('Missing auth info', 'MissingAuthInfoError');
         }
         const authInfo = (0, ts_types_1.isString)(auth) ? await authInfo_1.AuthInfo.create({ username: auth }) : auth;
         this.logger.debug(`removing username ${authInfo.getFields().username}`);
@@ -575,7 +586,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
                 throw messages.createError('noUsernameFound');
             }
             this.connection = await connection_1.Connection.create({
-                // If no username is provided or resolvable from an alias, AuthInfo will throw an SfdxError.
+                // If no username is provided or resolvable from an alias, AuthInfo will throw an SfError.
                 authInfo: await authInfo_1.AuthInfo.create({ username, isDevHub: this.options.isDevHub }),
             });
         }
@@ -585,18 +596,18 @@ class Org extends kit_1.AsyncOptionalCreatable {
         this.orgId = this.getField(Org.Fields.ORG_ID);
     }
     /**
-     * **Throws** *{@link SfdxError}{ name: 'NotSupportedError' }* Throws an unsupported error.
+     * **Throws** *{@link SfError}{ name: 'NotSupportedError' }* Throws an unsupported error.
      */
     getDefaultOptions() {
-        throw new sfdxError_1.SfdxError('Not Supported', 'NotSupportedError');
+        throw new sfError_1.SfError('Not Supported', 'NotSupportedError');
     }
     async queryProduction(org, field, value) {
         return org.connection.singleRecordQuery(`SELECT SandboxInfoId FROM SandboxProcess WHERE ${field} ='${value}' AND Status NOT IN ('D', 'E')`, { tooling: true });
     }
-    async destorySandbox(org, id) {
+    async destroySandbox(org, id) {
         return org.getConnection().tooling.delete('SandboxInfo', id);
     }
-    async destoryScratchOrg(org, id) {
+    async destroyScratchOrg(org, id) {
         return org.getConnection().delete('ActiveScratchOrg', id);
     }
     /**
@@ -641,7 +652,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
             }
         }
         // const deleteResult = await prodOrg.connection.tooling.delete('SandboxInfo', result.SandboxInfoId);
-        const deleteResult = await this.destorySandbox(prodOrg, result.SandboxInfoId);
+        const deleteResult = await this.destroySandbox(prodOrg, result.SandboxInfoId);
         this.logger.debug('Return from calling tooling.delete: %o ', deleteResult);
         await this.remove();
         if (Array.isArray(deleteResult) || !deleteResult.success) {
@@ -669,7 +680,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
             const username = this.getUsername();
             const activeScratchOrgRecordId = (await devHubConn.singleRecordQuery(`SELECT Id FROM ActiveScratchOrg WHERE SignupUsername='${username}'`)).Id;
             this.logger.trace(`found matching ActiveScratchOrg with SignupUsername: ${username}.  Deleting...`);
-            await this.destoryScratchOrg(devHub, activeScratchOrgRecordId);
+            await this.destroyScratchOrg(devHub, activeScratchOrgRecordId);
             await this.remove();
         }
         catch (err) {
@@ -703,7 +714,6 @@ class Org extends kit_1.AsyncOptionalCreatable {
             this.logger.debug(`Clearing auth cache for user: ${username}`);
             config.orgs.unset(username);
         }
-        await config.write();
     }
     /**
      * Deletes the users config file
@@ -743,34 +753,27 @@ class Org extends kit_1.AsyncOptionalCreatable {
         this.logger.debug(`Removing users associate with org: ${this.getOrgId()}`);
         const config = await this.retrieveOrgUsersConfig();
         this.logger.debug(`using path for org users: ${config.getPath()}`);
-        if (await config.exists()) {
-            const authInfos = await this.readUserAuthFiles();
-            this.logger.info(`Cleaning up usernames in org: ${this.getOrgId()}`);
-            for (const auth of authInfos) {
-                const username = auth.getFields().username;
-                const aliases = (username && globalInfo.aliases.getAll(username)) || [];
-                globalInfo.aliases.unsetAll(username);
-                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 removeConfig = async (configInfo) => {
-                    if ((configInfo.value === username || aliases.includes(configInfo.value)) &&
-                        (configInfo.isGlobal() || configInfo.isLocal())) {
-                        await config_1.Config.update(configInfo.isGlobal(), configInfo.key, undefined);
-                    }
-                };
-                await removeConfig(this.configAggregator.getInfo(orgConfigProperties_1.OrgConfigProperties.TARGET_DEV_HUB));
-                await removeConfig(this.configAggregator.getInfo(orgConfigProperties_1.OrgConfigProperties.TARGET_ORG));
-                await orgForUser.removeAuth();
-            }
-            await globalInfo.write();
-        }
+        const authInfos = await this.readUserAuthFiles();
+        await Promise.all(authInfos
+            .map((auth) => auth.getFields().username)
+            .map(async (username) => {
+            const aliasKeys = (username && globalInfo.aliases.getAll(username)) || [];
+            globalInfo.aliases.unsetAll(username);
+            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() ? orgConfigProperties_1.OrgConfigProperties.TARGET_DEV_HUB : orgConfigProperties_1.OrgConfigProperties.TARGET_ORG;
+            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 globalInfo.write();
     }
     /**
      * Remove an associate sandbox config.
@@ -851,7 +854,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
                     waitingOnAuth = true;
                 }
                 else {
-                    throw sfdxError_1.SfdxError.wrap(error);
+                    throw sfError_1.SfError.wrap(error);
                 }
             }
         }
@@ -943,7 +946,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
             }
             else {
                 // If it fails for any unexpected reason, just pass that through
-                throw sfdxError_1.SfdxError.wrap(error);
+                throw sfError_1.SfError.wrap(error);
             }
         }
     }

package/lib/org/permissionSetAssignment.js

@@ -12,7 +12,7 @@ const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const logger_1 = require("../logger");
 const messages_1 = require("../messages");
-const sfdxError_1 = require("../sfdxError");
+const sfError_1 = require("../sfError");
 messages_1.Messages.importMessagesDirectory(__dirname);
 const messages = messages_1.Messages.load('@salesforce/core', 'permissionSetAssignment', [
     'errorsEncounteredCreatingAssignment',
@@ -86,7 +86,7 @@ class PermissionSetAssignment {
                 errors.forEach((_message) => {
                     message = `${message}${_message}${os_1.EOL}`;
                 });
-                throw new sfdxError_1.SfdxError(message, 'errorsEncounteredCreatingAssignment');
+                throw new sfError_1.SfError(message, 'errorsEncounteredCreatingAssignment');
             }
             else {
                 throw messages.createError('notSuccessfulButNoErrorsReported');