@salesforce/core 2.26.1 → 2.28.0

package/CHANGELOG.md

@@ -2,6 +2,36 @@
 
 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.
 
+## [2.28.0](https://github.com/forcedotcom/sfdx-core/compare/v2.27.2...v2.28.0) (2021-09-16)
+
+
+### Features
+
+* add custom templates config ([3cf8a8c](https://github.com/forcedotcom/sfdx-core/commit/3cf8a8cee1e7196efced989dcca9b545e1283386))
+* add validator for custom templates config ([dd2bcfe](https://github.com/forcedotcom/sfdx-core/commit/dd2bcfe8e7fee5c5c1c6321189ec04288103d5b6))
+* update config name ([72e84bf](https://github.com/forcedotcom/sfdx-core/commit/72e84bfacef48a1c2d00a61ebbae3f632601abbd))
+
+### [2.27.2](https://github.com/forcedotcom/sfdx-core/compare/v2.27.1...v2.27.2) (2021-08-05)
+
+
+### Bug Fixes
+
+* improve error handling while removing config props ([eecf7b0](https://github.com/forcedotcom/sfdx-core/commit/eecf7b0d0cf14e1371dc4c5ef03a413f864b0a8b))
+
+### [2.27.1](https://github.com/forcedotcom/sfdx-core/compare/v2.27.0...v2.27.1) (2021-08-05)
+
+
+### Bug Fixes
+
+* dont fail when trying to unset sf config keys ([#456](https://github.com/forcedotcom/sfdx-core/issues/456)) ([8aff9fd](https://github.com/forcedotcom/sfdx-core/commit/8aff9fd4bdb73ec20e58f5a16a8192a8eecba912))
+
+## [2.27.0](https://github.com/forcedotcom/sfdx-core/compare/v2.26.1...v2.27.0) (2021-07-29)
+
+
+### Features
+
+* Core URL class SfdcUrl ([#420](https://github.com/forcedotcom/sfdx-core/issues/420)) ([66881ea](https://github.com/forcedotcom/sfdx-core/commit/66881eae2f30215c862ea398bfc1630d9a5898fe))
+
 ### [2.26.1](https://github.com/forcedotcom/sfdx-core/compare/v2.26.0...v2.26.1) (2021-07-19)
 
 

package/lib/authInfo.d.ts

@@ -99,16 +99,6 @@ export declare class OAuth2WithVerifier extends OAuth2 {
      */
     protected _postParams(params: Record<string, unknown>, callback: AnyFunction): Promise<any>;
 }
-/**
- * Salesforce URLs.
- */
-export declare enum SfdcUrl {
-    SANDBOX = "https://test.salesforce.com",
-    PRODUCTION = "https://login.salesforce.com"
-}
-export declare function getJwtAudienceUrl(options: OAuth2Options & {
-    createdOrgInstance?: string;
-}): Promise<string>;
 export declare const DEFAULT_CONNECTED_APP_INFO: {
     clientId: string;
     legacyClientId: string;
@@ -173,6 +163,8 @@ export declare class AuthInfo extends AsyncCreatable<AuthInfo.Options> {
      * Get a list of all auth files stored in the global directory.
      *
      * @returns {Promise<string[]>}
+     *
+     * @deprecated Removed in v3 {@link https://github.com/forcedotcom/sfdx-core/blob/v3/MIGRATING_V2-V3.md#globalinfo}
      */
     static listAllAuthFiles(): Promise<string[]>;
     /**
@@ -197,6 +189,8 @@ export declare class AuthInfo extends AsyncCreatable<AuthInfo.Options> {
      * Forces the auth file to be re-read from disk for a given user. Returns `true` if a value was removed.
      *
      * @param username The username for the auth info to re-read.
+     *
+     * @deprecated Removed in v3 {@link https://github.com/forcedotcom/sfdx-core/blob/v3/MIGRATING_V2-V3.md#configstore-configfile-authinfo-and-encrypting-values}
      */
     static clearCache(username: string): boolean;
     /**
@@ -324,7 +318,6 @@ export declare class AuthInfo extends AsyncCreatable<AuthInfo.Options> {
      * @private
      */
     private throwUserGetException;
-    private lookup;
 }
 export declare namespace AuthInfo {
     /**

package/lib/authInfo.js

@@ -6,13 +6,10 @@
  * 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.AuthInfo = exports.DEFAULT_CONNECTED_APP_INFO = exports.getJwtAudienceUrl = exports.SfdcUrl = exports.OAuth2WithVerifier = void 0;
+exports.AuthInfo = exports.DEFAULT_CONNECTED_APP_INFO = exports.OAuth2WithVerifier = void 0;
 const crypto_1 = require("crypto");
-const url_1 = require("url");
-const dns = require("dns");
 const path_1 = require("path");
 const path_2 = require("path");
-const url_2 = require("url");
 const os = require("os");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
@@ -32,7 +29,7 @@ const logger_1 = require("./logger");
 const sfdxError_1 = require("./sfdxError");
 const fs_1 = require("./util/fs");
 const sfdc_1 = require("./util/sfdc");
-const myDomainResolver_1 = require("./status/myDomainResolver");
+const sfdcUrl_1 = require("./util/sfdcUrl");
 // Extend OAuth2 to add JWT Bearer Token Flow support.
 class JwtOAuth2 extends jsforce_1.OAuth2 {
     constructor(options) {
@@ -97,56 +94,6 @@ class OAuth2WithVerifier extends jsforce_1.OAuth2 {
     }
 }
 exports.OAuth2WithVerifier = OAuth2WithVerifier;
-/**
- * Salesforce URLs.
- */
-var SfdcUrl;
-(function (SfdcUrl) {
-    SfdcUrl["SANDBOX"] = "https://test.salesforce.com";
-    SfdcUrl["PRODUCTION"] = "https://login.salesforce.com";
-})(SfdcUrl = exports.SfdcUrl || (exports.SfdcUrl = {}));
-function isSandboxUrl(options) {
-    var _a;
-    const createdOrgInstance = ts_types_1.getString(options, 'createdOrgInstance', '').trim().toLowerCase();
-    const loginUrl = (_a = options.loginUrl) !== null && _a !== void 0 ? _a : '';
-    return (/^cs|s$/gi.test(createdOrgInstance) ||
-        /sandbox\.my\.salesforce\.com/gi.test(loginUrl) || // enhanced domains >= 230
-        /(cs[0-9]+(\.my|)\.salesforce\.com)/gi.test(loginUrl) || // my domains on CS instance OR CS instance without my domain
-        /([a-z]{3}[0-9]+s\.sfdc-.+\.salesforce\.com)/gi.test(loginUrl) || // falcon sandbox ex: usa2s.sfdc-whatever.salesforce.com
-        /([a-z]{3}[0-9]+s\.sfdc-.+\.force\.com)/gi.test(loginUrl) || // falcon sandbox ex: usa2s.sfdc-whatever.salesforce.com
-        url_2.parse(loginUrl).hostname === 'test.salesforce.com');
-}
-async function resolvesToSandbox(options) {
-    if (isSandboxUrl(options)) {
-        return true;
-    }
-    let cnames = [];
-    if (options.loginUrl) {
-        const myDomainResolver = await myDomainResolver_1.MyDomainResolver.create({ url: new url_1.URL(options.loginUrl) });
-        cnames = await myDomainResolver.getCnames();
-    }
-    return cnames.some((cname) => isSandboxUrl({ ...options, loginUrl: cname }));
-}
-async function getJwtAudienceUrl(options) {
-    var _a;
-    // environment variable is used as an override
-    if (process.env.SFDX_AUDIENCE_URL) {
-        return process.env.SFDX_AUDIENCE_URL;
-    }
-    if (options.loginUrl && sfdc_1.sfdc.isInternalUrl(options.loginUrl)) {
-        // This is for internal developers when just doing authorize;
-        return options.loginUrl;
-    }
-    if (await resolvesToSandbox(options)) {
-        return SfdcUrl.SANDBOX;
-    }
-    const createdOrgInstance = ts_types_1.getString(options, 'createdOrgInstance', '').trim().toLowerCase();
-    if (/^gs1/gi.test(createdOrgInstance) || /(gs1.my.salesforce.com)/gi.test((_a = options.loginUrl) !== null && _a !== void 0 ? _a : '')) {
-        return 'https://gs1.salesforce.com';
-    }
-    return SfdcUrl.PRODUCTION;
-}
-exports.getJwtAudienceUrl = getJwtAudienceUrl;
 // parses the id field returned from jsForce oauth2 methods to get
 // user ID and org ID.
 function parseIdUrl(idUrl) {
@@ -263,12 +210,14 @@ class AuthInfo extends kit_1.AsyncCreatable {
      */
     static getDefaultInstanceUrl() {
         const configuredInstanceUrl = configAggregator_1.ConfigAggregator.getValue('instanceUrl').value;
-        return configuredInstanceUrl || SfdcUrl.PRODUCTION;
+        return configuredInstanceUrl || sfdcUrl_1.SfdcUrl.PRODUCTION;
     }
     /**
      * Get a list of all auth files stored in the global directory.
      *
      * @returns {Promise<string[]>}
+     *
+     * @deprecated Removed in v3 {@link https://github.com/forcedotcom/sfdx-core/blob/v3/MIGRATING_V2-V3.md#globalinfo}
      */
     static async listAllAuthFiles() {
         const globalFiles = await fs_1.fs.readdir(global_1.Global.DIR);
@@ -359,6 +308,8 @@ class AuthInfo extends kit_1.AsyncCreatable {
      * Forces the auth file to be re-read from disk for a given user. Returns `true` if a value was removed.
      *
      * @param username The username for the auth info to re-read.
+     *
+     * @deprecated Removed in v3 {@link https://github.com/forcedotcom/sfdx-core/blob/v3/MIGRATING_V2-V3.md#configstore-configfile-authinfo-and-encrypting-values}
      */
     static clearCache(username) {
         if (username) {
@@ -491,7 +442,7 @@ class AuthInfo extends kit_1.AsyncCreatable {
             // Decrypt a user provided client secret or use the default.
             opts = {
                 oauth2: {
-                    loginUrl: instanceUrl || SfdcUrl.PRODUCTION,
+                    loginUrl: instanceUrl || sfdcUrl_1.SfdcUrl.PRODUCTION,
                     clientId: this.fields.clientId || exports.DEFAULT_CONNECTED_APP_INFO.legacyClientId,
                     redirectUri: 'http://localhost:1717/OauthRedirect',
                 },
@@ -621,7 +572,7 @@ class AuthInfo extends kit_1.AsyncCreatable {
     }
     getInstanceUrl(options, aggregator) {
         const instanceUrl = ts_types_1.getString(options, 'instanceUrl') || aggregator.getPropertyValue('instanceUrl');
-        return instanceUrl || SfdcUrl.PRODUCTION;
+        return instanceUrl || sfdcUrl_1.SfdcUrl.PRODUCTION;
     }
     /**
      * Initialize this AuthInfo instance with the specified options. If options are not provided, initialize it from cache
@@ -756,7 +707,10 @@ class AuthInfo extends kit_1.AsyncCreatable {
     // Build OAuth config for a JWT auth flow
     async buildJwtConfig(options) {
         const privateKeyContents = await fs_1.fs.readFile(ts_types_1.ensure(options.privateKey), 'utf8');
-        const audienceUrl = await getJwtAudienceUrl(options);
+        const { loginUrl = sfdcUrl_1.SfdcUrl.PRODUCTION } = options;
+        const url = new sfdcUrl_1.SfdcUrl(loginUrl);
+        const createdOrgInstance = ts_types_1.getString(options, 'createdOrgInstance', '').trim().toLowerCase();
+        const audienceUrl = await url.getJwtAudienceUrl(createdOrgInstance);
         const jwtToken = jwt.sign({
             iss: options.clientId,
             sub: this.getUsername(),
@@ -781,10 +735,10 @@ class AuthInfo extends kit_1.AsyncCreatable {
             clientId: options.clientId,
         };
         const instanceUrl = ts_types_1.ensureString(authFieldsBuilder.instance_url);
-        const parsedUrl = url_2.parse(instanceUrl);
+        const sfdcUrl = new sfdcUrl_1.SfdcUrl(instanceUrl);
         try {
             // Check if the url is resolvable. This can fail when my-domains have not been replicated.
-            await this.lookup(ts_types_1.ensure(parsedUrl.hostname));
+            await sfdcUrl.lookup();
             authFields.instanceUrl = instanceUrl;
         }
         catch (err) {
@@ -875,7 +829,7 @@ class AuthInfo extends kit_1.AsyncCreatable {
         // within this file to support it.
         const apiVersion = 'v51.0'; // hardcoding to v51.0 just for this call is okay.
         const instance = ts_types_1.ensure(instanceUrl);
-        const baseUrl = new url_1.URL(instance);
+        const baseUrl = new sfdcUrl_1.SfdcUrl(instance);
         const userInfoUrl = `${baseUrl}services/oauth2/userinfo`;
         const headers = Object.assign({ Authorization: `Bearer ${accessToken}` }, connection_1.SFDX_HTTP_HEADERS);
         try {
@@ -929,19 +883,6 @@ class AuthInfo extends kit_1.AsyncCreatable {
         }
         throw new sfdxError_1.SfdxError(messages);
     }
-    // See https://nodejs.org/api/dns.html#dns_dns_lookup_hostname_options_callback
-    async lookup(host) {
-        return new Promise((resolve, reject) => {
-            dns.lookup(host, (err, address, family) => {
-                if (err) {
-                    reject(err);
-                }
-                else {
-                    resolve({ address, family });
-                }
-            });
-        });
-    }
 }
 exports.AuthInfo = AuthInfo;
 // The regular expression that filters files stored in $HOME/.sfdx

package/lib/authRemover.js

@@ -209,7 +209,14 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
                     .reduce((x, y) => x.concat(y), []);
                 const allKeys = keysWithUsername.concat(keysWithAlias);
                 this.logger.debug(`Found these config keys to remove: ${allKeys}`);
-                allKeys.forEach((key) => config.unset(key));
+                allKeys.forEach((key) => {
+                    try {
+                        config.unset(key);
+                    }
+                    catch {
+                        this.logger.debug(`Failed to remove ${key}`);
+                    }
+                });
                 await config.write();
             }
         }

package/lib/config/aliases.d.ts

@@ -22,6 +22,8 @@ export declare enum AliasGroup {
  * const username: string = await Aliases.fetch('myAlias');
  * ```
  * https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev_cli_usernames_orgs.htm
+ *
+ * @deprecated Replaced by GlobalInfo in v3 {@link https://github.com/forcedotcom/sfdx-core/blob/v3/MIGRATING_V2-V3.md#globalinfo}
  */
 export declare class Aliases extends ConfigGroup<ConfigGroup.Options> {
     /**

package/lib/config/aliases.js

@@ -33,6 +33,8 @@ var AliasGroup;
  * const username: string = await Aliases.fetch('myAlias');
  * ```
  * https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev_cli_usernames_orgs.htm
+ *
+ * @deprecated Replaced by GlobalInfo in v3 {@link https://github.com/forcedotcom/sfdx-core/blob/v3/MIGRATING_V2-V3.md#globalinfo}
  */
 class Aliases extends configGroup_1.ConfigGroup {
     /**

package/lib/config/authInfoConfig.d.ts

@@ -6,6 +6,8 @@ import { ConfigFile } from './configFile';
  * ```
  * const authInfo = await AuthInfoConfig.create(AuthInfoConfig.getOptions(username));
  * ```
+ *
+ * @deprecated Replaced by GlobalInfo in v3 {@link https://github.com/forcedotcom/sfdx-core/blob/v3/MIGRATING_V2-V3.md#globalinfo}
  */
 export declare class AuthInfoConfig extends ConfigFile<ConfigFile.Options> {
     /**

package/lib/config/authInfoConfig.js

@@ -15,6 +15,8 @@ const configFile_1 = require("./configFile");
  * ```
  * const authInfo = await AuthInfoConfig.create(AuthInfoConfig.getOptions(username));
  * ```
+ *
+ * @deprecated Replaced by GlobalInfo in v3 {@link https://github.com/forcedotcom/sfdx-core/blob/v3/MIGRATING_V2-V3.md#globalinfo}
  */
 class AuthInfoConfig extends configFile_1.ConfigFile {
     /**

package/lib/config/config.d.ts

@@ -52,10 +52,14 @@ export interface ConfigPropertyMetaInput {
 export declare class Config extends ConfigFile<ConfigFile.Options> {
     /**
      * Username associated with the default dev hub org.
+     *
+     * @deprecated Replaced by OrgConfigProperties.TARGET_DEV_HUB in v3 {@link https://github.com/forcedotcom/sfdx-core/blob/v3/MIGRATING_V2-V3.md#config}
      */
     static readonly DEFAULT_DEV_HUB_USERNAME: string;
     /**
      * Username associate with the default org.
+     *
+     * @deprecated Replaced by OrgConfigProperties.TARGET_ORG in v3 {@link https://github.com/forcedotcom/sfdx-core/blob/v3/MIGRATING_V2-V3.md#config}
      */
     static readonly DEFAULT_USERNAME: string;
     /**
@@ -74,6 +78,10 @@ export declare class Config extends ConfigFile<ConfigFile.Options> {
      * Disables telemetry reporting
      */
     static readonly DISABLE_TELEMETRY = "disableTelemetry";
+    /**
+     * Custom templates repo or local location.
+     */
+    static readonly CUSTOM_ORG_METADATA_TEMPLATES = "customOrgMetadataTemplates";
     /**
      * allows users to override the 10,000 result query limit
      */

package/lib/config/config.js

@@ -14,6 +14,7 @@ const crypto_1 = require("../crypto");
 const messages_1 = require("../messages");
 const sfdxError_1 = require("../sfdxError");
 const sfdc_1 = require("../util/sfdc");
+const sfdcUrl_1 = require("../util/sfdcUrl");
 const configFile_1 = require("./configFile");
 const log = logger_1.Logger.childFromRoot('core:config');
 const SFDX_CONFIG_FILE_NAME = 'sfdx-config.json';
@@ -257,10 +258,14 @@ class Config extends configFile_1.ConfigFile {
 exports.Config = Config;
 /**
  * Username associated with the default dev hub org.
+ *
+ * @deprecated Replaced by OrgConfigProperties.TARGET_DEV_HUB in v3 {@link https://github.com/forcedotcom/sfdx-core/blob/v3/MIGRATING_V2-V3.md#config}
  */
 Config.DEFAULT_DEV_HUB_USERNAME = 'defaultdevhubusername';
 /**
  * Username associate with the default org.
+ *
+ * @deprecated Replaced by OrgConfigProperties.TARGET_ORG in v3 {@link https://github.com/forcedotcom/sfdx-core/blob/v3/MIGRATING_V2-V3.md#config}
  */
 Config.DEFAULT_USERNAME = 'defaultusername';
 /**
@@ -279,6 +284,10 @@ Config.API_VERSION = 'apiVersion';
  * Disables telemetry reporting
  */
 Config.DISABLE_TELEMETRY = 'disableTelemetry';
+/**
+ * Custom templates repo or local location.
+ */
+Config.CUSTOM_ORG_METADATA_TEMPLATES = 'customOrgMetadataTemplates';
 /**
  * allows users to override the 10,000 result query limit
  */
@@ -288,7 +297,7 @@ Config.allowedProperties = [
         key: 'instanceUrl',
         input: {
             // If a value is provided validate it otherwise no value is unset.
-            validator: (value) => value == null || (ts_types_1.isString(value) && sfdc_1.sfdc.isSalesforceDomain(value)),
+            validator: (value) => value == null || (ts_types_1.isString(value) && new sfdcUrl_1.SfdcUrl(value).isSalesforceDomain()),
             get failedMessage() {
                 var _a;
                 return (_a = Config.messages) === null || _a === void 0 ? void 0 : _a.getMessage('InvalidInstanceUrl');
@@ -307,6 +316,17 @@ Config.allowedProperties = [
             },
         },
     },
+    {
+        key: Config.CUSTOM_ORG_METADATA_TEMPLATES,
+        input: {
+            // If a value is provided validate it otherwise no value is unset.
+            validator: (value) => value == null || ts_types_1.isString(value),
+            get failedMessage() {
+                var _a;
+                return (_a = Config.messages) === null || _a === void 0 ? void 0 : _a.getMessage('InvalidCustomOrgMetadataTemplates');
+            },
+        },
+    },
     { key: Config.DEFAULT_DEV_HUB_USERNAME },
     { key: Config.DEFAULT_USERNAME },
     {

package/lib/exported.d.ts

@@ -8,12 +8,14 @@ export { DeviceOauthService, DeviceCodeResponse, DeviceCodePollingResponse } fro
 export { OrgUsersConfig } from './config/orgUsersConfig';
 export { ConfigPropertyMeta, ConfigPropertyMetaInput, Config } from './config/config';
 export { ConfigInfo, ConfigAggregator } from './config/configAggregator';
-export { Authorization, AuthFields, AuthInfo, OAuth2WithVerifier, SfdcUrl, getJwtAudienceUrl } from './authInfo';
+export { Authorization, AuthFields, AuthInfo, OAuth2WithVerifier } from './authInfo';
 export { AuthConfigs, AuthRemover } from './authRemover';
 export { Connection, SFDX_HTTP_HEADERS } from './connection';
 export { Mode, Global } from './global';
 export { Lifecycle } from './lifecycleEvents';
 export { WebOAuthServer } from './webOAuthServer';
+export { SfdcUrl } from './util/sfdcUrl';
+export { getJwtAudienceUrl } from './util/getJwtAudienceUrl';
 export { Fields, FieldValue, LoggerLevel, LoggerLevelValue, LogLine, LoggerOptions, LoggerStream, Logger, } from './logger';
 export { Messages } from './messages';
 export { Org } from './org';

package/lib/exported.js

@@ -16,7 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PermissionSetAssignment = exports.User = exports.REQUIRED_FIELDS = exports.DefaultUserFields = exports.MyDomainResolver = exports.StreamingClient = exports.CometClient = exports.PollingClient = exports.SfdxErrorConfig = exports.SfdxError = exports.SchemaValidator = exports.SchemaPrinter = exports.SfdxProjectJson = exports.SfdxProject = exports.Org = exports.Messages = exports.Logger = exports.LoggerLevel = exports.WebOAuthServer = exports.Lifecycle = exports.Global = exports.Mode = exports.SFDX_HTTP_HEADERS = exports.Connection = exports.AuthRemover = exports.getJwtAudienceUrl = exports.SfdcUrl = exports.OAuth2WithVerifier = exports.AuthInfo = exports.ConfigAggregator = exports.Config = exports.OrgUsersConfig = exports.DeviceOauthService = exports.BaseConfigStore = exports.ConfigGroup = exports.ConfigFile = exports.AuthInfoConfig = exports.AliasGroup = exports.Aliases = void 0;
+exports.PermissionSetAssignment = exports.User = exports.REQUIRED_FIELDS = exports.DefaultUserFields = exports.MyDomainResolver = exports.StreamingClient = exports.CometClient = exports.PollingClient = exports.SfdxErrorConfig = exports.SfdxError = exports.SchemaValidator = exports.SchemaPrinter = exports.SfdxProjectJson = exports.SfdxProject = exports.Org = exports.Messages = exports.Logger = exports.LoggerLevel = exports.getJwtAudienceUrl = exports.SfdcUrl = exports.WebOAuthServer = exports.Lifecycle = exports.Global = exports.Mode = exports.SFDX_HTTP_HEADERS = exports.Connection = exports.AuthRemover = exports.OAuth2WithVerifier = exports.AuthInfo = exports.ConfigAggregator = exports.Config = exports.OrgUsersConfig = exports.DeviceOauthService = exports.BaseConfigStore = exports.ConfigGroup = exports.ConfigFile = exports.AuthInfoConfig = exports.AliasGroup = exports.Aliases = void 0;
 const messages_1 = require("./messages");
 messages_1.Messages.importMessagesDirectory(__dirname);
 var aliases_1 = require("./config/aliases");
@@ -41,8 +41,6 @@ Object.defineProperty(exports, "ConfigAggregator", { enumerable: true, get: func
 var authInfo_1 = require("./authInfo");
 Object.defineProperty(exports, "AuthInfo", { enumerable: true, get: function () { return authInfo_1.AuthInfo; } });
 Object.defineProperty(exports, "OAuth2WithVerifier", { enumerable: true, get: function () { return authInfo_1.OAuth2WithVerifier; } });
-Object.defineProperty(exports, "SfdcUrl", { enumerable: true, get: function () { return authInfo_1.SfdcUrl; } });
-Object.defineProperty(exports, "getJwtAudienceUrl", { enumerable: true, get: function () { return authInfo_1.getJwtAudienceUrl; } });
 var authRemover_1 = require("./authRemover");
 Object.defineProperty(exports, "AuthRemover", { enumerable: true, get: function () { return authRemover_1.AuthRemover; } });
 var connection_1 = require("./connection");
@@ -55,6 +53,10 @@ var lifecycleEvents_1 = require("./lifecycleEvents");
 Object.defineProperty(exports, "Lifecycle", { enumerable: true, get: function () { return lifecycleEvents_1.Lifecycle; } });
 var webOAuthServer_1 = require("./webOAuthServer");
 Object.defineProperty(exports, "WebOAuthServer", { enumerable: true, get: function () { return webOAuthServer_1.WebOAuthServer; } });
+var sfdcUrl_1 = require("./util/sfdcUrl");
+Object.defineProperty(exports, "SfdcUrl", { enumerable: true, get: function () { return sfdcUrl_1.SfdcUrl; } });
+var getJwtAudienceUrl_1 = require("./util/getJwtAudienceUrl");
+Object.defineProperty(exports, "getJwtAudienceUrl", { enumerable: true, get: function () { return getJwtAudienceUrl_1.getJwtAudienceUrl; } });
 var logger_1 = require("./logger");
 Object.defineProperty(exports, "LoggerLevel", { enumerable: true, get: function () { return logger_1.LoggerLevel; } });
 Object.defineProperty(exports, "Logger", { enumerable: true, get: function () { return logger_1.Logger; } });

package/lib/sfdxProject.js

@@ -10,7 +10,6 @@ exports.SfdxProject = exports.SfdxProjectJson = void 0;
 const path_1 = require("path");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
-const authInfo_1 = require("./authInfo");
 const configAggregator_1 = require("./config/configAggregator");
 const configFile_1 = require("./config/configFile");
 const validator_1 = require("./schema/validator");
@@ -18,6 +17,7 @@ const fs_1 = require("./util/fs");
 const internal_1 = require("./util/internal");
 const sfdxError_1 = require("./sfdxError");
 const sfdc_1 = require("./util/sfdc");
+const sfdcUrl_1 = require("./util/sfdcUrl");
 /**
  * The sfdx-project.json config object. This file determines if a folder is a valid sfdx project.
  *
@@ -533,7 +533,7 @@ class SfdxProject {
             Object.assign(this.projectConfig, configAggregator.getConfig());
             // we don't have a login url yet, so use instanceUrl from config or default
             if (!this.projectConfig.sfdcLoginUrl) {
-                this.projectConfig.sfdcLoginUrl = (_a = configAggregator.getConfig().instanceUrl) !== null && _a !== void 0 ? _a : authInfo_1.SfdcUrl.PRODUCTION;
+                this.projectConfig.sfdcLoginUrl = (_a = configAggregator.getConfig().instanceUrl) !== null && _a !== void 0 ? _a : sfdcUrl_1.SfdcUrl.PRODUCTION;
             }
             // LEGACY - Allow override of sfdcLoginUrl via env var FORCE_SFDC_LOGIN_URL
             if (process.env.FORCE_SFDC_LOGIN_URL) {

package/lib/status/myDomainResolver.js

@@ -13,7 +13,7 @@ const util_1 = require("util");
 const ts_types_1 = require("@salesforce/ts-types");
 const kit_1 = require("@salesforce/kit");
 const logger_1 = require("../logger");
-const sfdc_1 = require("../util/sfdc");
+const sfdcUrl_1 = require("../util/sfdcUrl");
 const pollingClient_1 = require("./pollingClient");
 // Timeout for DNS lookup polling defaults to 3 seconds and should always be at least 3 seconds
 const DNS_TIMEOUT = Math.max(3, new kit_1.Env().getNumber('SFDX_DNS_TIMEOUT', 3));
@@ -63,11 +63,11 @@ class MyDomainResolver extends kit_1.AsyncOptionalCreatable {
         const self = this;
         const pollingOptions = {
             async poll() {
-                const host = self.options.url.host;
+                const { host } = self.options.url;
                 let dnsResult;
                 try {
                     self.logger.debug(`Attempting to resolve url: ${host}`);
-                    if (sfdc_1.sfdc.isLocalUrl(host)) {
+                    if (new sfdcUrl_1.SfdcUrl(self.options.url).isLocalUrl()) {
                         return {
                             completed: true,
                             payload: '127.0.0.1',

package/lib/util/fs.d.ts

@@ -10,6 +10,9 @@ export declare type WriteJsonOptions = {
      */
     space?: number;
 };
+/**
+ * @deprecated Use fs/promises instead
+ */
 export declare const fs: typeof fsLib & {
     /**
      * The default file system mode to use when creating directories.

package/lib/util/fs.js

@@ -14,6 +14,9 @@ const kit_1 = require("@salesforce/kit");
 const fsLib = require("graceful-fs");
 const mkdirpLib = require("mkdirp");
 const sfdxError_1 = require("../sfdxError");
+/**
+ * @deprecated Use fs/promises instead
+ */
 exports.fs = Object.assign({}, fsLib, {
     /**
      * The default file system mode to use when creating directories.

package/lib/util/getJwtAudienceUrl.d.ts

@@ -0,0 +1,4 @@
+import { OAuth2Options } from 'jsforce';
+export declare function getJwtAudienceUrl(options: OAuth2Options & {
+    createdOrgInstance?: string;
+}): Promise<string>;

package/lib/util/getJwtAudienceUrl.js

@@ -0,0 +1,19 @@
+"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.getJwtAudienceUrl = void 0;
+const sfdcUrl_1 = require("./sfdcUrl");
+async function getJwtAudienceUrl(options) {
+    if (options.loginUrl) {
+        const url = new sfdcUrl_1.SfdcUrl(options.loginUrl);
+        return await url.getJwtAudienceUrl(options.createdOrgInstance);
+    }
+    return sfdcUrl_1.SfdcUrl.PRODUCTION;
+}
+exports.getJwtAudienceUrl = getJwtAudienceUrl;
+//# sourceMappingURL=getJwtAudienceUrl.js.map

package/lib/util/sfdc.d.ts

@@ -1,11 +1,5 @@
 import { JsonMap, Optional } from '@salesforce/ts-types';
 export declare const sfdc: {
-    /**
-     * Returns `true` if a provided URL contains a Salesforce owned domain.
-     *
-     * @param urlString The URL to inspect.
-     */
-    isSalesforceDomain: (urlString: string) => boolean;
     /**
      * Converts an 18 character Salesforce ID to 15 characters.
      *
@@ -55,10 +49,4 @@ export declare const sfdc: {
      * @param url
      */
     isInternalUrl: (url: string) => boolean;
-    /**
-     * Tests whether a given internal url runs on a local machine
-     *
-     * @param url
-     */
-    isLocalUrl: (url: string) => boolean;
 };

package/lib/util/sfdc.js

@@ -7,37 +7,10 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sfdc = void 0;
-const url_1 = require("url");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
+const sfdcUrl_1 = require("./sfdcUrl");
 exports.sfdc = {
-    /**
-     * Returns `true` if a provided URL contains a Salesforce owned domain.
-     *
-     * @param urlString The URL to inspect.
-     */
-    isSalesforceDomain: (urlString) => {
-        let url;
-        try {
-            url = new url_1.URL(urlString);
-        }
-        catch (e) {
-            return false;
-        }
-        // Source https://help.salesforce.com/articleView?id=000003652&type=1
-        const allowlistOfSalesforceDomainPatterns = [
-            '.cloudforce.com',
-            '.content.force.com',
-            '.force.com',
-            '.salesforce.com',
-            '.salesforceliveagent.com',
-            '.secure.force.com',
-        ];
-        const allowlistOfSalesforceHosts = ['developer.salesforce.com', 'trailhead.salesforce.com'];
-        return allowlistOfSalesforceDomainPatterns.some((pattern) => {
-            return url.hostname.endsWith(pattern) || allowlistOfSalesforceHosts.includes(url.hostname);
-        });
-    },
     /**
      * Converts an 18 character Salesforce ID to 15 characters.
      *
@@ -117,26 +90,6 @@ exports.sfdc = {
      *
      * @param url
      */
-    isInternalUrl: (url) => {
-        const INTERNAL_URL_PARTS = [
-            '.vpod.',
-            'stm.salesforce.com',
-            'stm.force.com',
-            '.blitz.salesforce.com',
-            '.stm.salesforce.ms',
-            '.pc-rnd.force.com',
-            '.pc-rnd.salesforce.com',
-        ];
-        return (url.startsWith('https://gs1.') || exports.sfdc.isLocalUrl(url) || INTERNAL_URL_PARTS.some((part) => url.includes(part)));
-    },
-    /**
-     * Tests whether a given internal url runs on a local machine
-     *
-     * @param url
-     */
-    isLocalUrl: (url) => {
-        const LOCAL_PARTS = ['localhost.sfdcdev.', '.internal.'];
-        return LOCAL_PARTS.some((part) => url.includes(part));
-    },
+    isInternalUrl: (url) => new sfdcUrl_1.SfdcUrl(url).isInternalUrl(),
 };
 //# sourceMappingURL=sfdc.js.map

package/lib/util/sfdcUrl.d.ts

@@ -0,0 +1,70 @@
+/// <reference types="node" />
+import { URL } from 'url';
+export declare class SfdcUrl extends URL {
+    /**
+     * Salesforce URLs
+     */
+    static readonly SANDBOX = "https://test.salesforce.com";
+    static readonly PRODUCTION = "https://login.salesforce.com";
+    private static readonly cache;
+    private logger;
+    constructor(input: string | URL, base?: string | URL);
+    /**
+     * Returns the appropiate jwt audience url for this url
+     * Use SFDX_AUDIENCE_URL env var to override the audience url
+     *
+     * @param createdOrgInstance The Salesforce instance the org was created on. e.g. `cs42`
+     * @return {Promise<string>} The audience url
+     */
+    getJwtAudienceUrl(createdOrgInstance?: string): Promise<string>;
+    /**
+     * Tests whether this url contains a Salesforce owned domain
+     *
+     * @return {boolean} true if this is a salesforce domain
+     */
+    isSalesforceDomain(): boolean;
+    /**
+     * Tests whether this url is an internal Salesforce domain
+     *
+     * @returns {boolean} true if this is a internal domain
+     */
+    isInternalUrl(): boolean;
+    /**
+     * Tests whether this url runs on a local machine
+     *
+     * @returns {boolean} true if this is a local machine
+     */
+    isLocalUrl(): boolean;
+    /**
+     * Tests whether this url has the lightning domain extension
+     * This method that performs the dns lookup of the host. If the lookup fails the internal polling (1 second), client will try again untill timeout
+     * If SFDX_DOMAIN_RETRY environment variable is set (number) it overrides the default timeout duration (240 seconds)
+     *
+     * @returns {Promise<true | never>} The resolved ip address or never
+     * @throws {@link SfdxError} If can't resolve DNS.
+     */
+    checkLightningDomain(): Promise<true | never>;
+    /**
+     * Method that performs the dns lookup of the host. If the lookup fails the internal polling (1 second), client will try again untill timeout
+     * If SFDX_DOMAIN_RETRY environment variable is set (number) it overrides the default timeout duration (240 seconds)
+     *
+     * @returns the resolved ip address.
+     * @throws {@link SfdxError} If can't resolve DNS.
+     */
+    lookup(): Promise<string>;
+    /**
+     * Tests whether this url is a sandbox url
+     *
+     * @param createdOrgInstance The Salesforce instance the org was created on. e.g. `cs42`
+     * @returns {boolean}
+     */
+    isSandboxUrl(createdOrgInstance?: string): boolean;
+    /**
+     * Tests whether this url is a sandbox url
+     * otherwise tryies 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

@@ -0,0 +1,180 @@
+"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.SfdcUrl = 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");
+class SfdcUrl extends url_1.URL {
+    constructor(input, base) {
+        super(input.toString(), base);
+        if (this.protocol !== 'https:' && !SfdcUrl.cache.has(this.origin)) {
+            SfdcUrl.cache.add(this.origin);
+            process.emitWarning('Using insecure protocol: ' + this.protocol + ' on url: ' + this.origin);
+        }
+    }
+    /**
+     * Returns the appropiate jwt audience url for this url
+     * Use SFDX_AUDIENCE_URL env var to override the audience url
+     *
+     * @param createdOrgInstance The Salesforce instance the org was created on. e.g. `cs42`
+     * @return {Promise<string>} The audience url
+     */
+    async getJwtAudienceUrl(createdOrgInstance) {
+        this.logger = await logger_1.Logger.child('SfdcUrl');
+        // environment variable is used as an override
+        const envVarVal = new kit_1.Env().getString('SFDX_AUDIENCE_URL', '');
+        if (envVarVal) {
+            this.logger.debug(`Audience URL overriden 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';
+        }
+        return SfdcUrl.PRODUCTION;
+    }
+    /**
+     * Tests whether this url contains a Salesforce owned domain
+     *
+     * @return {boolean} true if this is a salesforce domain
+     */
+    isSalesforceDomain() {
+        // Source https://help.salesforce.com/articleView?id=000003652&type=1
+        const allowlistOfSalesforceDomainPatterns = [
+            '.cloudforce.com',
+            '.content.force.com',
+            '.force.com',
+            '.salesforce.com',
+            '.salesforceliveagent.com',
+            '.secure.force.com',
+        ];
+        const allowlistOfSalesforceHosts = ['developer.salesforce.com', 'trailhead.salesforce.com'];
+        return allowlistOfSalesforceDomainPatterns.some((pattern) => {
+            return this.hostname.endsWith(pattern) || allowlistOfSalesforceHosts.includes(this.hostname);
+        });
+    }
+    /**
+     * Tests whether this url is an internal Salesforce domain
+     *
+     * @returns {boolean} true if this is a internal domain
+     */
+    isInternalUrl() {
+        const INTERNAL_URL_PARTS = [
+            '.vpod.',
+            'stm.salesforce.com',
+            'stm.force.com',
+            '.blitz.salesforce.com',
+            '.stm.salesforce.ms',
+            '.pc-rnd.force.com',
+            '.pc-rnd.salesforce.com',
+        ];
+        return (this.origin.startsWith('https://gs1.') ||
+            this.isLocalUrl() ||
+            INTERNAL_URL_PARTS.some((part) => this.origin.includes(part)));
+    }
+    /**
+     * Tests whether this url runs on a local machine
+     *
+     * @returns {boolean} true if this is a local machine
+     */
+    isLocalUrl() {
+        const LOCAL_PARTS = ['localhost.sfdcdev.', '.internal.'];
+        return LOCAL_PARTS.some((part) => this.origin.includes(part));
+    }
+    /**
+     * Tests whether this url has the lightning domain extension
+     * This method that performs the dns lookup of the host. If the lookup fails the internal polling (1 second), client will try again untill timeout
+     * If SFDX_DOMAIN_RETRY environment variable is set (number) it overrides the default timeout duration (240 seconds)
+     *
+     * @returns {Promise<true | never>} The resolved ip address or never
+     * @throws {@link SfdxError} If can't resolve DNS.
+     */
+    async checkLightningDomain() {
+        const domain = `https://${ts_types_1.ensureArray(/https?:\/\/([^.]*)/.exec(this.origin))
+            .slice(1, 2)
+            .pop()}.lightning.force.com`;
+        const quantity = ts_types_1.ensureNumber(new kit_1.Env().getNumber('SFDX_DOMAIN_RETRY', 240));
+        const timeout = new kit_1.Duration(quantity, kit_1.Duration.Unit.SECONDS);
+        if (this.isInternalUrl() || timeout.seconds === 0) {
+            return true;
+        }
+        const resolver = await myDomainResolver_1.MyDomainResolver.create({
+            url: new url_1.URL(domain),
+            timeout,
+            frequency: new kit_1.Duration(1, kit_1.Duration.Unit.SECONDS),
+        });
+        await resolver.resolve();
+        return true;
+    }
+    /**
+     * Method that performs the dns lookup of the host. If the lookup fails the internal polling (1 second), client will try again untill timeout
+     * If SFDX_DOMAIN_RETRY environment variable is set (number) it overrides the default timeout duration (240 seconds)
+     *
+     * @returns the resolved ip address.
+     * @throws {@link SfdxError} If can't resolve DNS.
+     */
+    async lookup() {
+        const quantity = ts_types_1.ensureNumber(new kit_1.Env().getNumber('SFDX_DOMAIN_RETRY', 240));
+        const timeout = new kit_1.Duration(quantity, kit_1.Duration.Unit.SECONDS);
+        const resolver = await myDomainResolver_1.MyDomainResolver.create({
+            url: new url_1.URL(this.origin),
+            timeout,
+            frequency: new kit_1.Duration(1, kit_1.Duration.Unit.SECONDS),
+        });
+        return resolver.resolve();
+    }
+    /**
+     * Tests whether this url is a sandbox url
+     *
+     * @param createdOrgInstance The Salesforce instance the org was created on. e.g. `cs42`
+     * @returns {boolean}
+     */
+    isSandboxUrl(createdOrgInstance) {
+        return ((createdOrgInstance && /^cs|s$/gi.test(createdOrgInstance)) ||
+            /sandbox\.my\.salesforce\.com/gi.test(this.origin) || // enhanced domains >= 230
+            /(cs[0-9]+(\.my|)\.salesforce\.com)/gi.test(this.origin) || // my domains on CS instance OR CS instance without my domain
+            /([a-z]{3}[0-9]+s\.sfdc-.+\.salesforce\.com)/gi.test(this.origin) || // falcon sandbox ex: usa2s.sfdc-whatever.salesforce.com
+            /([a-z]{3}[0-9]+s\.sfdc-.+\.force\.com)/gi.test(this.origin) || // falcon sandbox ex: usa2s.sfdc-whatever.force.com
+            this.hostname === 'test.salesforce.com');
+    }
+    /**
+     * Tests whether this url is a sandbox url
+     * otherwise tryies 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();
+        });
+    }
+}
+exports.SfdcUrl = SfdcUrl;
+/**
+ * Salesforce URLs
+ */
+SfdcUrl.SANDBOX = 'https://test.salesforce.com';
+SfdcUrl.PRODUCTION = 'https://login.salesforce.com';
+SfdcUrl.cache = new Set();
+//# sourceMappingURL=sfdcUrl.js.map

package/messages/config.json

@@ -3,6 +3,7 @@
   "InvalidConfigValue": "Invalid config value. %s",
   "InvalidInstanceUrl": "Specify a valid Salesforce instance URL",
   "InvalidApiVersion": "Specify a valid Salesforce API version, for example, 42.0",
+  "InvalidCustomOrgMetadataTemplates": "Specify a valid repository URL or directory for the custom org metadata templates.",
   "InvalidIsvDebuggerSid": "Specify a valid Debugger SID",
   "InvalidIsvDebuggerUrl": "Specify a valid Debugger URL",
   "InvalidNumberConfigValue": "Specify a valid positive integer, for example, 150000",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "2.26.1",
+  "version": "2.28.0",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "license": "BSD-3-Clause",

package/lib/util/checkLightningDomain.d.ts

@@ -1 +0,0 @@
-export default function checkLightningDomain(url: string): Promise<boolean>;

package/lib/util/checkLightningDomain.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-/*
- * 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
- */
-const url_1 = require("url");
-const kit_1 = require("@salesforce/kit");
-const myDomainResolver_1 = require("../status/myDomainResolver");
-const sfdc_1 = require("./sfdc");
-async function checkLightningDomain(url) {
-    var _a, _b;
-    const domain = `https://${(_a = /https?:\/\/([^.]*)/.exec(url)) === null || _a === void 0 ? void 0 : _a.slice(1, 2).pop()}.lightning.force.com`;
-    const quantity = (_b = new kit_1.Env().getNumber('SFDX_DOMAIN_RETRY', 240)) !== null && _b !== void 0 ? _b : 0;
-    const timeout = new kit_1.Duration(quantity, kit_1.Duration.Unit.SECONDS);
-    if (sfdc_1.sfdc.isInternalUrl(url) || timeout.seconds === 0) {
-        return true;
-    }
-    const resolver = await myDomainResolver_1.MyDomainResolver.create({
-        url: new url_1.URL(domain),
-        timeout,
-        frequency: new kit_1.Duration(1, kit_1.Duration.Unit.SECONDS),
-    });
-    await resolver.resolve();
-    return true;
-}
-exports.default = checkLightningDomain;
-//# sourceMappingURL=checkLightningDomain.js.map