@salesforce/core 3.19.0 → 3.19.3

package/lib/{globalInfo → stateAggregator}/globalInfoConfig.js

@@ -20,6 +20,9 @@ function deepCopy(data) {
     return JSON.parse(JSON.stringify(data));
 }
 exports.deepCopy = deepCopy;
+/**
+ * @deprecated use StateAggregator instead.
+ */
 class GlobalInfo extends configFile_1.ConfigFile {
     constructor() {
         super(...arguments);
@@ -57,16 +60,16 @@ class GlobalInfo extends configFile_1.ConfigFile {
         };
     }
     get orgs() {
-        return new orgAccessor_1.OrgAccessor(this);
+        return new orgAccessor_1.GlobalInfoOrgAccessor(this);
     }
     get tokens() {
-        return new tokenAccessor_1.TokenAccessor(this);
+        return new tokenAccessor_1.GlobaInfoTokenAccessor(this);
     }
     get aliases() {
-        return new aliasAccessor_1.AliasAccessor(this);
+        return new aliasAccessor_1.GlobalInfoAliasAccessor(this);
     }
     get sandboxes() {
-        return new sandboxAccessor_1.SandboxAccessor(this);
+        return new sandboxAccessor_1.GlobalInfoSandboxAccessor(this);
     }
     set(key, value) {
         if ((0, ts_types_1.isPlainObject)(value)) {

package/lib/stateAggregator/index.d.ts

@@ -0,0 +1,7 @@
+export * from './globalInfoConfig';
+export * from './sfdxDataHandler';
+export * from './types';
+export { GlobalInfoOrgAccessor, OrgAccessor } from './accessors/orgAccessor';
+export { GlobalInfoAliasAccessor, AliasAccessor } from './accessors/aliasAccessor';
+export { GlobaInfoTokenAccessor, TokenAccessor } from './accessors/tokenAccessor';
+export * from './stateAggregator';

package/lib/{globalInfo → stateAggregator}/index.js

@@ -16,14 +16,18 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TokenAccessor = exports.AliasAccessor = exports.OrgAccessor = void 0;
+exports.TokenAccessor = exports.GlobaInfoTokenAccessor = exports.AliasAccessor = exports.GlobalInfoAliasAccessor = exports.OrgAccessor = exports.GlobalInfoOrgAccessor = void 0;
 __exportStar(require("./globalInfoConfig"), exports);
 __exportStar(require("./sfdxDataHandler"), exports);
 __exportStar(require("./types"), exports);
 var orgAccessor_1 = require("./accessors/orgAccessor");
+Object.defineProperty(exports, "GlobalInfoOrgAccessor", { enumerable: true, get: function () { return orgAccessor_1.GlobalInfoOrgAccessor; } });
 Object.defineProperty(exports, "OrgAccessor", { enumerable: true, get: function () { return orgAccessor_1.OrgAccessor; } });
 var aliasAccessor_1 = require("./accessors/aliasAccessor");
+Object.defineProperty(exports, "GlobalInfoAliasAccessor", { enumerable: true, get: function () { return aliasAccessor_1.GlobalInfoAliasAccessor; } });
 Object.defineProperty(exports, "AliasAccessor", { enumerable: true, get: function () { return aliasAccessor_1.AliasAccessor; } });
 var tokenAccessor_1 = require("./accessors/tokenAccessor");
+Object.defineProperty(exports, "GlobaInfoTokenAccessor", { enumerable: true, get: function () { return tokenAccessor_1.GlobaInfoTokenAccessor; } });
 Object.defineProperty(exports, "TokenAccessor", { enumerable: true, get: function () { return tokenAccessor_1.TokenAccessor; } });
+__exportStar(require("./stateAggregator"), exports);
 //# sourceMappingURL=index.js.map

package/lib/{globalInfo → stateAggregator}/sfdxDataHandler.d.ts

@@ -11,7 +11,7 @@ interface Changes<T> {
     deleted: string[];
 }
 export declare class SfdxDataHandler {
-    handlers: (AuthHandler | AliasesHandler | SandboxesHandler)[];
+    handlers: (AuthHandler | AliasesHandler | SandboxesHandler | TokensHandler)[];
     private original;
     write(latest?: SfInfo): Promise<void>;
     merge(sfData?: SfInfo): Promise<SfInfo>;
@@ -50,4 +50,10 @@ export declare class SandboxesHandler extends BaseHandler<SfInfoKeys.SANDBOXES>
     listAllSandboxes(): Promise<SfSandbox[]>;
     private findChanges;
 }
+export declare class TokensHandler extends BaseHandler<SfInfoKeys.TOKENS> {
+    private static SFDX_TOKENS_FILENAME;
+    sfKey: typeof SfInfoKeys.TOKENS;
+    migrate(): Promise<Pick<SfInfo, SfInfoKeys.TOKENS>>;
+    write(latest: SfInfo): Promise<void>;
+}
 export {};

package/lib/{globalInfo → stateAggregator}/sfdxDataHandler.js

@@ -6,7 +6,7 @@
  * 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.SandboxesHandler = exports.AliasesHandler = exports.AuthHandler = exports.SfdxDataHandler = void 0;
+exports.TokensHandler = exports.SandboxesHandler = exports.AliasesHandler = exports.AuthHandler = exports.SfdxDataHandler = void 0;
 const path_1 = require("path");
 const fs = require("fs");
 const kit_1 = require("@salesforce/kit");
@@ -29,7 +29,7 @@ function isEqual(object1, object2) {
 }
 class SfdxDataHandler {
     constructor() {
-        this.handlers = [new AuthHandler(), new AliasesHandler(), new SandboxesHandler()];
+        this.handlers = [new AuthHandler(), new AliasesHandler(), new SandboxesHandler(), new TokensHandler()];
     }
     async write(latest = globalInfoConfig_1.GlobalInfo.emptyDataModel) {
         await Promise.all(this.handlers.map((handler) => handler.write(latest, this.original)));
@@ -306,4 +306,27 @@ class SandboxesHandler extends BaseHandler {
 exports.SandboxesHandler = SandboxesHandler;
 // The regular expression that filters files stored in $HOME/.sfdx
 SandboxesHandler.sandboxFilenameFilterRegEx = /^(00D.*?)\.sandbox\.json$/;
+class TokensHandler extends BaseHandler {
+    constructor() {
+        super(...arguments);
+        this.sfKey = types_1.SfInfoKeys.TOKENS;
+    }
+    async migrate() {
+        const filePath = (0, path_1.join)(global_1.Global.SFDX_DIR, TokensHandler.SFDX_TOKENS_FILENAME);
+        try {
+            const x = await fs.promises.readFile(filePath, 'utf8');
+            const tokens = (0, kit_1.parseJson)(x);
+            return { [this.sfKey]: tokens };
+        }
+        catch (e) {
+            return { [this.sfKey]: {} };
+        }
+    }
+    async write(latest) {
+        const filePath = (0, path_1.join)(global_1.Global.SFDX_DIR, TokensHandler.SFDX_TOKENS_FILENAME);
+        await fs.promises.writeFile(filePath, JSON.stringify(latest[types_1.SfInfoKeys.TOKENS], null, 2));
+    }
+}
+exports.TokensHandler = TokensHandler;
+TokensHandler.SFDX_TOKENS_FILENAME = 'tokens.json';
 //# sourceMappingURL=sfdxDataHandler.js.map

package/lib/stateAggregator/stateAggregator.d.ts

@@ -0,0 +1,20 @@
+import { AsyncOptionalCreatable } from '@salesforce/kit';
+import { AliasAccessor } from './accessors/aliasAccessor';
+import { OrgAccessor } from './accessors/orgAccessor';
+import { SandboxAccessor } from './accessors/sandboxAccessor';
+import { TokenAccessor } from './accessors/tokenAccessor';
+export declare class StateAggregator extends AsyncOptionalCreatable {
+    private static instance;
+    aliases: AliasAccessor;
+    orgs: OrgAccessor;
+    sandboxes: SandboxAccessor;
+    tokens: TokenAccessor;
+    static getInstance(): Promise<StateAggregator>;
+    /**
+     * Clear the cache to force reading from disk.
+     *
+     * *NOTE: Only call this method if you must and you know what you are doing.*
+     */
+    static clearInstance(): void;
+    protected init(): Promise<void>;
+}

package/lib/stateAggregator/stateAggregator.js

@@ -0,0 +1,38 @@
+"use strict";
+/*
+ * Copyright (c) 2022, 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.StateAggregator = void 0;
+const kit_1 = require("@salesforce/kit");
+const aliasAccessor_1 = require("./accessors/aliasAccessor");
+const orgAccessor_1 = require("./accessors/orgAccessor");
+const sandboxAccessor_1 = require("./accessors/sandboxAccessor");
+const tokenAccessor_1 = require("./accessors/tokenAccessor");
+class StateAggregator extends kit_1.AsyncOptionalCreatable {
+    static async getInstance() {
+        if (!StateAggregator.instance) {
+            StateAggregator.instance = await StateAggregator.create();
+        }
+        return StateAggregator.instance;
+    }
+    /**
+     * Clear the cache to force reading from disk.
+     *
+     * *NOTE: Only call this method if you must and you know what you are doing.*
+     */
+    static clearInstance() {
+        delete StateAggregator.instance;
+    }
+    async init() {
+        this.orgs = await orgAccessor_1.OrgAccessor.create();
+        this.sandboxes = await sandboxAccessor_1.SandboxAccessor.create();
+        this.aliases = await aliasAccessor_1.AliasAccessor.create();
+        this.tokens = await tokenAccessor_1.TokenAccessor.create();
+    }
+}
+exports.StateAggregator = StateAggregator;
+//# sourceMappingURL=stateAggregator.js.map

package/lib/{globalInfo → stateAggregator}/types.d.ts

@@ -1,4 +1,8 @@
 import { JsonMap } from '@salesforce/ts-types';
+import { AuthFields } from '../org';
+/**
+ * @deprecated
+ */
 export declare enum SfInfoKeys {
     ORGS = "orgs",
     TOKENS = "tokens",
@@ -9,12 +13,13 @@ export declare type Timestamp = {
     timestamp: string;
 };
 export declare type SfEntry = JsonMap;
-export declare type SfOrg = {
-    username: string;
-    orgId: string;
-    instanceUrl: string;
-    accessToken?: string;
-} & SfEntry;
+/**
+ * @deprecated
+ */
+export declare type SfOrg = AuthFields & SfEntry;
+/**
+ * @deprecated
+ */
 export interface SfOrgs {
     [key: string]: SfOrg & Timestamp;
 }
@@ -23,16 +28,21 @@ export declare type SfToken = {
     url: string;
     user?: string;
 } & SfEntry;
-export interface SfTokens {
+/**
+ */
+export declare type SfTokens = {
     [key: string]: SfToken & Timestamp;
-}
+};
 /**
  * The key will always be the alias and the value will always be the username, e.g.
  * { "MyAlias": "user@salesforce.com" }
  */
-export interface SfAliases {
+export declare type SfAliases = {
     [alias: string]: string;
-}
+};
+/**
+ * @deprecated
+ */
 export declare type SfSandbox = {
     sandboxOrgId: string;
     prodOrgUsername: string;
@@ -45,10 +55,15 @@ export declare type SfSandbox = {
  * The key will always be the sandbox username and the value will always be the
  * production org username
  * { "user@salesforce.com.mysandbox": "user@salesforce.com" }
+ *
+ * @deprecated
  */
 export interface SfSandboxes {
     [sandboxOrgId: string]: SfSandbox;
 }
+/**
+ * @deprecated
+ */
 export declare type SfInfo = {
     [SfInfoKeys.ORGS]: SfOrgs;
     [SfInfoKeys.TOKENS]: SfTokens;

package/lib/{globalInfo → stateAggregator}/types.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SfInfoKeys = void 0;
+/**
+ * @deprecated
+ */
 var SfInfoKeys;
 (function (SfInfoKeys) {
     SfInfoKeys["ORGS"] = "orgs";

package/lib/testSetup.d.ts

@@ -6,7 +6,8 @@ import { ConfigContents } from './config/configStore';
 import { Logger } from './logger';
 import { SfError } from './sfError';
 import { CometClient, CometSubscription, Message, StreamingExtension } from './status/streamingClient';
-import { SfOrg } from './globalInfo';
+import { AuthFields, SandboxFields } from './org';
+import { AliasGroup } from './config/aliasesConfig';
 /**
  * Different parts of the system that are mocked out. They can be restored for
  * individual tests. Test's stubs should always go on the DEFAULT which is exposed
@@ -19,6 +20,7 @@ export interface SandboxTypes {
     PROJECT: sinon.SinonSandbox;
     CONNECTION: sinon.SinonSandbox;
     FS: sinonType.SinonSandbox;
+    ORGS: sinonType.SinonSandbox;
 }
 /**
  * Different hooks into {@link ConfigFile} used for testing instead of doing file IO.
@@ -83,11 +85,16 @@ export interface TestContext {
      */
     configStubs: {
         [configName: string]: Optional<ConfigStub>;
-        GlobalInfo?: ConfigStub;
-        Aliases?: ConfigStub;
-        SfProjectJson?: ConfigStub;
+        AliasesConfig?: ConfigStub;
+        AuthInfoConfig?: ConfigStub;
         SfdxConfig?: ConfigStub;
+        SfProjectJson?: ConfigStub;
+        TokensConfig?: ConfigStub;
     };
+    /**
+     * An record of stubs created during instantaion.
+     */
+    stubs?: Record<string, sinonType.SinonStub>;
     /**
      * A function used when resolving the local path. Calls localPathResolverSync by default.
      *
@@ -150,7 +157,11 @@ export interface TestContext {
      */
     setConfigStubContents(name: string, value: ConfigContents): void;
     inProject(inProject: boolean): void;
+    stubAuths(...orgs: MockTestOrgData[]): Promise<void>;
+    stubSandboxes(...orgs: MockTestSandboxData[]): Promise<void>;
+    stubAliases(aliases: Record<string, string>, group?: AliasGroup): void;
 }
+export declare const uniqid: () => string;
 /**
  * Instantiate a @salesforce/core test context. This is automatically created by `const $$ = testSetup()`
  * but is useful if you don't want to have a global stub of @salesforce/core and you want to isolate it to
@@ -197,7 +208,7 @@ export declare const instantiateContext: (sinon?: any) => TestContext;
  * ```
  * @param testContext
  */
-export declare const stubContext: (testContext: TestContext) => void;
+export declare const stubContext: (testContext: TestContext) => Record<string, sinonType.SinonStub>;
 /**
  * Restore a @salesforce/core test context. This is automatically stubbed in the global beforeEach created by
  * `const $$ = testSetup()` but is useful if you don't want to have a global stub of @salesforce/core and you
@@ -402,5 +413,18 @@ export declare class MockTestOrgData {
     makeDevHub(): void;
     createUser(user: string): MockTestOrgData;
     getMockUserInfo(): JsonMap;
-    getConfig(): Promise<SfOrg>;
+    getConfig(): Promise<AuthFields>;
+}
+export declare class MockTestSandboxData {
+    id: string;
+    sandboxOrgId: string;
+    prodOrgUsername: string;
+    sandboxName?: string;
+    username?: string;
+    constructor(id?: string, options?: Partial<{
+        prodOrgUsername: string;
+        name: string;
+        username: string;
+    }>);
+    getConfig(): Promise<SandboxFields>;
 }

package/lib/testSetup.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MockTestOrgData = exports.StreamingMockCometClient = exports.StreamingMockCometSubscription = exports.StreamingMockSubscriptionCall = exports.shouldThrow = exports.unexpectedResult = exports.testSetup = exports.restoreContext = exports.stubContext = exports.instantiateContext = void 0;
+exports.MockTestSandboxData = exports.MockTestOrgData = exports.StreamingMockCometClient = exports.StreamingMockCometSubscription = exports.StreamingMockSubscriptionCall = exports.shouldThrow = exports.unexpectedResult = exports.testSetup = exports.restoreContext = exports.stubContext = exports.instantiateContext = exports.uniqid = void 0;
 /*
  * Copyright (c) 2020, salesforce.com, inc.
  * All rights reserved.
@@ -24,22 +24,25 @@ const messages_1 = require("./messages");
 const sfError_1 = require("./sfError");
 const sfProject_1 = require("./sfProject");
 const streamingClient_1 = require("./status/streamingClient");
-const globalInfo_1 = require("./globalInfo");
+const stateAggregator_1 = require("./stateAggregator");
+const sandboxAccessor_1 = require("./stateAggregator/accessors/sandboxAccessor");
+const aliasesConfig_1 = require("./config/aliasesConfig");
 const global_1 = require("./global");
 const uniqid = () => {
     return (0, crypto_1.randomBytes)(16).toString('hex');
 };
+exports.uniqid = uniqid;
 function getTestLocalPath(uid) {
     return (0, path_1.join)((0, os_1.tmpdir)(), uid, 'sfdx_core', 'local');
 }
 function getTestGlobalPath(uid) {
     return (0, path_1.join)((0, os_1.tmpdir)(), uid, 'sfdx_core', 'global');
 }
-function retrieveRootPathSync(isGlobal, uid = uniqid()) {
+function retrieveRootPathSync(isGlobal, uid = (0, exports.uniqid)()) {
     return isGlobal ? getTestGlobalPath(uid) : getTestLocalPath(uid);
 }
 // eslint-disable-next-line @typescript-eslint/require-await
-async function retrieveRootPath(isGlobal, uid = uniqid()) {
+async function retrieveRootPath(isGlobal, uid = (0, exports.uniqid)()) {
     return retrieveRootPathSync(isGlobal, uid);
 }
 function defaultFakeConnectionRequest() {
@@ -90,12 +93,13 @@ const instantiateContext = (sinon) => {
             CRYPTO: sinon.createSandbox(),
             CONNECTION: sinon.createSandbox(),
             FS: sinon.createSandbox(),
+            ORGS: sinon.createSandbox(),
         },
         TEST_LOGGER: new logger_1.Logger({
             name: 'SFDX_Core_Test_Logger',
         }).useMemoryLogging(),
-        id: uniqid(),
-        uniqid,
+        id: (0, exports.uniqid)(),
+        uniqid: exports.uniqid,
         configStubs: {},
         // eslint-disable-next-line @typescript-eslint/require-await
         localPathRetriever: async (uid) => getTestLocalPath(uid),
@@ -134,6 +138,34 @@ const instantiateContext = (sinon) => {
                 testContext.SANDBOXES.PROJECT.stub(sfProject_1.SfProject, 'resolveProjectPathSync').throws(new sfError_1.SfError('', 'InvalidProjectWorkspaceError'));
             }
         },
+        async stubAuths(...orgs) {
+            const entries = (await Promise.all(orgs.map(async (org) => [org.username, await org.getConfig()])));
+            const orgMap = new Map(entries);
+            (0, ts_sinon_1.stubMethod)(testContext.SANDBOX, stateAggregator_1.OrgAccessor.prototype, 'getAllFiles').returns([...orgMap.keys()].map((o) => `${o}.json`));
+            (0, ts_sinon_1.stubMethod)(testContext.SANDBOX, stateAggregator_1.OrgAccessor.prototype, 'hasFile').callsFake((username) => {
+                return orgMap.has(username);
+            });
+            const retrieveContents = async function () {
+                var _a;
+                const username = (0, path_1.basename)(this.path.replace('.json', ''));
+                return Promise.resolve((_a = orgMap.get(username)) !== null && _a !== void 0 ? _a : {});
+            };
+            this.configStubs.AuthInfoConfig = { retrieveContents };
+        },
+        async stubSandboxes(...sandboxes) {
+            const entries = (await Promise.all(sandboxes.map(async (sanbox) => [sanbox.username, await sanbox.getConfig()])));
+            const sandboxMap = new Map(entries);
+            (0, ts_sinon_1.stubMethod)(testContext.SANDBOX, sandboxAccessor_1.SandboxAccessor.prototype, 'getAllFiles').returns([...sandboxMap.keys()].map((o) => `${o}.sandbox.json`));
+            const retrieveContents = async function () {
+                var _a;
+                const username = (0, path_1.basename)(this.path.replace('.sandbox.json', ''));
+                return Promise.resolve((_a = sandboxMap.get(username)) !== null && _a !== void 0 ? _a : {});
+            };
+            this.configStubs.SandboxOrgConfig = { retrieveContents };
+        },
+        stubAliases(aliases, group = aliasesConfig_1.AliasGroup.ORGS) {
+            this.configStubs.AliasesConfig = { contents: { [group]: aliases } };
+        },
     };
     return testContext;
 };
@@ -166,6 +198,7 @@ const stubContext = (testContext) => {
     // Turn off the interoperability feature so that we don't have to mock
     // the old .sfdx config files
     global_1.Global.SFDX_INTEROPERABILITY = false;
+    const stubs = {};
     // Most core files create a child logger so stub this to return our test logger.
     (0, ts_sinon_1.stubMethod)(testContext.SANDBOX, logger_1.Logger, 'child').returns(Promise.resolve(testContext.TEST_LOGGER));
     (0, ts_sinon_1.stubMethod)(testContext.SANDBOX, logger_1.Logger, 'childFromRoot').returns(testContext.TEST_LOGGER);
@@ -230,8 +263,8 @@ const stubContext = (testContext) => {
             writeSync.call(this);
         }
     };
-    (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.CONFIG, configFile_1.ConfigFile.prototype, 'writeSync').callsFake(writeSync);
-    (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.CONFIG, configFile_1.ConfigFile.prototype, 'write').callsFake(write);
+    stubs.configWriteSync = (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.CONFIG, configFile_1.ConfigFile.prototype, 'writeSync').callsFake(writeSync);
+    stubs.configWrite = (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.CONFIG, configFile_1.ConfigFile.prototype, 'write').callsFake(write);
     (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.CRYPTO, crypto_2.Crypto.prototype, 'getKeyChain').callsFake(() => Promise.resolve({
         setPassword: () => Promise.resolve(),
         getPassword: (data, cb) => cb(undefined, '12345678901234567890123456789012'),
@@ -243,8 +276,23 @@ const stubContext = (testContext) => {
         }
         return testContext.fakeConnectionRequest.call(this, request, options);
     });
+    stubs.configExists = (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.ORGS, stateAggregator_1.OrgAccessor.prototype, 'exists').callsFake(async function (username) {
+        // @ts-expect-error because private member
+        if ([...this.contents.keys()].includes(username))
+            return Promise.resolve(true);
+        else
+            return Promise.resolve(false);
+    });
+    stubs.configRemove = (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.ORGS, stateAggregator_1.OrgAccessor.prototype, 'remove').callsFake(async function (username) {
+        // @ts-expect-error because private member
+        if ([...this.contents.keys()].includes(username))
+            return Promise.resolve(true);
+        else
+            return Promise.resolve(false);
+    });
     // Always start with the default and tests beforeEach or it methods can override it.
     testContext.fakeConnectionRequest = defaultFakeConnectionRequest;
+    return stubs;
 };
 exports.stubContext = stubContext;
 /**
@@ -271,7 +319,9 @@ const restoreContext = (testContext) => {
     Object.values(testContext.SANDBOXES).forEach((theSandbox) => theSandbox.restore());
     testContext.configStubs = {};
     // Give each test run a clean GlobalInstance
-    globalInfo_1.GlobalInfo.clearInstance();
+    stateAggregator_1.GlobalInfo.clearInstance();
+    // Give each test run a clean StateAggregator
+    stateAggregator_1.StateAggregator.clearInstance();
 };
 exports.restoreContext = restoreContext;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -281,7 +331,7 @@ const _testSetup = (sinon) => {
         // Allow each test to have their own config aggregator
         // @ts-ignore clear for testing.
         delete configAggregator_1.ConfigAggregator.instance;
-        (0, exports.stubContext)(testContext);
+        testContext.stubs = (0, exports.stubContext)(testContext);
     });
     afterEach(() => {
         (0, exports.restoreContext)(testContext);
@@ -473,7 +523,7 @@ exports.StreamingMockCometClient = StreamingMockCometClient;
  * Mock class for OrgData.
  */
 class MockTestOrgData {
-    constructor(id = uniqid(), options) {
+    constructor(id = (0, exports.uniqid)(), options) {
         this.testId = id;
         this.userId = `user_id_${this.testId}`;
         this.orgId = `${this.testId}`;
@@ -552,4 +602,22 @@ class MockTestOrgData {
     }
 }
 exports.MockTestOrgData = MockTestOrgData;
+class MockTestSandboxData {
+    constructor(id = (0, exports.uniqid)(), options) {
+        this.id = id;
+        this.sandboxOrgId = id;
+        this.prodOrgUsername = (options === null || options === void 0 ? void 0 : options.prodOrgUsername) || `admin_${id}@gb.org`;
+        this.sandboxName = (options === null || options === void 0 ? void 0 : options.name) || `sandbox_${id}`;
+        this.username = (options === null || options === void 0 ? void 0 : options.username) || `${this.prodOrgUsername}.sandbox`;
+    }
+    async getConfig() {
+        return {
+            sandboxOrgId: this.sandboxOrgId,
+            prodOrgUsername: this.prodOrgUsername,
+            sandboxName: this.sandboxName,
+            sandboxUsername: this.username,
+        };
+    }
+}
+exports.MockTestSandboxData = MockTestSandboxData;
 //# sourceMappingURL=testSetup.js.map

package/lib/util/sfdcUrl.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 import { URL } from 'url';
+export declare function getLoginAudienceCombos(audienceUrl: string, loginUrl: string): [string, string][];
 export declare class SfdcUrl extends URL {
     /**
      * Salesforce URLs
@@ -27,7 +28,7 @@ export declare class SfdcUrl extends URL {
     /**
      * Tests whether this url is an internal Salesforce domain
      *
-     * @returns {boolean} true if this is a internal domain
+     * @returns {boolean} true if this is an internal domain
      */
     isInternalUrl(): boolean;
     /**
@@ -57,6 +58,7 @@ export declare class SfdcUrl extends URL {
     /**
      * Tests whether this url is a sandbox url
      *
+     * @Deprecated - identification of a sandbox instance by URL alone is not deterministic
      * @param createdOrgInstance The Salesforce instance the org was created on. e.g. `cs42`
      * @returns {boolean}
      */
@@ -67,12 +69,4 @@ export declare class SfdcUrl extends URL {
      * @returns {boolean} true if this domain is a lightning domain
      */
     isLightningDomain(): boolean;
-    /**
-     * Tests whether this url is a sandbox url
-     * otherwise tries to resolve dns cnames and then look if any is sandbox url
-     *
-     * @param createdOrgInstance The Salesforce instance the org was created on. e.g. `cs42`
-     * @returns {Promise<boolean>} true if this domain resolves to sanbox url
-     */
-    private resolvesToSandbox;
 }

package/lib/util/sfdcUrl.js

@@ -6,13 +6,37 @@
  * 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.SfdcUrl = void 0;
+exports.SfdcUrl = exports.getLoginAudienceCombos = void 0;
 const url_1 = require("url");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const myDomainResolver_1 = require("../status/myDomainResolver");
 const logger_1 = require("../logger");
 const lifecycleEvents_1 = require("../lifecycleEvents");
+function getLoginAudienceCombos(audienceUrl, loginUrl) {
+    const filtered = [
+        [loginUrl, loginUrl],
+        [SfdcUrl.SANDBOX, SfdcUrl.SANDBOX],
+        [SfdcUrl.PRODUCTION, SfdcUrl.PRODUCTION],
+        [audienceUrl, audienceUrl],
+        [audienceUrl, SfdcUrl.PRODUCTION],
+        [audienceUrl, SfdcUrl.SANDBOX],
+        [loginUrl, audienceUrl],
+        [loginUrl, SfdcUrl.PRODUCTION],
+        [loginUrl, SfdcUrl.SANDBOX],
+        [SfdcUrl.PRODUCTION, audienceUrl],
+        [SfdcUrl.SANDBOX, audienceUrl],
+    ].filter(([login, audience]) => !((login === SfdcUrl.PRODUCTION && audience === SfdcUrl.SANDBOX) ||
+        (login === SfdcUrl.SANDBOX && audience === SfdcUrl.PRODUCTION)));
+    const reduced = filtered.reduce((acc, [login, audience]) => {
+        const l = new url_1.URL(login);
+        const a = new url_1.URL(audience);
+        acc.set(`${l.origin}:${a.origin}`, [login, audience]);
+        return acc;
+    }, new Map());
+    return [...reduced.values()];
+}
+exports.getLoginAudienceCombos = getLoginAudienceCombos;
 class SfdcUrl extends url_1.URL {
     constructor(input, base) {
         super(input.toString(), base);
@@ -45,13 +69,6 @@ class SfdcUrl extends url_1.URL {
             this.logger.debug(`Audience URL overridden by env var SFDX_AUDIENCE_URL=${envVarVal}`);
             return envVarVal;
         }
-        if (this.isInternalUrl()) {
-            // This is for internal developers when just doing authorize
-            return this.origin;
-        }
-        if (await this.resolvesToSandbox(createdOrgInstance)) {
-            return SfdcUrl.SANDBOX;
-        }
         if ((createdOrgInstance && /^gs1/gi.test(createdOrgInstance)) || /(gs1.my.salesforce.com)/gi.test(this.origin)) {
             return 'https://gs1.salesforce.com';
         }
@@ -81,7 +98,7 @@ class SfdcUrl extends url_1.URL {
     /**
      * Tests whether this url is an internal Salesforce domain
      *
-     * @returns {boolean} true if this is a internal domain
+     * @returns {boolean} true if this is an internal domain
      */
     isInternalUrl() {
         const INTERNAL_URL_PARTS = [
@@ -157,9 +174,11 @@ class SfdcUrl extends url_1.URL {
     /**
      * Tests whether this url is a sandbox url
      *
+     * @Deprecated - identification of a sandbox instance by URL alone is not deterministic
      * @param createdOrgInstance The Salesforce instance the org was created on. e.g. `cs42`
      * @returns {boolean}
      */
+    // TODO: how to get rid of this?
     isSandboxUrl(createdOrgInstance) {
         return ((createdOrgInstance && /^cs|s$/gi.test(createdOrgInstance)) ||
             this.origin.endsWith('sandbox.my.salesforce.mil') ||
@@ -177,25 +196,7 @@ class SfdcUrl extends url_1.URL {
      * @returns {boolean} true if this domain is a lightning domain
      */
     isLightningDomain() {
-        return /\.lightning\.force\.com/.test(this.origin);
-    }
-    /**
-     * Tests whether this url is a sandbox url
-     * otherwise tries to resolve dns cnames and then look if any is sandbox url
-     *
-     * @param createdOrgInstance The Salesforce instance the org was created on. e.g. `cs42`
-     * @returns {Promise<boolean>} true if this domain resolves to sanbox url
-     */
-    async resolvesToSandbox(createdOrgInstance) {
-        if (this.isSandboxUrl(createdOrgInstance)) {
-            return true;
-        }
-        const myDomainResolver = await myDomainResolver_1.MyDomainResolver.create({ url: this });
-        const cnames = await myDomainResolver.getCnames();
-        return cnames.some((cname) => {
-            const url = new SfdcUrl(`https://${cname}`);
-            return url.isSandboxUrl();
-        });
+        return /\.lightning\.force\.com/.test(this.origin) || /\.lightning\.crmforce\.mil/.test(this.origin);
     }
 }
 exports.SfdcUrl = SfdcUrl;