@salesforce/plugin-org 2.2.24 → 2.2.25

package/lib/commands/org/resume/scratch.js

@@ -0,0 +1,61 @@
+"use strict";
+/*
+ * 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 });
+const node_assert_1 = require("node:assert");
+const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
+const core_1 = require("@salesforce/core");
+const scratchOrgOutput_1 = require("../../../shared/scratchOrgOutput");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/plugin-org', 'resume_scratch');
+class EnvResumeScratch extends sf_plugins_core_1.SfCommand {
+    async run() {
+        const { flags } = await this.parse(EnvResumeScratch);
+        const cache = await core_1.ScratchOrgCache.create();
+        const lifecycle = core_1.Lifecycle.getInstance();
+        const jobId = flags['use-most-recent'] ? cache.getLatestKey() : flags['job-id'];
+        if (!jobId && flags['use-most-recent'])
+            throw messages.createError('error.NoRecentJobId');
+        // oclif doesn't know that the exactlyOne flag will ensure that one of these is set, and there we definitely have a jobID.
+        (0, node_assert_1.strict)(jobId);
+        const { hubBaseUrl } = cache.get(jobId);
+        let lastStatus;
+        lifecycle.on(core_1.scratchOrgLifecycleEventName, async (data) => {
+            lastStatus = (0, scratchOrgOutput_1.buildStatus)(data, hubBaseUrl);
+            this.spinner.status = lastStatus;
+            return Promise.resolve();
+        });
+        this.log();
+        this.spinner.start('Creating Scratch Org');
+        const { username, scratchOrgInfo, authFields, warnings } = await (0, core_1.scratchOrgResume)(jobId);
+        this.spinner.stop(lastStatus);
+        this.log();
+        this.logSuccess(messages.getMessage('success'));
+        return { username, scratchOrgInfo, authFields, warnings, orgId: scratchOrgInfo?.Id };
+    }
+}
+exports.default = EnvResumeScratch;
+EnvResumeScratch.summary = messages.getMessage('summary');
+EnvResumeScratch.description = messages.getMessage('description');
+EnvResumeScratch.examples = messages.getMessages('examples');
+EnvResumeScratch.aliases = ['env:resume:scratch'];
+EnvResumeScratch.deprecateAliases = true;
+EnvResumeScratch.flags = {
+    'job-id': sf_plugins_core_1.Flags.salesforceId({
+        char: 'i',
+        summary: messages.getMessage('flags.job-id.summary'),
+        description: messages.getMessage('flags.job-id.description'),
+        exactlyOne: ['use-most-recent', 'job-id'],
+        startsWith: '2SR',
+    }),
+    'use-most-recent': sf_plugins_core_1.Flags.boolean({
+        char: 'r',
+        summary: messages.getMessage('flags.use-most-recent.summary'),
+        exactlyOne: ['use-most-recent', 'job-id'],
+    }),
+};
+//# sourceMappingURL=scratch.js.map

package/lib/commands/org/resume/scratch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scratch.js","sourceRoot":"","sources":["../../../../src/commands/org/resume/scratch.ts"],"names":[],"mappings":"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"}

package/lib/shared/orgHighlighter.d.ts

@@ -1,3 +1,3 @@
-import { ExtendedAuthFields } from './orgTypes';
+import { ExtendedAuthFields, FullyPopulatedScratchOrgFields } from './orgTypes';
 export declare const getStyledValue: (key: string, value: string) => string;
-export declare const getStyledObject: (objectToStyle: ExtendedAuthFields) => ExtendedAuthFields;
+export declare const getStyledObject: (objectToStyle: ExtendedAuthFields | FullyPopulatedScratchOrgFields | Record<string, string>) => Record<string, string>;

package/lib/shared/orgHighlighter.js

@@ -25,12 +25,14 @@ const styledProperties = new Map([
     ],
 ]);
 const getStyledValue = (key, value) => {
-    if (!value || !styledProperties.has(key)) {
+    if (!value)
         return value;
-    }
-    return styledProperties.get(key).has(value)
-        ? styledProperties.get(key).get(value)(value)
-        : styledProperties.get(key).get('else')(value);
+    const prop = styledProperties.get(key);
+    if (!prop)
+        return value;
+    // I'm not sure how to type the inner Map so that it knows else is definitely there
+    const chalkMethod = prop.get(value) ?? prop.get('else');
+    return chalkMethod(value);
 };
 exports.getStyledValue = getStyledValue;
 const getStyledObject = (objectToStyle) => {

package/lib/shared/orgHighlighter.js.map

@@ -1 +1 @@
-{"version":3,"file":"orgHighlighter.js","sourceRoot":"","sources":["../../src/shared/orgHighlighter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAA+B;AAG/B,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC;IAC/B;QACE,QAAQ;QACR,IAAI,GAAG,CAAC;YACN,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC;YACvB,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC;SACpB,CAAC;KACH;IACD;QACE,iBAAiB;QACjB,IAAI,GAAG,CAAC;YACN,CAAC,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC;YAC1B,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC;SACpB,CAAC;KACH;CACF,CAAC,CAAC;AAEI,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE,KAAa,EAAU,EAAE;IACnE,IAAI,CAAC,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QACxC,OAAO,KAAK,CAAC;KACd;IACD,OAAO,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC;QACzC,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC;QAC7C,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC;AACnD,CAAC,CAAC;AAPW,QAAA,cAAc,kBAOzB;AAEK,MAAM,eAAe,GAAG,CAAC,aAAiC,EAAsB,EAAE;IACvF,MAAM,YAAY,GAAG,EAAE,GAAG,aAAa,EAAE,CAAC;IAC1C,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,IAAA,sBAAc,EAAC,GAAG,EAAE,KAAe,CAAC,CAAC,CAAC,CAChG,CAAC;AACJ,CAAC,CAAC;AALW,QAAA,eAAe,mBAK1B"}
+{"version":3,"file":"orgHighlighter.js","sourceRoot":"","sources":["../../src/shared/orgHighlighter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAA+B;AAG/B,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAmC;IACjE;QACE,QAAQ;QACR,IAAI,GAAG,CAAC;YACN,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC;YACvB,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC;SACpB,CAAC;KACH;IACD;QACE,iBAAiB;QACjB,IAAI,GAAG,CAAC;YACN,CAAC,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC;YAC1B,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC;SACpB,CAAC;KACH;CACF,CAAC,CAAC;AAEI,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE,KAAa,EAAU,EAAE;IACnE,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IACzB,MAAM,IAAI,GAAG,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACvC,IAAI,CAAC,IAAI;QAAE,OAAO,KAAK,CAAC;IAExB,mFAAmF;IACnF,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAK,IAAI,CAAC,GAAG,CAAC,MAAM,CAAiB,CAAC;IACzE,OAAO,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5B,CAAC,CAAC;AARW,QAAA,cAAc,kBAQzB;AAEK,MAAM,eAAe,GAAG,CAC7B,aAA2F,EACnE,EAAE;IAC1B,MAAM,YAAY,GAAG,EAAE,GAAG,aAAa,EAAE,CAAC;IAC1C,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,IAAA,sBAAc,EAAC,GAAG,EAAE,KAAe,CAAC,CAAC,CAAC,CAChG,CAAC;AACJ,CAAC,CAAC;AAPW,QAAA,eAAe,mBAO1B"}

package/lib/shared/orgHooks.d.ts

@@ -0,0 +1,24 @@
+import { Optional } from '@salesforce/ts-types';
+import { AuthFields } from '@salesforce/core';
+import { Command, Hook, Hooks } from '@oclif/core/lib/interfaces';
+type HookOpts<T> = {
+    options: {
+        Command: Command.Class;
+        argv: string[];
+        commandId: string;
+    };
+    return: Optional<T>;
+};
+export type OrgCreateResult = Pick<AuthFields, 'accessToken' | 'clientId' | 'created' | 'createdOrgInstance' | 'devHubUsername' | 'expirationDate' | 'instanceUrl' | 'loginUrl' | 'orgId' | 'username'>;
+type PostOrgCreateOpts = HookOpts<OrgCreateResult>;
+/**
+ * Extends OCLIF's Hooks interface to add types for hooks that run on org commands
+ */
+export interface OrgHooks extends Hooks {
+    postorgcreate: PostOrgCreateOpts;
+}
+export type OrgHook<T> = (this: Hook.Context, options: T extends keyof Hooks ? OrgHooks[T] : T) => any;
+export declare namespace OrgHook {
+    type PostOrgCreate = Hook<OrgHooks['postorgcreate']>;
+}
+export {};

