@salesforce/core 4.0.0-v3.0 → 4.0.0

package/lib/util/jsonXmlTools.js

@@ -0,0 +1,41 @@
+"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.fixExistingDollarSign = exports.JsonAsXml = exports.writeJSONasXML = exports.standardOptions = void 0;
+const fs_1 = require("fs");
+const jsToXml = require("js2xmlparser");
+exports.standardOptions = {
+    declaration: {
+        include: true,
+        encoding: 'UTF-8',
+        version: '1.0',
+    },
+    format: {
+        doubleQuotes: true,
+    },
+};
+const writeJSONasXML = async ({ path, json, type, options = exports.standardOptions, }) => {
+    const xml = jsToXml.parse(type, (0, exports.fixExistingDollarSign)(json), options);
+    return await fs_1.promises.writeFile(path, xml);
+};
+exports.writeJSONasXML = writeJSONasXML;
+const JsonAsXml = ({ json, type, options = exports.standardOptions }) => {
+    return jsToXml.parse(type, (0, exports.fixExistingDollarSign)(json), options);
+};
+exports.JsonAsXml = JsonAsXml;
+const fixExistingDollarSign = (existing) => {
+    const existingCopy = { ...existing };
+    if (existingCopy.$) {
+        const temp = existingCopy.$;
+        delete existingCopy.$;
+        existingCopy['@'] = temp;
+    }
+    return existingCopy;
+};
+exports.fixExistingDollarSign = fixExistingDollarSign;
+//# sourceMappingURL=jsonXmlTools.js.map

package/lib/util/mapKeys.d.ts

@@ -0,0 +1,14 @@
+/**
+ *  Use mapKeys to convert object keys to another format using the specified conversion function.
+ *
+ *  E.g., to deep convert all object keys to camelCase:  mapKeys(myObj, _.camelCase, true)
+ *        to shallow convert object keys to lower case:  mapKeys(myObj, _.toLower)
+ *
+ *  NOTE: This mutates the object passed in for conversion.
+ *
+ *  @param target - {Object} The object to convert the keys
+ *  @param converter - {Function} The function that converts the object key
+ *  @param deep - {boolean} Whether to do a deep object key conversion
+ *  @return {Object} - the object with the converted keys
+ */
+export default function mapKeys(obj: any, converter: (key: string) => string, deep?: boolean): Record<string, unknown>;

package/lib/util/mapKeys.js

@@ -0,0 +1,48 @@
+"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 });
+const ts_types_1 = require("@salesforce/ts-types");
+/**
+ *  Use mapKeys to convert object keys to another format using the specified conversion function.
+ *
+ *  E.g., to deep convert all object keys to camelCase:  mapKeys(myObj, _.camelCase, true)
+ *        to shallow convert object keys to lower case:  mapKeys(myObj, _.toLower)
+ *
+ *  NOTE: This mutates the object passed in for conversion.
+ *
+ *  @param target - {Object} The object to convert the keys
+ *  @param converter - {Function} The function that converts the object key
+ *  @param deep - {boolean} Whether to do a deep object key conversion
+ *  @return {Object} - the object with the converted keys
+ */
+function mapKeys(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
+obj, converter, deep) {
+    const target = Object.assign({}, obj);
+    return Object.fromEntries(Object.entries(target).map(([key, value]) => {
+        const k = converter.call(null, key);
+        if (deep) {
+            let v = value;
+            if (Array.isArray(value)) {
+                v = value.map((v1) => {
+                    if ((0, ts_types_1.isPlainObject)(v1)) {
+                        return mapKeys(v1, converter, deep);
+                    }
+                    return v1;
+                });
+            }
+            else if ((0, ts_types_1.isPlainObject)(value)) {
+                v = mapKeys(value, converter, deep);
+            }
+            return [k, v];
+        }
+        return [k, value];
+    }));
+}
+exports.default = mapKeys;
+//# sourceMappingURL=mapKeys.js.map

package/lib/util/sfdc.d.ts

