@salesforce/core 3.23.8 → 3.24.1

package/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 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.24.1](https://github.com/forcedotcom/sfdx-core/compare/v3.24.0...v3.24.1) (2022-07-21)
+
+### Bug Fixes
+
+- bump jsforce ([#622](https://github.com/forcedotcom/sfdx-core/issues/622)) ([c7b53b7](https://github.com/forcedotcom/sfdx-core/commit/c7b53b73977012f81e029a15f39c3fb35bc1041d))
+
+## [3.24.0](https://github.com/forcedotcom/sfdx-core/compare/v3.23.9...v3.24.0) (2022-07-14)
+
+### Features
+
+- org.scratchOrgCreate uses all options except hub ([045a7aa](https://github.com/forcedotcom/sfdx-core/commit/045a7aa56c97323aa8b3191c4879cd1b43f0cfb1))
+
+### Bug Fixes
+
+- align messages/files ([5a5f04d](https://github.com/forcedotcom/sfdx-core/commit/5a5f04d3ea8ffb30fdbbfe2c83824ec56a56ec34))
+- load messages by name ([7c3a2d9](https://github.com/forcedotcom/sfdx-core/commit/7c3a2d9d84f9553bb9cf1bc369b49ca46100484e))
+- use named messages always ([2bb25a9](https://github.com/forcedotcom/sfdx-core/commit/2bb25a9c24fcb7146e363783ea81bc3708060a18))
+
+### [3.23.9](https://github.com/forcedotcom/sfdx-core/compare/v3.23.8...v3.23.9) (2022-07-14)
+
 ### [3.23.8](https://github.com/forcedotcom/sfdx-core/compare/v3.23.7...v3.23.8) (2022-07-13)
 
 ### Bug Fixes

package/lib/config/config.js

@@ -245,7 +245,7 @@ class Config extends configFile_1.ConfigFile {
     constructor(options) {
         super(Object.assign({
             isGlobal: false,
-        }, options !== null && options !== void 0 ? options : {}, {
+        }, options ?? {}, {
             // Don't let consumers of config override this. If they really really want to,
             // they can extend this class.
             isState: true,
@@ -319,7 +319,7 @@ class Config extends configFile_1.ConfigFile {
     }
     static getPropertyConfigMeta(propertyName) {
         const prop = Config.propertyConfigMap()[propertyName];
-        if ((prop === null || prop === void 0 ? void 0 : prop.deprecated) && (prop === null || prop === void 0 ? void 0 : prop.newKey)) {
+        if (prop?.deprecated && prop?.newKey) {
             return Config.propertyConfigMap()[prop.newKey];
         }
         return prop;
@@ -400,7 +400,7 @@ class Config extends configFile_1.ConfigFile {
                 super.set(property.key, value);
             }
             else {
-                let valueError = (value === null || value === void 0 ? void 0 : value.toString()) || '';
+                let valueError = value?.toString() || '';
                 if (property.input.failedMessage) {
                     valueError = (0, ts_types_1.isString)(property.input.failedMessage)
                         ? property.input.failedMessage
@@ -460,8 +460,7 @@ class Config extends configFile_1.ConfigFile {
      */
     async cryptProperties(encrypt) {
         const hasEncryptedProperties = this.entries().some(([key]) => {
-            var _a;
-            return !!((_a = Config.propertyConfigMap()[key]) === null || _a === void 0 ? void 0 : _a.encrypted);
+            return !!Config.propertyConfigMap()[key]?.encrypted;
         });
         if (hasEncryptedProperties) {
             await this.initCrypto();
@@ -553,12 +552,11 @@ class SfdxConfig {
      * - For example, target-org will be renamed to defaultusername.
      */
     translate(contents, direction) {
-        var _a;
         const translated = {};
         for (const [key, value] of Object.entries(contents)) {
             const propConfig = direction === 'toNew'
                 ? this.config.getPropertyConfig(key)
-                : (_a = Config.getAllowedProperties().find((c) => c.newKey === key)) !== null && _a !== void 0 ? _a : {};
+                : Config.getAllowedProperties().find((c) => c.newKey === key) ?? {};
             if (propConfig.deprecated && propConfig.newKey) {
                 const normalizedKey = direction === 'toNew' ? propConfig.newKey : propConfig.key;
                 translated[normalizedKey] = value;

package/lib/config/configAggregator.js

@@ -65,7 +65,7 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
         if (ConfigAggregator.encrypted) {
             await config.loadProperties();
         }
-        if (options === null || options === void 0 ? void 0 : options.customConfigMeta) {
+        if (options?.customConfigMeta) {
             config_1.Config.addAllowedProperties(options.customConfigMeta);
         }
         return ConfigAggregator.instance;
@@ -137,7 +137,6 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
      * @param throwOnDeprecation True, if you want an error throw when reading a deprecated config
      */
     getInfo(key, throwOnDeprecation = false) {
-        var _a;
         const meta = this.getPropertyMeta(key);
         if (throwOnDeprecation && meta.deprecated && meta.newKey) {
             throw messages.createError('deprecatedConfigKey', [key, meta.newKey]);
@@ -151,7 +150,7 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
             isLocal: () => location === "Local" /* LOCAL */,
             isGlobal: () => location === "Global" /* GLOBAL */,
             isEnvVar: () => location === "Environment" /* ENVIRONMENT */,
-            deprecated: (_a = meta.deprecated) !== null && _a !== void 0 ? _a : false,
+            deprecated: meta.deprecated ?? false,
         };
     }
     /**
@@ -332,14 +331,14 @@ class SfdxConfigAggregator extends ConfigAggregator {
         if (SfdxConfigAggregator.encrypted) {
             await config.loadProperties();
         }
-        if (options === null || options === void 0 ? void 0 : options.customConfigMeta) {
+        if (options?.customConfigMeta) {
             config_1.Config.addAllowedProperties(options.customConfigMeta);
         }
         return SfdxConfigAggregator.instance;
     }
     getPropertyMeta(key) {
         const match = this.getAllowedProperties().find((element) => key === element.key);
-        if ((match === null || match === void 0 ? void 0 : match.deprecated) && (match === null || match === void 0 ? void 0 : match.newKey)) {
+        if (match?.deprecated && match?.newKey) {
             return this.getPropertyMeta(match.newKey);
         }
         else if (match) {
@@ -370,10 +369,9 @@ class SfdxConfigAggregator extends ConfigAggregator {
         });
     }
     translate(key, direction = 'toNew') {
-        var _a;
         const propConfig = direction === 'toNew'
             ? this.getPropertyMeta(key)
-            : (_a = config_1.Config.getAllowedProperties().find((c) => c.newKey === key)) !== null && _a !== void 0 ? _a : {};
+            : config_1.Config.getAllowedProperties().find((c) => c.newKey === key) ?? {};
         return propConfig.key || key;
     }
 }

package/lib/config/configStore.js

@@ -205,8 +205,7 @@ class BaseConfigStore extends kit_1.AsyncOptionalCreatable {
         });
     }
     getEncryptedKeys() {
-        var _a, _b;
-        return [...(((_a = this.options) === null || _a === void 0 ? void 0 : _a.encryptedKeys) || []), ...(((_b = this.statics) === null || _b === void 0 ? void 0 : _b.encryptedKeys) || [])];
+        return [...(this.options?.encryptedKeys || []), ...(this.statics?.encryptedKeys || [])];
     }
     /**
      * This config file has encrypted keys and it should attempt to encrypt them.

package/lib/config/envVars.js

@@ -408,9 +408,8 @@ class EnvVars extends kit_1.Env {
         return 'SFDX_';
     }
     getPropertyFromEnv(property, prefix = EnvVars.defaultPrefix()) {
-        var _a;
         const envName = EnvVars.propertyToEnvName(property, prefix);
-        const synonym = (_a = exports.SUPPORTED_ENV_VARS[envName]) === null || _a === void 0 ? void 0 : _a.synonymOf;
+        const synonym = exports.SUPPORTED_ENV_VARS[envName]?.synonymOf;
         return this.get(envName) || this.get(synonym);
     }
     asDictionary() {

package/lib/deviceOauthService.d.ts

@@ -1,7 +1,7 @@
 import { AsyncCreatable } from '@salesforce/kit';
-import { OAuth2Config } from 'jsforce/lib/oauth2';
+import { OAuth2Config } from 'jsforce';
 import { JsonMap, Nullable } from '@salesforce/ts-types';
-import { AuthInfo } from './org/authInfo';
+import { AuthInfo } from './org';
 export interface DeviceCodeResponse extends JsonMap {
     device_code: string;
     interval: number;

package/lib/deviceOauthService.js

@@ -14,9 +14,8 @@ const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const FormData = require("form-data");
 const logger_1 = require("./logger");
-const authInfo_1 = require("./org/authInfo");
+const org_1 = require("./org");
 const sfError_1 = require("./sfError");
-const connection_1 = require("./org/connection");
 const messages_1 = require("./messages");
 messages_1.Messages.importMessagesDirectory(__dirname);
 const messages = messages_1.Messages.load('@salesforce/core', 'auth', ['pollingTimeout']);
@@ -59,9 +58,9 @@ class DeviceOauthService extends kit_1.AsyncCreatable {
         this.pollingCount = 0;
         this.options = options;
         if (!this.options.clientId)
-            this.options.clientId = authInfo_1.DEFAULT_CONNECTED_APP_INFO.clientId;
+            this.options.clientId = org_1.DEFAULT_CONNECTED_APP_INFO.clientId;
         if (!this.options.loginUrl)
-            this.options.loginUrl = authInfo_1.AuthInfo.getDefaultInstanceUrl();
+            this.options.loginUrl = org_1.AuthInfo.getDefaultInstanceUrl();
     }
     /**
      * Begin the authorization flow by requesting the login
@@ -90,7 +89,7 @@ class DeviceOauthService extends kit_1.AsyncCreatable {
      * @returns {Promise<AuthInfo>}
      */
     async authorizeAndSave(approval) {
-        const authInfo = await authInfo_1.AuthInfo.create({
+        const authInfo = await org_1.AuthInfo.create({
             oauth2Options: {
                 loginUrl: approval.instance_url,
                 refreshToken: approval.refresh_token,
@@ -113,7 +112,7 @@ class DeviceOauthService extends kit_1.AsyncCreatable {
         form.append('scope', DeviceOauthService.SCOPE);
         return {
             url,
-            headers: { ...connection_1.SFDX_HTTP_HEADERS, ...form.getHeaders() },
+            headers: { ...org_1.SFDX_HTTP_HEADERS, ...form.getHeaders() },
             method: 'POST',
             body: form.getBuffer(),
         };
@@ -125,7 +124,7 @@ class DeviceOauthService extends kit_1.AsyncCreatable {
         form.append('code', code);
         return {
             url,
-            headers: { ...connection_1.SFDX_HTTP_HEADERS, ...form.getHeaders() },
+            headers: { ...org_1.SFDX_HTTP_HEADERS, ...form.getHeaders() },
             method: 'POST',
             body: form.getBuffer(),
         };

package/lib/org/authInfo.d.ts

@@ -1,16 +1,8 @@
 import { AsyncOptionalCreatable } from '@salesforce/kit';
 import { Nullable } from '@salesforce/ts-types';
-import { OAuth2, OAuth2Config as JsforceOAuth2Config } from 'jsforce';
+import { JwtOAuth2Config, OAuth2 } from 'jsforce';
 import { Connection } from './connection';
 import { Org } from './org';
-export declare type OAuth2Config = JsforceOAuth2Config & {
-    privateKey?: string;
-    privateKeyFile?: string;
-    authCode?: string;
-    refreshToken?: string;
-    loginUrl?: string;
-    username?: string;
-};
 /**
  * Fields for authorization, org, and local information.
  */
@@ -86,7 +78,7 @@ export declare type ConnectionOptions = AuthFields & {
     /**
      * OAuth options.
      */
-    oauth2?: Partial<OAuth2Config>;
+    oauth2?: Partial<JwtOAuth2Config>;
     /**
      * Refresh token callback.
      */
@@ -169,7 +161,7 @@ export declare class AuthInfo extends AsyncOptionalCreatable<AuthInfo.Options> {
      *
      * @param options The options to generate the URL.
      */
-    static getAuthorizationUrl(options: OAuth2Config & {
+    static getAuthorizationUrl(options: JwtOAuth2Config & {
         scope?: string;
     }, oauth2?: OAuth2): string;
     /**
@@ -335,7 +327,7 @@ export declare namespace AuthInfo {
         /**
          * OAuth options.
          */
-        oauth2Options?: OAuth2Config;
+        oauth2Options?: JwtOAuth2Config;
         /**
          * Options for the access token auth.
          */

package/lib/org/authInfo.js

@@ -40,20 +40,6 @@ const messages = messages_1.Messages.load('@salesforce/core', 'core', [
     'authCodeExchangeError',
     'missingClientId',
 ]);
-// Extend OAuth2 to add JWT Bearer Token Flow support.
-class JwtOAuth2 extends jsforce_1.OAuth2 {
-    constructor(options) {
-        super(options);
-    }
-    jwtAuthorize(innerToken) {
-        // @ts-ignore
-        return super._postParams({
-            // eslint-disable-next-line camelcase
-            grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
-            assertion: innerToken,
-        });
-    }
-}
 // parses the id field returned from jsForce oauth2 methods to get
 // user ID and org ID.
 function parseIdUrl(idUrl) {
@@ -144,14 +130,13 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      * @returns {Promise<OrgAuthorization[]>}
      */
     static async listAllAuthorizations(orgAuthFilter = (orgAuth) => !!orgAuth) {
-        var _a;
         const stateAggregator = await stateAggregator_1.StateAggregator.getInstance();
         const config = (await configAggregator_1.ConfigAggregator.create()).getConfigInfo();
         const orgs = await stateAggregator.orgs.readAll();
         const final = [];
         for (const org of orgs) {
             const username = (0, ts_types_1.ensureString)(org.username);
-            const aliases = (_a = stateAggregator.aliases.getAll(username)) !== null && _a !== void 0 ? _a : undefined;
+            const aliases = stateAggregator.aliases.getAll(username) ?? undefined;
             // Get a list of configuration values that are set to either the username or one
             // of the aliases
             const configs = config
@@ -296,7 +281,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      * Find all dev hubs available in the local environment.
      */
     static async getDevHubAuthInfos() {
-        return await AuthInfo.listAllAuthorizations((possibleHub) => { var _a; return (_a = possibleHub === null || possibleHub === void 0 ? void 0 : possibleHub.isDevHub) !== null && _a !== void 0 ? _a : false; });
+        return await AuthInfo.listAllAuthorizations((possibleHub) => possibleHub?.isDevHub ?? false);
     }
     static async queryScratchOrg(devHubUsername, scratchOrgId) {
         const devHubOrg = await org_1.Org.create({ aliasOrUsername: devHubUsername });
@@ -409,8 +394,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         return opts;
     }
     getClientId() {
-        var _a;
-        return ((_a = this.getFields()) === null || _a === void 0 ? void 0 : _a.clientId) || exports.DEFAULT_CONNECTED_APP_INFO.legacyClientId;
+        return this.getFields()?.clientId || exports.DEFAULT_CONNECTED_APP_INFO.legacyClientId;
     }
     getRedirectUri() {
         return 'http://localhost:1717/OauthRedirect';
@@ -421,8 +405,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      * @param decrypt Decrypt the fields.
      */
     getFields(decrypt) {
-        var _a;
-        return (_a = this.stateAggregator.orgs.get(this.username, decrypt)) !== null && _a !== void 0 ? _a : {};
+        return this.stateAggregator.orgs.get(this.username, decrypt) ?? {};
     }
     /**
      * Get the org front door (used for web based oauth flows)
@@ -498,7 +481,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         }
         const username = (0, ts_types_1.ensureString)(this.getUsername());
         const alias = this.stateAggregator.aliases.get(username);
-        const value = alias !== null && alias !== void 0 ? alias : username;
+        const value = alias ?? username;
         if (options.org) {
             config.set(orgConfigProperties_1.OrgConfigProperties.TARGET_ORG, value);
         }
@@ -522,7 +505,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');
@@ -534,7 +517,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
                 throw messages.createError('authInfoOverwriteError');
             }
         }
-        const oauthUsername = username || (authOptions === null || authOptions === void 0 ? void 0 : authOptions.username);
+        const oauthUsername = username || authOptions?.username;
         if (oauthUsername) {
             this.username = oauthUsername;
             await this.stateAggregator.orgs.read(oauthUsername, false, false);
@@ -562,9 +545,8 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         }
     }
     getInstanceUrl(options, aggregator) {
-        var _a;
-        const instanceUrl = (_a = options === null || options === void 0 ? void 0 : options.instanceUrl) !== null && _a !== void 0 ? _a : aggregator.getPropertyValue(orgConfigProperties_1.OrgConfigProperties.ORG_INSTANCE_URL);
-        return instanceUrl !== null && instanceUrl !== void 0 ? instanceUrl : sfdcUrl_1.SfdcUrl.PRODUCTION;
+        const instanceUrl = options?.instanceUrl ?? aggregator.getPropertyValue(orgConfigProperties_1.OrgConfigProperties.ORG_INSTANCE_URL);
+        return instanceUrl ?? sfdcUrl_1.SfdcUrl.PRODUCTION;
     }
     /**
      * Initialize this AuthInfo instance with the specified options. If options are not provided, initialize it from cache
@@ -584,7 +566,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
             if (this.isTokenOptions(options)) {
                 authConfig = options;
                 const userInfo = await this.retrieveUserInfo((0, ts_types_1.ensureString)(options.instanceUrl), (0, ts_types_1.ensureString)(options.accessToken));
-                this.update({ username: userInfo === null || userInfo === void 0 ? void 0 : userInfo.username, orgId: userInfo === null || userInfo === void 0 ? void 0 : userInfo.organizationId });
+                this.update({ username: userInfo?.username, orgId: userInfo?.organizationId });
             }
             else {
                 if (this.options.parentUsername) {
@@ -651,7 +633,6 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
     // A callback function for a connection to refresh an access token.  This is used
     // both for a JWT connection and an OAuth connection.
     async refreshFn(conn, callback) {
-        var _a;
         this.logger.info('Access token has expired. Updating...');
         try {
             const fields = this.getFields(true);
@@ -661,7 +642,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         }
         catch (err) {
             const error = err;
-            if ((_a = error === null || error === void 0 ? void 0 : error.message) === null || _a === void 0 ? void 0 : _a.includes('Data Not Available')) {
+            if (error?.message?.includes('Data Not Available')) {
                 // Set cause to keep original stacktrace
                 return await callback(messages.createError('orgDataNotAvailableError', [this.getUsername()], [], error));
             }
@@ -673,14 +654,13 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
     }
     // Build OAuth config for a JWT auth flow
     async authJwt(options) {
-        var _a;
         if (!options.clientId) {
             throw messages.createError('missingClientId');
         }
         const privateKeyContents = await this.readJwtKey((0, ts_types_1.ensureString)(options.privateKey));
         const { loginUrl = sfdcUrl_1.SfdcUrl.PRODUCTION } = options;
         const url = new sfdcUrl_1.SfdcUrl(loginUrl);
-        const createdOrgInstance = ((_a = this.getFields().createdOrgInstance) !== null && _a !== void 0 ? _a : '').trim().toLowerCase();
+        const createdOrgInstance = (this.getFields().createdOrgInstance ?? '').trim().toLowerCase();
         const audienceUrl = await url.getJwtAudienceUrl(createdOrgInstance);
         let authFieldsBuilder;
         const authErrors = [];
@@ -729,7 +709,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         }, privateKeyContents, {
             algorithm: 'RS256',
         });
-        const oauth2 = new JwtOAuth2({ loginUrl });
+        const oauth2 = new jsforce_1.JwtOAuth2({ loginUrl });
         return (0, ts_types_1.ensureJsonMap)(await oauth2.jwtAuthorize(jwtToken));
     }
     // Build OAuth config for a refresh token auth flow
@@ -756,15 +736,13 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         let username = this.getUsername();
         if (!username) {
             const userInfo = await this.retrieveUserInfo(authFieldsBuilder.instance_url, authFieldsBuilder.access_token);
-            username = (0, ts_types_1.ensureString)(userInfo === null || userInfo === void 0 ? void 0 : userInfo.username);
+            username = (0, ts_types_1.ensureString)(userInfo?.username);
         }
         return {
             orgId,
             username,
             accessToken: authFieldsBuilder.access_token,
-            // @ts-ignore TODO: need better typings for jsforce
             instanceUrl: authFieldsBuilder.instance_url,
-            // @ts-ignore TODO: need better typings for jsforce
             loginUrl: options.loginUrl || authFieldsBuilder.instance_url,
             refreshToken: options.refreshToken,
             clientId: options.clientId,
@@ -793,7 +771,6 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         catch (err) {
             throw messages.createError('authCodeExchangeError', [err.message]);
         }
-        // @ts-ignore TODO: need better typings for jsforce
         const { orgId } = parseIdUrl(authFields.id);
         let username = this.getUsername();
         // Only need to query for the username if it isn't known. For example, a new auth code exchange
@@ -801,15 +778,13 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         if (!username) {
             // @ts-ignore
             const userInfo = await this.retrieveUserInfo(authFields.instance_url, authFields.access_token);
-            username = userInfo === null || userInfo === void 0 ? void 0 : userInfo.username;
+            username = userInfo?.username;
         }
         return {
             accessToken: authFields.access_token,
-            // @ts-ignore TODO: need better typings for jsforce
             instanceUrl: authFields.instance_url,
             orgId,
             username,
-            // @ts-ignore TODO: need better typings for jsforce
             loginUrl: options.loginUrl || authFields.instance_url,
             refreshToken: authFields.refresh_token,
             clientId: options.clientId,
@@ -857,16 +832,15 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      * @private
      */
     throwUserGetException(response) {
-        var _a, _b, _c;
         let errorMsg = '';
-        const bodyAsString = (_a = response.body) !== null && _a !== void 0 ? _a : JSON.stringify({ message: 'UNKNOWN', errorCode: 'UNKNOWN' });
+        const bodyAsString = response.body ?? JSON.stringify({ message: 'UNKNOWN', errorCode: 'UNKNOWN' });
         try {
             const body = (0, kit_1.parseJson)(bodyAsString);
             if ((0, ts_types_1.isArray)(body)) {
-                errorMsg = body.map((line) => { var _a, _b; return (_b = (_a = line.message) !== null && _a !== void 0 ? _a : line.errorCode) !== null && _b !== void 0 ? _b : 'UNKNOWN'; }).join(os.EOL);
+                errorMsg = body.map((line) => line.message ?? line.errorCode ?? 'UNKNOWN').join(os.EOL);
             }
             else {
-                errorMsg = (_c = (_b = body.message) !== null && _b !== void 0 ? _b : body.errorCode) !== null && _c !== void 0 ? _c : 'UNKNOWN';
+                errorMsg = body.message ?? body.errorCode ?? 'UNKNOWN';
             }
         }
         catch (err) {

package/lib/org/connection.d.ts

@@ -63,14 +63,10 @@ export declare class Connection<S extends Schema = Schema> extends JSForceConnec
      */
     init(): Promise<void>;
     /**
-     * TODO: This should be moved into JSForce V2 once ready
-     * this is only a temporary solution to support both REST and SOAP APIs
-     *
      * deploy a zipped buffer from the SDRL with REST or SOAP
      *
      * @param zipInput data to deploy
      * @param options JSForce deploy options + a boolean for rest
-     * @param callback
      */
     deploy(zipInput: Buffer, options: DeployOptionsWithRest): Promise<DeployResultLocator<AsyncResult & Schema>>;
     /**
@@ -86,13 +82,12 @@ export declare class Connection<S extends Schema = Schema> extends JSForceConnec
      */
     baseUrl(): string;
     /**
-     * TODO: This should be moved into JSForce V2 once ready
-     * this is only a temporary solution to support both REST and SOAP APIs
-     *
-     * Will deploy a recently validated deploy request
+     * Will deploy a recently validated deploy request - directly calling jsforce now that this is supported.
+     * WARNING: will always return a string from jsforce, the type is JsonCollection to support backwards compatibility
      *
      * @param options.id = the deploy ID that's been validated already from a previous checkOnly deploy request
      * @param options.rest = a boolean whether or not to use the REST API
+     * @deprecated use {@link Connection.metadata#deployRecentValidation} instead - the jsforce implementation, instead of this wrapper
      */
     deployRecentValidation(options: recentValidationOptions): Promise<JsonCollection>;
     /**

package/lib/org/connection.js

@@ -9,7 +9,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SingleRecordQueryErrors = exports.Connection = exports.DNS_ERROR_NAME = exports.SFDX_HTTP_HEADERS = void 0;
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 const url_1 = require("url");
-const FormData = require("form-data");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const jsforce_1 = require("jsforce");
@@ -75,9 +74,8 @@ class Connection extends jsforce_1.Connection {
      * @param options Constructor options.
      */
     static async create(options) {
-        var _a, _b;
         const baseOptions = {
-            version: (_a = options.connectionOptions) === null || _a === void 0 ? void 0 : _a.version,
+            version: options.connectionOptions?.version,
             callOptions: {
                 client: clientId,
             },
@@ -101,7 +99,7 @@ class Connection extends jsforce_1.Connection {
                 }
             }
             else {
-                conn.logger.debug(`The org-api-version ${baseOptions.version} was found from ${((_b = options.connectionOptions) === null || _b === void 0 ? void 0 : _b.version) ? 'passed in options' : 'config'}`);
+                conn.logger.debug(`The org-api-version ${baseOptions.version} was found from ${options.connectionOptions?.version ? 'passed in options' : 'config'}`);
             }
         }
         catch (err) {
@@ -122,14 +120,10 @@ class Connection extends jsforce_1.Connection {
         this.logger = this.tooling._logger = await logger_1.Logger.child('connection');
     }
     /**
-     * TODO: This should be moved into JSForce V2 once ready
-     * this is only a temporary solution to support both REST and SOAP APIs
-     *
      * deploy a zipped buffer from the SDRL with REST or SOAP
      *
      * @param zipInput data to deploy
      * @param options JSForce deploy options + a boolean for rest
-     * @param callback
      */
     async deploy(zipInput, options) {
         const rest = options.rest;
@@ -138,27 +132,7 @@ class Connection extends jsforce_1.Connection {
         if (rest) {
             this.logger.debug('deploy with REST');
             await this.refreshAuth();
-            const headers = {
-                Authorization: this && `OAuth ${this.accessToken}`,
-                'Sforce-Call-Options': 'client=sfdx-core',
-            };
-            const client = this.oauth2 && this.oauth2.clientId;
-            if (client) {
-                headers.clientId = client;
-            }
-            const form = new FormData();
-            // Add the zip file
-            form.append('file', zipInput, {
-                contentType: 'application/zip',
-                filename: 'package.xml',
-            });
-            // Add the deploy options
-            form.append('entity_content', JSON.stringify({ deployOptions: options }), {
-                contentType: 'application/json',
-            });
-            const url = `${this.baseUrl()}/metadata/deployRequest`;
-            const httpRequest = { method: 'POST', url, headers, body: form };
-            return this.request(httpRequest);
+            return this.metadata.deployRest(zipInput, options);
         }
         else {
             this.logger.debug('deploy with SOAP');
@@ -176,7 +150,6 @@ class Connection extends jsforce_1.Connection {
         const httpRequest = (0, ts_types_1.isString)(request) ? { method: 'GET', url: request } : request;
         httpRequest.headers = Object.assign({}, exports.SFDX_HTTP_HEADERS, httpRequest.headers);
         this.logger.debug(`request: ${JSON.stringify(httpRequest)}`);
-        //  The "as" is a workaround for the jsforce typings.
         return super.request(httpRequest, options);
     }
     /**
@@ -187,37 +160,17 @@ class Connection extends jsforce_1.Connection {
         return super._baseUrl();
     }
     /**
-     * TODO: This should be moved into JSForce V2 once ready
-     * this is only a temporary solution to support both REST and SOAP APIs
-     *
-     * Will deploy a recently validated deploy request
+     * Will deploy a recently validated deploy request - directly calling jsforce now that this is supported.
+     * WARNING: will always return a string from jsforce, the type is JsonCollection to support backwards compatibility
      *
      * @param options.id = the deploy ID that's been validated already from a previous checkOnly deploy request
      * @param options.rest = a boolean whether or not to use the REST API
+     * @deprecated use {@link Connection.metadata#deployRecentValidation} instead - the jsforce implementation, instead of this wrapper
      */
     async deployRecentValidation(options) {
-        const rest = options.rest;
-        delete options.rest;
-        if (rest) {
-            const url = `${this.baseUrl()}/metadata/deployRequest`;
-            const messageBody = JSON.stringify({
-                validatedDeployRequestId: options.id,
-            });
-            const requestInfo = {
-                method: 'POST',
-                url,
-                body: messageBody,
-            };
-            const requestOptions = { headers: 'json' };
-            return this.request(requestInfo, requestOptions);
-        }
-        else {
-            // the _invoke is private in jsforce, we can call the SOAP deployRecentValidation like this
-            // @ts-ignore
-            return this.metadata['_invoke']('deployRecentValidation', {
-                validationId: options.id,
-            });
-        }
+        // REST returns an object with an id property, SOAP returns the id as a string directly. That is now handled
+        // in jsforce, so we have to cast a string as unkown as JsonCollection to support backwards compatibility.
+        return (await this.metadata.deployRecentValidation(options));
     }
     /**
      * Retrieves the highest api version that is supported by the target server instance.
@@ -249,8 +202,7 @@ class Connection extends jsforce_1.Connection {
      * Verify that instance has a reachable DNS entry, otherwise will throw error
      */
     async isResolvable() {
-        var _a;
-        if (!((_a = this.options.connectionOptions) === null || _a === void 0 ? void 0 : _a.instanceUrl)) {
+        if (!this.options.connectionOptions?.instanceUrl) {
             throw messages.createError('noInstanceUrlError');
         }
         const resolver = await myDomainResolver_1.MyDomainResolver.create({

package/lib/org/org.d.ts

@@ -68,7 +68,7 @@ export declare type ResumeSandboxRequest = {
     SandboxName?: string;
     SandboxProcessObjId?: string;
 };
-export declare type ScratchOrgRequest = Pick<ScratchOrgCreateOptions, 'connectedAppConsumerKey' | 'durationDays' | 'nonamespace' | 'noancestors' | 'wait' | 'retry' | 'apiversion' | 'definitionjson' | 'definitionfile' | 'orgConfig' | 'clientSecret'>;
+export declare type ScratchOrgRequest = Omit<ScratchOrgCreateOptions, 'hubOrg'>;
 export declare type SandboxFields = {
     sandboxOrgId: string;
     prodOrgUsername: string;