@salesforce/plugin-org 1.9.2 → 1.11.1

package/lib/commands/force/org/beta/create.js

@@ -0,0 +1,304 @@
+"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 });
+exports.Create = void 0;
+const os = require("os");
+const fs = require("fs");
+const command_1 = require("@salesforce/command");
+const kit_1 = require("@salesforce/kit");
+const core_1 = require("@salesforce/core");
+const sandboxReporter_1 = require("../../../../shared/sandboxReporter");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/plugin-org', 'create');
+class Create extends command_1.SfdxCommand {
+    constructor() {
+        super(...arguments);
+        this.lifecycleEventNames = ['postorgcreate'];
+    }
+    async run() {
+        this.logger.debug('Create started with args %s ', this.flags);
+        if (this.flags.type === core_1.OrgTypes.Sandbox) {
+            this.validateSandboxFlags();
+            return this.createSandbox();
+        }
+        else {
+            // default to scratch org
+            return this.createScratchOrg();
+        }
+    }
+    validateSandboxFlags() {
+        if (!this.flags.targetusername) {
+            throw core_1.SfdxError.create('@salesforce/plugin-org', 'create', 'requiresUsername');
+        }
+        if (this.flags.retry !== 0) {
+            throw core_1.SfdxError.create('@salesforce/plugin-org', 'create', 'retryIsNotValidForSandboxes');
+        }
+        if (this.flags.clientid) {
+            this.ux.warn(messages.getMessage('clientIdNotSupported', [this.flags.clientid]));
+        }
+        if (this.flags.nonamespace) {
+            this.ux.warn(messages.getMessage('noNamespaceNotSupported', [this.flags.nonamespace]));
+        }
+        if (this.flags.noancestors) {
+            this.ux.warn(messages.getMessage('noAncestorsNotSupported', [this.flags.noancestors]));
+        }
+        if (this.flags.durationdays) {
+            this.ux.warn(messages.getMessage('durationDaysNotSupported', [this.flags.durationdays]));
+        }
+    }
+    lowerToUpper(object) {
+        // the API has keys defined in capital camel case, while the definition schema has them as lower camel case
+        // we need to convert lower camel case to upper before merging options so they will override properly
+        Object.keys(object).map((key) => {
+            const upperCase = key.charAt(0).toUpperCase();
+            if (key.charAt(0) !== upperCase) {
+                const capitalKey = upperCase + key.slice(1);
+                object[capitalKey] = object[key];
+                delete object[key];
+            }
+        });
+        return object;
+    }
+    createSandboxRequest() {
+        this.logger.debug('Create Varargs: %s ', this.varargs);
+        let sandboxDefFileContents = this.readJsonDefFile();
+        let capitalizedVarArgs = {};
+        if (sandboxDefFileContents) {
+            sandboxDefFileContents = this.lowerToUpper(sandboxDefFileContents);
+        }
+        if (this.varargs) {
+            capitalizedVarArgs = this.lowerToUpper(this.varargs);
+        }
+        // varargs override file input
+        const sandboxReq = { SandboxName: undefined, ...sandboxDefFileContents, ...capitalizedVarArgs };
+        if (!sandboxReq.SandboxName) {
+            // sandbox names are 10 chars or less, a radix of 36 = [a-z][0-9]
+            // technically without querying the production org, the generated name could already exist, but the chances of that are lower than the perf penalty of querying and verifying
+            sandboxReq.SandboxName = `sbx${Date.now().toString(36).slice(-7)}`;
+            this.ux.warn(`No SandboxName defined, generating new SandboxName: ${sandboxReq.SandboxName}`);
+        }
+        if (!sandboxReq.LicenseType) {
+            throw core_1.SfdxError.create('@salesforce/plugin-org', 'create', 'missingLicenseType');
+        }
+        return sandboxReq;
+    }
+    async createSandbox() {
+        const prodOrg = await core_1.Org.create({ aliasOrUsername: this.flags.targetusername });
+        const lifecycle = core_1.Lifecycle.getInstance();
+        // register the sandbox event listeners before calling `prodOrg.createSandbox()`
+        // `on` doesn't support synchronous methods
+        // eslint-disable-next-line @typescript-eslint/require-await
+        lifecycle.on(core_1.SandboxEvents.EVENT_ASYNC_RESULT, async (results) => {
+            this.ux.log(messages.getMessage('sandboxSuccess', [results.Id, results.SandboxName, this.flags.targetusername]));
+        });
+        // eslint-disable-next-line @typescript-eslint/require-await
+        lifecycle.on(core_1.SandboxEvents.EVENT_STATUS, async (results) => {
+            this.ux.log(sandboxReporter_1.SandboxReporter.sandboxProgress(results));
+        });
+        // eslint-disable-next-line @typescript-eslint/require-await
+        lifecycle.on(core_1.SandboxEvents.EVENT_AUTH, async (results) => {
+            this.sandboxAuth = results;
+        });
+        lifecycle.on(core_1.SandboxEvents.EVENT_RESULT, async (results) => {
+            var _a;
+            const { sandboxReadyForUse, data } = sandboxReporter_1.SandboxReporter.logSandboxProcessResult(results);
+            this.ux.log(sandboxReadyForUse);
+            this.ux.styledHeader('Sandbox Org Creation Status');
+            this.ux.table(data, {
+                columns: [
+                    { key: 'key', label: 'Name' },
+                    { key: 'value', label: 'Value' },
+                ],
+            });
+            if ((_a = results.sandboxRes) === null || _a === void 0 ? void 0 : _a.authUserName) {
+                if (this.flags.setalias) {
+                    const alias = await core_1.Aliases.create(core_1.Aliases.getDefaultOptions());
+                    alias.set(this.flags.setalias, results.sandboxRes.authUserName);
+                    const result = await alias.write();
+                    this.logger.debug('Set Alias: %s result: %s', this.flags.setalias, result);
+                }
+                if (this.flags.setdefaultusername) {
+                    const globalConfig = this.configAggregator.getGlobalConfig();
+                    globalConfig.set(core_1.Config.DEFAULT_USERNAME, results.sandboxRes.authUserName);
+                    const result = await globalConfig.write();
+                    this.logger.debug('Set defaultUsername: %s result: %s', this.flags.setdefaultusername, result);
+                }
+            }
+        });
+        const sandboxReq = this.createSandboxRequest();
+        this.logger.debug('Calling create with SandboxRequest: %s ', sandboxReq);
+        const wait = this.flags.wait;
+        try {
+            return prodOrg.createSandbox(sandboxReq, { wait });
+        }
+        catch (e) {
+            // guaranteed to be SfdxError from core;
+            const err = e;
+            if (err === null || err === void 0 ? void 0 : err.message.includes('The org cannot be found')) {
+                // there was most likely an issue with DNS when auth'ing to the new sandbox, but it was created.
+                if (this.flags.setalias && this.sandboxAuth) {
+                    const alias = await core_1.Aliases.create(core_1.Aliases.getDefaultOptions());
+                    alias.set(this.flags.setalias, this.sandboxAuth.authUserName);
+                    const result = await alias.write();
+                    this.logger.debug('Set Alias: %s result: %s', this.flags.setalias, result);
+                }
+                if (this.flags.setdefaultusername && this.sandboxAuth) {
+                    const globalConfig = this.configAggregator.getGlobalConfig();
+                    globalConfig.set(core_1.Config.DEFAULT_USERNAME, this.sandboxAuth.authUserName);
+                    const result = await globalConfig.write();
+                    this.logger.debug('Set defaultUsername: %s result: %s', this.flags.setdefaultusername, result);
+                }
+                err.actions = [messages.getMessage('dnsTimeout'), messages.getMessage('partialSuccess')];
+                err.exitCode = 68;
+                throw err;
+            }
+        }
+    }
+    readJsonDefFile() {
+        // the -f option
+        if (this.flags.definitionfile) {
+            this.logger.debug('Reading JSON DefFile %s ', this.flags.definitionfile);
+            return JSON.parse(fs.readFileSync(this.flags.definitionfile, 'utf-8'));
+        }
+    }
+    async setAliasAndDefaultUsername(username) {
+        if (this.flags.setalias) {
+            const alias = await core_1.Aliases.create(core_1.Aliases.getDefaultOptions());
+            alias.set(this.flags.setalias, username);
+            const result = await alias.write();
+            this.logger.debug('Set Alias: %s result: %s', this.flags.setalias, result);
+        }
+        if (this.flags.setdefaultusername) {
+            const globalConfig = this.configAggregator.getGlobalConfig();
+            globalConfig.set(core_1.Config.DEFAULT_USERNAME, username);
+            const result = await globalConfig.write();
+            this.logger.debug('Set defaultUsername: %s result: %s', this.flags.setdefaultusername, result);
+        }
+    }
+    async createScratchOrg() {
+        this.logger.debug('OK, will do scratch org creation');
+        if (!this.hubOrg) {
+            throw core_1.SfdxError.create('@salesforce/plugin-org', 'create', 'RequiresDevhubUsernameError');
+        }
+        // Ensure we have an org config input source.
+        if (!this.flags.definitionfile && Object.keys(this.varargs).length === 0) {
+            throw new core_1.SfdxError(messages.getMessage('noConfig'));
+        }
+        this.logger.debug('validation complete');
+        let secret;
+        if (this.flags.clientid) {
+            // If the user supplied a specific client ID, we have no way of knowing if it's
+            // a certificate-based Connected App or not. Therefore, we have to assume that
+            // we'll need the client secret, so prompt the user for it.
+            secret = await this.ux.prompt(messages.getMessage('secretPrompt'), {
+                type: 'mask',
+            });
+        }
+        const createCommandOptions = {
+            connectedAppConsumerKey: this.flags.clientid,
+            durationDays: this.flags.durationdays,
+            nonamespace: this.flags.nonamespace,
+            noancestors: this.flags.noancestors,
+            wait: this.flags.wait,
+            retry: this.flags.retry,
+            apiversion: this.flags.apiversion,
+            definitionfile: this.flags.definitionfile,
+            orgConfig: this.varargs,
+            clientSecret: secret,
+        };
+        const { username, scratchOrgInfo, authFields, warnings } = await this.hubOrg.scratchOrgCreate(createCommandOptions);
+        await core_1.Lifecycle.getInstance().emit('scratchOrgInfo', scratchOrgInfo);
+        await this.setAliasAndDefaultUsername(username);
+        // emit postorgcreate event for hook
+        const postOrgCreateHookInfo = [authFields].map((element) => ({
+            accessToken: element.accessToken,
+            clientId: element.clientId,
+            created: element.created,
+            createdOrgInstance: element.createdOrgInstance,
+            devHubUsername: element.devHubUsername,
+            expirationDate: element.expirationDate,
+            instanceUrl: element.instanceUrl,
+            loginUrl: element.loginUrl,
+            orgId: element.orgId,
+            username: element.username,
+        }))[0];
+        await core_1.Lifecycle.getInstance().emit('postorgcreate', postOrgCreateHookInfo);
+        this.logger.debug(`orgConfig.loginUrl: ${authFields.loginUrl}`);
+        this.logger.debug(`orgConfig.instanceUrl: ${authFields.instanceUrl}`);
+        this.ux.log(messages.getMessage('scratchOrgCreateSuccess', [authFields.orgId, username]));
+        if (warnings.length > 0) {
+            warnings.forEach((warning) => {
+                this.ux.warn(warning);
+            });
+        }
+        return {
+            username,
+            scratchOrgInfo,
+            authFields,
+            warnings,
+            orgId: authFields.orgId,
+        };
+    }
+}
+exports.Create = Create;
+Create.description = messages.getMessage('description');
+Create.examples = messages.getMessage('examples').split(os.EOL);
+Create.supportsDevhubUsername = true;
+Create.supportsUsername = true;
+Create.varargs = true;
+Create.flagsConfig = {
+    type: command_1.flags.enum({
+        char: 't',
+        description: messages.getMessage('flags.type'),
+        options: [core_1.OrgTypes.Scratch, core_1.OrgTypes.Sandbox],
+        default: core_1.OrgTypes.Scratch,
+    }),
+    definitionfile: command_1.flags.filepath({
+        char: 'f',
+        description: messages.getMessage('flags.definitionFile'),
+    }),
+    nonamespace: command_1.flags.boolean({
+        char: 'n',
+        description: messages.getMessage('flags.noNamespace'),
+    }),
+    noancestors: command_1.flags.boolean({
+        char: 'c',
+        description: messages.getMessage('flags.noAncestors'),
+    }),
+    clientid: command_1.flags.string({
+        char: 'i',
+        description: messages.getMessage('flags.clientId'),
+    }),
+    setdefaultusername: command_1.flags.boolean({
+        char: 's',
+        description: messages.getMessage('flags.setDefaultUsername'),
+    }),
+    setalias: command_1.flags.string({
+        char: 'a',
+        description: messages.getMessage('flags.setAlias'),
+    }),
+    wait: command_1.flags.minutes({
+        char: 'w',
+        description: messages.getMessage('flags.wait'),
+        min: 6,
+        default: kit_1.Duration.minutes(6),
+    }),
+    durationdays: command_1.flags.integer({
+        char: 'd',
+        description: messages.getMessage('flags.durationDays'),
+        min: 1,
+        max: 30,
+    }),
+    retry: command_1.flags.number({
+        hidden: true,
+        default: 0,
+        max: 10,
+        description: messages.getMessage('flags.retry'),
+    }),
+};
+//# sourceMappingURL=create.js.map