package/lib/shared/orgHooks.js

@@ -0,0 +1,9 @@
+"use strict";
+/*
+ * Copyright (c) 2021, 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 });
+//# sourceMappingURL=orgHooks.js.map

package/lib/shared/orgHooks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"orgHooks.js","sourceRoot":"","sources":["../../src/shared/orgHooks.ts"],"names":[],"mappings":";AAAA;;;;;GAKG"}

package/lib/shared/orgListUtil.d.ts

@@ -1,17 +1,17 @@
-import { AuthInfo, AuthFields, Logger } from '@salesforce/core';
-import { Dictionary, JsonMap } from '@salesforce/ts-types';
+import { AuthInfo, Logger } from '@salesforce/core';
+import { Dictionary } from '@salesforce/ts-types';
 import { Record } from 'jsforce';
-import { ScratchOrgInfoSObject, ExtendedAuthFields } from './orgTypes';
+import { ScratchOrgInfoSObject, ExtendedAuthFields, ExtendedAuthFieldsScratch, FullyPopulatedScratchOrgFields } from './orgTypes';
 type OrgGroups = {
     nonScratchOrgs: ExtendedAuthFields[];
-    scratchOrgs: ExtendedAuthFields[];
+    scratchOrgs: ExtendedAuthFieldsScratch[];
 };
-type ExtendedScratchOrgInfo = ScratchOrgInfoSObject & {
+type OrgGroupsFullyPopulated = {
+    nonScratchOrgs: ExtendedAuthFields[];
+    scratchOrgs: FullyPopulatedScratchOrgFields[];
+};
+type ExtendedScratchOrgInfo = Record & ScratchOrgInfoSObject & {
     devHubOrgId: string;
-    attributes: {
-        type: string;
-        url: string;
-    };
 };
 export declare class OrgListUtil {
     private static logger;
@@ -24,14 +24,14 @@ export declare class OrgListUtil {
      * @param {string[]|null} userFilenames- an array of strings that are validated against the server.
      * @param {object} flags - the result of this.flags on an sfdx command
      */
