@salesforce/core 3.19.1 → 3.19.4

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;

package/messages/core.md

@@ -24,6 +24,12 @@ Due to: %s
 
 Error authenticating with JWT config due to: %s
 
+# jwtAuthErrors
+
+Error authenticating with JWT.
+Errors encountered:
+%s
+
 # refreshTokenAuthError
 
 Error authenticating with the refresh token due to: %s
@@ -55,3 +61,7 @@ Setting aliases must be in the format <key>=<value> but found: [%s].
 
 All JSON input must have heads down camelcase keys. E.g., `{ sfdcLoginUrl: "https://login.salesforce.com" }`
 Found "%s" at %s
+
+# missingClientId
+
+Client ID is required for JWT authentication.

package/messages/scratchOrgCreate.md

@@ -2,10 +2,6 @@
 
 Org snapshots don’t support one or more options you specified: %s.
 
-# SourceStatusResetFailureError
-
-Successfully created org with ID: %s and name: %s. Unfortunately, source tracking isn’t working as expected. If you run force:source:status, the results may be incorrect. Try again by creating another scratch org.
-
 # DurationDaysValidationMinError
 
 Expected 'durationDays' greater than or equal to %s but received %s.

package/messages/scratchOrgInfoApi.md

@@ -9,3 +9,7 @@ You cannot use 'settings' and `'orgPreferences' in your scratch definition file,
 # DeprecatedPrefFormat
 
 We've deprecated OrgPreferences. Update the scratch org definition file to replace OrgPreferences with their corresponding settings.
+
+# SourceStatusResetFailureError
+
+Successfully created org with ID: %s and name: %s. Unfortunately, source tracking isn’t working as expected. If you run force:source:status, the results may be incorrect. Try again by creating another scratch org.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "3.19.1",
+  "version": "3.19.4",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -68,14 +68,14 @@
     "@typescript-eslint/parser": "4.33.0",
     "chai": "^4.3.4",
     "commitizen": "^3.1.2",
-    "eslint": "^6.8.0",
+    "eslint": "^7.27.0",
     "eslint-config-prettier": "^6.15.0",
     "eslint-config-salesforce": "^0.1.6",
     "eslint-config-salesforce-license": "^0.1.6",
     "eslint-config-salesforce-typescript": "^0.2.8",
-    "eslint-plugin-header": "^3.1.1",
+    "eslint-plugin-header": "3.0.0",
     "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-jsdoc": "^27.1.2",
+    "eslint-plugin-jsdoc": "^35.1.2",
     "eslint-plugin-prettier": "^3.1.3",
     "husky": "^7.0.4",
     "mocha": "^9.1.3",

package/lib/globalInfo/accessors/orgAccessor.d.ts

@@ -1,13 +0,0 @@
-import { Optional } from '@salesforce/ts-types';
-import { GlobalInfo } from '../globalInfoConfig';
-import { SfOrgs, SfOrg } from '../types';
-export declare class OrgAccessor {
-    private globalInfo;
-    constructor(globalInfo: GlobalInfo);
-    getAll(decrypt?: boolean): SfOrgs;
-    get(username: string, decrypt?: boolean): Optional<SfOrg>;
-    has(username: string): boolean;
-    set(username: string, org: SfOrg): void;
-    update(username: string, org: Partial<SfOrg>): void;
-    unset(username: string): void;
-}

package/lib/globalInfo/accessors/orgAccessor.js

@@ -1,45 +0,0 @@
-"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.OrgAccessor = void 0;
-const types_1 = require("../types");
-class OrgAccessor {
-    constructor(globalInfo) {
-        this.globalInfo = globalInfo;
-    }
-    getAll(decrypt = false) {
-        return this.globalInfo.get(types_1.SfInfoKeys.ORGS, decrypt);
-    }
-    get(username, decrypt = false) {
-        const auth = this.globalInfo.get(`${types_1.SfInfoKeys.ORGS}["${username}"]`, decrypt);
-        // For legacy, some things wants the username in the returned auth info.
-        if (auth && !auth.username)
-            auth.username = username;
-        return auth;
-    }
-    has(username) {
-        return !!this.getAll()[username];
-    }
-    set(username, org) {
-        // For legacy, and to keep things standard, some things wants the username in auth info.
-        if (!org.username)
-            org.username = username;
-        this.globalInfo.set(`${types_1.SfInfoKeys.ORGS}["${username}"]`, org);
-    }
-    update(username, org) {
-        // For legacy, and to keep things standard, some things wants the username in auth info.
-        if (!org.username)
-            org.username = username;
-        this.globalInfo.update(`${types_1.SfInfoKeys.ORGS}["${username}"]`, org);
-    }
-    unset(username) {
-        delete this.globalInfo.get(types_1.SfInfoKeys.ORGS)[username];
-    }
-}
-exports.OrgAccessor = OrgAccessor;
-//# sourceMappingURL=orgAccessor.js.map

package/lib/globalInfo/accessors/tokenAccessor.d.ts

@@ -1,13 +0,0 @@
-import { Optional } from '@salesforce/ts-types';
-import { GlobalInfo } from '../globalInfoConfig';
-import { SfTokens, SfToken, Timestamp } from '../types';
-export declare class TokenAccessor {
-    private globalInfo;
-    constructor(globalInfo: GlobalInfo);
-    getAll(decrypt?: boolean): SfTokens;
-    get(name: string, decrypt?: boolean): Optional<SfToken & Timestamp>;
-    has(name: string): boolean;
-    set(name: string, token: SfToken): void;
-    update(name: string, token: Partial<SfToken>): void;
-    unset(name: string): void;
-}

package/lib/globalInfo/index.d.ts

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