@@ -1,11 +1,5 @@
 import { JsonMap, Optional } from '@salesforce/ts-types';
 export declare const sfdc: {
-    /**
-     * Returns `true` if a provided URL contains a Salesforce owned domain.
-     *
-     * @param urlString The URL to inspect.
-     */
-    isSalesforceDomain: (urlString: string) => boolean;
     /**
      * Converts an 18 character Salesforce ID to 15 characters.
      *
@@ -42,7 +36,7 @@ export declare const sfdc: {
      * @param data The object in which to check key casing.
      * @param sectionBlocklist properties in the object to exclude from the search. e.g. a blocklist of `["a"]` and data of `{ "a": { "B" : "b"}}` would ignore `B` because it is in the object value under `a`.
      */
-    findUpperCaseKeys: (data?: Optional<JsonMap>, sectionBlocklist?: string[]) => Optional<string>;
+    findUpperCaseKeys: (data?: JsonMap | undefined, sectionBlocklist?: string[]) => Optional<string>;
     /**
      * Tests whether a given string is an access token
      *
@@ -55,10 +49,4 @@ export declare const sfdc: {
      * @param url
      */
     isInternalUrl: (url: string) => boolean;
-    /**
-     * Tests whether a given internal url runs on a local machine
-     *
-     * @param url
-     */
-    isLocalUrl: (url: string) => boolean;
 };

package/lib/util/sfdc.js

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

package/lib/util/sfdcUrl.d.ts

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

package/lib/util/sfdcUrl.js