package/lib/commands/force/org/beta/create.js.map

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

package/lib/commands/force/org/delete.d.ts

@@ -0,0 +1,14 @@
+import { FlagsConfig, SfdxCommand } from '@salesforce/command';
+declare type DeleteResult = {
+    orgId: string;
+    username: string;
+};
+export declare class Delete extends SfdxCommand {
+    static readonly requiresUsername = true;
+    static readonly supportsDevhubUsername = true;
+    static readonly description: string;
+    static readonly examples: string[];
+    static readonly flagsConfig: FlagsConfig;
+    run(): Promise<DeleteResult>;
+}
+export {};

package/lib/commands/force/org/delete.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Delete = 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
+ */
+const os = require("os");
+const command_1 = require("@salesforce/command");
+const core_1 = require("@salesforce/core");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/plugin-org', 'delete');
+class Delete extends command_1.SfdxCommand {
+    async run() {
+        const username = this.org.getUsername();
+        const orgId = this.org.getOrgId();
+        const isSandbox = await this.org.isSandbox();
+        // read the config file for the org to be deleted, if it has a PROD_ORG_USERNAME entry, it's a sandbox
+        // we either need permission to proceed without a prompt OR get the user to confirm
+        if (this.flags.noprompt ||
+            (await this.ux.confirm(messages.getMessage('confirmDelete', [isSandbox ? 'sandbox' : 'scratch', username])))) {
+            let alreadyDeleted = false;
+            let successMessageKey = 'commandSandboxSuccess';
+            try {
+                // will determine if it's a scratch org or sandbox and will delete from the appropriate parent org (DevHub or Production)
+                await this.org.delete();
+            }
+            catch (e) {
+                if (e instanceof Error && e.name === 'ScratchOrgNotFound') {
+                    alreadyDeleted = true;
+                }
+                else if (e instanceof Error && e.name === 'SandboxNotFound') {
+                    successMessageKey = 'sandboxConfigOnlySuccess';
+                }
+                else {
+                    throw e;
+                }
+            }
+            this.ux.log(isSandbox
+                ? messages.getMessage(successMessageKey, [username])
+                : messages.getMessage(alreadyDeleted ? 'deleteOrgConfigOnlyCommandSuccess' : 'deleteOrgCommandSuccess', [
+                    username,
+                ]));
+        }
+        return { username, orgId };
+    }
+}
+exports.Delete = Delete;
+Delete.requiresUsername = true;
+Delete.supportsDevhubUsername = true;
+Delete.description = messages.getMessage('description');
+Delete.examples = messages.getMessage('examples').split(os.EOL);
+Delete.flagsConfig = {
+    noprompt: command_1.flags.boolean({
+        char: 'p',
+        description: messages.getMessage('flags.noprompt'),
+    }),
+};
+//# sourceMappingURL=delete.js.map

