@salesforce/core 3.23.6 → 3.23.9

package/lib/stateAggregator/accessors/aliasAccessor.js

@@ -36,8 +36,7 @@ class GlobalInfoAliasAccessor {
      * @param entity the aliasable entity that you want to get the alias of
      */
     get(entity) {
-        var _a;
-        return (_a = this.getAll(entity).find((alias) => alias)) !== null && _a !== void 0 ? _a : null;
+        return this.getAll(entity).find((alias) => alias) ?? null;
     }
     /**
      * Returns the value that corresponds to the given alias if it exists
@@ -45,8 +44,7 @@ class GlobalInfoAliasAccessor {
      * @param alias the alias that corresponds to a value
      */
     getValue(alias) {
-        var _a;
-        return (_a = this.getAll()[alias]) !== null && _a !== void 0 ? _a : null;
+        return this.getAll()[alias] ?? null;
     }
     /**
      * Returns the username that corresponds to the given alias if it exists
@@ -54,8 +52,7 @@ class GlobalInfoAliasAccessor {
      * @param alias the alias that corresponds to a username
      */
     getUsername(alias) {
-        var _a;
-        return (_a = this.getAll()[alias]) !== null && _a !== void 0 ? _a : null;
+        return this.getAll()[alias] ?? null;
     }
     /**
      * If the provided string is an alias, it returns the corresponding value.
@@ -68,8 +65,7 @@ class GlobalInfoAliasAccessor {
      * @param valueOrAlias a string that might be a value or might be an alias
      */
     resolveValue(valueOrAlias) {
-        var _a;
-        return (_a = this.getValue(valueOrAlias)) !== null && _a !== void 0 ? _a : valueOrAlias;
+        return this.getValue(valueOrAlias) ?? valueOrAlias;
     }
     /**
      * If the provided string is an alias, it returns the corresponding username.
@@ -82,8 +78,7 @@ class GlobalInfoAliasAccessor {
      * @param usernameOrAlias a string that might be a username or might be an alias
      */
     resolveUsername(usernameOrAlias) {
-        var _a;
-        return (_a = this.getUsername(usernameOrAlias)) !== null && _a !== void 0 ? _a : usernameOrAlias;
+        return this.getUsername(usernameOrAlias) ?? usernameOrAlias;
     }
     /**
      * Set an alias for the given aliasable entity
@@ -121,10 +116,9 @@ class GlobalInfoAliasAccessor {
      * Returns the username of given aliasable entity
      */
     getNameOf(entity) {
-        var _a;
         if (typeof entity === 'string')
             return entity;
-        const aliaseeName = (_a = entity.username) !== null && _a !== void 0 ? _a : entity.user;
+        const aliaseeName = entity.username ?? entity.user;
         if (!aliaseeName) {
             throw new sfError_1.SfError(`Invalid aliasee, it must contain a user or username property: ${JSON.stringify(entity)}`);
         }
@@ -153,8 +147,7 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
      * @param entity the aliasable entity that you want to get the alias of
      */
     get(entity) {
-        var _a;
-        return (_a = this.getAll(entity).find((alias) => alias)) !== null && _a !== void 0 ? _a : null;
+        return this.getAll(entity).find((alias) => alias) ?? null;
     }
     /**
      * Returns the value that corresponds to the given alias if it exists
@@ -162,8 +155,7 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
      * @param alias the alias that corresponds to a value
      */
     getValue(alias) {
-        var _a;
-        return (_a = this.getAll()[alias]) !== null && _a !== void 0 ? _a : null;
+        return this.getAll()[alias] ?? null;
     }
     /**
      * Returns the username that corresponds to the given alias if it exists
@@ -171,8 +163,7 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
      * @param alias the alias that corresponds to a username
      */
     getUsername(alias) {
-        var _a;
-        return (_a = this.getAll()[alias]) !== null && _a !== void 0 ? _a : null;
+        return this.getAll()[alias] ?? null;
     }
     /**
      * If the provided string is an alias, it returns the corresponding value.
@@ -185,8 +176,7 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
      * @param valueOrAlias a string that might be a value or might be an alias
      */
     resolveValue(valueOrAlias) {
-        var _a;
-        return (_a = this.getValue(valueOrAlias)) !== null && _a !== void 0 ? _a : valueOrAlias;
+        return this.getValue(valueOrAlias) ?? valueOrAlias;
     }
     /**
      * If the provided string is an alias, it returns the corresponding username.
@@ -199,8 +189,7 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
      * @param usernameOrAlias a string that might be a username or might be an alias
      */
     resolveUsername(usernameOrAlias) {
-        var _a;
-        return (_a = this.getUsername(usernameOrAlias)) !== null && _a !== void 0 ? _a : usernameOrAlias;
+        return this.getUsername(usernameOrAlias) ?? usernameOrAlias;
     }
     /**
      * If the provided string is an alias, return it.
@@ -212,10 +201,9 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
      * @param usernameOrAlias a string that might be a username or might be an alias
      */
     resolveAlias(usernameOrAlias) {
-        var _a;
         if (this.has(usernameOrAlias))
             return usernameOrAlias;
-        return (_a = Object.entries(this.getAll()).find(([, username]) => username === usernameOrAlias)) === null || _a === void 0 ? void 0 : _a[0];
+        return Object.entries(this.getAll()).find(([, username]) => username === usernameOrAlias)?.[0];
     }
     /**
      * Set an alias for the given aliasable entity
@@ -260,10 +248,9 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
      * Returns the username of given aliasable entity
      */
     getNameOf(entity) {
-        var _a;
         if (typeof entity === 'string')
             return entity;
-        const aliaseeName = (_a = entity.username) !== null && _a !== void 0 ? _a : entity.user;
+        const aliaseeName = entity.username ?? entity.user;
         if (!aliaseeName) {
             throw new sfError_1.SfError(`Invalid aliasee, it must contain a user or username property: ${JSON.stringify(entity)}`);
         }

package/lib/stateAggregator/accessors/orgAccessor.js

@@ -35,15 +35,13 @@ class GlobalInfoOrgAccessor {
         return !!this.getAll()[username];
     }
     set(username, org) {
-        var _a;
         // For legacy, and to keep things standard, some things wants the username in auth info.
-        (_a = org.username) !== null && _a !== void 0 ? _a : (org.username = username);
+        org.username ?? (org.username = username);
         this.globalInfo.set(`${types_1.SfInfoKeys.ORGS}["${username}"]`, org);
     }
     update(username, org) {
-        var _a;
         // For legacy, and to keep things standard, some things wants the username in auth info.
-        (_a = org.username) !== null && _a !== void 0 ? _a : (org.username = username);
+        org.username ?? (org.username = username);
         this.globalInfo.update(`${types_1.SfInfoKeys.ORGS}["${username}"]`, org);
     }
     unset(username) {
@@ -176,17 +174,16 @@ class BaseOrgAccessor extends kit_1.AsyncOptionalCreatable {
      * @param org
      */
     set(username, org) {
-        var _a, _b;
         const config = this.configs.get(username);
         if (config) {
             config.setContentsFromObject(org);
             const contents = config.getContents();
-            (_a = contents.username) !== null && _a !== void 0 ? _a : (contents.username = username);
+            contents.username ?? (contents.username = username);
             this.contents.set(username, contents);
         }
         else {
             // @ts-ignore
-            (_b = org.username) !== null && _b !== void 0 ? _b : (org.username = username);
+            org.username ?? (org.username = username);
             this.contents.set(username, org);
         }
     }
@@ -207,8 +204,7 @@ class BaseOrgAccessor extends kit_1.AsyncOptionalCreatable {
      * @param username
      */
     async remove(username) {
-        var _a;
-        await ((_a = this.configs.get(username)) === null || _a === void 0 ? void 0 : _a.unlink());
+        await this.configs.get(username)?.unlink();
         this.configs.delete(username);
         this.contents.delete(username);
     }

package/lib/stateAggregator/accessors/sandboxAccessor.js

@@ -39,8 +39,7 @@ class GlobalInfoSandboxAccessor {
      * @param sandboxOrgId the sandboxOrgId that corresponds to a sandbox
      */
     get(sandboxOrgId) {
-        var _a;
-        return sandboxOrgId ? (_a = this.getAll()[sandboxOrgId]) !== null && _a !== void 0 ? _a : null : null;
+        return sandboxOrgId ? this.getAll()[sandboxOrgId] ?? null : null;
     }
     /**
      * Returns true if the given sandbox org id exists
@@ -48,8 +47,7 @@ class GlobalInfoSandboxAccessor {
      * @param sandboxOrgId the sandboxOrgId that corresponds to a sandbox
      */
     has(sandboxOrgId) {
-        var _a;
-        return !!(sandboxOrgId ? (_a = this.getAll()[sandboxOrgId]) !== null && _a !== void 0 ? _a : null : null);
+        return !!(sandboxOrgId ? this.getAll()[sandboxOrgId] ?? null : null);
     }
     /**
      * Set an sandboxOrgId for the given sandbox entity

package/lib/stateAggregator/sfdxDataHandler.js

@@ -50,13 +50,12 @@ class SfdxDataHandler {
 exports.SfdxDataHandler = SfdxDataHandler;
 class BaseHandler {
     async merge(sfData = globalInfoConfig_1.GlobalInfo.emptyDataModel) {
-        var _a, _b;
         const sfdxData = await this.migrate();
         const merged = (0, globalInfoConfig_1.deepCopy)(sfData);
         // Only merge the key this handler is responsible for.
         const key = this.sfKey;
-        const sfKeys = Object.keys((_a = sfData[key]) !== null && _a !== void 0 ? _a : {});
-        const sfdxKeys = Object.keys((_b = sfdxData[key]) !== null && _b !== void 0 ? _b : {});
+        const sfKeys = Object.keys(sfData[key] ?? {});
+        const sfdxKeys = Object.keys(sfdxData[key] ?? {});
         const commonKeys = sfKeys.filter((k) => sfdxKeys.includes(k));
         for (const k of commonKeys) {
             const [newer, older] = [sfData[key][k], sfdxData[key][k]].sort((a, b) => {
@@ -115,12 +114,11 @@ class AuthHandler extends BaseHandler {
         }));
     }
     async findChanges(latest, original) {
-        var _a;
         const latestAuths = latest.orgs;
         const originalAuths = original.orgs;
         const changed = {};
         for (const [username, auth] of Object.entries(latestAuths)) {
-            const originalAuth = (_a = originalAuths[username]) !== null && _a !== void 0 ? _a : {};
+            const originalAuth = originalAuths[username] ?? {};
             if (!isEqual(auth, originalAuth)) {
                 changed[username] = auth;
             }
@@ -218,13 +216,12 @@ class SandboxesHandler extends BaseHandler {
         this.sfKey = types_1.SfInfoKeys.SANDBOXES;
     }
     async merge(sfData = globalInfoConfig_1.GlobalInfo.emptyDataModel) {
-        var _a, _b;
         const sfdxData = await this.migrate();
         const merged = (0, globalInfoConfig_1.deepCopy)(sfData);
         // Only merge the key this handler is responsible for.
         const key = this.sfKey;
-        const sfKeys = Object.keys((_a = sfData[key]) !== null && _a !== void 0 ? _a : {});
-        const sfdxKeys = Object.keys((_b = sfdxData[key]) !== null && _b !== void 0 ? _b : {});
+        const sfKeys = Object.keys(sfData[key] ?? {});
+        const sfdxKeys = Object.keys(sfdxData[key] ?? {});
         // sandbox entries for .sf and .sfdx contain static data. Given there
         // can be no mutation during the life of the sandbox, having to merge common keys
         // is unnecessary.
@@ -289,12 +286,11 @@ class SandboxesHandler extends BaseHandler {
         }));
     }
     async findChanges(latest, original) {
-        var _a;
         const latestSandboxes = latest.sandboxes;
         const originalSandboxes = original.sandboxes;
         const changed = {};
         for (const [sandboxOrgId, sandbox] of Object.entries(latestSandboxes)) {
-            const originalSandbox = (_a = originalSandboxes[sandboxOrgId]) !== null && _a !== void 0 ? _a : {};
+            const originalSandbox = originalSandboxes[sandboxOrgId] ?? {};
             if (!isEqual(sandbox, originalSandbox)) {
                 changed[sandboxOrgId] = sandbox;
             }

package/lib/status/pollingClient.js

@@ -53,7 +53,6 @@ class PollingClient extends kit_1.AsyncOptionalCreatable {
      * in the polling options.
      */
     async subscribe() {
-        var _a;
         let errorInPollingFunction; // keep this around for returning in the catch block
         const doPoll = async () => {
             let result;
@@ -89,7 +88,7 @@ class PollingClient extends kit_1.AsyncOptionalCreatable {
             }
             await lifecycleEvents_1.Lifecycle.getInstance().emit('POLLING_TIME_OUT', error);
             this.logger.debug('Polling timed out');
-            throw new sfError_1.SfError('The client has timed out.', (_a = this.options.timeoutErrorName) !== null && _a !== void 0 ? _a : 'PollingClientTimeout');
+            throw new sfError_1.SfError('The client has timed out.', this.options.timeoutErrorName ?? 'PollingClientTimeout');
         }
     }
 }

package/lib/testSetup.js

@@ -41,11 +41,10 @@ const global_1 = require("./global");
  * - length: the length of the unique id as presented in hexadecimal.
  */
 function uniqid(options) {
-    var _a, _b;
-    const uniqueString = (0, crypto_1.randomBytes)(Math.ceil(((_a = options === null || options === void 0 ? void 0 : options.length) !== null && _a !== void 0 ? _a : 32) / 2.0))
+    const uniqueString = (0, crypto_1.randomBytes)(Math.ceil((options?.length ?? 32) / 2.0))
         .toString('hex')
-        .slice(0, (_b = options === null || options === void 0 ? void 0 : options.length) !== null && _b !== void 0 ? _b : 32);
-    if (!(options === null || options === void 0 ? void 0 : options.template)) {
+        .slice(0, options?.length ?? 32);
+    if (!options?.template) {
         return uniqueString;
     }
     return options.template.includes('%s')
@@ -168,9 +167,8 @@ const instantiateContext = (sinon) => {
                 return orgMap.has(username);
             });
             const retrieveContents = async function () {
-                var _a;
                 const username = (0, path_1.basename)(this.path.replace('.json', ''));
-                return Promise.resolve((_a = orgMap.get(username)) !== null && _a !== void 0 ? _a : {});
+                return Promise.resolve(orgMap.get(username) ?? {});
             };
             this.configStubs.AuthInfoConfig = { retrieveContents };
         },
@@ -179,9 +177,8 @@ const instantiateContext = (sinon) => {
             const sandboxMap = new Map(entries);
             (0, ts_sinon_1.stubMethod)(testContext.SANDBOX, sandboxAccessor_1.SandboxAccessor.prototype, 'getAllFiles').returns([...sandboxMap.keys()].map((o) => `${o}.sandbox.json`));
             const retrieveContents = async function () {
-                var _a;
                 const username = (0, path_1.basename)(this.path.replace('.sandbox.json', ''));
-                return Promise.resolve((_a = sandboxMap.get(username)) !== null && _a !== void 0 ? _a : {});
+                return Promise.resolve(sandboxMap.get(username) ?? {});
             };
             this.configStubs.SandboxOrgConfig = { retrieveContents };
         },
@@ -595,7 +592,7 @@ class MockTestOrgData {
         this.testId = id;
         this.userId = `user_id_${this.testId}`;
         this.orgId = `${this.testId}`;
-        this.username = (options === null || options === void 0 ? void 0 : options.username) || `admin_${this.testId}@gb.org`;
+        this.username = options?.username || `admin_${this.testId}@gb.org`;
         this.loginUrl = `https://login.${this.testId}.salesforce.com`;
         this.instanceUrl = `https://instance.${this.testId}.salesforce.com`;
         this.clientId = `${this.testId}/client_id`;
@@ -702,9 +699,9 @@ class MockTestSandboxData {
     constructor(id = uniqid(), options) {
         this.id = id;
         this.sandboxOrgId = id;
-        this.prodOrgUsername = (options === null || options === void 0 ? void 0 : options.prodOrgUsername) || `admin_${id}@gb.org`;
-        this.sandboxName = (options === null || options === void 0 ? void 0 : options.name) || `sandbox_${id}`;
-        this.username = (options === null || options === void 0 ? void 0 : options.username) || `${this.prodOrgUsername}.sandbox`;
+        this.prodOrgUsername = options?.prodOrgUsername || `admin_${id}@gb.org`;
+        this.sandboxName = options?.name || `sandbox_${id}`;
+        this.username = options?.username || `${this.prodOrgUsername}.sandbox`;
     }
     /**
      * Return the auth config file contents.

package/lib/util/checkLightningDomain.js

@@ -11,9 +11,8 @@ const kit_1 = require("@salesforce/kit");
 const myDomainResolver_1 = require("../status/myDomainResolver");
 const sfdc_1 = require("./sfdc");
 async function checkLightningDomain(url) {
-    var _a, _b;
-    const domain = `https://${(_a = /https?:\/\/([^.]*)/.exec(url)) === null || _a === void 0 ? void 0 : _a.slice(1, 2).pop()}.lightning.force.com`;
-    const quantity = (_b = new kit_1.Env().getNumber('SFDX_DOMAIN_RETRY', 240)) !== null && _b !== void 0 ? _b : 0;
+    const domain = `https://${/https?:\/\/([^.]*)/.exec(url)?.slice(1, 2).pop()}.lightning.force.com`;
+    const quantity = new kit_1.Env().getNumber('SFDX_DOMAIN_RETRY', 240) ?? 0;
     const timeout = new kit_1.Duration(quantity, kit_1.Duration.Unit.SECONDS);
     if (sfdc_1.sfdc.isInternalUrl(url) || timeout.seconds === 0) {
         return true;

package/lib/util/directoryWriter.d.ts

@@ -0,0 +1,11 @@
+/// <reference types="node" />
+import { Readable } from 'stream';
+import { StructuredWriter } from './structuredWriter';
+export declare class DirectoryWriter implements StructuredWriter {
+    private readonly rootDestination?;
+    constructor(rootDestination?: string | undefined);
+    addToStore(contents: string | Readable | Buffer, targetPath: string): Promise<void>;
+    finalize(): Promise<void>;
+    getDestinationPath(): string | undefined;
+    get buffer(): Buffer;
+}

package/lib/util/directoryWriter.js

@@ -0,0 +1,52 @@
+"use strict";
+/*
+ * Copyright (c) 2021, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DirectoryWriter = void 0;
+const stream_1 = require("stream");
+const fs = require("fs");
+const os = require("os");
+const path = require("path");
+const util_1 = require("util");
+const pipeline = (0, util_1.promisify)(stream_1.pipeline);
+class DirectoryWriter {
+    constructor(rootDestination) {
+        this.rootDestination = rootDestination;
+        if (!this.rootDestination) {
+            this.rootDestination = fs.mkdtempSync(`${os.tmpdir()}${path.sep}`);
+        }
+        else {
+            fs.mkdirSync(this.rootDestination, { recursive: true });
+        }
+    }
+    async addToStore(contents, targetPath) {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const destPath = path.join(this.rootDestination, targetPath);
+        fs.mkdirSync(path.dirname(destPath), { recursive: true });
+        if (contents instanceof stream_1.Readable) {
+            const writeStream = fs.createWriteStream(destPath);
+            await pipeline(contents, writeStream);
+        }
+        else if (typeof contents === 'string') {
+            fs.writeFileSync(destPath, contents);
+        }
+        else if (contents instanceof Buffer) {
+            fs.writeFileSync(destPath, contents);
+        }
+    }
+    finalize() {
+        return Promise.resolve(undefined);
+    }
+    getDestinationPath() {
+        return this.rootDestination;
+    }
+    get buffer() {
+        throw new Error('Not implemented');
+    }
+}
+exports.DirectoryWriter = DirectoryWriter;
+//# sourceMappingURL=directoryWriter.js.map

package/lib/util/structuredWriter.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="node" />
+import { Readable } from 'stream';
+export interface StructuredWriter {
+    addToStore(contents: string | Readable | Buffer, path: string): Promise<void>;
+    finalize(): Promise<void>;
+    getDestinationPath(): string | undefined;
+    get buffer(): Buffer;
+}

package/lib/util/structuredWriter.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=structuredWriter.js.map

package/lib/util/zipWriter.d.ts

@@ -1,13 +1,14 @@
 /// <reference types="node" />
-import { pipeline as cbPipeline, Readable, Writable } from 'stream';
-export declare const pipeline: typeof cbPipeline.__promisify__;
-export declare class ZipWriter extends Writable {
-    private rootDestination?;
+import { Readable, Writable } from 'stream';
+import { StructuredWriter } from './structuredWriter';
+export declare class ZipWriter extends Writable implements StructuredWriter {
+    private readonly rootDestination?;
     private zip;
     private buffers;
     constructor(rootDestination?: string | undefined);
-    addToZip(contents: string | Readable | Buffer, path: string): void;
+    addToStore(contents: string | Readable | Buffer, path: string): Promise<void>;
     finalize(): Promise<void>;
+    getDestinationPath(): string | undefined;
     private getOutputStream;
     private getInputBuffer;
     get buffer(): Buffer;

package/lib/util/zipWriter.js

@@ -6,12 +6,12 @@
  * 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.ZipWriter = exports.pipeline = void 0;
+exports.ZipWriter = void 0;
 const fs_1 = require("fs");
 const stream_1 = require("stream");
 const util_1 = require("util");
 const archiver_1 = require("archiver");
-exports.pipeline = (0, util_1.promisify)(stream_1.pipeline);
+const pipeline = (0, util_1.promisify)(stream_1.pipeline);
 class ZipWriter extends stream_1.Writable {
     constructor(rootDestination) {
         super({ objectMode: true });
@@ -21,15 +21,19 @@ class ZipWriter extends stream_1.Writable {
         // higher values = diminishing returns on compression and made conversion slower
         this.zip = (0, archiver_1.create)('zip', { zlib: { level: 3 } });
         this.buffers = [];
-        void (0, exports.pipeline)(this.zip, this.getOutputStream());
+        void pipeline(this.zip, this.getOutputStream());
     }
-    addToZip(contents, path) {
+    async addToStore(contents, path) {
         this.zip.append(contents, { name: path });
+        return Promise.resolve();
     }
     async finalize() {
         await this.zip.finalize();
         await this.getInputBuffer();
     }
+    getDestinationPath() {
+        return this.rootDestination;
+    }
     getOutputStream() {
         if (this.rootDestination) {
             return (0, fs_1.createWriteStream)(this.rootDestination);

package/lib/webOAuthServer.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="node" />
 import * as http from 'http';
+import { JwtOAuth2Config } from 'jsforce';
 import { AsyncCreatable } from '@salesforce/kit';
-import { AuthInfo, OAuth2Config } from './org/authInfo';
+import { AuthInfo } from './org';
 /**
  * Handles the creation of a web server for web based login flows.
  *
@@ -79,7 +80,7 @@ export declare class WebOAuthServer extends AsyncCreatable<WebOAuthServer.Option
 }
 export declare namespace WebOAuthServer {
     interface Options {
-        oauthConfig: OAuth2Config;
+        oauthConfig: JwtOAuth2Config;
     }
     type Request = http.IncomingMessage & {
         query: {

package/lib/webOAuthServer.js

@@ -11,11 +11,11 @@ const http = require("http");
 const querystring_1 = require("querystring");
 const url_1 = require("url");
 const net_1 = require("net");
+const jsforce_1 = require("jsforce");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
-const jsforce_1 = require("jsforce");
 const logger_1 = require("./logger");
-const authInfo_1 = require("./org/authInfo");
+const org_1 = require("./org");
 const sfError_1 = require("./sfError");
 const messages_1 = require("./messages");
 const sfProject_1 = require("./sfProject");
@@ -85,7 +85,7 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
                 this.executeOauthRequest()
                     .then(async (response) => {
                     try {
-                        const authInfo = await authInfo_1.AuthInfo.create({
+                        const authInfo = await org_1.AuthInfo.create({
                             oauth2Options: this.oauthConfig,
                             oauth2: this.oauth2,
                         });
@@ -127,14 +127,14 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
         this.logger = await logger_1.Logger.child(this.constructor.name);
         const port = await WebOAuthServer.determineOauthPort();
         if (!this.oauthConfig.clientId)
-            this.oauthConfig.clientId = authInfo_1.DEFAULT_CONNECTED_APP_INFO.clientId;
+            this.oauthConfig.clientId = org_1.DEFAULT_CONNECTED_APP_INFO.clientId;
         if (!this.oauthConfig.loginUrl)
-            this.oauthConfig.loginUrl = authInfo_1.AuthInfo.getDefaultInstanceUrl();
+            this.oauthConfig.loginUrl = org_1.AuthInfo.getDefaultInstanceUrl();
         if (!this.oauthConfig.redirectUri)
             this.oauthConfig.redirectUri = `http://localhost:${port}/OauthRedirect`;
         this.webServer = await WebServer.create({ port });
         this.oauth2 = new jsforce_1.OAuth2(this.oauthConfig);
-        this.authUrl = authInfo_1.AuthInfo.getAuthorizationUrl(this.oauthConfig, this.oauth2);
+        this.authUrl = org_1.AuthInfo.getAuthorizationUrl(this.oauthConfig, this.oauth2);
     }
     /**
      * Executes the oauth request

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "3.23.6",
+  "version": "3.23.9",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -49,7 +49,7 @@
     "form-data": "^4.0.0",
     "graceful-fs": "^4.2.9",
     "js2xmlparser": "^4.0.1",
-    "jsforce": "2.0.0-beta.14",
+    "jsforce": "beta",
     "jsonwebtoken": "8.5.1",
     "mkdirp": "1.0.4",
     "ts-retry-promise": "^0.6.0"
@@ -60,6 +60,7 @@
     "@salesforce/prettier-config": "^0.0.2",
     "@salesforce/ts-sinon": "^1.3.21",
     "@types/archiver": "^5.3.1",
+    "@types/chai-string": "^1.4.2",
     "@types/debug": "0.0.31",
     "@types/jsen": "0.0.21",
     "@types/jsonwebtoken": "8.5.7",
@@ -68,6 +69,7 @@
     "@typescript-eslint/eslint-plugin": "^4.33.0",
     "@typescript-eslint/parser": "4.33.0",
     "chai": "^4.3.4",
+    "chai-string": "^1.5.0",
     "commitizen": "^3.1.2",
     "eslint": "^7.27.0",
     "eslint-config-prettier": "^6.15.0",