@@ -0,0 +1,206 @@
+"use strict";
+/*
+ * Copyright (c) 2021, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SfdcUrl = void 0;
+const url_1 = require("url");
+const kit_1 = require("@salesforce/kit");
+const ts_types_1 = require("@salesforce/ts-types");
+const myDomainResolver_1 = require("../status/myDomainResolver");
+const logger_1 = require("../logger");
+const lifecycleEvents_1 = require("../lifecycleEvents");
+class SfdcUrl extends url_1.URL {
+    constructor(input, base) {
+        super(input.toString(), base);
+        if (this.protocol !== 'https:' && !SfdcUrl.cache.has(this.origin)) {
+            SfdcUrl.cache.add(this.origin);
+            void lifecycleEvents_1.Lifecycle.getInstance().emitWarning(`Using insecure protocol: ${this.protocol} on url: ${this.origin}`);
+        }
+    }
+    static isValidUrl(input) {
+        try {
+            new url_1.URL(input.toString());
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    /**
+     * Returns the appropriate jwt audience url for this url
+     * Use SFDX_AUDIENCE_URL env var to override the audience url
+     *
+     * @param createdOrgInstance The Salesforce instance the org was created on. e.g. `cs42`
+     * @return {Promise<string>} The audience url
+     */
+    async getJwtAudienceUrl(createdOrgInstance) {
+        this.logger = await logger_1.Logger.child('SfdcUrl');
+        // environment variable is used as an override
+        const envVarVal = new kit_1.Env().getString('SFDX_AUDIENCE_URL', '');
+        if (envVarVal) {
+            this.logger.debug(`Audience URL overridden by env var SFDX_AUDIENCE_URL=${envVarVal}`);
+            return envVarVal;
+        }
+        if (this.isInternalUrl()) {
+            // This is for internal developers when just doing authorize
+            return this.origin;
+        }
+        if (await this.resolvesToSandbox(createdOrgInstance)) {
+            return SfdcUrl.SANDBOX;
+        }
+        if ((createdOrgInstance && /^gs1/gi.test(createdOrgInstance)) || /(gs1.my.salesforce.com)/gi.test(this.origin)) {
+            return 'https://gs1.salesforce.com';
+        }
+        return SfdcUrl.PRODUCTION;
+    }
+    /**
+     * Tests whether this url contains a Salesforce owned domain
+     *
+     * @return {boolean} true if this is a salesforce domain
+     */
+    isSalesforceDomain() {
+        // Source https://help.salesforce.com/articleView?id=000003652&type=1
+        const allowlistOfSalesforceDomainPatterns = [
+            '.cloudforce.com',
+            '.content.force.com',
+            '.force.com',
+            '.salesforce.com',
+            '.salesforceliveagent.com',
+            '.secure.force.com',
+            'crmforce.mil',
+        ];
+        const allowlistOfSalesforceHosts = ['developer.salesforce.com', 'trailhead.salesforce.com'];
+        return allowlistOfSalesforceDomainPatterns.some((pattern) => {
+            return this.hostname.endsWith(pattern) || allowlistOfSalesforceHosts.includes(this.hostname);
+        });
+    }
+    /**
+     * Tests whether this url is an internal Salesforce domain
+     *
+     * @returns {boolean} true if this is a internal domain
+     */
+    isInternalUrl() {
+        const INTERNAL_URL_PARTS = [
+            '.vpod.',
+            'stm.salesforce.com',
+            'stm.force.com',
+            '.blitz.salesforce.com',
+            '.stm.salesforce.ms',
+            '.pc-rnd.force.com',
+            '.pc-rnd.salesforce.com',
+        ];
+        return (this.origin.startsWith('https://gs1.') ||
+            this.isLocalUrl() ||
+            INTERNAL_URL_PARTS.some((part) => this.origin.includes(part)));
+    }
+    /**
+     * Tests whether this url runs on a local machine
+     *
+     * @returns {boolean} true if this is a local machine
+     */
+    isLocalUrl() {
+        const LOCAL_PARTS = ['localhost.sfdcdev.', '.internal.'];
+        return LOCAL_PARTS.some((part) => this.origin.includes(part));
+    }
+    toLightningDomain() {
+        if (this.origin.endsWith('.my.salesforce.mil')) {
+            return this.origin.replace('.my.salesforce.mil', '.lightning.crmforce.mil');
+        }
+        // all non-mil domains
+        return `https://${(0, ts_types_1.ensureArray)(/https?:\/\/([^.]*)/.exec(this.origin))
+            .slice(1, 2)
+            .pop()}.lightning.force.com`;
+    }
+    /**
+     * Tests whether this url has the lightning domain extension
+     * This method that performs the dns lookup of the host. If the lookup fails the internal polling (1 second), client will try again until timeout
+     * If SFDX_DOMAIN_RETRY environment variable is set (number) it overrides the default timeout duration (240 seconds)
+     *
+     * @returns {Promise<true | never>} The resolved ip address or never
+     * @throws {@link SfdxError} If can't resolve DNS.
+     */
+    async checkLightningDomain() {
+        const quantity = (0, ts_types_1.ensureNumber)(new kit_1.Env().getNumber('SFDX_DOMAIN_RETRY', 240));
+        const timeout = new kit_1.Duration(quantity, kit_1.Duration.Unit.SECONDS);
+        if (this.isInternalUrl() || timeout.seconds === 0) {
+            return true;
+        }
+        const resolver = await myDomainResolver_1.MyDomainResolver.create({
+            url: new url_1.URL(this.toLightningDomain()),
+            timeout,
+            frequency: new kit_1.Duration(1, kit_1.Duration.Unit.SECONDS),
+        });
+        await resolver.resolve();
+        return true;
+    }
+    /**
+     * Method that performs the dns lookup of the host. If the lookup fails the internal polling (1 second), client will try again untill timeout
+     * If SFDX_DOMAIN_RETRY environment variable is set (number) it overrides the default timeout duration (240 seconds)
+     *
+     * @returns the resolved ip address.
+     * @throws {@link SfdxError} If can't resolve DNS.
+     */
+    async lookup() {
+        const quantity = (0, ts_types_1.ensureNumber)(new kit_1.Env().getNumber('SFDX_DOMAIN_RETRY', 240));
+        const timeout = new kit_1.Duration(quantity, kit_1.Duration.Unit.SECONDS);
+        const resolver = await myDomainResolver_1.MyDomainResolver.create({
+            url: new url_1.URL(this.origin),
+            timeout,
+            frequency: new kit_1.Duration(1, kit_1.Duration.Unit.SECONDS),
+        });
+        return resolver.resolve();
+    }
+    /**
+     * Tests whether this url is a sandbox url
+     *
+     * @param createdOrgInstance The Salesforce instance the org was created on. e.g. `cs42`
+     * @returns {boolean}
+     */
+    isSandboxUrl(createdOrgInstance) {
+        return ((createdOrgInstance && /^cs|s$/gi.test(createdOrgInstance)) ||
+            this.origin.endsWith('sandbox.my.salesforce.mil') ||
+            /sandbox\.my\.salesforce\.com/gi.test(this.origin) || // enhanced domains >= 230
+            /(cs[0-9]+(\.my|)\.salesforce\.com)/gi.test(this.origin) || // my domains on CS instance OR CS instance without my domain
+            /([a-z]{3}[0-9]+s\.sfdc-.+\.salesforce\.com)/gi.test(this.origin) || // falcon sandbox ex: usa2s.sfdc-whatever.salesforce.com
+            /([a-z]{3}[0-9]+s\.sfdc-.+\.force\.com)/gi.test(this.origin) || // falcon sandbox ex: usa2s.sfdc-whatever.force.com
+            this.hostname === 'test.salesforce.com');
+    }
+    /**
+     * Test whether this url represents a lightning domain
+     *
+     * @returns {boolean} true if this domain is a lightning domain
+     */
+    isLightningDomain() {
+        return /\.lightning\.force\.com/.test(this.origin);
+    }
+    /**
+     * Tests whether this url is a sandbox url
+     * otherwise tries to resolve dns cnames and then look if any is sandbox url
+     *
+     * @param createdOrgInstance The Salesforce instance the org was created on. e.g. `cs42`
+     * @returns {Promise<boolean>} true if this domain resolves to sanbox url
+     */
+    async resolvesToSandbox(createdOrgInstance) {
+        if (this.isSandboxUrl(createdOrgInstance)) {
+            return true;
+        }
+        const myDomainResolver = await myDomainResolver_1.MyDomainResolver.create({ url: this });
+        const cnames = await myDomainResolver.getCnames();
+        return cnames.some((cname) => {
+            const url = new SfdcUrl(`https://${cname}`);
+            return url.isSandboxUrl();
+        });
+    }
+}
+exports.SfdcUrl = SfdcUrl;
+/**
+ * Salesforce URLs
+ */
+SfdcUrl.SANDBOX = 'https://test.salesforce.com';
+SfdcUrl.PRODUCTION = 'https://login.salesforce.com';
+SfdcUrl.cache = new Set();
+//# sourceMappingURL=sfdcUrl.js.map