package/lib/commands/force/org/delete.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../src/commands/force/org/delete.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,yBAAyB;AACzB,iDAAsE;AACtE,2CAA4C;AAE5C,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,wBAAwB,EAAE,QAAQ,CAAC,CAAC;AAO3E,MAAa,MAAO,SAAQ,qBAAW;IAY9B,KAAK,CAAC,GAAG;QACd,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;QACxC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;QAClC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;QAC7C,sGAAsG;QACtG,mFAAmF;QACnF,IACE,IAAI,CAAC,KAAK,CAAC,QAAQ;YACnB,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAC5G;YACA,IAAI,cAAc,GAAG,KAAK,CAAC;YAC3B,IAAI,iBAAiB,GAAG,uBAAuB,CAAC;YAChD,IAAI;gBACF,yHAAyH;gBACzH,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;aACzB;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,IAAI,KAAK,oBAAoB,EAAE;oBACzD,cAAc,GAAG,IAAI,CAAC;iBACvB;qBAAM,IAAI,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,IAAI,KAAK,iBAAiB,EAAE;oBAC7D,iBAAiB,GAAG,0BAA0B,CAAC;iBAChD;qBAAM;oBACL,MAAM,CAAC,CAAC;iBACT;aACF;YAED,IAAI,CAAC,EAAE,CAAC,GAAG,CACT,SAAS;gBACP,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC,QAAQ,CAAC,CAAC;gBACpD,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,mCAAmC,CAAC,CAAC,CAAC,yBAAyB,EAAE;oBACpG,QAAQ;iBACT,CAAC,CACP,CAAC;SACH;QACD,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IAC7B,CAAC;;AA9CH,wBA+CC;AA9CwB,uBAAgB,GAAG,IAAI,CAAC;AACxB,6BAAsB,GAAG,IAAI,CAAC;AAC9B,kBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AACjD,eAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;AACzD,kBAAW,GAAgB;IAChD,QAAQ,EAAE,eAAK,CAAC,OAAO,CAAC;QACtB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC;KACnD,CAAC;CACH,CAAC"}

