@salesforce/core 3.30.9 → 3.30.11

package/lib/org/authInfo.js

@@ -1,12 +1,13 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AuthInfo = exports.DEFAULT_CONNECTED_APP_INFO = void 0;
 /*
  * Copyright (c) 2020, 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
  */
+/* eslint-disable class-methods-use-this */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AuthInfo = exports.DEFAULT_CONNECTED_APP_INFO = void 0;
 const crypto_1 = require("crypto");
 const path_1 = require("path");
 const os = require("os");
@@ -109,7 +110,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         super(options);
         // Possibly overridden in create
         this.usingAccessToken = false;
-        this.options = options || {};
+        this.options = options ?? {};
     }
     /**
      * Returns the default instance url
@@ -118,7 +119,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      */
     static getDefaultInstanceUrl() {
         const configuredInstanceUrl = configAggregator_1.ConfigAggregator.getValue(orgConfigProperties_1.OrgConfigProperties.ORG_INSTANCE_URL).value;
-        return configuredInstanceUrl || sfdcUrl_1.SfdcUrl.PRODUCTION;
+        return configuredInstanceUrl ?? sfdcUrl_1.SfdcUrl.PRODUCTION;
     }
     /**
      * Get a list of all authorizations based on auth files stored in the global directory.
@@ -143,6 +144,8 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
                 .filter((c) => aliases.includes(c.value) || c.value === username)
                 .map((c) => c.key);
             try {
+                // prevent ConfigFile collision bug
+                // eslint-disable-next-line no-await-in-loop
                 const authInfo = await AuthInfo.create({ username });
                 const { orgId, instanceUrl, devHubUsername, expirationDate, isDevHub } = authInfo.getFields();
                 final.push({
@@ -151,7 +154,8 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
                     username,
                     instanceUrl,
                     isScratchOrg: Boolean(devHubUsername),
-                    isDevHub: isDevHub || false,
+                    isDevHub: isDevHub ?? false,
+                    // eslint-disable-next-line no-await-in-loop
                     isSandbox: await stateAggregator.sandboxes.hasFile(orgId),
                     orgId: orgId,
                     accessToken: authInfo.getConnectionOptions().accessToken,
@@ -201,14 +205,14 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
     static getAuthorizationUrl(options, oauth2) {
         // Always use a verifier for enhanced security
         options.useVerifier = true;
-        const oauth2Verifier = oauth2 || new jsforce_1.OAuth2(options);
+        const oauth2Verifier = oauth2 ?? new jsforce_1.OAuth2(options);
         // The state parameter allows the redirectUri callback listener to ignore request
         // that don't contain the state value.
         const params = {
             state: (0, crypto_1.randomBytes)(Math.ceil(6)).toString('hex'),
             prompt: 'login',
             // Default connected app is 'refresh_token api web'
-            scope: options.scope || kit_1.env.getString('SFDX_AUTH_SCOPES', 'refresh_token api web'),
+            scope: options.scope ?? kit_1.env.getString('SFDX_AUTH_SCOPES', 'refresh_token api web'),
         };
         return oauth2Verifier.getAuthorizationUrl(params);
     }
@@ -281,7 +285,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      * Find all dev hubs available in the local environment.
      */
     static async getDevHubAuthInfos() {
-        return await AuthInfo.listAllAuthorizations((possibleHub) => possibleHub?.isDevHub ?? false);
+        return AuthInfo.listAllAuthorizations((possibleHub) => possibleHub?.isDevHub ?? false);
     }
     static async queryScratchOrg(devHubUsername, scratchOrgId) {
         const devHubOrg = await org_1.Org.create({ aliasOrUsername: devHubUsername });
@@ -346,7 +350,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      */
     update(authData) {
         if (authData && (0, ts_types_1.isPlainObject)(authData)) {
-            this.username = authData.username || this.username;
+            this.username = authData.username ?? this.username;
             this.stateAggregator.orgs.update(this.username, authData);
             this.logger.info(`Updated auth info for username: ${this.username}`);
         }
@@ -381,7 +385,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
             // Decrypt a user provided client secret or use the default.
             opts = {
                 oauth2: {
-                    loginUrl: instanceUrl || sfdcUrl_1.SfdcUrl.PRODUCTION,
+                    loginUrl: instanceUrl ?? sfdcUrl_1.SfdcUrl.PRODUCTION,
                     clientId: this.getClientId(),
                     redirectUri: this.getRedirectUri(),
                 },
@@ -394,7 +398,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         return opts;
     }
     getClientId() {
-        return this.getFields()?.clientId || exports.DEFAULT_CONNECTED_APP_INFO.legacyClientId;
+        return this.getFields()?.clientId ?? exports.DEFAULT_CONNECTED_APP_INFO.legacyClientId;
     }
     getRedirectUri() {
         return 'http://localhost:1717/OauthRedirect';
@@ -432,7 +436,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         const instanceUrl = (0, ts_types_1.ensure)(decryptedFields.instanceUrl, 'undefined instanceUrl').replace(/^https?:\/\//, '');
         let sfdxAuthUrl = 'force://';
         if (decryptedFields.clientId) {
-            sfdxAuthUrl += `${decryptedFields.clientId}:${decryptedFields.clientSecret || ''}:`;
+            sfdxAuthUrl += `${decryptedFields.clientId}:${decryptedFields.clientSecret ?? ''}:`;
         }
         sfdxAuthUrl += `${(0, ts_types_1.ensure)(decryptedFields.refreshToken, 'undefined refreshToken')}@${instanceUrl}`;
         return sfdxAuthUrl;
@@ -505,7 +509,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
     async init() {
         this.stateAggregator = await stateAggregator_1.StateAggregator.getInstance();
         const username = this.options.username;
-        const authOptions = this.options.oauth2Options || this.options.accessTokenOptions;
+        const authOptions = this.options.oauth2Options ?? this.options.accessTokenOptions;
         // Must specify either username and/or options
         if (!username && !authOptions) {
             throw messages.createError('authInfoCreationError');
@@ -517,7 +521,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
                 throw messages.createError('authInfoOverwriteError');
             }
         }
-        const oauthUsername = username || authOptions?.username;
+        const oauthUsername = username ?? authOptions?.username;
         if (oauthUsername) {
             this.username = oauthUsername;
             await this.stateAggregator.orgs.read(oauthUsername, false, false);
@@ -527,7 +531,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
             // Need to initAuthOptions the logger and authInfoCrypto since we don't call init()
             this.logger = await logger_1.Logger.child('AuthInfo');
             const aggregator = await configAggregator_1.ConfigAggregator.create();
-            const instanceUrl = this.getInstanceUrl(authOptions, aggregator);
+            const instanceUrl = this.getInstanceUrl(aggregator, authOptions);
             this.update({
                 accessToken: oauthUsername,
                 instanceUrl,
@@ -544,7 +548,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
             await this.initAuthOptions(authOptions);
         }
     }
-    getInstanceUrl(options, aggregator) {
+    getInstanceUrl(aggregator, options) {
         const instanceUrl = options?.instanceUrl ?? aggregator.getPropertyValue(orgConfigProperties_1.OrgConfigProperties.ORG_INSTANCE_URL);
         return instanceUrl ?? sfdcUrl_1.SfdcUrl.PRODUCTION;
     }
@@ -595,14 +599,12 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
                     // refresh token flow (from sfdxUrl or OAuth refreshFn)
                     authConfig = await this.buildRefreshTokenConfig(options);
                 }
+                else if (this.options.oauth2 instanceof jsforce_1.OAuth2) {
+                    // authcode exchange / web auth flow
+                    authConfig = await this.exchangeToken(options, this.options.oauth2);
+                }
                 else {
-                    if (this.options.oauth2 instanceof jsforce_1.OAuth2) {
-                        // authcode exchange / web auth flow
-                        authConfig = await this.exchangeToken(options, this.options.oauth2);
-                    }
-                    else {
-                        authConfig = await this.exchangeToken(options);
-                    }
+                    authConfig = await this.exchangeToken(options);
                 }
             }
             authConfig.isDevHub = await this.determineIfDevHub((0, ts_types_1.ensureString)(authConfig.instanceUrl), (0, ts_types_1.ensureString)(authConfig.accessToken));
@@ -613,6 +615,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         }
         return this;
     }
+    // eslint-disable-next-line @typescript-eslint/require-await
     async loadDecryptedAuthFromConfig(username) {
         // Fetch from the persisted auth file
         const authInfo = this.stateAggregator.orgs.get(username, true);
@@ -668,6 +671,8 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         const loginAndAudienceUrls = (0, sfdcUrl_1.getLoginAudienceCombos)(audienceUrl, loginUrl);
         for (const [login, audience] of loginAndAudienceUrls) {
             try {
+                // sequentially, in probabilistic order
+                // eslint-disable-next-line no-await-in-loop
                 authFieldsBuilder = await this.tryJwtAuth(options.clientId, login, audience, privateKeyContents);
                 break;
             }
@@ -698,7 +703,9 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
             authFields.instanceUrl = instanceUrl;
         }
         catch (err) {
-            this.logger.debug(`Instance URL [${authFieldsBuilder.instance_url}] is not available.  DNS lookup failed. Using loginUrl [${options.loginUrl}] instead. This may result in a "Destination URL not reset" error.`);
+            this.logger.debug(
+            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+            `Instance URL [${authFieldsBuilder.instance_url}] is not available.  DNS lookup failed. Using loginUrl [${options.loginUrl}] instead. This may result in a "Destination URL not reset" error.`);
             authFields.instanceUrl = options.loginUrl;
         }
         return authFields;
@@ -713,6 +720,8 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
             algorithm: 'RS256',
         });
         const oauth2 = new jsforce_1.JwtOAuth2({ loginUrl });
+        // jsforce has it types as any
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         return (0, ts_types_1.ensureJsonMap)(await oauth2.jwtAuthorize(jwtToken));
     }
     // Build OAuth config for a refresh token auth flow