package/lib/util/zipWriter.d.ts

@@ -0,0 +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?;
+    private zip;
+    private buffers;
+    constructor(rootDestination?: string | undefined);
+    addToZip(contents: string | Readable | Buffer, path: string): void;
+    finalize(): Promise<void>;
+    private getOutputStream;
+    private getInputBuffer;
+    get buffer(): Buffer;
+}

package/lib/util/zipWriter.js

@@ -0,0 +1,68 @@
+"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.ZipWriter = exports.pipeline = 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);
+class ZipWriter extends stream_1.Writable {
+    constructor(rootDestination) {
+        super({ objectMode: true });
+        this.rootDestination = rootDestination;
+        // compression-/speed+ (0)<---(3)---------->(9) compression+/speed-
+        // 3 appears to be a decent balance of compression and speed. It felt like
+        // 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());
+    }
+    addToZip(contents, path) {
+        this.zip.append(contents, { name: path });
+    }
+    async finalize() {
+        await this.zip.finalize();
+        await this.getInputBuffer();
+    }
+    getOutputStream() {
+        if (this.rootDestination) {
+            return (0, fs_1.createWriteStream)(this.rootDestination);
+        }
+        else {
+            const bufferWritable = new stream_1.Writable();
+            // eslint-disable-next-line no-underscore-dangle
+            bufferWritable._write = (chunk, encoding, cb) => {
+                this.buffers.push(chunk);
+                cb();
+            };
+            return bufferWritable;
+        }
+    }
+    async getInputBuffer() {
+        if (this.rootDestination) {
+            const inputStream = (0, fs_1.createReadStream)(this.rootDestination);
+            return new Promise((resolve, reject) => {
+                inputStream.on('data', (chunk) => {
+                    this.buffers.push(chunk);
+                });
+                inputStream.once('end', () => {
+                    return resolve();
+                });
+                inputStream.once('error', (error) => {
+                    return reject(error);
+                });
+            });
+        }
+    }
+    get buffer() {
+        return Buffer.concat(this.buffers);
+    }
+}
+exports.ZipWriter = ZipWriter;
+//# sourceMappingURL=zipWriter.js.map

package/lib/webOAuthServer.d.ts

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