package/lib/commands/force/org/open.js

@@ -24,18 +24,24 @@ class OrgOpenCommand extends command_1.SfdxCommand {
         const orgId = this.org.getOrgId();
         const username = this.org.getUsername();
         const output = { orgId, url, username };
-        this.ux.warn(sharedMessages.getMessage('SecurityWarning'));
-        this.ux.log('');
-        if (new kit_1.Env().getBoolean('SFDX_CONTAINER_MODE')) {
+        const containerMode = new kit_1.Env().getBoolean('SFDX_CONTAINER_MODE');
+        // security warning only for --json OR --urlonly OR containerMode
+        if (this.flags.urlonly || this.flags.json || containerMode) {
+            this.ux.warn(sharedMessages.getMessage('SecurityWarning'));
+            this.ux.log('');
+        }
+        if (containerMode) {
             // instruct the user that they need to paste the URL into the browser
             this.ux.styledHeader('Action Required!');
             this.ux.log(messages.getMessage('containerAction', [orgId, url]));
             return output;
         }
-        this.ux.log(messages.getMessage('humanSuccess', [orgId, username, url]));
         if (this.flags.urlonly) {
+            // this includes the URL
+            this.ux.log(messages.getMessage('humanSuccess', [orgId, username, url]));
             return output;
         }
+        this.ux.log(messages.getMessage('humanSuccessNoUrl', [orgId, username]));
         // we actually need to open the org
         try {
             this.ux.startSpinner(messages.getMessage('domainWaiting'));
@@ -54,9 +60,7 @@ class OrgOpenCommand extends command_1.SfdxCommand {
             }
             throw core_1.SfdxError.wrap(err);
         }
-        const openOptions = this.flags.browser
-            ? { app: { name: open.apps[this.flags.browser] } }
-            : {};
+        const openOptions = typeof this.flags.browser === 'string' ? { app: { name: open.apps[this.flags.browser] } } : {};
         await (0, utils_1.openUrl)(url, openOptions);
         return output;
     }

package/lib/commands/force/org/open.js.map

@@ -1 +1 @@
-{"version":3,"file":"open.js","sourceRoot":"","sources":["../../../../src/commands/force/org/open.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2BAAyB;AAEzB,iDAAsE;AACtE,2CAAqE;AACrE,yCAAgD;AAChD,6BAA8B;AAC9B,iDAAgD;AAEhD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,wBAAwB,EAAE,MAAM,CAAC,CAAC;AACzE,MAAM,cAAc,GAAG,eAAQ,CAAC,YAAY,CAAC,wBAAwB,EAAE,UAAU,CAAC,CAAC;AAEnF,MAAa,cAAe,SAAQ,qBAAW;IAuBtC,KAAK,CAAC,GAAG;;QACd,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACpD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,YAAY,WAAW,IAAI,CAAC,KAAK,CAAC,IAAc,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC;QACnG,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;QAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;QACxC,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC;QAExC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAC3D,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEhB,IAAI,IAAI,SAAG,EAAE,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE;YAC/C,qEAAqE;YACrE,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC;YACzC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;YAClE,OAAO,MAAM,CAAC;SACf;QAED,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;QAEzE,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;YACtB,OAAO,MAAM,CAAC;SACf;QACD,mCAAmC;QACnC,IAAI;YACF,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC;YAC3D,MAAM,OAAO,GAAG,IAAI,cAAO,CAAC,GAAG,CAAC,CAAC;YACjC,MAAM,OAAO,CAAC,oBAAoB,EAAE,CAAC;SACtC;QAAC,OAAO,GAAG,EAAE;YACZ,0GAA0G;YAC1G,IAAI,MAAA,GAAG,CAAC,OAAO,0CAAE,QAAQ,CAAC,SAAS,CAAC,EAAE;gBACpC,MAAM,MAAM,GAAG,WAAW,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC;gBAClF,MAAM,OAAO,GAAG,IAAI,cAAQ,CAAC,IAAI,SAAG,EAAE,CAAC,SAAS,CAAC,mBAAmB,EAAE,GAAG,CAAC,EAAE,cAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACnG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,MAAM,UAAU,OAAO,CAAC,OAAO,UAAU,CAAC,CAAC;gBACpF,MAAM,IAAI,gBAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE,oBAAoB,EAAE;oBACnF,QAAQ,CAAC,UAAU,CAAC,qBAAqB,CAAC;iBAC3C,CAAC,CAAC;aACJ;YACD,MAAM,gBAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC3B;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO;YACpC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAiB,CAAiB,EAAE,EAAE;YAC5E,CAAC,CAAC,EAAE,CAAC;QAEP,MAAM,IAAA,eAAO,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAChC,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,iBAAiB;QAC7B,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,mDAAmD;QACjF,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;QACtC,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACrC,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAG,CAAC,MAAM,CAAC,YAAY,CAAW,CAAC;QACzE,MAAM,gBAAgB,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACxD,OAAO,GAAG,gBAAgB,4BAA4B,WAAW,EAAE,CAAC;IACtE,CAAC;;AA9EH,wCA+EC;AA9EwB,0BAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AACjD,uBAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,QAAG,CAAC,CAAC;AACtD,+BAAgB,GAAG,IAAI,CAAC;AACxB,0BAAW,GAAgB;IAChD,OAAO,EAAE,eAAK,CAAC,MAAM,CAAC;QACpB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC;QAC3C,OAAO,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC;QACtC,SAAS,EAAE,CAAC,SAAS,CAAC;KACvB,CAAC;IACF,IAAI,EAAE,eAAK,CAAC,MAAM,CAAC;QACjB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC;QAC3C,GAAG,EAAE,gBAAgB;QACrB,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;KAChE,CAAC;IACF,OAAO,EAAE,eAAK,CAAC,OAAO,CAAC;QACrB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC;KAC5C,CAAC;CACH,CAAC"}
+{"version":3,"file":"open.js","sourceRoot":"","sources":["../../../../src/commands/force/org/open.ts"],"names":[],"mappings":"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"}

package/lib/shared/orgHooks.d.ts

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

@@ -263,7 +263,7 @@ class OrgListUtil {
                 const logger = await OrgListUtil.retrieveLogger();
                 logger.trace(`error refreshing auth for org: ${org.getUsername()}`);
                 logger.trace(error);
-                return (_a = error.code) !== null && _a !== void 0 ? _a : error.message;
+                return ((_a = error.code) !== null && _a !== void 0 ? _a : error.message);
             }
         }
         catch (err) {
@@ -271,7 +271,7 @@ class OrgListUtil {
             const logger = await OrgListUtil.retrieveLogger();
             logger.trace(`error refreshing auth for org: ${username}`);
             logger.trace(error);
-            return (_c = (_b = error.code) !== null && _b !== void 0 ? _b : error.message) !== null && _c !== void 0 ? _c : 'Unknown';
+            return ((_c = (_b = error.code) !== null && _b !== void 0 ? _b : error.message) !== null && _c !== void 0 ? _c : 'Unknown');
         }
     }
 }

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/sandboxReporter.d.ts