@@ -734,6 +743,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         catch (err) {
             throw messages.createError('refreshTokenAuthError', [err.message]);
         }
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         const { orgId } = parseIdUrl(authFieldsBuilder.id);
         let username = this.getUsername();
@@ -746,7 +756,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
             username,
             accessToken: authFieldsBuilder.access_token,
             instanceUrl: authFieldsBuilder.instance_url,
-            loginUrl: options.loginUrl || authFieldsBuilder.instance_url,
+            loginUrl: options.loginUrl ?? authFieldsBuilder.instance_url,
             refreshToken: options.refreshToken,
             clientId: options.clientId,
             clientSecret: options.clientSecret,
@@ -779,6 +789,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         // Only need to query for the username if it isn't known. For example, a new auth code exchange
         // rather than refreshing a token on an existing connection.
         if (!username) {
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
             const userInfo = await this.retrieveUserInfo(authFields.instance_url, authFields.access_token);
             username = userInfo?.username;
@@ -788,7 +799,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
             instanceUrl: authFields.instance_url,
             orgId,
             username,
-            loginUrl: options.loginUrl || authFields.instance_url,
+            loginUrl: options.loginUrl ?? authFields.instance_url,
             refreshToken: authFields.refresh_token,
             clientId: options.clientId,
             clientSecret: options.clientSecret,
@@ -801,7 +812,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         const apiVersion = 'v51.0'; // hardcoding to v51.0 just for this call is okay.
         const instance = (0, ts_types_1.ensure)(instanceUrl);
         const baseUrl = new sfdcUrl_1.SfdcUrl(instance);
-        const userInfoUrl = `${baseUrl}services/oauth2/userinfo`;
+        const userInfoUrl = `${baseUrl.toString()}services/oauth2/userinfo`;
         const headers = Object.assign({ Authorization: `Bearer ${accessToken}` }, connection_1.SFDX_HTTP_HEADERS);
         try {
             this.logger.info(`Sending request for Username after successful auth code exchange to URL: ${userInfoUrl}`);
@@ -811,7 +822,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
             }
             else {
                 const userInfoJson = (0, kit_1.parseJsonMap)(response.body);
-                const url = `${baseUrl}/services/data/${apiVersion}/sobjects/User/${userInfoJson.user_id}`;
+                const url = `${baseUrl.toString()}/services/data/${apiVersion}/sobjects/User/${userInfoJson.user_id}`;
                 this.logger.info(`Sending request for User SObject after successful auth code exchange to URL: ${url}`);
                 response = await new transport_1.default().httpRequest({ url, method: 'GET', headers });
                 if (response.statusCode >= 400) {
@@ -863,7 +874,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         const apiVersion = 'v51.0'; // hardcoding to v51.0 just for this call is okay.
         const instance = (0, ts_types_1.ensure)(instanceUrl);
         const baseUrl = new sfdcUrl_1.SfdcUrl(instance);
-        const scratchOrgInfoUrl = `${baseUrl}/services/data/${apiVersion}/query?q=SELECT%20Id%20FROM%20ScratchOrgInfo%20limit%201`;
+        const scratchOrgInfoUrl = `${baseUrl.toString()}/services/data/${apiVersion}/query?q=SELECT%20Id%20FROM%20ScratchOrgInfo%20limit%201`;
         const headers = Object.assign({ Authorization: `Bearer ${accessToken}` }, connection_1.SFDX_HTTP_HEADERS);
         try {
             const res = await new transport_1.default().httpRequest({ url: scratchOrgInfoUrl, method: 'GET', headers });

package/lib/org/authRemover.js

@@ -59,6 +59,8 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
         const auths = this.findAllAuths();
         const usernames = Object.keys(auths);
         for (const username of usernames) {
+            // prevent ConfigFile collision bug
+            // eslint-disable-next-line no-await-in-loop
             await this.removeAuth(username);
         }
     }
@@ -81,10 +83,9 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
      */
     findAllAuths() {
         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 };
-        }, {});
+        return orgs.reduce((x, y) => 
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        ({ ...x, [y.username]: y }), {});
     }
     async init() {
         this.logger = await logger_1.Logger.child(this.constructor.name);
@@ -98,6 +99,7 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
      * @param usernameOrAlias username or alias
      * @returns {Promise<string>}
      */
+    // eslint-disable-next-line @typescript-eslint/require-await
     async resolveUsername(usernameOrAlias) {
         return this.stateAggregator.aliases.resolveUsername(usernameOrAlias);
     }
@@ -127,7 +129,7 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
      */
     async unsetConfigValues(username) {
         const aliases = this.getAliases(username);
-        this.logger.debug(`Clearing config keys for username ${username} and aliases: ${aliases}`);
+        this.logger.debug(`Clearing config keys for username ${username} and aliases: ${aliases.join(',')}`);
         const configs = [this.config.getGlobalConfig(), this.config.getLocalConfig()];
         for (const config of configs) {
             if (config) {
@@ -137,7 +139,7 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
                     .filter((k) => !!k)
                     .reduce((x, y) => x.concat(y), []);
                 const allKeys = keysWithUsername.concat(keysWithAlias);
-                this.logger.debug(`Found these config keys to remove: ${allKeys}`);
+                this.logger.debug(`Found these config keys to remove: ${allKeys.join(',')}`);
                 allKeys.forEach((key) => {
                     try {
                         config.unset(key);
@@ -146,6 +148,8 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
                         this.logger.debug(`Failed to remove ${key}`);
                     }
                 });
+                // prevent ConfigFile collision bug
+                // eslint-disable-next-line no-await-in-loop
                 await config.write();
             }
         }
@@ -160,7 +164,7 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
         const existingAliases = this.stateAggregator.aliases.getAll(username);
         if (existingAliases.length === 0)
             return;
-        this.logger.debug(`Found these aliases to remove: ${existingAliases}`);
+        this.logger.debug(`Found these aliases to remove: ${existingAliases.join(',')}`);
         existingAliases.forEach((alias) => this.stateAggregator.aliases.unset(alias));
         await this.stateAggregator.aliases.write();
     }

package/lib/org/connection.d.ts

@@ -37,10 +37,6 @@ export interface Tooling<S extends Schema = Schema> extends JSForceTooling<S> {
  * ```
  */
 export declare class Connection<S extends Schema = Schema> extends JSForceConnection<S> {
-    /**
-     * Tooling api reference.
-     */
-    get tooling(): Tooling<S>;
     private logger;
     private options;
     private username;
@@ -52,6 +48,10 @@ export declare class Connection<S extends Schema = Schema> extends JSForceConnec
      * @ignore
      */
     constructor(options: Connection.Options<S>);
+    /**
+     * Tooling api reference.
+     */
+    get tooling(): Tooling<S>;
     /**
      * Creates an instance of a Connection. Performs additional async initializations.
      *

package/lib/org/connection.js

@@ -26,8 +26,9 @@ const messages = messages_1.Messages.load('@salesforce/core', 'connection', [
     'incorrectAPIVersionError',
     'domainNotFoundError',
     'noInstanceUrlError',
+    'noApiVersionsError',
 ]);
-const clientId = `sfdx toolbelt:${process.env.SFDX_SET_CLIENT_IDS || ''}`;
+const clientId = `sfdx toolbelt:${process.env.SFDX_SET_CLIENT_IDS ?? ''}`;
 exports.SFDX_HTTP_HEADERS = {
     'content-type': 'application/json',
     'user-agent': clientId,
@@ -57,11 +58,10 @@ class Connection extends jsforce_1.Connection {
      * @ignore
      */
     constructor(options) {
-        super(options.connectionOptions || {});
+        super(options.connectionOptions ?? {});
         this.options = options;
         this.username = options.authInfo.getUsername();
     }
-    // The following are all initialized in either this constructor or the super constructor, sometimes conditionally...
     /**
      * Tooling api reference.
      */
@@ -82,7 +82,7 @@ class Connection extends jsforce_1.Connection {
         };
         if (!baseOptions.version) {
             // Set the API version obtained from the config aggregator.
-            const configAggregator = options.configAggregator || (await configAggregator_1.ConfigAggregator.create());
+            const configAggregator = options.configAggregator ?? (await configAggregator_1.ConfigAggregator.create());
             baseOptions.version = (0, ts_types_1.asString)(configAggregator.getInfo('org-api-version').value);
         }
         const providedOptions = options.authInfo.getConnectionOptions();
@@ -157,6 +157,7 @@ class Connection extends jsforce_1.Connection {
      */
     baseUrl() {
         // essentially the same as pathJoin(super.instanceUrl, 'services', 'data', `v${super.version}`);
+        // eslint-disable-next-line no-underscore-dangle
         return super._baseUrl();
     }
     /**
@@ -178,6 +179,11 @@ class Connection extends jsforce_1.Connection {
     async retrieveMaxApiVersion() {
         await this.isResolvable();
         const versions = await this.request(`${this.instanceUrl}/services/data`);
+        // if the server doesn't return a list of versions, it's possibly a instanceUrl issue where the local file is out of date.
+        if (!Array.isArray(versions)) {
+            this.logger.debug(`server response for retrieveMaxApiVersion: ${versions}`);
+            throw messages.createError('noApiVersionsError');
+        }
         this.logger.debug(`response for org versions: ${versions.map((item) => item.version).join(',')}`);
         const max = (0, ts_types_1.ensure)((0, kit_1.maxBy)(versions, (version) => version.version));
         return max.version;
@@ -272,6 +278,7 @@ class Connection extends jsforce_1.Connection {
      * @param url Partial url.
      */
     normalizeUrl(url) {
+        // eslint-disable-next-line no-underscore-dangle
         return this._normalizeUrl(url);
     }
     /**
@@ -285,7 +292,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(orgConfigProperties_1.OrgConfigProperties.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,
@@ -312,7 +319,8 @@ class Connection extends jsforce_1.Connection {
         }
         if (result.totalSize > 1) {
             throw new sfError_1.SfError(options.returnChoicesOnMultiple
-                ? `Multiple records found. ${result.records.map((item) => item[options.choiceField]).join(',')}`
+                ? // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+                    `Multiple records found. ${result.records.map((item) => item[options.choiceField]).join(',')}`
                 : 'The query returned more than 1 record', exports.SingleRecordQueryErrors.MultipleRecords);
         }
         return result.records[0];

package/lib/org/index.js

@@ -7,7 +7,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/org/org.js

@@ -5,6 +5,7 @@
  * 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
  */
+/* eslint-disable class-methods-use-this */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Org = exports.SandboxEvents = exports.OrgTypes = void 0;
 const path_1 = require("path");
@@ -104,14 +105,14 @@ class Org extends kit_1.AsyncOptionalCreatable {
         async: false,
         interval: kit_1.Duration.seconds(30),
     }) {
-        this.logger.debug(`CreateSandbox called with SandboxRequest: ${sandboxReq}`);
+        this.logger.debug(`CreateSandbox called with SandboxRequest: ${JSON.stringify(sandboxReq, undefined, 2)}`);
         const createResult = await this.connection.tooling.create('SandboxInfo', sandboxReq);
-        this.logger.debug(`Return from calling tooling.create: ${createResult}`);
+        this.logger.debug(`Return from calling tooling.create: ${JSON.stringify(createResult, undefined, 2)}`);
         if (Array.isArray(createResult) || !createResult.success) {
             throw messages.createError('sandboxInfoCreateFailed', [JSON.stringify(createResult)]);
         }
         const sandboxCreationProgress = await this.querySandboxProcessBySandboxInfoId(createResult.id);
-        this.logger.debug(`Return from calling singleRecordQuery with tooling: ${sandboxCreationProgress}`);
+        this.logger.debug(`Return from calling singleRecordQuery with tooling: ${JSON.stringify(sandboxCreationProgress, undefined, 2)}`);
         const isAsync = !!options.async;
         if (isAsync) {
             // The user didn't want us to poll, so simply return the status
@@ -119,7 +120,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
             return sandboxCreationProgress;
         }
         const [wait, pollInterval] = this.validateWaitOptions(options);
-        this.logger.debug(`create - pollStatusAndAuth sandboxProcessObj ${sandboxCreationProgress}, max wait time of ${wait.minutes} minutes`);
+        this.logger.debug(`create - pollStatusAndAuth sandboxProcessObj ${JSON.stringify(sandboxCreationProgress, undefined, 2)}, max wait time of ${wait.minutes} minutes`);
         return this.pollStatusAndAuth({
             sandboxProcessObj: sandboxCreationProgress,
             wait,
@@ -151,7 +152,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
         async: false,
         interval: kit_1.Duration.seconds(30),
     }) {
-        this.logger.debug(`ResumeSandbox called with ResumeSandboxRequest: ${resumeSandboxRequest}`);
+        this.logger.debug(`ResumeSandbox called with ResumeSandboxRequest: ${JSON.stringify(resumeSandboxRequest, undefined, 2)}`);
         let sandboxCreationProgress;
         // seed the sandboxCreationProgress via the resumeSandboxRequest options
         if (resumeSandboxRequest.SandboxName) {
@@ -165,7 +166,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
                 resumeSandboxRequest.SandboxName ?? resumeSandboxRequest.SandboxProcessObjId,
             ]);
         }
-        this.logger.debug(`Return from calling singleRecordQuery with tooling: ${sandboxCreationProgress}`);
+        this.logger.debug(`Return from calling singleRecordQuery with tooling: ${JSON.stringify(sandboxCreationProgress, undefined, 2)}`);
         await lifecycleEvents_1.Lifecycle.getInstance().emit(SandboxEvents.EVENT_RESUME, sandboxCreationProgress);
         const [wait, pollInterval] = this.validateWaitOptions(options);
         // if wait is 0, return the sandboxCreationProgress immediately
@@ -176,7 +177,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
                 if (sandboxInfo) {
                     await lifecycleEvents_1.Lifecycle.getInstance().emit(SandboxEvents.EVENT_AUTH, sandboxInfo);
                     try {
-                        this.logger.debug(`sandbox signup complete with ${sandboxInfo}`);
+                        this.logger.debug(`sandbox signup complete with ${JSON.stringify(sandboxInfo, undefined, 2)}`);
                         await this.writeSandboxAuthFile(sandboxCreationProgress, sandboxInfo);
                         return sandboxCreationProgress;
                     }
@@ -188,7 +189,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
             await lifecycleEvents_1.Lifecycle.getInstance().emit(SandboxEvents.EVENT_ASYNC_RESULT, sandboxCreationProgress);
             throw messages.createError('sandboxCreateNotComplete');
         }
-        this.logger.debug(`resume - pollStatusAndAuth sandboxProcessObj ${sandboxCreationProgress}, max wait time of ${wait.minutes} minutes`);
+        this.logger.debug(`resume - pollStatusAndAuth sandboxProcessObj ${JSON.stringify(sandboxCreationProgress, undefined, 2)}, max wait time of ${wait.minutes} minutes`);
         return this.pollStatusAndAuth({
             sandboxProcessObj: sandboxCreationProgress,
             wait,
@@ -236,7 +237,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
             }
             throw err;
         }
-        return this.manageDelete(async () => await fs.promises.rmdir(dataPath), dataPath, throwWhenRemoveFails);
+        return this.manageDelete(async () => fs.promises.rmdir(dataPath), dataPath, throwWhenRemoveFails);
     }
     /**
      * @ignore
@@ -449,7 +450,11 @@ class Org extends kit_1.AsyncOptionalCreatable {
      */
     async setTracksSource(value) {
         const originalAuth = await authInfo_1.AuthInfo.create({ username: this.getUsername() });
-        originalAuth.handleAliasAndDefaultSettings({ setDefault: false, setDefaultDevHub: false, setTracksSource: value });
+        return originalAuth.handleAliasAndDefaultSettings({
+            setDefault: false,
+            setDefaultDevHub: false,
+            setTracksSource: value,
+        });
     }
     /**
      * Returns `true` if the org is a scratch org.
@@ -660,14 +665,14 @@ class Org extends kit_1.AsyncOptionalCreatable {
      * Returns an org field. Returns undefined if the field is not set or invalid.
      */
     getField(key) {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        /* eslint-disable @typescript-eslint/ban-ts-comment, @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-assignment */
         // @ts-ignore Legacy. We really shouldn't be doing this.
         const ownProp = this[key];
         if (ownProp && typeof ownProp !== 'function')
             return ownProp;
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         return this.getConnection().getAuthInfoFields()[key];
+        /* eslint-enable @typescript-eslint/ban-ts-comment, @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-assignment */
     }
     /**
      * Returns a map of requested fields.
@@ -740,7 +745,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
                 const aliasOrUsername = this.options.isDevHub
                     ? this.configAggregator.getPropertyValue(orgConfigProperties_1.OrgConfigProperties.TARGET_DEV_HUB)
                     : this.configAggregator.getPropertyValue(orgConfigProperties_1.OrgConfigProperties.TARGET_ORG);
-                this.options.aliasOrUsername = aliasOrUsername || undefined;
+                this.options.aliasOrUsername = aliasOrUsername ?? undefined;
             }
             const username = stateAggregator.aliases.resolveUsername(this.options.aliasOrUsername);
             if (!username) {
@@ -759,6 +764,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
     /**
      * **Throws** *{@link SfError}{ name: 'NotSupportedError' }* Throws an unsupported error.
      */
+    // eslint-disable-next-line class-methods-use-this
     getDefaultOptions() {
         throw new sfError_1.SfError('Not Supported', 'NotSupportedError');
     }
@@ -788,7 +794,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
         interval: kit_1.Duration.seconds(30),
     }) {
         const [wait, pollInterval] = this.validateWaitOptions(options);
-        this.logger.debug(`AuthWithRetries sandboxProcessObj ${sandboxProcessObj}, max wait time of ${wait.minutes} minutes`);
+        this.logger.debug(`AuthWithRetries sandboxProcessObj ${JSON.stringify(sandboxProcessObj, undefined, 2)}, max wait time of ${wait.minutes} minutes`);
         return this.pollStatusAndAuth({
             sandboxProcessObj,
             wait,
@@ -817,6 +823,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
             throw messages.createError('SandboxProcessNotFoundBySandboxName', [sandboxNameIn]);
         }
     }
+    // eslint-disable-next-line class-methods-use-this
     async queryProduction(org, field, value) {
         return org.connection.singleRecordQuery(`SELECT SandboxInfoId FROM SandboxProcess WHERE ${field} ='${value}' AND Status NOT IN ('D', 'E')`, { tooling: true });
     }
@@ -1038,7 +1045,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
                 timestamp: new Date().toISOString(),
             };
             await this.setSandboxConfig(sandboxOrgId, sfSandbox);
-            (await stateAggregator_1.StateAggregator.getInstance()).sandboxes.write(sandboxOrgId);
+            await (await stateAggregator_1.StateAggregator.getInstance()).sandboxes.write(sandboxOrgId);
             await lifecycleEvents_1.Lifecycle.getInstance().emit(SandboxEvents.EVENT_RESULT, {
                 sandboxProcessObj,
                 sandboxRes,
@@ -1124,6 +1131,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
                 callbackUrl,
             };
             this.logger.debug('Calling sandboxAuth with SandboxUserAuthRequest', sandboxReq);
+            // eslint-disable-next-line no-underscore-dangle
             const url = `${this.connection.tooling._baseUrl()}/sandboxAuth`;
             const params = {
                 method: 'POST',

package/lib/org/scratchOrgCreate.js

@@ -83,7 +83,7 @@ const scratchOrgResume = async (jobId) => {
     const configAggregator = await configAggregator_1.ConfigAggregator.create();
     await (0, scratchOrgLifecycleEvents_1.emit)({ stage: 'deploy settings', scratchOrgInfo: soi });
     const settingsGenerator = new scratchOrgSettingsGenerator_1.default();
-    settingsGenerator.extract({ ...soi, ...definitionjson });
+    await settingsGenerator.extract({ ...soi, ...definitionjson });
     const [authInfo] = await Promise.all([
         (0, scratchOrgInfoApi_1.resolveUrl)(scratchOrgAuthInfo),
         (0, scratchOrgInfoApi_1.deploySettings)(scratchOrg, settingsGenerator, apiVersion ??
@@ -144,6 +144,7 @@ const scratchOrgCreate = async (options) => {
     cache.set(scratchOrgInfoId, {
         hubUsername: hubOrg.getUsername(),
         hubBaseUrl: hubOrg.getField(org_1.Org.Fields.INSTANCE_URL)?.toString(),
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         definitionjson: { ...(definitionjson ? JSON.parse(definitionjson) : {}), ...orgConfig, ...settings },
         clientSecret,
         alias,

package/lib/org/scratchOrgInfoApi.js

@@ -63,8 +63,8 @@ const buildOAuth2Options = async (options) => {
     logger.debug(`isJwtFlow: ${isJwtFlow}`);
     if (isJwtFlow && !process.env.SFDX_CLIENT_SECRET) {
         oauth2Options.privateKeyFile = options.hubOrg.getConnection().getAuthInfoFields().privateKey;
-        const retries = options?.retry || kit_1.env.getNumber('SFDX_JWT_AUTH_RETRY_ATTEMPTS') || 0;
-        const timeoutInSeconds = kit_1.env.getNumber('SFDX_JWT_AUTH_RETRY_TIMEOUT') || 300;
+        const retries = options?.retry ?? kit_1.env.getNumber('SFDX_JWT_AUTH_RETRY_ATTEMPTS') ?? 0;
+        const timeoutInSeconds = kit_1.env.getNumber('SFDX_JWT_AUTH_RETRY_TIMEOUT') ?? 300;
         const timeout = kit_1.Duration.seconds(timeoutInSeconds).milliseconds;
         const delay = retries ? timeout / retries : 1000;
         return {
@@ -137,9 +137,7 @@ const getAuthInfo = async (options) => {
  * @param id Record ID for the ScratchOrgInfoObject
  * @returns Promise<ScratchOrgInfo>
  */
-const queryScratchOrgInfo = async (hubOrg, id) => {
-    return (await hubOrg.getConnection().sobject('ScratchOrgInfo').retrieve(id));
-};
+const queryScratchOrgInfo = async (hubOrg, id) => (await hubOrg.getConnection().sobject('ScratchOrgInfo').retrieve(id));
 exports.queryScratchOrgInfo = queryScratchOrgInfo;
 /**
  * after we successfully signup an org we need to trade the auth token for access and refresh token.
@@ -300,7 +298,7 @@ timeout = kit_1.Duration.minutes(15)) => {
     const client = await pollingClient_1.PollingClient.create(pollingOptions);
     try {
         const resultInProgress = await client.subscribe();
-        return (0, scratchOrgErrorCodes_1.checkScratchOrgInfoForErrors)(resultInProgress, hubOrg.getUsername());
+        return await (0, scratchOrgErrorCodes_1.checkScratchOrgInfoForErrors)(resultInProgress, hubOrg.getUsername());
     }
     catch (error) {
         if (error instanceof Error) {

package/lib/org/scratchOrgInfoGenerator.d.ts

@@ -9,6 +9,7 @@ export interface ScratchOrgInfoPayload extends PartialScratchOrgInfo {
     connectedAppConsumerKey: string;
     namespace: string;
     connectedAppCallbackUrl: string;
+    durationDays: number;
 }
 /**
  * Generates the package2AncestorIds scratch org property