@salesforce/core 3.6.5 → 3.7.2

package/CHANGELOG.md

@@ -2,47 +2,59 @@
 
 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.6.5](https://github.com/forcedotcom/sfdx-core/compare/v3.6.4...v3.6.5) (2021-09-29)
+### [3.7.2](https://github.com/forcedotcom/sfdx-core/compare/v3.7.1...v3.7.2) (2021-10-28)
 
 
 ### Bug Fixes
 
-* add getValue to AliasAccessor ([c4b69f5](https://github.com/forcedotcom/sfdx-core/commit/c4b69f5ff38547fad640c64833291fe0c6e06a79))
+* make @types/sfdx-faye a dependendcy ([683680b](https://github.com/forcedotcom/sfdx-core/commit/683680b8133048f71d25ef4df7aa24d9700dc5e8))
 
-### [3.6.4](https://github.com/forcedotcom/sfdx-core/compare/v3.6.3...v3.6.4) (2021-09-23)
+### [3.7.1](https://github.com/forcedotcom/sfdx-core/compare/v3.7.0...v3.7.1) (2021-10-28)
+
+## [3.7.0](https://github.com/forcedotcom/sfdx-core/compare/v3.6.6...v3.7.0) (2021-10-12)
+
+
+### Features
+
+* use jsforce v2 ([#457](https://github.com/forcedotcom/sfdx-core/issues/457)) ([4a9094e](https://github.com/forcedotcom/sfdx-core/commit/4a9094e958288cdcc6c69f5d87b10a70a437d8e9))
 
+### [3.6.6](https://github.com/forcedotcom/sfdx-core/compare/v3.6.5...v3.6.6) (2021-10-08)
+
+### [3.6.5](https://github.com/forcedotcom/sfdx-core/compare/v3.6.4...v3.6.5) (2021-09-29)
 
 ### Bug Fixes
 
-* edit the env var blurbs ([#482](https://github.com/forcedotcom/sfdx-core/issues/482)) ([bbbdb6d](https://github.com/forcedotcom/sfdx-core/commit/bbbdb6d0800015e94ce0f0c551eec8ed73dd87c6))
+- add getValue to AliasAccessor ([c4b69f5](https://github.com/forcedotcom/sfdx-core/commit/c4b69f5ff38547fad640c64833291fe0c6e06a79))
 
-### [3.6.3](https://github.com/forcedotcom/sfdx-core/compare/v3.6.2...v3.6.3) (2021-09-23)
+### [3.6.4](https://github.com/forcedotcom/sfdx-core/compare/v3.6.3...v3.6.4) (2021-09-23)
+
+### Bug Fixes
 
+- edit the env var blurbs ([#482](https://github.com/forcedotcom/sfdx-core/issues/482)) ([bbbdb6d](https://github.com/forcedotcom/sfdx-core/commit/bbbdb6d0800015e94ce0f0c551eec8ed73dd87c6))
+
+### [3.6.3](https://github.com/forcedotcom/sfdx-core/compare/v3.6.2...v3.6.3) (2021-09-23)
 
 ### Bug Fixes
 
-* edit the config var blurbs ([#480](https://github.com/forcedotcom/sfdx-core/issues/480)) ([f845512](https://github.com/forcedotcom/sfdx-core/commit/f8455121bfd96f27495bc124dc06570632dfce70))
+- edit the config var blurbs ([#480](https://github.com/forcedotcom/sfdx-core/issues/480)) ([f845512](https://github.com/forcedotcom/sfdx-core/commit/f8455121bfd96f27495bc124dc06570632dfce70))
 
 ### [3.6.2](https://github.com/forcedotcom/sfdx-core/compare/v3.6.1...v3.6.2) (2021-09-17)
 
-
 ### Bug Fixes
 
-* improve time to build auths for many orgs @W-9914839@ ([#478](https://github.com/forcedotcom/sfdx-core/issues/478)) ([c788541](https://github.com/forcedotcom/sfdx-core/commit/c7885415d59994b28552227f0b84dcee5d3ec7cf))
+- improve time to build auths for many orgs @W-9914839@ ([#478](https://github.com/forcedotcom/sfdx-core/issues/478)) ([c788541](https://github.com/forcedotcom/sfdx-core/commit/c7885415d59994b28552227f0b84dcee5d3ec7cf))
 
 ### [3.6.1](https://github.com/forcedotcom/sfdx-core/compare/v3.6.0...v3.6.1) (2021-09-13)
 
-
 ### Bug Fixes
 
-* remove tokens associated with org ([#477](https://github.com/forcedotcom/sfdx-core/issues/477)) ([5034fa2](https://github.com/forcedotcom/sfdx-core/commit/5034fa2d4c52d347c00499e137a71366e4feba7f))
+- remove tokens associated with org ([#477](https://github.com/forcedotcom/sfdx-core/issues/477)) ([5034fa2](https://github.com/forcedotcom/sfdx-core/commit/5034fa2d4c52d347c00499e137a71366e4feba7f))
 
 ## [3.6.0](https://github.com/forcedotcom/sfdx-core/compare/v3.5.0...v3.6.0) (2021-09-10)
 
-
 ### Features
 
-* add help section helper ([#474](https://github.com/forcedotcom/sfdx-core/issues/474)) ([b34c2d7](https://github.com/forcedotcom/sfdx-core/commit/b34c2d7a442aed2cf091fd394a7c3656287d1dbf))
+- add help section helper ([#474](https://github.com/forcedotcom/sfdx-core/issues/474)) ([b34c2d7](https://github.com/forcedotcom/sfdx-core/commit/b34c2d7a442aed2cf091fd394a7c3656287d1dbf))
 
 ## [3.5.0](https://github.com/forcedotcom/sfdx-core/compare/v3.4.5...v3.5.0) (2021-09-09)
 
@@ -210,6 +222,20 @@ All notable changes to this project will be documented in this file. See [standa
 - add GlobalInfo config file ([#397](https://github.com/forcedotcom/sfdx-core/issues/397)) ([579998b](https://github.com/forcedotcom/sfdx-core/commit/579998b6ee70dbb9772e65896bbabf6d812aae23))
 - default to reading files from cache ([12b5930](https://github.com/forcedotcom/sfdx-core/commit/12b59301df96395c4edcbfb0816dbddd45af95db))
 
+### [2.28.1](https://github.com/forcedotcom/sfdx-core/compare/v2.28.0...v2.28.1) (2021-10-06)
+
+### Bug Fixes
+
+- crmforce.mil ([e263d5d](https://github.com/forcedotcom/sfdx-core/commit/e263d5d74be9c0651e5c2676d6eec1c31fca05e4))
+
+## [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

package/lib/config/config.d.ts

@@ -80,6 +80,10 @@ export declare enum SfdxPropertyKeys {
      * Disables telemetry reporting
      */
     DISABLE_TELEMETRY = "disableTelemetry",
+    /**
+     * Custom templates repo or local location.
+     */
+    CUSTOM_ORG_METADATA_TEMPLATES = "customOrgMetadataTemplates",
     /**
      * allows users to override the 10,000 result query limit
      */

package/lib/config/config.js

@@ -73,6 +73,10 @@ var SfdxPropertyKeys;
      * Disables telemetry reporting
      */
     SfdxPropertyKeys["DISABLE_TELEMETRY"] = "disableTelemetry";
+    /**
+     * Custom templates repo or local location.
+     */
+    SfdxPropertyKeys["CUSTOM_ORG_METADATA_TEMPLATES"] = "customOrgMetadataTemplates";
     /**
      * allows users to override the 10,000 result query limit
      */

package/lib/deviceOauthService.d.ts

@@ -1,5 +1,5 @@
 import { AsyncCreatable } from '@salesforce/kit';
-import { OAuth2Options } from 'jsforce';
+import { OAuth2Config } from 'jsforce/lib/oauth2';
 import { Nullable, JsonMap } from '@salesforce/ts-types';
 import { AuthInfo } from './org/authInfo';
 export interface DeviceCodeResponse extends JsonMap {
@@ -34,7 +34,7 @@ export interface DeviceCodePollingResponse extends JsonMap {
  * const authInfo = await deviceOauthService.authorizeAndSave(approval);
  * ```
  */
-export declare class DeviceOauthService extends AsyncCreatable<OAuth2Options> {
+export declare class DeviceOauthService extends AsyncCreatable<OAuth2Config> {
     static RESPONSE_TYPE: string;
     static GRANT_TYPE: string;
     static SCOPE: string;
@@ -42,7 +42,7 @@ export declare class DeviceOauthService extends AsyncCreatable<OAuth2Options> {
     private logger;
     private options;
     private pollingCount;
-    constructor(options: OAuth2Options);
+    constructor(options: OAuth2Config);
     /**
      * Begin the authorization flow by requesting the login
      *

package/lib/deviceOauthService.js

@@ -9,9 +9,8 @@
 /* eslint-disable @typescript-eslint/ban-types */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceOauthService = void 0;
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-const Transport = require("jsforce/lib/transport");
+const url_1 = require("url");
+const transport_1 = require("jsforce/lib/transport");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const logger_1 = require("./logger");
@@ -27,7 +26,7 @@ async function wait(ms = 1000) {
     });
 }
 async function makeRequest(options) {
-    const rawResponse = await new Transport().httpRequest(options);
+    const rawResponse = await new transport_1.default().httpRequest(options);
     const response = kit_1.parseJsonMap(rawResponse.body);
     if (response.error) {
         const err = new sfdxError_1.SfdxError('Request Failed.');
@@ -109,36 +108,36 @@ class DeviceOauthService extends kit_1.AsyncCreatable {
         this.logger.debug(`this.options.loginUrl: ${this.options.loginUrl}`);
     }
     getLoginOptions(url) {
+        const body = new url_1.URLSearchParams();
+        body.append('client_id', ts_types_1.ensureString(this.options.clientId));
+        body.append('response_type', DeviceOauthService.RESPONSE_TYPE);
+        body.append('scope', DeviceOauthService.SCOPE);
         return {
             url,
             headers: connection_1.SFDX_HTTP_HEADERS,
             method: 'POST',
-            form: {
-                client_id: ts_types_1.ensureString(this.options.clientId),
-                response_type: DeviceOauthService.RESPONSE_TYPE,
-                scope: DeviceOauthService.SCOPE,
-            },
+            body,
         };
     }
     getPollingOptions(url, code) {
+        const body = new url_1.URLSearchParams();
+        body.append('client_id', ts_types_1.ensureString(this.options.clientId));
+        body.append('grant_type', DeviceOauthService.GRANT_TYPE);
+        body.append('code', code);
         return {
             url,
             headers: connection_1.SFDX_HTTP_HEADERS,
             method: 'POST',
-            form: {
-                code,
-                grant_type: DeviceOauthService.GRANT_TYPE,
-                client_id: ts_types_1.ensureString(this.options.clientId),
-            },
+            body,
         };
     }
     getDeviceFlowRequestUrl() {
         return `${ts_types_1.ensureString(this.options.loginUrl)}/services/oauth2/token`;
     }
-    async poll(pollingOptions) {
+    async poll(httpRequest) {
         this.logger.debug(`polling for device approval (attempt ${this.pollingCount} of ${DeviceOauthService.POLLING_COUNT_MAX})`);
         try {
-            return await makeRequest(pollingOptions);
+            return await makeRequest(httpRequest);
         }
         catch (e) {
             const err = e.data;
@@ -160,11 +159,11 @@ class DeviceOauthService extends kit_1.AsyncCreatable {
     shouldContinuePolling() {
         return this.pollingCount < DeviceOauthService.POLLING_COUNT_MAX;
     }
-    async pollForDeviceApproval(pollingOptions, interval) {
+    async pollForDeviceApproval(httpRequest, interval) {
         this.logger.debug('BEGIN POLLING FOR DEVICE APPROVAL');
         let result;
         while (this.shouldContinuePolling()) {
-            result = await this.poll(pollingOptions);
+            result = await this.poll(httpRequest);
             if (result) {
                 this.logger.debug('POLLING FOR DEVICE APPROVAL SUCCESS');
                 break;

package/lib/exported.d.ts

@@ -1,4 +1,4 @@
-export { OAuth2Options } from 'jsforce';
+export { OAuth2Config } from 'jsforce';
 export { ConfigFile } from './config/configFile';
 export { EnvironmentVariable, SUPPORTED_ENV_VARS } from './config/envVars';
 export { BaseConfigStore, ConfigContents, ConfigEntry, ConfigStore, ConfigValue } from './config/configStore';
@@ -7,7 +7,7 @@ export { DeviceOauthService, DeviceCodeResponse, DeviceCodePollingResponse } fro
 export { OrgUsersConfig } from './config/orgUsersConfig';
 export { ConfigPropertyMeta, ConfigPropertyMetaInput, Config, SfdxPropertyKeys, SFDX_ALLOWED_PROPERTIES, } from './config/config';
 export { ConfigInfo, ConfigAggregator } from './config/configAggregator';
-export { AuthFields, AuthInfo, OAuth2WithVerifier, OrgAuthorization } from './org/authInfo';
+export { AuthFields, AuthInfo, OrgAuthorization } from './org/authInfo';
 export { AuthRemover } from './org/authRemover';
 export { Connection, SFDX_HTTP_HEADERS } from './org/connection';
 export { Mode, Global } from './global';
@@ -23,9 +23,8 @@ export { PackageDir, NamedPackageDir, PackageDirDependency, SfdxProject, SfdxPro
 export { SchemaPrinter } from './schema/printer';
 export { SchemaValidator } from './schema/validator';
 export { SfdxError } from './sfdxError';
-export { StatusResult } from './status/client';
 export { PollingClient } from './status/pollingClient';
-export { CometClient, CometSubscription, StreamingClient } from './status/streamingClient';
+export { CometClient, CometSubscription, StreamingClient, StatusResult } from './status/streamingClient';
 export { MyDomainResolver } from './status/myDomainResolver';
 export { DefaultUserFields, REQUIRED_FIELDS, User, UserFields } from './org/user';
 export { PermissionSetAssignment, PermissionSetAssignmentFields } from './org/permissionSetAssignment';

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.SfdxError = exports.SchemaValidator = exports.SchemaPrinter = exports.SfdxProjectJson = exports.SfdxProject = exports.ORG_CONFIG_ALLOWED_PROPERTIES = exports.OrgConfigProperties = 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.SFDX_ALLOWED_PROPERTIES = exports.SfdxPropertyKeys = exports.Config = exports.OrgUsersConfig = exports.DeviceOauthService = exports.SfInfoKeys = exports.GlobalInfo = exports.BaseConfigStore = exports.SUPPORTED_ENV_VARS = exports.EnvironmentVariable = exports.ConfigFile = void 0;
+exports.PermissionSetAssignment = exports.User = exports.REQUIRED_FIELDS = exports.DefaultUserFields = exports.MyDomainResolver = exports.StreamingClient = exports.CometClient = exports.PollingClient = exports.SfdxError = exports.SchemaValidator = exports.SchemaPrinter = exports.SfdxProjectJson = exports.SfdxProject = exports.ORG_CONFIG_ALLOWED_PROPERTIES = exports.OrgConfigProperties = 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.AuthInfo = exports.ConfigAggregator = exports.SFDX_ALLOWED_PROPERTIES = exports.SfdxPropertyKeys = exports.Config = exports.OrgUsersConfig = exports.DeviceOauthService = exports.SfInfoKeys = exports.GlobalInfo = exports.BaseConfigStore = exports.SUPPORTED_ENV_VARS = exports.EnvironmentVariable = exports.ConfigFile = void 0;
 const messages_1 = require("./messages");
 messages_1.Messages.importMessagesDirectory(__dirname);
 var configFile_1 = require("./config/configFile");
@@ -41,7 +41,6 @@ var configAggregator_1 = require("./config/configAggregator");
 Object.defineProperty(exports, "ConfigAggregator", { enumerable: true, get: function () { return configAggregator_1.ConfigAggregator; } });
 var authInfo_1 = require("./org/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; } });
 var authRemover_1 = require("./org/authRemover");
 Object.defineProperty(exports, "AuthRemover", { enumerable: true, get: function () { return authRemover_1.AuthRemover; } });
 var connection_1 = require("./org/connection");

package/lib/global.js

@@ -79,5 +79,5 @@ Global.SF_DIR = path.join(os.homedir(), Global.SF_STATE_FOLDER);
 /**
  * The full system path to the global log file.
  */
-Global.LOG_FILE_PATH = path.join(Global.SFDX_DIR, 'sfdx.log');
+Global.LOG_FILE_PATH = path.join(Global.SF_DIR, 'sf.log');
 //# sourceMappingURL=global.js.map

package/lib/logger.d.ts

@@ -150,7 +150,7 @@ export declare class Logger {
     /**
      * The name of the root sfdx `Logger`.
      */
-    static readonly ROOT_NAME = "sfdx";
+    static readonly ROOT_NAME = "sf";
     /**
      * The default `LoggerLevel` when constructing new `Logger` instances.
      */

package/lib/logger.js

@@ -628,7 +628,7 @@ exports.Logger = Logger;
 /**
  * The name of the root sfdx `Logger`.
  */
-Logger.ROOT_NAME = 'sfdx';
+Logger.ROOT_NAME = 'sf';
 /**
  * The default `LoggerLevel` when constructing new `Logger` instances.
  */

package/lib/org/authInfo.d.ts

@@ -1,7 +1,14 @@
 import { AsyncOptionalCreatable } from '@salesforce/kit';
-import { AnyFunction, Nullable } from '@salesforce/ts-types';
-import { OAuth2, OAuth2Options, TokenResponse } from 'jsforce';
+import { Nullable } from '@salesforce/ts-types';
+import { OAuth2, OAuth2Config as JsforceOAuth2Config } from 'jsforce';
 import { Connection } from './connection';
+export declare type OAuth2Config = JsforceOAuth2Config & {
+    privateKey?: string;
+    privateKeyFile?: string;
+    authCode?: string;
+    refreshToken?: string;
+    loginUrl?: string;
+};
 /**
  * Fields for authorization, org, and local information.
  */
@@ -63,46 +70,12 @@ export declare type ConnectionOptions = AuthFields & {
     /**
      * OAuth options.
      */
-    oauth2?: Partial<OAuth2Options>;
+    oauth2?: Partial<OAuth2Config>;
     /**
      * Refresh token callback.
      */
     refreshFn?: RefreshFn;
 };
-/**
- * Extend OAuth2 to add code verifier support for the auth code (web auth) flow
- * const oauth2 = new OAuth2WithVerifier({ loginUrl, clientSecret, clientId, redirectUri });
- *
- * const authUrl = oauth2.getAuthorizationUrl({
- *    state: 'foo',
- *    prompt: 'login',
- *    scope: 'api web'
- * });
- * console.log(authUrl);
- * const authCode = await retrieveCode();
- * const authInfo = await AuthInfo.create({ oauth2Options: { clientId, clientSecret, loginUrl, authCode }, oauth2});
- * console.log(`access token: ${authInfo.getFields(true).accessToken}`);
- */
-export declare class OAuth2WithVerifier extends OAuth2 {
-    readonly codeVerifier: string;
-    constructor(options: OAuth2Options);
-    /**
-     * Overrides jsforce.OAuth2.getAuthorizationUrl.  Get Salesforce OAuth2 authorization page
-     * URL to redirect user agent, adding a verification code for added security.
-     *
-     * @param params
-     */
-    getAuthorizationUrl(params: Record<string, unknown>): string;
-    requestToken(code: string, callback?: (err: Error, tokenResponse: TokenResponse) => void): Promise<TokenResponse>;
-    /**
-     * Overrides jsforce.OAuth2._postParams because jsforce's oauth impl doesn't support
-     * coder_verifier and code_challenge. This enables the server to disallow trading a one-time auth code
-     * for an access/refresh token when the verifier and challenge are out of alignment.
-     *
-     * See https://github.com/jsforce/jsforce/issues/665
-     */
-    protected _postParams(params: Record<string, unknown>, callback: AnyFunction): Promise<any>;
-}
 export declare const DEFAULT_CONNECTED_APP_INFO: {
     clientId: string;
     legacyClientId: string;
@@ -180,9 +153,9 @@ export declare class AuthInfo extends AsyncOptionalCreatable<AuthInfo.Options> {
      *
      * @param options The options to generate the URL.
      */
-    static getAuthorizationUrl(options: OAuth2Options & {
+    static getAuthorizationUrl(options: OAuth2Config & {
         scope?: string;
-    }, oauth2?: OAuth2WithVerifier): string;
+    }, oauth2?: OAuth2): string;
     /**
      * Parse a sfdx auth url, usually obtained by `authInfo.getSfdxAuthUrl`.
      *
@@ -235,6 +208,8 @@ export declare class AuthInfo extends AsyncOptionalCreatable<AuthInfo.Options> {
      * Get the auth fields (decrypted) needed to make a connection.
      */
     getConnectionOptions(): ConnectionOptions;
+    getClientId(): string;
+    getRedirectUri(): string;
     /**
      * Get the authorization fields.
      *
@@ -320,7 +295,7 @@ export declare namespace AuthInfo {
         /**
          * OAuth options.
          */
-        oauth2Options?: OAuth2Options;
+        oauth2Options?: OAuth2Config;
         /**
          * Options for the access token auth.
          */

package/lib/org/authInfo.js

@@ -6,7 +6,7 @@
  * 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.OAuth2WithVerifier = void 0;
+exports.AuthInfo = exports.DEFAULT_CONNECTED_APP_INFO = void 0;
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 const crypto_1 = require("crypto");
 const path_1 = require("path");
@@ -14,9 +14,7 @@ const os = require("os");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const jsforce_1 = require("jsforce");
-// No typings directly available for jsforce/lib/transport
-// @ts-ignore
-const Transport = require("jsforce/lib/transport");
+const transport_1 = require("jsforce/lib/transport");
 const jwt = require("jsonwebtoken");
 const config_1 = require("../config/config");
 const configAggregator_1 = require("../config/configAggregator");
@@ -46,65 +44,15 @@ class JwtOAuth2 extends jsforce_1.OAuth2 {
     constructor(options) {
         super(options);
     }
-    jwtAuthorize(innerToken, callback) {
+    jwtAuthorize(innerToken) {
         // @ts-ignore
         return super._postParams({
             // eslint-disable-next-line camelcase
             grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
             assertion: innerToken,
-        }, callback);
-    }
-}
-/**
- * Extend OAuth2 to add code verifier support for the auth code (web auth) flow
- * const oauth2 = new OAuth2WithVerifier({ loginUrl, clientSecret, clientId, redirectUri });
- *
- * const authUrl = oauth2.getAuthorizationUrl({
- *    state: 'foo',
- *    prompt: 'login',
- *    scope: 'api web'
- * });
- * console.log(authUrl);
- * const authCode = await retrieveCode();
- * const authInfo = await AuthInfo.create({ oauth2Options: { clientId, clientSecret, loginUrl, authCode }, oauth2});
- * console.log(`access token: ${authInfo.getFields(true).accessToken}`);
- */
-class OAuth2WithVerifier extends jsforce_1.OAuth2 {
-    constructor(options) {
-        super(options);
-        // Set a code verifier string for OAuth authorization
-        this.codeVerifier = base64UrlEscape(crypto_1.randomBytes(Math.ceil(128)).toString('base64'));
-    }
-    /**
-     * Overrides jsforce.OAuth2.getAuthorizationUrl.  Get Salesforce OAuth2 authorization page
-     * URL to redirect user agent, adding a verification code for added security.
-     *
-     * @param params
-     */
-    getAuthorizationUrl(params) {
-        // code verifier must be a base 64 url encoded hash of 128 bytes of random data. Our random data is also
-        // base 64 url encoded. See Connection.create();
-        const codeChallenge = base64UrlEscape(crypto_1.createHash('sha256').update(this.codeVerifier).digest('base64'));
-        kit_1.set(params, 'code_challenge', codeChallenge);
-        return super.getAuthorizationUrl(params);
-    }
-    async requestToken(code, callback) {
-        return super.requestToken(code, callback);
-    }
-    /**
-     * Overrides jsforce.OAuth2._postParams because jsforce's oauth impl doesn't support
-     * coder_verifier and code_challenge. This enables the server to disallow trading a one-time auth code
-     * for an access/refresh token when the verifier and challenge are out of alignment.
-     *
-     * See https://github.com/jsforce/jsforce/issues/665
-     */
-    async _postParams(params, callback) {
-        kit_1.set(params, 'code_verifier', this.codeVerifier);
-        // @ts-ignore TODO: need better typings for jsforce
-        return super._postParams(params, callback);
+        });
     }
 }
-exports.OAuth2WithVerifier = OAuth2WithVerifier;
 // parses the id field returned from jsForce oauth2 methods to get
 // user ID and org ID.
 function parseIdUrl(idUrl) {
@@ -129,13 +77,6 @@ exports.DEFAULT_CONNECTED_APP_INFO = {
     legacyClientId: 'SalesforceDevelopmentExperience',
     legacyClientSecret: '1384510088588713504',
 };
-// Makes a nodejs base64 encoded string compatible with rfc4648 alternative encoding for urls.
-// @param base64Encoded a nodejs base64 encoded string
-function base64UrlEscape(base64Encoded) {
-    // builtin node js base 64 encoding is not 64 url compatible.
-    // See https://toolsn.ietf.org/html/rfc4648#section-5
-    return base64Encoded.replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
-}
 /**
  * Handles persistence and fetching of user authentication information using
  * JWT, OAuth, or refresh tokens. Sets up the refresh flows that jsForce will
@@ -270,7 +211,9 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      * @param options The options to generate the URL.
      */
     static getAuthorizationUrl(options, oauth2) {
-        const oauth2Verifier = oauth2 || new OAuth2WithVerifier(options);
+        // Always use a verifier for enhanced security
+        options.useVerifier = true;
+        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 = {
@@ -399,8 +342,8 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
             opts = {
                 oauth2: {
                     loginUrl: instanceUrl || sfdcUrl_1.SfdcUrl.PRODUCTION,
-                    clientId: decryptedCopy.clientId || exports.DEFAULT_CONNECTED_APP_INFO.legacyClientId,
-                    redirectUri: 'http://localhost:1717/OauthRedirect',
+                    clientId: this.getClientId(),
+                    redirectUri: this.getRedirectUri(),
                 },
                 accessToken,
                 instanceUrl,
@@ -410,6 +353,13 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         // decrypt the fields
         return opts;
     }
+    getClientId() {
+        var _a;
+        return ((_a = this.getFields()) === null || _a === void 0 ? void 0 : _a.clientId) || exports.DEFAULT_CONNECTED_APP_INFO.legacyClientId;
+    }
+    getRedirectUri() {
+        return 'http://localhost:1717/OauthRedirect';
+    }
     /**
      * Get the authorization fields.
      *
@@ -581,7 +531,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
                     authConfig = await this.buildRefreshTokenConfig(options);
                 }
                 else {
-                    if (this.options.oauth2 instanceof OAuth2WithVerifier) {
+                    if (this.options.oauth2 instanceof jsforce_1.OAuth2) {
                         // authcode exchange / web auth flow
                         authConfig = await this.exchangeToken(options, this.options.oauth2);
                     }
@@ -604,8 +554,8 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         return authInfo;
     }
     isTokenOptions(options) {
-        // Although OAuth2Options does not contain refreshToken, privateKey, or privateKeyFile, a JS consumer could still pass those in
-        // which WILL have an access token as well, but it should be considered an OAuth2Options at that point.
+        // Although OAuth2Config does not contain refreshToken, privateKey, or privateKeyFile, a JS consumer could still pass those in
+        // which WILL have an access token as well, but it should be considered an OAuth2Config at that point.
         return ('accessToken' in options &&
             !('refreshToken' in options) &&
             !('privateKey' in options) &&
@@ -681,6 +631,9 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
             options.clientId = exports.DEFAULT_CONNECTED_APP_INFO.legacyClientId;
             options.clientSecret = exports.DEFAULT_CONNECTED_APP_INFO.legacyClientSecret;
         }
+        if (!options.redirectUri) {
+            options.redirectUri = this.getRedirectUri();
+        }
         const oauth2 = new jsforce_1.OAuth2(options);
         let authFieldsBuilder;
         try {
@@ -717,6 +670,12 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      * @param oauth2 The oauth2 extension that includes a code_challenge
      */
     async exchangeToken(options, oauth2 = new jsforce_1.OAuth2(options)) {
+        if (!oauth2.redirectUri) {
+            oauth2.redirectUri = this.getRedirectUri();
+        }
+        if (!oauth2.clientId) {
+            oauth2.clientId = this.getClientId();
+        }
         // Exchange the auth code for an access token and refresh token.
         let authFields;
         try {
@@ -760,7 +719,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         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}`);
-            let response = await new Transport().httpRequest({ url: userInfoUrl, headers });
+            let response = await new transport_1.default().httpRequest({ url: userInfoUrl, method: 'GET', headers });
             if (response.statusCode >= 400) {
                 this.throwUserGetException(response);
             }
@@ -768,7 +727,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
                 const userInfoJson = kit_1.parseJsonMap(response.body);
                 const url = `${baseUrl}/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().httpRequest({ url, headers });
+                response = await new transport_1.default().httpRequest({ url, method: 'GET', headers });
                 if (response.statusCode >= 400) {
                     this.throwUserGetException(response);
                 }