@salesforce/core 3.18.3 → 3.19.2

package/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [3.19.2](https://github.com/forcedotcom/sfdx-core/compare/v3.19.1...v3.19.2) (2022-06-02)
+
+### Bug Fixes
+
+- loosen audience url determination ([#588](https://github.com/forcedotcom/sfdx-core/issues/588)) ([a58ab89](https://github.com/forcedotcom/sfdx-core/commit/a58ab89e2ada34fbdb6d8c72d88966a5281db60b))
+
+### [3.19.1](https://github.com/forcedotcom/sfdx-core/compare/v3.19.0...v3.19.1) (2022-05-27)
+
+### Bug Fixes
+
+- env var resolution in ConfigAggregator ([#590](https://github.com/forcedotcom/sfdx-core/issues/590)) ([a65cfbd](https://github.com/forcedotcom/sfdx-core/commit/a65cfbdd0e2a6c3806aa4da3270b237f68b37133))
+
+## [3.19.0](https://github.com/forcedotcom/sfdx-core/compare/v3.18.3...v3.19.0) (2022-05-20)
+
+### Features
+
+- missing prop and logic correction ([debe97e](https://github.com/forcedotcom/sfdx-core/commit/debe97e08f54bbd55edd2cb5b18e9d14abd3652f))
+- property on org with inteligent defaults and handling of undefined ([e7295d3](https://github.com/forcedotcom/sfdx-core/commit/e7295d38f2b8defdb54a77e61b4ef8862e5398f9))
+- tracking property on AuthFields ([2243d34](https://github.com/forcedotcom/sfdx-core/commit/2243d345c5cc81bd637c889adbe1db6eae6c93fc))
+- tracksSource in TestSetup mock ([7544c60](https://github.com/forcedotcom/sfdx-core/commit/7544c604bd4a32d21d105e8472f41b2d37fbf601))
+
 ### [3.18.3](https://github.com/forcedotcom/sfdx-core/compare/v3.18.2...v3.18.3) (2022-05-20)
 
 ### [3.18.2](https://github.com/forcedotcom/sfdx-core/compare/v3.18.1...v3.18.2) (2022-05-17)

package/lib/config/configAggregator.d.ts

@@ -1,5 +1,5 @@
 import { AsyncOptionalCreatable } from '@salesforce/kit';
-import { AnyJson, JsonMap, Optional } from '@salesforce/ts-types';
+import { AnyJson, Dictionary, JsonMap, Optional } from '@salesforce/ts-types';
 import { Config, ConfigPropertyMeta } from './config';
 /**
  * Information about a config property.
@@ -161,7 +161,7 @@ export declare class ConfigAggregator extends AsyncOptionalCreatable<ConfigAggre
     /**
      * Get the config properties that are environment variables.
      */
-    getEnvVars(): Map<string, string>;
+    getEnvVars(): Dictionary<string>;
     /**
      * Re-read all property configurations from disk.
      */

package/lib/config/configAggregator.js

@@ -37,6 +37,7 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
      */
     constructor(options) {
         super(options || {});
+        this.envVars = {};
         // Don't throw an project error with the aggregator, since it should resolve to global if
         // there is no project.
         try {
@@ -107,7 +108,7 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
      */
     getPropertyValue(key) {
         if (this.getAllowedProperties().some((element) => key === element.key)) {
-            return this.getConfig()[key] || this.getEnvVars().get(key);
+            return this.getConfig()[key];
         }
         else {
             throw messages.createError('unknownConfigKey', [key]);
@@ -164,7 +165,7 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
      * @param key The key of the property.
      */
     getLocation(key) {
-        if (this.getEnvVars().get(key) != null) {
+        if (this.envVars[key] != null) {
             return "Environment" /* ENVIRONMENT */;
         }
         if (this.localConfig && this.localConfig.get(key)) {
@@ -189,8 +190,8 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
      * @param key The key of the property.
      */
     getPath(key) {
-        if (this.envVars.getString(key) != null) {
-            return `$${this.envVars.propertyToEnvName(key)}`;
+        if (this.envVars[key] != null) {
+            return `$${envVars_1.EnvVars.propertyToEnvName(key)}`;
         }
         if (this.localConfig && this.localConfig.getContents()[key] != null) {
             return this.localConfig.getPath();
@@ -239,7 +240,7 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
      * Get the config properties that are environment variables.
      */
     getEnvVars() {
-        return this.envVars.asMap();
+        return this.envVars;
     }
     /**
      * Re-read all property configurations from disk.
@@ -287,9 +288,12 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
         this.resolveProperties(this.globalConfig.readSync(), this.localConfig && this.localConfig.readSync());
     }
     resolveProperties(globalConfig, localConfig) {
-        this.envVars = new envVars_1.EnvVars();
+        const envVars = new envVars_1.EnvVars();
         for (const property of this.getAllowedProperties()) {
-            this.envVars.setPropertyFromEnv(property.key);
+            const key = property.newKey ? property.newKey : property.key;
+            const value = envVars.getPropertyFromEnv(property.key);
+            if (value)
+                this.envVars[key] = value;
         }
         // Global config must be read first so it is on the left hand of the
         // object assign and is overwritten by the local config.
@@ -298,7 +302,7 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
         if (localConfig) {
             configs.push(localConfig);
         }
-        configs.push(this.envVars.asDictionary());
+        configs.push(this.envVars);
         const json = {};
         const reduced = configs.filter(ts_types_1.isJsonMap).reduce((acc, el) => (0, kit_1.merge)(acc, el), json);
         return reduced;

package/lib/config/envVars.d.ts

@@ -87,10 +87,9 @@ declare type EnvType = {
 export declare const SUPPORTED_ENV_VARS: EnvType;
 export declare class EnvVars extends Env {
     constructor(env?: NodeJS.ProcessEnv);
+    static propertyToEnvName(property: string, prefix?: string): string;
     private static defaultPrefix;
-    propertyToEnvName(property: string, prefix?: string | undefined): string;
-    setPropertyFromEnv(property: string, prefix?: string | undefined): void;
-    getPropertyFromEnv<T>(property: string, prefix?: string | undefined): T | undefined;
+    getPropertyFromEnv<T>(property: string, prefix?: string): Nullable<T>;
     asDictionary(): Dictionary<unknown>;
     asMap(): Map<string, string>;
     private resolve;

package/lib/config/envVars.js

@@ -337,7 +337,7 @@ exports.SUPPORTED_ENV_VARS = {
     },
     [EnvironmentVariable.SF_ORG_MAX_QUERY_LIMIT]: {
         description: getMessage(EnvironmentVariable.SF_ORG_MAX_QUERY_LIMIT),
-        synonymOf: null,
+        synonymOf: EnvironmentVariable.SFDX_MAX_QUERY_LIMIT,
     },
     [EnvironmentVariable.SF_MDAPI_TEMP_DIR]: {
         description: getMessage(EnvironmentVariable.SF_MDAPI_TEMP_DIR),
@@ -397,6 +397,9 @@ class EnvVars extends kit_1.Env {
         super(env);
         this.resolve();
     }
+    static propertyToEnvName(property, prefix = EnvVars.defaultPrefix()) {
+        return `${prefix || ''}${(0, change_case_1.snakeCase)(property).toUpperCase()}`;
+    }
     static defaultPrefix() {
         if (process.argv[0].startsWith('sfdx'))
             return 'SFDX_';
@@ -404,19 +407,11 @@ class EnvVars extends kit_1.Env {
             return 'SF_';
         return 'SFDX_';
     }
-    propertyToEnvName(property, prefix = EnvVars.defaultPrefix()) {
-        return `${prefix || ''}${(0, change_case_1.snakeCase)(property).toUpperCase()}`;
-    }
-    setPropertyFromEnv(property, prefix = EnvVars.defaultPrefix()) {
-        const envName = this.propertyToEnvName(property, prefix);
-        const value = this.getString(envName);
-        if (value) {
-            this.setString(property, value);
-        }
-    }
     getPropertyFromEnv(property, prefix = EnvVars.defaultPrefix()) {
-        const envName = this.propertyToEnvName(property, prefix);
-        return this.get(envName);
+        var _a;
+        const envName = EnvVars.propertyToEnvName(property, prefix);
+        const synonym = (_a = exports.SUPPORTED_ENV_VARS[envName]) === null || _a === void 0 ? void 0 : _a.synonymOf;
+        return this.get(envName) || this.get(synonym);
     }
     asDictionary() {
         return this.entries().reduce((accumulator, [key, value]) => {

package/lib/config/sandboxProcessCache.d.ts

@@ -6,6 +6,7 @@ export declare type SandboxRequestCacheEntry = {
     prodOrgUsername: string;
     sandboxProcessObject: Partial<SandboxProcessObject>;
     sandboxRequest: Partial<SandboxRequest>;
+    tracksSource?: boolean;
 };
 export declare class SandboxRequestCache extends TTLConfig<TTLConfig.Options, SandboxRequestCacheEntry> {
     static getDefaultOptions(): TTLConfig.Options;

package/lib/org/authInfo.d.ts

@@ -37,6 +37,7 @@ export declare type AuthFields = {
     usernames?: string[];
     userProfileName?: string;
     expirationDate?: string;
+    tracksSource?: boolean;
 };
 export declare type OrgAuthorization = {
     orgId: string;
@@ -64,6 +65,7 @@ export declare type AuthSideEffects = {
     alias?: string;
     setDefault: boolean;
     setDefaultDevHub: boolean;
+    setTracksSource?: boolean;
 };
 /**
  * A function to update a refresh token when the access token is expired.
@@ -287,7 +289,8 @@ export declare class AuthInfo extends AsyncOptionalCreatable<AuthInfo.Options> {
     private loadDecryptedAuthFromConfig;
     private isTokenOptions;
     private refreshFn;
-    private buildJwtConfig;
+    private authJwt;
+    private tryJwtAuth;
     private buildRefreshTokenConfig;
     /**
      * Performs an authCode exchange but the Oauth2 feature of jsforce is extended to include a code_challenge

package/lib/org/authInfo.js

@@ -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 {
@@ -463,14 +464,22 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      * @param sideEffects - instance of AuthSideEffects
      */
     async handleAliasAndDefaultSettings(sideEffects) {
-        if (sideEffects.alias || sideEffects.setDefault || sideEffects.setDefaultDevHub) {
+        if (sideEffects.alias ||
+            sideEffects.setDefault ||
+            sideEffects.setDefaultDevHub ||
+            typeof sideEffects.setTracksSource === 'boolean') {
             if (sideEffects.alias)
                 await this.setAlias(sideEffects.alias);
             if (sideEffects.setDefault)
                 await this.setAsDefault({ org: true });
             if (sideEffects.setDefaultDevHub)
                 await this.setAsDefault({ devHub: true });
-            await this.save();
+            if (typeof sideEffects.setTracksSource === 'boolean') {
+                await this.save({ tracksSource: sideEffects.setTracksSource });
+            }
+            else {
+                await this.save();
+            }
         }
     }
     /**
@@ -599,7 +608,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)
@@ -659,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),
@@ -701,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/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',
@@ -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

@@ -235,6 +235,17 @@ export declare class Org extends AsyncOptionalCreatable<Org.Options> {
      * scratch org**. If you need accuracy, use the {@link Org.determineIfScratch} method.
      */
     isScratch(): boolean;
+    /**
+     * Returns `true` if the org uses source tracking.
+     * Side effect: updates files where the property doesn't currently exist
+     */
+    tracksSource(): Promise<boolean>;
+    /**
+     * Set the tracking property on the org's auth file
+     *
+     * @param value true or false (whether the org should use source tracking or not)
+     */
+    setTracksSource(value: boolean): Promise<void>;
     /**
      * Returns `true` if the org is a scratch org.
      *
@@ -528,6 +539,11 @@ export declare namespace Org {
         /**
          * The snapshot used to create the scratch org.
          */
-        SNAPSHOT = "snapshot"
+        SNAPSHOT = "snapshot",
+        /**
+         * true: the org supports and wants source tracking
+         * false: the org opted out of tracking or can't support it
+         */
+        TRACKS_SOURCE = "tracksSource"
     }
 }

package/lib/org/org.js

@@ -418,6 +418,41 @@ class Org extends kit_1.AsyncOptionalCreatable {
             return false;
         }
     }
+    /**
+     * Returns `true` if the org uses source tracking.
+     * Side effect: updates files where the property doesn't currently exist
+     */
+    async tracksSource() {
+        // use the property if it exists
+        const tracksSource = this.getField(Org.Fields.TRACKS_SOURCE);
+        if ((0, ts_types_1.isBoolean)(tracksSource)) {
+            return tracksSource;
+        }
+        // scratch orgs with no property use tracking by default
+        if (await this.determineIfScratch()) {
+            // save true for next time to avoid checking again
+            await this.setTracksSource(true);
+            return true;
+        }
+        if (await this.determineIfSandbox()) {
+            // does the sandbox know about the SourceMember object?
+            const supportsSourceMembers = await this.supportsSourceTracking();
+            await this.setTracksSource(supportsSourceMembers);
+            return supportsSourceMembers;
+        }
+        // any other non-sandbox, non-scratch orgs won't use tracking
+        await this.setTracksSource(false);
+        return false;
+    }
+    /**
+     * Set the tracking property on the org's auth file
+     *
+     * @param value true or false (whether the org should use source tracking or not)
+     */
+    async setTracksSource(value) {
+        const originalAuth = await authInfo_1.AuthInfo.create({ username: this.getUsername() });
+        originalAuth.handleAliasAndDefaultSettings({ setDefault: false, setDefaultDevHub: false, setTracksSource: value });
+    }
     /**
      * Returns `true` if the org is a scratch org.
      *
@@ -656,9 +691,8 @@ class Org extends kit_1.AsyncOptionalCreatable {
         if (this.isScratch()) {
             return true;
         }
-        const conn = this.getConnection();
         try {
-            await conn.tooling.sobject('SourceMember').describe();
+            await this.getConnection().tooling.sobject('SourceMember').describe();
             return true;
         }
         catch (err) {
@@ -1207,6 +1241,11 @@ exports.Org = Org;
          * The snapshot used to create the scratch org.
          */
         Fields["SNAPSHOT"] = "snapshot";
+        /**
+         * true: the org supports and wants source tracking
+         * false: the org opted out of tracking or can't support it
+         */
+        Fields["TRACKS_SOURCE"] = "tracksSource";
         // Should it be on org? Leave it off for now, as it might
         // be confusing to the consumer what this actually is.
         // USERNAMES = 'usernames',

package/lib/org/scratchOrgCache.d.ts

@@ -11,6 +11,7 @@ export declare type CachedOptions = {
     apiVersion?: string;
     alias?: string;
     setDefault?: boolean;
+    tracksSource?: boolean;
 };
 export declare class ScratchOrgCache extends TTLConfig<TTLConfig.Options, CachedOptions> {
     static getFileName(): string;

package/lib/org/scratchOrgCreate.d.ts

@@ -47,6 +47,8 @@ export interface ScratchOrgCreateOptions {
     alias?: string;
     /** after complete, set the org as the default */
     setDefault?: boolean;
+    /** do not use source tracking for this org */
+    tracksSource?: boolean;
 }
 export declare const scratchOrgResume: (jobId: string) => Promise<ScratchOrgCreateResult>;
 export declare const scratchOrgCreate: (options: ScratchOrgCreateOptions) => Promise<ScratchOrgCreateResult>;

package/lib/org/scratchOrgCreate.js

@@ -24,7 +24,6 @@ const scratchOrgCache_1 = require("./scratchOrgCache");
 const scratchOrgErrorCodes_1 = require("./scratchOrgErrorCodes");
 messages_1.Messages.importMessagesDirectory(__dirname);
 const messages = messages_1.Messages.load('@salesforce/core', 'scratchOrgCreate', [
-    'SourceStatusResetFailureError',
     'DurationDaysValidationMaxError',
     'DurationDaysValidationMinError',
     'RetryNotIntError',
@@ -67,7 +66,7 @@ const scratchOrgResume = async (jobId) => {
     if (!cache.has(jobId)) {
         throw messages.createError('CacheMissError', [jobId]);
     }
-    const { hubUsername, apiVersion, clientSecret, signupTargetLoginUrlConfig, definitionjson, alias, setDefault } = cache.get(jobId);
+    const { hubUsername, apiVersion, clientSecret, signupTargetLoginUrlConfig, definitionjson, alias, setDefault, tracksSource, } = cache.get(jobId);
     const hubOrg = await org_1.Org.create({ aliasOrUsername: hubUsername });
     const soi = await (0, scratchOrgInfoApi_1.queryScratchOrgInfo)(hubOrg, jobId);
     await (0, scratchOrgErrorCodes_1.validateScratchOrgInfoForResume)({ jobId, scratchOrgInfo: soi, cache, hubUsername });
@@ -99,6 +98,7 @@ const scratchOrgResume = async (jobId) => {
         alias,
         setDefault: setDefault !== null && setDefault !== void 0 ? setDefault : false,
         setDefaultDevHub: false,
+        setTracksSource: tracksSource !== null && tracksSource !== void 0 ? tracksSource : true,
     });
     cache.unset((_c = soi.Id) !== null && _c !== void 0 ? _c : jobId);
     const authFields = authInfo.getFields();
@@ -117,7 +117,7 @@ const scratchOrgCreate = async (options) => {
     const logger = await logger_1.Logger.child('scratchOrgCreate');
     logger.debug('scratchOrgCreate');
     await (0, scratchOrgLifecycleEvents_1.emit)({ stage: 'prepare request' });
-    const { hubOrg, connectedAppConsumerKey, durationDays = 1, nonamespace, noancestors, wait = kit_1.Duration.minutes(exports.DEFAULT_STREAM_TIMEOUT_MINUTES), retry = 0, apiversion, definitionjson, definitionfile, orgConfig, clientSecret = undefined, alias, setDefault = false, } = options;
+    const { hubOrg, connectedAppConsumerKey, durationDays = 1, nonamespace, noancestors, wait = kit_1.Duration.minutes(exports.DEFAULT_STREAM_TIMEOUT_MINUTES), retry = 0, apiversion, definitionjson, definitionfile, orgConfig, clientSecret = undefined, alias, setDefault = false, tracksSource = true, } = options;
     validateDuration(durationDays);
     validateRetry(retry);
     const { scratchOrgInfoPayload, ignoreAncestorIds, warnings } = await (0, scratchOrgInfoGenerator_1.getScratchOrgInfoPayload)({
@@ -153,6 +153,7 @@ const scratchOrgCreate = async (options) => {
         clientSecret,
         alias,
         setDefault,
+        tracksSource,
     });
     await cache.write();
     logger.debug(`scratch org has recordId ${scratchOrgInfoId}`);
@@ -185,9 +186,12 @@ const scratchOrgCreate = async (options) => {
         (0, scratchOrgInfoApi_1.deploySettings)(scratchOrg, settingsGenerator, (_c = apiversion !== null && apiversion !== void 0 ? apiversion : new configAggregator_1.ConfigAggregator().getPropertyValue('org-api-version')) !== null && _c !== void 0 ? _c : (await scratchOrg.retrieveMaxApiVersion())),
     ]);
     await scratchOrgAuthInfo.handleAliasAndDefaultSettings({
-        alias,
-        setDefault,
-        setDefaultDevHub: false,
+        ...{
+            alias,
+            setDefault,
+            setDefaultDevHub: false,
+            setTracksSource: tracksSource === false ? false : true,
+        },
     });
     cache.unset(scratchOrgInfoId);
     const authFields = authInfo.getFields();

package/lib/testSetup.d.ts

@@ -389,6 +389,7 @@ export declare class MockTestOrgData {
     authcode: string;
     accessToken: string;
     refreshToken: string;
+    tracksSource: boolean | undefined;
     userId: string;
     redirectUri: string;
     isDevHub?: boolean;

package/lib/testSetup.js

@@ -543,6 +543,7 @@ class MockTestOrgData {
         config.createdOrgInstance = 'CS1';
         config.created = '1519163543003';
         config.userId = this.userId;
+        config.tracksSource = this.tracksSource;
         if (this.devHubUsername) {
             config.devHubUsername = this.devHubUsername;
         }

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.18.3",
+  "version": "3.19.2",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -35,7 +35,7 @@
   ],
   "dependencies": {
     "@salesforce/bunyan": "^2.0.0",
-    "@salesforce/kit": "^1.5.34",
+    "@salesforce/kit": "^1.5.41",
     "@salesforce/schemas": "^1.1.0",
     "@salesforce/ts-types": "^1.5.20",
     "@types/graceful-fs": "^4.1.5",
@@ -49,7 +49,7 @@
     "form-data": "^4.0.0",
     "graceful-fs": "^4.2.9",
     "js2xmlparser": "^4.0.1",
-    "jsforce": "2.0.0-beta.9",
+    "jsforce": "2.0.0-beta.10",
     "jsonwebtoken": "8.5.1",
     "mkdirp": "1.0.4",
     "ts-retry-promise": "^0.6.0"
@@ -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",