@@ -0,0 +1,12 @@
+import { StatusEvent, ResultEvent } from '@salesforce/core';
+export declare class SandboxReporter {
+    static sandboxProgress(update: StatusEvent): string;
+    static logSandboxProcessResult(result: ResultEvent): {
+        sandboxReadyForUse: string;
+        data: Array<{
+            key: string;
+            value: string | number;
+        }>;
+    };
+    private static getSecondsToHuman;
+}

package/lib/shared/sandboxReporter.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SandboxReporter = void 0;
+const kit_1 = require("@salesforce/kit");
+class SandboxReporter {
+    static sandboxProgress(update) {
+        const { retries, interval, sandboxProcessObj, waitingOnAuth } = update;
+        const waitTimeInSec = retries * interval;
+        const waitTime = SandboxReporter.getSecondsToHuman(waitTimeInSec);
+        const waitTimeMsg = `Sleeping ${interval} seconds. Will wait ${waitTime} more before timing out.`;
+        const sandboxIdentifierMsg = `${sandboxProcessObj.SandboxName}(${sandboxProcessObj.Id})`;
+        const waitingOnAuthMessage = waitingOnAuth ? ', waiting on JWT auth' : '';
+        const completionMessage = `(${sandboxProcessObj.CopyProgress}% completed${waitingOnAuthMessage})`;
+        return `Sandbox request ${sandboxIdentifierMsg} is ${sandboxProcessObj.Status} ${completionMessage}. ${waitTimeMsg}`;
+    }
+    static logSandboxProcessResult(result
+    // sandboxProcessObj.CopyProgress is a number
+    ) {
+        const { sandboxProcessObj, sandboxRes } = result;
+        const sandboxReadyForUse = `Sandbox ${sandboxProcessObj.SandboxName}(${sandboxProcessObj.Id}) is ready for use.`;
+        const data = [
+            { key: 'Id', value: sandboxProcessObj.Id },
+            { key: 'SandboxName', value: sandboxProcessObj.SandboxName },
+            { key: 'Status', value: sandboxProcessObj.Status },
+            { key: 'CopyProgress', value: sandboxProcessObj.CopyProgress },
+            { key: 'Description', value: sandboxProcessObj.Description },
+            { key: 'LicenseType', value: sandboxProcessObj.LicenseType },
+            { key: 'SandboxInfoId', value: sandboxProcessObj.SandboxInfoId },
+            { key: 'SourceId', value: sandboxProcessObj.SourceId },
+            { key: 'SandboxOrg', value: sandboxProcessObj.SandboxOrganization },
+            { key: 'Created Date', value: sandboxProcessObj.CreatedDate },
+            { key: 'ApexClassId', value: sandboxProcessObj.ApexClassId },
+            { key: 'Authorized Sandbox Username', value: sandboxRes.authUserName },
+        ];
+        return { sandboxReadyForUse, data };
+    }
+    static getSecondsToHuman(waitTimeInSec) {
+        const hours = kit_1.Duration.hours(Math.floor(waitTimeInSec / 3600));
+        const minutes = kit_1.Duration.minutes(Math.floor((waitTimeInSec % 3600) / 60));
+        const seconds = kit_1.Duration.seconds(Math.floor(waitTimeInSec % 60));
+        const hDisplay = hours.hours > 0 ? hours.toString() + ' ' : '';
+        const mDisplay = minutes.minutes > 0 ? minutes.toString() + ' ' : '';
+        const sDisplay = seconds.seconds > 0 ? seconds.toString() : '';
+        return (hDisplay + mDisplay + sDisplay).trim();
+    }
+}
+exports.SandboxReporter = SandboxReporter;
+//# sourceMappingURL=sandboxReporter.js.map

package/lib/shared/sandboxReporter.js.map

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