-    static readLocallyValidatedMetaConfigsGroupedByOrgType(userFilenames: string[], flags: Dictionary<string | boolean>): Promise<OrgGroups>;
+    static readLocallyValidatedMetaConfigsGroupedByOrgType(userFilenames: string[], flags: Dictionary<string | boolean>): Promise<OrgGroupsFullyPopulated>;
     /**
      * Organizes the scratchOrgs by DevHub to optimize calls to retrieveScratchOrgInfoFromDevHub(), then calls reduceScratchOrgInfo()
      *
      * @param {ExtendedAuthFields[]} scratchOrgs- an array of strings that are validated against the server.
      * @returns the same scratch org list, but with updated information from the server.
      */
-    static processScratchOrgs(scratchOrgs: ExtendedAuthFields[]): Promise<ExtendedAuthFields[]>;
+    static processScratchOrgs(scratchOrgs: ExtendedAuthFieldsScratch[]): Promise<FullyPopulatedScratchOrgFields[]>;
     /**
      * Used to retrieve authInfo of the auth files
      *
@@ -47,18 +47,8 @@ export declare class OrgListUtil {
      * @private
      */
     static groupOrgs(authInfos: AuthInfo[]): Promise<OrgGroups>;
-    /**
-     * Helper utility to remove sensitive information from a scratch org auth config. By default refreshTokens and client secrets are removed.
-     *
-     * @param {*} config - scratch org auth object.
-     * @param {string[]} properties - properties to exclude ex ['refreshToken', 'clientSecret']
-     * @returns the config less the sensitive information.
-     */
-    static removeRestrictedInfoFromConfig(config: AuthFields, properties?: string[]): AuthFields;
-    /** Identify the default orgs */
-    static identifyDefaultOrgs(orgInfo: ExtendedAuthFields, config: JsonMap): void;
-    static retrieveScratchOrgInfoFromDevHub(devHubUsername: string, orgIdsToQuery: string[]): Promise<Array<Partial<Record> & ExtendedScratchOrgInfo>>;
-    static reduceScratchOrgInfo(updatedContents: Array<Partial<Record> & ExtendedScratchOrgInfo>, orgs: ExtendedAuthFields[]): Promise<ExtendedAuthFields[]>;
+    static retrieveScratchOrgInfoFromDevHub(devHubUsername: string, orgIdsToQuery: string[]): Promise<ExtendedScratchOrgInfo[]>;
+    static reduceScratchOrgInfo(updatedContents: Array<Partial<Record> & ExtendedScratchOrgInfo>, orgs: ExtendedAuthFieldsScratch[]): Promise<FullyPopulatedScratchOrgFields[]>;
     /**
      * Asks the org if it's a devHub.  Because the dev hub setting can't be deactivated, only ask orgs that aren't already stored as hubs.
      * This has a number of side effects, including updating the AuthInfo files and
@@ -73,7 +63,7 @@ export declare class OrgListUtil {
      * @param username The username used when the org was authenticated
      * @returns {Promise.<string>}
      */
