@salesforce/core 3.19.0 → 3.19.3

package/lib/org/authInfo.js

@@ -21,7 +21,7 @@ const configAggregator_1 = require("../config/configAggregator");
 const logger_1 = require("../logger");
 const sfError_1 = require("../sfError");
 const sfdc_1 = require("../util/sfdc");
-const globalInfo_1 = require("../globalInfo");
+const stateAggregator_1 = require("../stateAggregator");
 const messages_1 = require("../messages");
 const sfdcUrl_1 = require("../util/sfdcUrl");
 const connection_1 = require("./connection");
@@ -38,6 +38,7 @@ const messages = messages_1.Messages.load('@salesforce/core', 'core', [
     'jwtAuthError',
     'authCodeUsernameRetrievalError',
     'authCodeExchangeError',
+    'missingClientId',
 ]);
 // Extend OAuth2 to add JWT Bearer Token Flow support.
 class JwtOAuth2 extends jsforce_1.OAuth2 {
@@ -144,13 +145,13 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      */
     static async listAllAuthorizations(orgAuthFilter = (orgAuth) => !!orgAuth) {
         var _a;
-        const globalInfo = await globalInfo_1.GlobalInfo.getInstance();
+        const stateAggregator = await stateAggregator_1.StateAggregator.getInstance();
         const config = (await configAggregator_1.ConfigAggregator.create()).getConfigInfo();
-        const orgs = Object.values(globalInfo.orgs.getAll());
+        const orgs = await stateAggregator.orgs.readAll();
         const final = [];
         for (const org of orgs) {
             const username = (0, ts_types_1.ensureString)(org.username);
-            const aliases = (_a = globalInfo.aliases.getAll(username)) !== null && _a !== void 0 ? _a : undefined;
+            const aliases = (_a = stateAggregator.aliases.getAll(username)) !== null && _a !== void 0 ? _a : undefined;
             // Get a list of configuration values that are set to either the username or one
             // of the aliases
             const configs = config
@@ -166,7 +167,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
                     instanceUrl,
                     isScratchOrg: Boolean(devHubUsername),
                     isDevHub: isDevHub || false,
-                    isSandbox: globalInfo.sandboxes.has(orgId),
+                    isSandbox: await stateAggregator.sandboxes.hasFile(orgId),
                     orgId: orgId,
                     accessToken: authInfo.getConnectionOptions().accessToken,
                     oauthMethod: authInfo.isJwt() ? 'jwt' : authInfo.isOauth() ? 'web' : 'token',
@@ -196,7 +197,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      */
     static async hasAuthentications() {
         try {
-            const auths = (await globalInfo_1.GlobalInfo.getInstance()).orgs.getAll();
+            const auths = await (await stateAggregator_1.StateAggregator.getInstance()).orgs.list();
             return !(0, kit_1.isEmpty)(auths);
         }
         catch (err) {
@@ -295,7 +296,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      * Find all dev hubs available in the local environment.
      */
     static async getDevHubAuthInfos() {
-        return (await AuthInfo.listAllAuthorizations()).filter((possibleHub) => possibleHub === null || possibleHub === void 0 ? void 0 : possibleHub.isDevHub);
+        return await AuthInfo.listAllAuthorizations((possibleHub) => { var _a; return (_a = possibleHub === null || possibleHub === void 0 ? void 0 : possibleHub.isDevHub) !== null && _a !== void 0 ? _a : false; });
     }
     static async queryScratchOrg(devHubUsername, scratchOrgId) {
         const devHubOrg = await org_1.Org.create({ aliasOrUsername: devHubUsername });
@@ -348,7 +349,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
             this.logger.debug('Username is an accesstoken. Skip saving authinfo to disk.');
             return this;
         }
-        await this.globalInfo.write();
+        await this.stateAggregator.orgs.write(username);
         this.logger.info(`Saved auth info for username: ${username}`);
         return this;
     }
@@ -359,13 +360,10 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      * @param authData Authorization fields to update.
      */
     update(authData) {
-        // todo move into configstore
         if (authData && (0, ts_types_1.isPlainObject)(authData)) {
             this.username = authData.username || this.username;
-            const existingFields = this.globalInfo.orgs.get(this.getUsername());
-            const mergedFields = Object.assign({}, existingFields || {}, authData);
-            this.globalInfo.orgs.set(this.getUsername(), mergedFields);
-            this.logger.info(`Updated auth info for username: ${this.getUsername()}`);
+            this.stateAggregator.orgs.update(this.username, authData);
+            this.logger.info(`Updated auth info for username: ${this.username}`);
         }
         return this;
     }
@@ -423,7 +421,8 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      * @param decrypt Decrypt the fields.
      */
     getFields(decrypt) {
-        return this.globalInfo.orgs.get(this.username, decrypt);
+        var _a;
+        return (_a = this.stateAggregator.orgs.get(this.username, decrypt)) !== null && _a !== void 0 ? _a : {};
     }
     /**
      * Get the org front door (used for web based oauth flows)
@@ -498,7 +497,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
             config = await config_1.Config.create({ isGlobal: true });
         }
         const username = (0, ts_types_1.ensureString)(this.getUsername());
-        const alias = this.globalInfo.aliases.get(username);
+        const alias = this.stateAggregator.aliases.get(username);
         const value = alias !== null && alias !== void 0 ? alias : username;
         if (options.org) {
             config.set(orgConfigProperties_1.OrgConfigProperties.TARGET_ORG, value);
@@ -514,14 +513,14 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      * @param alias alias to set
      */
     async setAlias(alias) {
-        this.globalInfo.aliases.set(alias, this.getUsername());
+        this.stateAggregator.aliases.set(alias, this.getUsername());
+        await this.stateAggregator.aliases.write();
     }
     /**
      * Initializes an instance of the AuthInfo class.
      */
     async init() {
-        // We have to set the global instance here because we need synchronous access to it later
-        this.globalInfo = await globalInfo_1.GlobalInfo.getInstance();
+        this.stateAggregator = await stateAggregator_1.StateAggregator.getInstance();
         const username = this.options.username;
         const authOptions = this.options.oauth2Options || this.options.accessTokenOptions;
         // Must specify either username and/or options
@@ -531,14 +530,14 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         // If a username AND oauth options, ensure an authorization for the username doesn't
         // already exist. Throw if it does so we don't overwrite the authorization.
         if (username && authOptions) {
-            const authExists = this.globalInfo.orgs.has(username);
-            if (authExists) {
+            if (await this.stateAggregator.orgs.hasFile(username)) {
                 throw messages.createError('authInfoOverwriteError');
             }
         }
         const oauthUsername = username || (0, ts_types_1.getString)(authOptions, 'username');
         if (oauthUsername) {
             this.username = oauthUsername;
+            await this.stateAggregator.orgs.read(oauthUsername, false, false);
         } // Else it will be set in initAuthOptions below.
         // If the username is an access token, use that for auth and don't persist
         if ((0, ts_types_1.isString)(oauthUsername) && sfdc_1.sfdc.matchesAccessToken(oauthUsername)) {
@@ -555,7 +554,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
             this.usingAccessToken = true;
         }
         // If a username with NO oauth options, ensure authorization already exist.
-        else if (username && !authOptions && !this.globalInfo.orgs.has(username)) {
+        else if (username && !authOptions && !(await this.stateAggregator.orgs.exists(username))) {
             throw messages.createError('namedOrgNotFound', [username]);
         }
         else {
@@ -607,7 +606,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
                     options.privateKey = (0, path_1.resolve)(options.privateKeyFile);
                 }
                 if (options.privateKey) {
-                    authConfig = await this.buildJwtConfig(options);
+                    authConfig = await this.authJwt(options);
                 }
                 else if (!options.authCode && options.refreshToken) {
                     // refresh token flow (from sfdxUrl or OAuth refreshFn)
@@ -624,6 +623,8 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
                 }
             }
             authConfig.isDevHub = await this.determineIfDevHub((0, ts_types_1.ensureString)(authConfig.instanceUrl), (0, ts_types_1.ensureString)(authConfig.accessToken));
+            if (authConfig.username)
+                await this.stateAggregator.orgs.read(authConfig.username, false, false);
             // Update the auth fields WITH encryption
             this.update(authConfig);
         }
@@ -631,7 +632,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
     }
     async loadDecryptedAuthFromConfig(username) {
         // Fetch from the persisted auth file
-        const authInfo = this.globalInfo.orgs.get(username, true);
+        const authInfo = this.stateAggregator.orgs.get(username, true);
         if (!authInfo) {
             throw messages.createError('namedOrgNotFound', [username]);
         }
@@ -667,27 +668,32 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         }
     }
     // Build OAuth config for a JWT auth flow
-    async buildJwtConfig(options) {
+    async authJwt(options) {
+        if (!options.clientId) {
+            throw messages.createError('missingClientId');
+        }
         const privateKeyContents = await fs.promises.readFile((0, ts_types_1.ensure)(options.privateKey), 'utf8');
         const { loginUrl = sfdcUrl_1.SfdcUrl.PRODUCTION } = options;
         const url = new sfdcUrl_1.SfdcUrl(loginUrl);
         const createdOrgInstance = (0, ts_types_1.getString)(options, 'createdOrgInstance', '').trim().toLowerCase();
         const audienceUrl = await url.getJwtAudienceUrl(createdOrgInstance);
-        const jwtToken = jwt.sign({
-            iss: options.clientId,
-            sub: this.getUsername(),
-            aud: audienceUrl,
-            exp: Date.now() + 300,
-        }, privateKeyContents, {
-            algorithm: 'RS256',
-        });
-        const oauth2 = new JwtOAuth2({ loginUrl: options.loginUrl });
         let authFieldsBuilder;
-        try {
-            authFieldsBuilder = (0, ts_types_1.ensureJsonMap)(await oauth2.jwtAuthorize(jwtToken));
+        const authErrors = [];
+        // given that we can no longer depend on instance names or URls to determine audience, let's try them all
+        const loginAndAudienceUrls = (0, sfdcUrl_1.getLoginAudienceCombos)(audienceUrl, loginUrl);
+        for (const [login, audience] of loginAndAudienceUrls) {
+            try {
+                authFieldsBuilder = await this.tryJwtAuth(options.clientId, login, audience, privateKeyContents);
+                break;
+            }
+            catch (err) {
+                const error = err;
+                const message = error.message.includes('audience') ? `${error.message}-${login}:${audience}` : error.message;
+                authErrors.push(message);
+            }
         }
-        catch (err) {
-            throw messages.createError('jwtAuthError', [err.message]);
+        if (!authFieldsBuilder) {
+            throw messages.createError('jwtAuthError', [authErrors.join('\n')]);
         }
         const authFields = {
             accessToken: (0, ts_types_1.asString)(authFieldsBuilder.access_token),
@@ -709,6 +715,18 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         }
         return authFields;
     }
+    async tryJwtAuth(clientId, loginUrl, audienceUrl, privateKeyContents) {
+        const jwtToken = jwt.sign({
+            iss: clientId,
+            sub: this.getUsername(),
+            aud: audienceUrl,
+            exp: Date.now() + 300,
+        }, privateKeyContents, {
+            algorithm: 'RS256',
+        });
+        const oauth2 = new JwtOAuth2({ loginUrl });
+        return (0, ts_types_1.ensureJsonMap)(await oauth2.jwtAuthorize(jwtToken));
+    }
     // Build OAuth config for a refresh token auth flow
     async buildRefreshTokenConfig(options) {
         // Ideally, this would be removed at some point in the distant future when all auth files

package/lib/org/authRemover.d.ts

@@ -1,5 +1,6 @@
 import { AsyncOptionalCreatable } from '@salesforce/kit';
-import { SfOrg, SfOrgs } from '../globalInfo';
+import { JsonMap } from '@salesforce/ts-types';
+import { AuthFields } from '.';
 /**
  * Handles  the removing of authorizations, which includes deleting the auth file
  * in the global .sfdx folder, deleting any configs that are associated with the username/alias,
@@ -25,7 +26,7 @@ import { SfOrg, SfOrgs } from '../globalInfo';
  */
 export declare class AuthRemover extends AsyncOptionalCreatable {
     private config;
-    private globalInfo;
+    private stateAggregator;
     private logger;
     /**
      * Removes the authentication and any configs or aliases associated with it
@@ -45,13 +46,13 @@ export declare class AuthRemover extends AsyncOptionalCreatable {
      * @param usernameOrAlias username or alias of the auth you want to find, defaults to the configured target-org
      * @returns {Promise<SfOrg>}
      */
-    findAuth(usernameOrAlias?: string): Promise<SfOrg>;
+    findAuth(usernameOrAlias?: string): Promise<AuthFields>;
     /**
      * Finds all org authorizations in the global info file (.sf/sf.json)
      *
-     * @returns {SfOrgs}
+     * @returns {Record<string, AuthFields>}
      */
-    findAllAuths(): SfOrgs;
+    findAllAuths(): Record<string, AuthFields & JsonMap>;
     protected init(): Promise<void>;
     /**
      * Returns the username for a given alias if the alias exists.

package/lib/org/authRemover.js

@@ -11,7 +11,7 @@ const kit_1 = require("@salesforce/kit");
 const configAggregator_1 = require("../config/configAggregator");
 const logger_1 = require("../logger");
 const messages_1 = require("../messages");
-const globalInfo_1 = require("../globalInfo");
+const stateAggregator_1 = require("../stateAggregator");
 const orgConfigProperties_1 = require("./orgConfigProperties");
 messages_1.Messages.importMessagesDirectory(__dirname);
 const coreMessages = messages_1.Messages.load('@salesforce/core', 'core', ['namedOrgNotFound']);
@@ -50,9 +50,8 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
         this.logger.debug(`Removing authorization for user ${username}`);
         await this.unsetConfigValues(username);
         await this.unsetAliases(username);
-        this.unsetTokens(username);
-        this.globalInfo.orgs.unset(username);
-        await this.globalInfo.write();
+        await this.unsetTokens(username);
+        await this.stateAggregator.orgs.remove(username);
     }
     /**
      * Removes all authentication files and any configs or aliases associated with them
@@ -73,8 +72,8 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
      * @returns {Promise<SfOrg>}
      */
     async findAuth(usernameOrAlias) {
-        const username = usernameOrAlias ? await this.resolveUsername(usernameOrAlias) : this.getTargetOrg();
-        const auth = this.globalInfo.orgs.get(username);
+        const username = await this.resolveUsername(usernameOrAlias || this.getTargetOrg());
+        const auth = this.stateAggregator.orgs.get(username);
         if (!auth) {
             throw coreMessages.createError('namedOrgNotFound');
         }
@@ -83,15 +82,20 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
     /**
      * Finds all org authorizations in the global info file (.sf/sf.json)
      *
-     * @returns {SfOrgs}
+     * @returns {Record<string, AuthFields>}
      */
     findAllAuths() {
-        return this.globalInfo.orgs.getAll();
+        const orgs = this.stateAggregator.orgs.getAll();
+        return orgs.reduce((x, y) => {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            return { ...x, [y.username]: y };
+        }, {});
     }
     async init() {
         this.logger = await logger_1.Logger.child(this.constructor.name);
         this.config = await configAggregator_1.ConfigAggregator.create();
-        this.globalInfo = await globalInfo_1.GlobalInfo.getInstance();
+        this.stateAggregator = await stateAggregator_1.StateAggregator.getInstance();
+        await this.stateAggregator.orgs.readAll();
     }
     /**
      * Returns the username for a given alias if the alias exists.
@@ -100,7 +104,7 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
      * @returns {Promise<string>}
      */
     async resolveUsername(usernameOrAlias) {
-        return this.globalInfo.aliases.resolveUsername(usernameOrAlias);
+        return this.stateAggregator.aliases.resolveUsername(usernameOrAlias);
     }
     /**
      * @returns {string}
@@ -119,7 +123,7 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
      * @returns {Promise<string[]>}
      */
     getAliases(username) {
-        return this.globalInfo.aliases.getAll(username);
+        return this.stateAggregator.aliases.getAll(username);
     }
     /**
      * Unsets any configured values (both global and local) for provided username
@@ -158,20 +162,22 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
      */
     async unsetAliases(username) {
         this.logger.debug(`Clearing aliases for username: ${username}`);
-        const existingAliases = this.globalInfo.aliases.getAll(username);
+        const existingAliases = this.stateAggregator.aliases.getAll(username);
         if (existingAliases.length === 0)
             return;
         this.logger.debug(`Found these aliases to remove: ${existingAliases}`);
-        existingAliases.forEach((alias) => this.globalInfo.aliases.unset(alias));
+        existingAliases.forEach((alias) => this.stateAggregator.aliases.unset(alias));
+        await this.stateAggregator.aliases.write();
     }
-    unsetTokens(username) {
+    async unsetTokens(username) {
         this.logger.debug(`Clearing tokens for username: ${username}`);
-        const tokens = this.globalInfo.tokens.getAll();
+        const tokens = this.stateAggregator.tokens.getAll();
         for (const [key, token] of Object.entries(tokens)) {
             if (token.user === username) {
-                this.globalInfo.tokens.unset(key);
+                this.stateAggregator.tokens.unset(key);
             }
         }
+        await this.stateAggregator.tokens.write();
     }
 }
 exports.AuthRemover = AuthRemover;

package/lib/org/connection.js

@@ -21,6 +21,7 @@ const sfError_1 = require("../sfError");
 const sfdc_1 = require("../util/sfdc");
 const messages_1 = require("../messages");
 const lifecycleEvents_1 = require("../lifecycleEvents");
+const orgConfigProperties_1 = require("./orgConfigProperties");
 messages_1.Messages.importMessagesDirectory(__dirname);
 const messages = messages_1.Messages.load('@salesforce/core', 'connection', [
     'incorrectAPIVersionError',
@@ -292,7 +293,7 @@ class Connection extends jsforce_1.Connection {
      * Getter for the AuthInfo fields.
      */
     getAuthInfoFields() {
-        // If the GlobalInfo.unsetOrg is called, the AuthFields are no longer accessible.
+        // If the StateAggregator.orgs.remove is called, the AuthFields are no longer accessible.
         return this.options.authInfo.getFields() || {};
     }
     /**
@@ -332,7 +333,7 @@ class Connection extends jsforce_1.Connection {
     async autoFetchQuery(soql, queryOptions = {}) {
         const config = await configAggregator_1.ConfigAggregator.create();
         // take the limit from the calling function, then the config, then default 10,000
-        const maxFetch = config.getInfo('org-max-query-limit').value || queryOptions.maxFetch || 10000;
+        const maxFetch = config.getInfo(orgConfigProperties_1.OrgConfigProperties.ORG_MAX_QUERY_LIMIT).value || queryOptions.maxFetch || 10000;
         const options = Object.assign(queryOptions, {
             autoFetch: true,
             maxFetch,

package/lib/org/org.d.ts

@@ -2,7 +2,6 @@ import { AsyncOptionalCreatable, Duration } from '@salesforce/kit';
 import { AnyJson, JsonMap, Nullable, Optional } from '@salesforce/ts-types';
 import { ConfigAggregator } from '../config/configAggregator';
 import { OrgUsersConfig } from '../config/orgUsersConfig';
-import { SfSandbox } from '../globalInfo';
 import { Connection } from './connection';
 import { AuthFields, AuthInfo } from './authInfo';
 import { ScratchOrgCreateOptions, ScratchOrgCreateResult } from './scratchOrgCreate';
@@ -70,6 +69,14 @@ export declare type ResumeSandboxRequest = {
     SandboxProcessObjId?: string;
 };
 export declare type ScratchOrgRequest = Pick<ScratchOrgCreateOptions, 'connectedAppConsumerKey' | 'durationDays' | 'nonamespace' | 'noancestors' | 'wait' | 'retry' | 'apiversion' | 'definitionjson' | 'definitionfile' | 'orgConfig' | 'clientSecret'>;
+export declare type SandboxFields = {
+    sandboxOrgId: string;
+    prodOrgUsername: string;
+    sandboxName?: string;
+    sandboxUsername?: string;
+    sandboxProcessId?: string;
+    sandboxInfoId?: string;
+};
 /**
  * Provides a way to manage a locally authenticated Org.
  *
@@ -312,15 +319,15 @@ export declare class Org extends AsyncOptionalCreatable<Org.Options> {
      * set the sandbox config related to this given org
      *
      * @param orgId {string} orgId of the sandbox
-     * @param config {SfSandbox} config of the sandbox
+     * @param config {SandboxFields} config of the sandbox
      */
-    setSandboxConfig(orgId: string, config: SfSandbox): Promise<Org>;
+    setSandboxConfig(orgId: string, config: SandboxFields): Promise<Org>;
     /**
      * get the sandbox config for the given orgId
      *
      * @param orgId {string} orgId of the sandbox
      */
-    getSandboxConfig(orgId: string): Promise<Nullable<SfSandbox>>;
+    getSandboxConfig(orgId: string): Promise<Nullable<SandboxFields>>;
     /**
      * Retrieves the highest api version that is supported by the target server instance. If the apiVersion configured for
      * Sfdx is greater than the one returned in this call an api version mismatch occurs. In the case of the CLI that
@@ -381,6 +388,7 @@ export declare class Org extends AsyncOptionalCreatable<Org.Options> {
      * **Throws** *{@link SfError}{ name: 'NotSupportedError' }* Throws an unsupported error.
      */
     protected getDefaultOptions(): Org.Options;
+    private getLocalDataDir;
     /**
      * Gets the sandboxProcessObject and then polls for it to complete.
      *

package/lib/org/org.js

@@ -21,7 +21,7 @@ const sfError_1 = require("../sfError");
 const sfdc_1 = require("../util/sfdc");
 const webOAuthServer_1 = require("../webOAuthServer");
 const messages_1 = require("../messages");
-const globalInfo_1 = require("../globalInfo");
+const stateAggregator_1 = require("../stateAggregator");
 const pollingClient_1 = require("../status/pollingClient");
 const connection_1 = require("./connection");
 const authInfo_1 = require("./authInfo");
@@ -225,8 +225,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
     async cleanLocalOrgData(orgDataPath, throwWhenRemoveFails = false) {
         let dataPath;
         try {
-            const rootFolder = await config_1.Config.resolveRootFolder(false);
-            dataPath = (0, path_1.join)(rootFolder, global_1.Global.SFDX_STATE_FOLDER, orgDataPath ? orgDataPath : 'orgs');
+            dataPath = await this.getLocalDataDir(orgDataPath);
             this.logger.debug(`cleaning data for path: ${dataPath}`);
         }
         catch (err) {
@@ -271,7 +270,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
      *
      */
     async isSandbox() {
-        return (await globalInfo_1.GlobalInfo.getInstance()).sandboxes.has(this.getOrgId());
+        return await (await stateAggregator_1.StateAggregator.getInstance()).sandboxes.hasFile(this.getOrgId());
     }
     /**
      * Check that this org is a scratch org by asking the dev hub if it knows about it.
@@ -502,8 +501,8 @@ class Org extends kit_1.AsyncOptionalCreatable {
             const organization = await this.retrieveOrganizationInformation();
             const isScratch = organization.IsSandbox && organization.TrialExpirationDate;
             const isSandbox = organization.IsSandbox && !organization.TrialExpirationDate;
-            const info = await globalInfo_1.GlobalInfo.getInstance();
-            info.orgs.update(username, {
+            const stateAggregator = await stateAggregator_1.StateAggregator.getInstance();
+            stateAggregator.orgs.update(username, {
                 [Org.Fields.NAME]: organization.Name,
                 [Org.Fields.INSTANCE_NAME]: organization.InstanceName,
                 [Org.Fields.NAMESPACE_PREFIX]: organization.NamespacePrefix,
@@ -511,7 +510,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
                 [Org.Fields.IS_SCRATCH]: isScratch,
                 [Org.Fields.TRIAL_EXPIRATION_DATE]: organization.TrialExpirationDate,
             });
-            await info.write();
+            await stateAggregator.orgs.write(username);
         }
     }
     /**
@@ -618,10 +617,10 @@ class Org extends kit_1.AsyncOptionalCreatable {
      * set the sandbox config related to this given org
      *
      * @param orgId {string} orgId of the sandbox
-     * @param config {SfSandbox} config of the sandbox
+     * @param config {SandboxFields} config of the sandbox
      */
     async setSandboxConfig(orgId, config) {
-        (await globalInfo_1.GlobalInfo.getInstance()).sandboxes.set(orgId, config);
+        (await stateAggregator_1.StateAggregator.getInstance()).sandboxes.set(orgId, config);
         return this;
     }
     /**
@@ -630,7 +629,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
      * @param orgId {string} orgId of the sandbox
      */
     async getSandboxConfig(orgId) {
-        return (await globalInfo_1.GlobalInfo.getInstance()).sandboxes.get(orgId);
+        return (await stateAggregator_1.StateAggregator.getInstance()).sandboxes.read(orgId);
     }
     /**
      * Retrieves the highest api version that is supported by the target server instance. If the apiVersion configured for
@@ -733,7 +732,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
      * Initialize async components.
      */
     async init() {
-        const globalInfo = await globalInfo_1.GlobalInfo.getInstance();
+        const stateAggregator = await stateAggregator_1.StateAggregator.getInstance();
         this.logger = await logger_1.Logger.child('Org');
         this.configAggregator = this.options.aggregator ? this.options.aggregator : await configAggregator_1.ConfigAggregator.create();
         if (!this.options.connection) {
@@ -744,7 +743,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
                     : this.configAggregator.getPropertyValue(orgConfigProperties_1.OrgConfigProperties.TARGET_ORG);
                 this.options.aliasOrUsername = aliasOrUsername || undefined;
             }
-            const username = globalInfo.aliases.resolveUsername(this.options.aliasOrUsername);
+            const username = stateAggregator.aliases.resolveUsername(this.options.aliasOrUsername);
             if (!username) {
                 throw messages.createError('noUsernameFound');
             }
@@ -764,6 +763,10 @@ class Org extends kit_1.AsyncOptionalCreatable {
     getDefaultOptions() {
         throw new sfError_1.SfError('Not Supported', 'NotSupportedError');
     }
+    async getLocalDataDir(orgDataPath) {
+        const rootFolder = await config_1.Config.resolveRootFolder(false);
+        return (0, path_1.join)(rootFolder, global_1.Global.SFDX_STATE_FOLDER, orgDataPath ? orgDataPath : 'orgs');
+    }
     /**
      * Gets the sandboxProcessObject and then polls for it to complete.
      *
@@ -926,14 +929,14 @@ class Org extends kit_1.AsyncOptionalCreatable {
      * this Org. You don't want to call this method directly. Instead consider calling Org.remove()
      */
     async removeAuth() {
-        const config = await globalInfo_1.GlobalInfo.getInstance();
+        const stateAggregator = await stateAggregator_1.StateAggregator.getInstance();
         const username = this.getUsername();
         // If there is no username, it has already been removed from the globalInfo.
         // We can skip the unset and just ensure that globalInfo is updated.
         if (username) {
             this.logger.debug(`Removing auth for user: ${username}`);
             this.logger.debug(`Clearing auth cache for user: ${username}`);
-            config.orgs.unset(username);
+            await stateAggregator.orgs.remove(username);
         }
     }
     /**
@@ -964,7 +967,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
      */
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     async removeUsers(throwWhenRemoveFails) {
-        const globalInfo = await globalInfo_1.GlobalInfo.getInstance();
+        const stateAggregator = await stateAggregator_1.StateAggregator.getInstance();
         this.logger.debug(`Removing users associate with org: ${this.getOrgId()}`);
         const config = await this.retrieveOrgUsersConfig();
         this.logger.debug(`using path for org users: ${config.getPath()}`);
@@ -972,8 +975,8 @@ class Org extends kit_1.AsyncOptionalCreatable {
         await Promise.all(authInfos
             .map((auth) => auth.getFields().username)
             .map(async (username) => {
-            const aliasKeys = (username && globalInfo.aliases.getAll(username)) || [];
-            globalInfo.aliases.unsetAll(username);
+            const aliasKeys = (username && stateAggregator.aliases.getAll(username)) || [];
+            stateAggregator.aliases.unsetAll(username);
             const orgForUser = username === this.getUsername()
                 ? this
                 : await Org.create({
@@ -988,12 +991,11 @@ class Org extends kit_1.AsyncOptionalCreatable {
                 needsConfigUpdate ? config_1.Config.update(configInfo.isGlobal(), orgType, undefined) : undefined,
             ].filter(Boolean);
         }));
-        await globalInfo.write();
+        await stateAggregator.aliases.write();
     }
     async removeSandboxConfig() {
-        const globalInfo = await globalInfo_1.GlobalInfo.getInstance();
-        globalInfo.sandboxes.unset(this.getOrgId());
-        await globalInfo.write();
+        const stateAggregator = await stateAggregator_1.StateAggregator.getInstance();
+        await stateAggregator.sandboxes.remove(this.getOrgId());
     }
     async writeSandboxAuthFile(sandboxProcessObj, sandboxRes) {
         this.logger.debug(`writeSandboxAuthFile sandboxProcessObj: ${JSON.stringify(sandboxProcessObj)}, sandboxRes: ${JSON.stringify(sandboxRes)}`);
@@ -1023,22 +1025,22 @@ class Org extends kit_1.AsyncOptionalCreatable {
             this.logger.debug('Creating AuthInfo for sandbox', sandboxRes.authUserName, productionAuthFields.username, oauth2Options);
             // save auth info for new sandbox
             await authInfo.save();
-            if (!authInfo.getFields().orgId) {
+            const sandboxOrgId = authInfo.getFields().orgId;
+            if (!sandboxOrgId) {
                 throw messages.createError('AuthInfoOrgIdUndefined');
             }
             // set the sandbox config value
             const sfSandbox = {
                 sandboxUsername: sandboxRes.authUserName,
-                sandboxOrgId: authInfo.getFields().orgId,
+                sandboxOrgId,
                 prodOrgUsername: this.getUsername(),
                 sandboxName: sandboxProcessObj.SandboxName,
                 sandboxProcessId: sandboxProcessObj.Id,
                 sandboxInfoId: sandboxProcessObj.SandboxInfoId,
                 timestamp: new Date().toISOString(),
             };
-            await this.setSandboxConfig(authInfo.getFields().orgId, sfSandbox);
-            const globalInfo = await globalInfo_1.GlobalInfo.getInstance();
-            await globalInfo.write();
+            await this.setSandboxConfig(sandboxOrgId, sfSandbox);
+            (await stateAggregator_1.StateAggregator.getInstance()).sandboxes.write(sandboxOrgId);
             await lifecycleEvents_1.Lifecycle.getInstance().emit(SandboxEvents.EVENT_RESULT, {
                 sandboxProcessObj,
                 sandboxRes,