-    static determineConnectedStatusForNonScratchOrg(username: string): Promise<string>;
+    static determineConnectedStatusForNonScratchOrg(username: string): Promise<string | undefined>;
 }
-export declare const identifyActiveOrgByStatus: (org: ExtendedAuthFields) => boolean;
+export declare const identifyActiveOrgByStatus: (org: FullyPopulatedScratchOrgFields) => boolean;
 export {};

package/lib/shared/orgListUtil.js

@@ -1,15 +1,16 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.identifyActiveOrgByStatus = exports.OrgListUtil = 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.identifyActiveOrgByStatus = exports.OrgListUtil = void 0;
 const path_1 = require("path");
 const fs = require("fs/promises");
 const core_1 = require("@salesforce/core");
+const ts_types_1 = require("@salesforce/ts-types");
 const lib_1 = require("@salesforce/kit/lib");
 const utils_1 = require("./utils");
 class OrgListUtil {
@@ -33,7 +34,7 @@ class OrgListUtil {
         // parallelize two very independent operations
         const [nonScratchOrgs, scratchOrgs] = await Promise.all([
             Promise.all(orgs.nonScratchOrgs.map(async (fields) => {
-                if (!flags.skipconnectionstatus) {
+                if (!flags.skipconnectionstatus && fields.username) {
                     // skip completely if we're skipping the connection
                     fields.connectedStatus = await OrgListUtil.determineConnectedStatusForNonScratchOrg(fields.username);
                     if (!fields.isDevHub && fields.connectedStatus === 'Connected') {
@@ -57,13 +58,11 @@ class OrgListUtil {
      * @returns the same scratch org list, but with updated information from the server.
      */
     static async processScratchOrgs(scratchOrgs) {
-        const orgIdsGroupedByDevHub = scratchOrgs
-            .filter((fields) => fields.devHubUsername)
-            .reduce((accum, fields) => {
-            accum[fields.devHubUsername] = [...(accum[fields.devHubUsername] ?? []), core_1.sfdc.trimTo15(fields.orgId)];
-            return accum;
-        }, {});
-        const updatedContents = (await Promise.all(Object.entries(orgIdsGroupedByDevHub).map(async ([devHubUsername, orgIds]) => OrgListUtil.retrieveScratchOrgInfoFromDevHub(devHubUsername, orgIds)))).reduce((accumulator, iterator) => [...accumulator, ...iterator], []);
+        const orgIdsGroupedByDevHub = new Map();
+        scratchOrgs.forEach((fields) => {
+            orgIdsGroupedByDevHub.set(fields.devHubUsername, (orgIdsGroupedByDevHub.get(fields.devHubUsername) ?? []).concat([(0, core_1.trimTo15)(fields.orgId)]));
+        });
+        const updatedContents = (await Promise.all(Array.from(orgIdsGroupedByDevHub).map(([devHubUsername, orgIds]) => OrgListUtil.retrieveScratchOrgInfoFromDevHub(devHubUsername, orgIds)))).reduce((accumulator, iterator) => [...accumulator, ...iterator], []);
         return OrgListUtil.reduceScratchOrgInfo(updatedContents, scratchOrgs);
     }
     /**
@@ -104,7 +103,7 @@ class OrgListUtil {
                 logger.warn(err.message);
             }
         }));
-        return allAuths.filter((auth) => !!auth);
+        return allAuths.filter((ts_types_1.isObject));
     }
     /**
      * Helper to group orgs by {scratchOrg, nonScratchOrgs}
@@ -115,58 +114,33 @@ class OrgListUtil {
      * @private
      */
     static async groupOrgs(authInfos) {
-        const output = {
-            scratchOrgs: [],
-            nonScratchOrgs: [],
-        };
-        const config = (await core_1.SfdxConfigAggregator.create()).getConfig();
-        for (const authInfo of authInfos) {
+        const configAggregator = await core_1.SfdxConfigAggregator.create();
+        const results = await Promise.all(authInfos.map(async (authInfo) => {
+            // for (const authInfo of authInfos) {
             let currentValue;
             try {
-                currentValue = OrgListUtil.removeRestrictedInfoFromConfig(authInfo.getFields(true));
+                // we're going to assert that these have a username/orgId because they came from the auth files
+                currentValue = removeRestrictedInfoFromConfig(authInfo.getFields(true));
             }
             catch (error) {
-                // eslint-disable-next-line no-await-in-loop
                 const logger = await OrgListUtil.retrieveLogger();
                 logger.warn(`Error decrypting ${authInfo.getUsername()}`);
-                currentValue = OrgListUtil.removeRestrictedInfoFromConfig(authInfo.getFields());
+                currentValue = removeRestrictedInfoFromConfig(authInfo.getFields());
             }
-            // eslint-disable-next-line no-await-in-loop
             const [alias, lastUsed] = await Promise.all([
                 (0, utils_1.getAliasByUsername)(currentValue.username),
                 fs.stat((0, path_1.join)(core_1.Global.SFDX_DIR, `${currentValue.username}.json`)),
             ]);
-            currentValue.alias = alias;
-            currentValue.lastUsed = lastUsed.atime;
-            OrgListUtil.identifyDefaultOrgs(currentValue, config);
-            if (currentValue.devHubUsername) {
-                output.scratchOrgs.push(currentValue);
-            }
-            else {
-                output.nonScratchOrgs.push(currentValue);
-            }
-        }
-        return output;
-    }
-    /**
-     * Helper utility to remove sensitive information from a scratch org auth config. By default refreshTokens and client secrets are removed.
-     *
-     * @param {*} config - scratch org auth object.
-     * @param {string[]} properties - properties to exclude ex ['refreshToken', 'clientSecret']
-     * @returns the config less the sensitive information.
-     */
-    static removeRestrictedInfoFromConfig(config, properties = ['refreshToken', 'clientSecret']) {
-        return (0, lib_1.omit)(config, properties);
-    }
-    /** Identify the default orgs */
-    static identifyDefaultOrgs(orgInfo, config) {
-        if (config['target-org'] && (orgInfo.username === config['target-org'] || orgInfo.alias === config['target-org'])) {
-            orgInfo.isDefaultUsername = true;
-        }
-        else if (config['target-dev-hub'] &&
-            (orgInfo.username === config['target-dev-hub'] || orgInfo.alias === config['target-dev-hub'])) {
-            orgInfo.isDefaultDevHubUsername = true;
-        }
+            return {
+                ...identifyDefaultOrgs({ ...currentValue, alias }, configAggregator),
+                lastUsed: lastUsed.atime,
+                alias,
+            };
+        }));
+        return {
+            scratchOrgs: results.filter((result) => 'expirationDate' in result),
+            nonScratchOrgs: results.filter((result) => !('expirationDate' in result)),
+        };
     }
     static async retrieveScratchOrgInfoFromDevHub(devHubUsername, orgIdsToQuery) {
         const fields = [
@@ -197,35 +171,33 @@ class OrgListUtil {
         }
     }
     static async reduceScratchOrgInfo(updatedContents, orgs) {
-        // Reduce the information to key value pairs with signupUsername as key
-        const contentMap = updatedContents.reduce((map, scratchOrgInfo) => {
-            if (scratchOrgInfo) {
-                map[scratchOrgInfo.SignupUsername] = scratchOrgInfo;
-            }
-            return map;
-        }, {});
-        for (const scratchOrgInfo of orgs) {
-            const updatedOrgInfo = contentMap[scratchOrgInfo.username];
-            if (updatedOrgInfo) {
-                scratchOrgInfo.signupUsername = updatedOrgInfo.SignupUsername;
-                scratchOrgInfo.createdBy = updatedOrgInfo.CreatedBy.Username;
-                scratchOrgInfo.createdDate = updatedOrgInfo.CreatedDate;
-                scratchOrgInfo.devHubOrgId = updatedOrgInfo.devHubOrgId;
-                scratchOrgInfo.attributes = updatedOrgInfo.attributes;
-                scratchOrgInfo.orgName = updatedOrgInfo.OrgName;
-                scratchOrgInfo.edition = updatedOrgInfo.Edition;
-                scratchOrgInfo.status = updatedOrgInfo.Status;
-                scratchOrgInfo.expirationDate = updatedOrgInfo.ExpirationDate;
-                scratchOrgInfo.isExpired = updatedOrgInfo.Status === 'Deleted';
-                scratchOrgInfo.namespace = updatedOrgInfo.Namespace;
-            }
-            else {
-                // eslint-disable-next-line no-await-in-loop
-                const logger = await OrgListUtil.retrieveLogger();
-                logger.warn(`Can't find ${scratchOrgInfo.username} in the updated contents`);
-            }
+        const contentMap = new Map(updatedContents.map((org) => [org.SignupUsername, org]));
+        const results = orgs.map((scratchOrgInfo) => {
+            const updatedOrgInfo = contentMap.get(scratchOrgInfo.username);
+            return updatedOrgInfo
+                ? {
+                    ...scratchOrgInfo,
+                    signupUsername: updatedOrgInfo.SignupUsername,
+                    createdBy: updatedOrgInfo.CreatedBy.Username,
+                    createdDate: updatedOrgInfo.CreatedDate,
+                    devHubOrgId: updatedOrgInfo.devHubOrgId,
+                    devHubId: updatedOrgInfo.devHubOrgId,
+                    attributes: updatedOrgInfo.attributes,
+                    orgName: updatedOrgInfo.OrgName,
+                    edition: updatedOrgInfo.Edition,
+                    status: updatedOrgInfo.Status,
+                    expirationDate: updatedOrgInfo.ExpirationDate,
+                    isExpired: updatedOrgInfo.Status === 'Deleted',
+                    namespace: updatedOrgInfo.Namespace,
+                }
+                : `Can't find ${scratchOrgInfo.username} in the updated contents`;
+        });
+        const warnings = results.filter((result) => typeof result === 'string');
+        if (warnings.length) {
+            const logger = await OrgListUtil.retrieveLogger();
+            warnings.forEach((warning) => logger.warn(warning));
         }
-        return orgs;
+        return results.filter((result) => typeof result !== 'string');
     }
     /**
      * Asks the org if it's a devHub.  Because the dev hub setting can't be deactivated, only ask orgs that aren't already stored as hubs.
@@ -278,6 +250,24 @@ class OrgListUtil {
     }
 }
 exports.OrgListUtil = OrgListUtil;
-const identifyActiveOrgByStatus = (org) => org.status === 'Active';
+const identifyActiveOrgByStatus = (org) => 'status' in org && org.status === 'Active';
 exports.identifyActiveOrgByStatus = identifyActiveOrgByStatus;
+/** Identify the default orgs */
+const identifyDefaultOrgs = (orgInfo, config) => {
+    // remove undefined, since the config might also be undefined
+    const possibleDefaults = [orgInfo.alias, orgInfo.username].filter(Boolean);
+    return {
+        ...orgInfo,
+        isDefaultDevHubUsername: possibleDefaults.includes(config.getPropertyValue(core_1.OrgConfigProperties.TARGET_DEV_HUB)),
+        isDefaultUsername: possibleDefaults.includes(config.getPropertyValue(core_1.OrgConfigProperties.TARGET_ORG)),
+    };
+};
+/**
+ * Helper utility to remove sensitive information from a scratch org auth config. By default refreshTokens and client secrets are removed.
+ *
+ * @param {*} config - scratch org auth object.
+ * @param {string[]} properties - properties to exclude ex ['refreshToken', 'clientSecret']
+ * @returns the config less the sensitive information.
+ */
+const removeRestrictedInfoFromConfig = (config, properties = ['refreshToken', 'clientSecret']) => (0, lib_1.omit)(config, properties);
 //# sourceMappingURL=orgListUtil.js.map

package/lib/shared/orgListUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"orgListUtil.js","sourceRoot":"","sources":["../../src/shared/orgListUtil.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"orgListUtil.js","sourceRoot":"","sources":["../../src/shared/orgListUtil.ts"],"names":[],"mappings":"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"}

package/lib/shared/orgTypes.d.ts

@@ -1,6 +1,6 @@
-import { AuthFields } from '@salesforce/core';
+import { AuthFields, ScratchOrgInfo } from '@salesforce/core';
 import { Dictionary } from '@salesforce/ts-types';
-export interface OrgDisplayReturn extends Partial<ScratchOrgFields> {
+export type OrgDisplayReturn = Partial<ScratchOrgFields> & {
     username: string;
     id: string;
     accessToken: string;
@@ -10,14 +10,29 @@ export interface OrgDisplayReturn extends Partial<ScratchOrgFields> {
     password?: string;
     connectedStatus?: string;
     sfdxAuthUrl?: string;
-}
-export interface ExtendedAuthFields extends AuthFields, OrgListFields, Partial<ScratchOrgFields> {
-    signupUsername?: string;
+};
+/** Convenience type for the fields that are in the auth file
+ *
+ * core's AuthFields has everything as optional.
+ *
+ * In this case, we have a username because these come from auth files */
+export type AuthFieldsFromFS = Omit<AuthFields, 'expirationDate'> & {
+    username: string;
+    orgId: string;
+    accessToken: string;
+    instanceUrl: string;
+    clientId: string;
+    string: string;
+};
+export type ExtendedAuthFields = AuthFieldsFromFS & OrgListFields;
+export type ExtendedAuthFieldsScratch = ExtendedAuthFields & {
+    expirationDate: string;
+    devHubUsername: string;
     devHubOrgId?: string;
-    isExpired?: boolean;
-    connectedStatus?: string;
-    attributes?: Dictionary<unknown>;
-}
+};
+export type FullyPopulatedScratchOrgFields = ScratchOrgFields & ExtendedAuthFieldsScratch & {
+    isExpired: boolean;
+};
 export interface ScratchOrgInfoSObject {
     Id: string;
     CreatedDate: string;
@@ -28,23 +43,36 @@ export interface ScratchOrgInfoSObject {
     };
     Edition: string;
     Namespace?: string;
-    OrgName?: string;
+    OrgName: string;
     SignupUsername: string;
 }
+/** fields in the  */
 export interface ScratchOrgFields {
     createdBy: string;
     createdDate: string;
     expirationDate: string;
     orgName: string;
     status: string;
-    devHubId?: string;
+    devHubId: string;
     edition?: string;
     namespace?: string;
     snapshot?: string;
     lastUsed?: Date;
+    signupUsername: string;
 }
 export interface OrgListFields {
+    connectedStatus?: string;
     isDefaultUsername?: boolean;
     isDefaultDevHubUsername?: boolean;
     defaultMarker?: '(D)' | '(U)';
+    attributes?: Dictionary<unknown>;
+    lastUsed?: Date;
+}
+/** If the scratch org is resumed, but doesn't get very far in the process, it won't have much information on it */
+export interface ScratchCreateResponse {
+    username?: string;
+    scratchOrgInfo?: ScratchOrgInfo;
+    authFields?: AuthFields;
+    warnings: string[];
+    orgId?: string;
 }

package/lib/shared/sandboxCommandBase.d.ts

@@ -0,0 +1,33 @@
+import { SfCommand } from '@salesforce/sf-plugins-core';
+import { Config } from '@oclif/core';
+import { Lifecycle, Org, ResultEvent, SandboxProcessObject, SandboxRequestCache, SandboxRequestCacheEntry, SandboxUserAuthResponse, StatusEvent } from '@salesforce/core';
+import { SandboxProgress } from './sandboxProgress';
+import { State } from './stagedProgress';
+export declare abstract class SandboxCommandBase<T> extends SfCommand<T> {
+    protected sandboxProgress: SandboxProgress;
+    protected latestSandboxProgressObj?: SandboxProcessObject;
+    protected sandboxAuth?: SandboxUserAuthResponse;
+    protected prodOrg?: Org;
+    protected pollingTimeOut: boolean;
+    protected sandboxRequestConfig: SandboxRequestCache;
+    protected sandboxRequestData: SandboxRequestCacheEntry | undefined;
+    constructor(argv: string[], config: Config);
+    protected getSandboxRequestConfig(): Promise<SandboxRequestCache>;
+    protected calculateTrackingSetting(tracking?: boolean): Promise<boolean>;
+    protected registerLifecycleListeners(lifecycle: Lifecycle, options: {
+        isAsync: boolean;
+        alias?: string;
+        setDefault: boolean;
+        prodOrg?: Org;
+        tracksSource?: boolean;
+    }): void;
+    protected reportResults(results: ResultEvent): void;
+    protected updateProgress(event: StatusEvent | (Omit<ResultEvent, 'sandboxRes'> & {
+        sandboxRes?: ResultEvent['sandboxRes'];
+    }), isAsync: boolean): void;
+    protected updateStage(stage: string | undefined, state: State): void;
+    protected updateSandboxRequestData(): void;
+    protected saveSandboxProgressConfig(): void;
+    private removeSandboxProgressConfig;
+    protected abstract getCheckSandboxStatusParams(): string[];
+}