@salesforce/core 4.0.0 → 4.0.1

package/lib/crypto/keyChainImpl.js

@@ -9,36 +9,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.keyChainImpl = exports.GenericWindowsKeychainAccess = exports.GenericUnixKeychainAccess = exports.GenericKeychainAccess = exports.KeychainAccess = void 0;
 const childProcess = require("child_process");
 const nodeFs = require("fs");
+const fs = require("fs");
 const os = require("os");
-const path = require("path");
 const os_1 = require("os");
+const path = require("path");
 const ts_types_1 = require("@salesforce/ts-types");
+const kit_1 = require("@salesforce/kit");
 const global_1 = require("../global");
-const fs_1 = require("../util/fs");
 const messages_1 = require("../messages");
-messages_1.Messages.importMessagesDirectory(__dirname);
-const messages = messages_1.Messages.load('@salesforce/core', 'encryption', [
-    'missingCredentialProgramError',
-    'credentialProgramAccessError',
-    'keyChainServiceRequiredError',
-    'keyChainAccountRequiredError',
-    'passwordRetryError',
-    'passwordRequiredError',
-    'passwordNotFoundError',
-    'setCredentialError',
-    'keyChainUserCanceledError',
-    'genericKeychainServiceError',
-    'genericKeychainInvalidPermsError',
-]);
+const messages = new messages_1.Messages('@salesforce/core', 'encryption', new Map([["invalidEncryptedFormatError", "The encrypted data is not properly formatted."], ["invalidEncryptedFormatError.actions", ["If attempting to create a scratch org then re-authorize. Otherwise create a new scratch org."]], ["authDecryptError", "Failed to decipher auth data. reason: %s."], ["unsupportedOperatingSystemError", "Unsupported Operating System: %s"], ["missingCredentialProgramError", "Unable to find required security software: %s"], ["credentialProgramAccessError", "Unable to execute security software: %s"], ["passwordRetryError", "Failed to get the password after %i retries."], ["passwordRequiredError", "A password is required."], ["keyChainServiceRequiredError", "Unable to get or set a keychain value without a service name."], ["keyChainAccountRequiredError", "Unable to get or set a keychain value without an account name."], ["keyChainUserCanceledError", "User canceled authentication."], ["keychainPasswordCreationError", "Failed to create a password in the keychain."], ["genericKeychainServiceError", "The service and account specified in %s do not match the version of the toolbelt."], ["genericKeychainServiceError.actions", ["Check your toolbelt version and re-auth."]], ["genericKeychainInvalidPermsError", "Invalid file permissions for secret file"], ["genericKeychainInvalidPermsError.actions", ["Ensure the file %s has the file permission octal value of %s."]], ["passwordNotFoundError", "Could not find password.\n%s"], ["passwordNotFoundError.actions", ["Ensure a valid password is returned with the following command: [%s]"]], ["setCredentialError", "Command failed with response:\n%s"], ["setCredentialError.actions", ["Determine why this command failed to set an encryption key for user %s: [%s]."]], ["macKeychainOutOfSync", "We\u2019ve encountered an error with the Mac keychain being out of sync with your `sfdx` credentials. To fix the problem, sync your credentials by authenticating into your org again using the auth commands."]]));
 const GET_PASSWORD_RETRY_COUNT = 3;
 /**
  * Helper to reduce an array of cli args down to a presentable string for logging.
  *
  * @param optionsArray CLI command args.
  */
-function _optionsToString(optionsArray) {
-    return optionsArray.reduce((accum, element) => `${accum} ${element}`);
-}
+const optionsToString = (optionsArray) => optionsArray.join(' ');
 /**
  * Helper to determine if a program is executable. Returns `true` if the program is executable for the user. For
  * Windows true is always returned.
@@ -47,7 +33,7 @@ function _optionsToString(optionsArray) {
  * @param gid Unix group id.
  * @param uid Unix user id.
  */
-const _isExe = (mode, gid, uid) => {
+const isExe = (mode, gid, uid) => {
     if (process.platform === 'win32') {
         return true;
     }
@@ -58,15 +44,18 @@ const _isExe = (mode, gid, uid) => {
 /**
  * Private helper to validate that a program exists on the file system and is executable.
  *
- * **Throws** *{@link SfdxError}{ name: 'MissingCredentialProgramError' }* When the OS credential program isn't found.
+ * **Throws** *{@link SfError}{ name: 'MissingCredentialProgramError' }* When the OS credential program isn't found.
  *
- * **Throws** *{@link SfdxError}{ name: 'CredentialProgramAccessError' }* When the OS credential program isn't accessible.
+ * **Throws** *{@link SfError}{ name: 'CredentialProgramAccessError' }* When the OS credential program isn't accessible.
  *
  * @param programPath The absolute path of the program.
  * @param fsIfc The file system interface.
  * @param isExeIfc Executable validation function.
  */
-const _validateProgram = async (programPath, fsIfc, isExeIfc) => {
+// eslint-disable-next-line no-underscore-dangle
+const _validateProgram = async (programPath, fsIfc, isExeIfc
+// eslint-disable-next-line @typescript-eslint/require-await
+) => {
     let noPermission;
     try {
         const stats = fsIfc.statSync(programPath);
@@ -97,7 +86,7 @@ class KeychainAccess {
      * Validates the os level program is executable.
      */
     async validateProgram() {
-        await _validateProgram(this.osImpl.getProgram(), this.fsIfc, _isExe);
+        await _validateProgram(this.osImpl.getProgram(), this.fsIfc, isExe);
     }
     /**
      * Returns a password using the native program for credential management.
@@ -135,6 +124,7 @@ class KeychainAccess {
                 return await this.osImpl.onGetCommandClose(code, stdout, stderr, opts, fn);
             }
             catch (e) {
+                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                 // @ts-ignore
                 if (e.retry) {
                     if (retryCount >= GET_PASSWORD_RETRY_COUNT) {
@@ -171,7 +161,7 @@ class KeychainAccess {
             fn(messages.createError('passwordRequiredError'));
             return;
         }
-        await _validateProgram(this.osImpl.getProgram(), this.fsIfc, _isExe);
+        await _validateProgram(this.osImpl.getProgram(), this.fsIfc, isExe);
         const credManager = this.osImpl.setCommandFunc(opts, childProcess.spawn);
         let stdout = '';
         let stderr = '';
@@ -187,7 +177,7 @@ class KeychainAccess {
         }
         credManager.on('close', 
         // eslint-disable-next-line @typescript-eslint/no-misused-promises
-        async (code) => await this.osImpl.onSetCommandClose(code, stdout, stderr, opts, fn));
+        async (code) => this.osImpl.onSetCommandClose(code, stdout, stderr, opts, fn));
         if (credManager.stdin) {
             credManager.stdin.end();
         }
@@ -199,23 +189,25 @@ exports.KeychainAccess = KeychainAccess;
  *
  * Uses libsecret.
  */
-const _linuxImpl = {
+const linuxImpl = {
     getProgram() {
-        return process.env.SFDX_SECRET_TOOL_PATH || path.join(path.sep, 'usr', 'bin', 'secret-tool');
+        return process.env.SFDX_SECRET_TOOL_PATH ?? path.join(path.sep, 'usr', 'bin', 'secret-tool');
     },
     getProgramOptions(opts) {
         return ['lookup', 'user', opts.account, 'domain', opts.service];
     },
     getCommandFunc(opts, fn) {
-        return fn(_linuxImpl.getProgram(), _linuxImpl.getProgramOptions(opts));
+        return fn(linuxImpl.getProgram(), linuxImpl.getProgramOptions(opts));
     },
+    // eslint-disable-next-line @typescript-eslint/require-await
     async onGetCommandClose(code, stdout, stderr, opts, fn) {
         if (code === 1) {
-            const command = `${_linuxImpl.getProgram()} ${_optionsToString(_linuxImpl.getProgramOptions(opts))}`;
+            const command = `${linuxImpl.getProgram()} ${optionsToString(linuxImpl.getProgramOptions(opts))}`;
             const error = messages.createError('passwordNotFoundError', [], [command]);
             // This is a workaround for linux.
             // Calling secret-tool too fast can cause it to return an unexpected error. (below)
-            if (stderr != null && stderr.includes('invalid or unencryptable secret')) {
+            if (stderr?.includes('invalid or unencryptable secret')) {
+                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                 // @ts-ignore TODO: make an error subclass with this field
                 error.retry = true;
                 // Throwing here allows us to perform a retry in KeychainAccess
@@ -232,15 +224,16 @@ const _linuxImpl = {
         return ['store', "--label='salesforce.com'", 'user', opts.account, 'domain', opts.service];
     },
     setCommandFunc(opts, fn) {
-        const secretTool = fn(_linuxImpl.getProgram(), _linuxImpl.setProgramOptions(opts));
+        const secretTool = fn(linuxImpl.getProgram(), linuxImpl.setProgramOptions(opts));
         if (secretTool.stdin) {
             secretTool.stdin.write(`${opts.password}\n`);
         }
         return secretTool;
     },
+    // eslint-disable-next-line @typescript-eslint/require-await
     async onSetCommandClose(code, stdout, stderr, opts, fn) {
         if (code !== 0) {
-            const command = `${_linuxImpl.getProgram()} ${_optionsToString(_linuxImpl.setProgramOptions(opts))}`;
+            const command = `${linuxImpl.getProgram()} ${optionsToString(linuxImpl.setProgramOptions(opts))}`;
             fn(messages.createError('setCredentialError', [`${stdout} - ${stderr}`], [os.userInfo().username, command]));
         }
         else {
@@ -253,7 +246,7 @@ const _linuxImpl = {
  *
  * /usr/bin/security is a cli front end for OSX keychain.
  */
-const _darwinImpl = {
+const darwinImpl = {
     getProgram() {
         return path.join(path.sep, 'usr', 'bin', 'security');
     },
@@ -261,8 +254,9 @@ const _darwinImpl = {
         return ['find-generic-password', '-a', opts.account, '-s', opts.service, '-g'];
     },
     getCommandFunc(opts, fn) {
-        return fn(_darwinImpl.getProgram(), _darwinImpl.getProgramOptions(opts));
+        return fn(darwinImpl.getProgram(), darwinImpl.getProgramOptions(opts));
     },
+    // eslint-disable-next-line @typescript-eslint/require-await
     async onGetCommandClose(code, stdout, stderr, opts, fn) {
         let err;
         if (code !== 0) {
@@ -272,7 +266,7 @@ const _darwinImpl = {
                     break;
                 }
                 default: {
-                    const command = `${_darwinImpl.getProgram()} ${_optionsToString(_darwinImpl.getProgramOptions(opts))}`;
+                    const command = `${darwinImpl.getProgram()} ${optionsToString(darwinImpl.getProgramOptions(opts))}`;
                     err = messages.createError('passwordNotFoundError', [`${stdout} - ${stderr}`], [command]);
                 }
             }
@@ -283,7 +277,7 @@ const _darwinImpl = {
         // stdout. Reference: http://blog.macromates.com/2006/keychain-access-from-shell/
         if (stderr.includes('password')) {
             const match = RegExp(/"(.*)"/).exec(stderr);
-            if (!match || !match[1]) {
+            if (!match?.[1]) {
                 fn(messages.createError('passwordNotFoundError', [`${stdout} - ${stderr}`]));
             }
             else {
@@ -291,7 +285,7 @@ const _darwinImpl = {
             }
         }
         else {
-            const command = `${_darwinImpl.getProgram()} ${_optionsToString(_darwinImpl.getProgramOptions(opts))}`;
+            const command = `${darwinImpl.getProgram()} ${optionsToString(darwinImpl.getProgramOptions(opts))}`;
             fn(messages.createError('passwordNotFoundError', [`${stdout} - ${stderr}`], [command]));
         }
     },
@@ -303,11 +297,12 @@ const _darwinImpl = {
         return result;
     },
     setCommandFunc(opts, fn) {
-        return fn(_darwinImpl.getProgram(), _darwinImpl.setProgramOptions(opts));
+        return fn(darwinImpl.getProgram(), darwinImpl.setProgramOptions(opts));
     },
+    // eslint-disable-next-line @typescript-eslint/require-await
     async onSetCommandClose(code, stdout, stderr, opts, fn) {
         if (code !== 0) {
-            const command = `${_darwinImpl.getProgram()} ${_optionsToString(_darwinImpl.setProgramOptions(opts))}`;
+            const command = `${darwinImpl.getProgram()} ${optionsToString(darwinImpl.setProgramOptions(opts))}`;
             fn(messages.createError('setCredentialError', [`${stdout} - ${stderr}`], [os.userInfo().username, command]));
         }
         else {
@@ -315,31 +310,32 @@ const _darwinImpl = {
         }
     },
 };
-const secretFile = path.join((0, os_1.homedir)(), global_1.Global.SFDX_STATE_FOLDER, 'key.json');
+const getSecretFile = () => path.join(global_1.Global.DIR, 'key.json');
 var SecretField;
 (function (SecretField) {
     SecretField["SERVICE"] = "service";
     SecretField["ACCOUNT"] = "account";
     SecretField["KEY"] = "key";
 })(SecretField || (SecretField = {}));
-async function _writeFile(opts, fn) {
+async function writeFile(opts, fn) {
     try {
         const contents = {
             [SecretField.ACCOUNT]: opts.account,
             [SecretField.KEY]: opts.password,
             [SecretField.SERVICE]: opts.service,
         };
-        await fs_1.fs.mkdirp(path.dirname(secretFile));
-        await fs_1.fs.writeFile(secretFile, JSON.stringify(contents, null, 4), { mode: '600' });
+        const secretFile = getSecretFile();
+        await fs.promises.mkdir(path.dirname(secretFile), { recursive: true });
+        await fs.promises.writeFile(secretFile, JSON.stringify(contents, null, 4), { mode: '600' });
         fn(null, contents);
     }
     catch (err) {
         fn(err);
     }
 }
-async function _readFile() {
+async function readFile() {
     // The file and access is validated before this method is called
-    const fileContents = await fs_1.fs.readJsonMap(secretFile);
+    const fileContents = (0, kit_1.parseJsonMap)(await fs.promises.readFile(getSecretFile(), 'utf8'));
     return {
         account: (0, ts_types_1.ensureString)(fileContents[SecretField.ACCOUNT]),
         password: (0, ts_types_1.asString)(fileContents[SecretField.KEY]),
@@ -358,7 +354,7 @@ class GenericKeychainAccess {
             if (fileAccessError == null) {
                 // read it's contents
                 try {
-                    const { service, account, password } = await _readFile();
+                    const { service, account, password } = await readFile();
                     // validate service name and account just because
                     if (opts.service === service && opts.account === account) {
                         fn(null, password);
@@ -366,20 +362,18 @@ class GenericKeychainAccess {
                     else {
                         // if the service and account names don't match then maybe someone or something is editing
                         // that file. #donotallow
-                        fn(messages.createError('genericKeychainServiceError', [secretFile]));
+                        fn(messages.createError('genericKeychainServiceError', [getSecretFile()]));
                     }
                 }
                 catch (readJsonErr) {
                     fn(readJsonErr);
                 }
             }
+            else if (fileAccessError.code === 'ENOENT') {
+                fn(messages.createError('passwordNotFoundError'));
+            }
             else {
-                if (fileAccessError.code === 'ENOENT') {
-                    fn(messages.createError('passwordNotFoundError'));
-                }
-                else {
-                    fn(fileAccessError);
-                }
+                fn(fileAccessError);
             }
         });
     }
@@ -391,7 +385,7 @@ class GenericKeychainAccess {
                 // file not found
                 if (fileAccessError.code === 'ENOENT') {
                     // create the file
-                    await _writeFile.call(this, opts, fn);
+                    await writeFile.call(this, opts, fn);
                 }
                 else {
                     fn(fileAccessError);
@@ -399,14 +393,15 @@ class GenericKeychainAccess {
             }
             else {
                 // the existing file validated. we can write the updated key
-                await _writeFile.call(this, opts, fn);
+                await writeFile.call(this, opts, fn);
             }
         });
     }
+    // eslint-disable-next-line class-methods-use-this
     async isValidFileAccess(cb) {
         try {
             const root = (0, os_1.homedir)();
-            await fs_1.fs.access(path.join(root, global_1.Global.SFDX_STATE_FOLDER), fs_1.fs.constants.R_OK | fs_1.fs.constants.X_OK | fs_1.fs.constants.W_OK);
+            await fs.promises.access(path.join(root, global_1.Global.SFDX_STATE_FOLDER), fs.constants.R_OK | fs.constants.X_OK | fs.constants.W_OK);
             await cb(null);
         }
         catch (err) {
@@ -426,13 +421,15 @@ class GenericUnixKeychainAccess extends GenericKeychainAccess {
                 await cb(err);
             }
             else {
-                const stats = await fs_1.fs.stat(secretFile);
+                const secretFile = getSecretFile();
+                const stats = await fs.promises.stat(secretFile);
                 const octalModeStr = (stats.mode & 0o777).toString(8);
                 const EXPECTED_OCTAL_PERM_VALUE = '600';
                 if (octalModeStr === EXPECTED_OCTAL_PERM_VALUE) {
                     await cb(null);
                 }
                 else {
+                    // eslint-disable-next-line @typescript-eslint/no-floating-promises
                     cb(messages.createError('genericKeychainInvalidPermsError', [secretFile], [secretFile, EXPECTED_OCTAL_PERM_VALUE]));
                 }
             }
@@ -451,7 +448,7 @@ class GenericWindowsKeychainAccess extends GenericKeychainAccess {
             }
             else {
                 try {
-                    await fs_1.fs.access(secretFile, fs_1.fs.constants.R_OK | fs_1.fs.constants.W_OK);
+                    await fs.promises.access(getSecretFile(), fs.constants.R_OK | fs.constants.W_OK);
                     await cb(null);
                 }
                 catch (e) {
@@ -470,8 +467,8 @@ exports.keyChainImpl = {
     generic_unix: new GenericUnixKeychainAccess(),
     // eslint-disable-next-line camelcase
     generic_windows: new GenericWindowsKeychainAccess(),
-    darwin: new KeychainAccess(_darwinImpl, nodeFs),
-    linux: new KeychainAccess(_linuxImpl, nodeFs),
+    darwin: new KeychainAccess(darwinImpl, nodeFs),
+    linux: new KeychainAccess(linuxImpl, nodeFs),
     validateProgram: _validateProgram,
 };
 //# sourceMappingURL=keyChainImpl.js.map

package/lib/crypto/secureBuffer.d.ts

@@ -5,7 +5,7 @@ import { Optional } from '@salesforce/ts-types';
  *
  * @param buffer A buffer containing the decrypted secret.
  */
-export declare type DecipherCallback<T> = (buffer: Buffer) => T;
+export type DecipherCallback<T> = (buffer: Buffer) => T;
 /**
  * Used to store and retrieve a sensitive information in memory. This is not meant for at rest encryption.
  *

package/lib/deviceOauthService.d.ts

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

package/lib/deviceOauthService.js

@@ -9,17 +9,15 @@
 /* eslint-disable @typescript-eslint/ban-types */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceOauthService = void 0;
-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 FormData = require("form-data");
 const logger_1 = require("./logger");
-const authInfo_1 = require("./org/authInfo");
-const sfdxError_1 = require("./sfdxError");
-const connection_1 = require("./org/connection");
+const org_1 = require("./org");
+const sfError_1 = require("./sfError");
 const messages_1 = require("./messages");
-messages_1.Messages.importMessagesDirectory(__dirname);
-const messages = messages_1.Messages.load('@salesforce/core', 'auth', ['pollingTimeout']);
+const messages = new messages_1.Messages('@salesforce/core', 'auth', new Map([["targetOrgNotSet", "A default user is not set."], ["targetOrgNotSet.actions", ["Run the \"sfdx auth\" commands with --setdefaultusername to connect to an org and set it as your default org.", "Run \"force:org:create\" with --setdefaultusername to create a scratch org and set it as your default org.", "Run \"sfdx config:set defaultusername=<username>\" to set your default username."]], ["portInUse", "Cannot start the OAuth redirect server on port %s."], ["portInUse.actions", ["Kill the process running on port %s or use a custom connected app and update OauthLocalPort in the sfdx-project.json file."]], ["invalidRequestMethod", "Invalid request method: %s"], ["invalidRequestUri", "Invalid request uri: %s"], ["pollingTimeout", "The device authorization request timed out. After executing force:auth:device:login, you must approve access to the device within 10 minutes. This can happen if the URL wasn\u2019t copied into the browser, login was not attempted, or the 2FA process was not completed within 10 minutes. Request authorization again."], ["serverErrorHTMLResponse", "<html><head><style>body {background-color:#F4F6F9; font-family: Arial, sans-serif; font-size: 0.8125rem; line-height: 1.5rem; color: #16325c;} #center {margin: auto; width: 370px; padding: 100px 0px 20px;} #logo-container {margin-left: auto; margin-right: auto; text-align: center;} #logo {max-width: 180px; max-height: 113px; margin-bottom: 2rem; border: 0;} #header {font-size: 1.5rem; text-align: center; margin-bottom: 1rem;} #message {background-color: #FFFFFF; margin: 0px auto; padding: 1.25rem; border-radius: 0.25rem; border: 1px solid #D8DDE6;} #footer {height: 24px; width: 370px; text-align: center; font-size: .75rem; position: absolute; bottom: 10;}</style></head><body><div id=\"center\"><div id=\"logo-container\"><img id=\"logo\" aria-hidden=\"true\" name=\"logo\" alt=\"Salesforce\" src=\"data:image/svg+xml;base64,%s\"></div><div id=\"header\">%s</div><div id=\"message\">%s<br/><br/>This is most likely <b>not</b> an error with the Salesforce CLI. Please ensure all information is accurate and try again.</div><div id=\"footer\">&copy; %s Salesforce, Inc. All rights reserved.</div></div></body></html>"], ["missingAuthCode", "No authentication code found on login response."], ["serverSuccessHTMLResponse", "<html><head><style>body {background-color:#F4F6F9; font-family: Arial, sans-serif; font-size: 0.8125rem; line-height: 1.5rem; color: #16325c;} #center {margin: auto; width: 300px; padding: 100px 0px 20px;} #logo-container {margin-left: auto; margin-right: auto; text-align: center;} #logo {max-width: 180px; max-height: 113px; margin-bottom: 2rem; border: 0;} #header {font-size: 1.5rem; text-align: center; margin-bottom: 1rem;} #message {background-color: #FFFFFF; margin: 0px auto; padding: 1.25rem; border-radius: 0.25rem; border: 1px solid #D8DDE6;} #footer {height: 24px; width: 300px; text-align: center; font-size: .75rem; position: absolute; bottom: 10;}</style></head><body><div id=\"center\"><div id=\"logo-container\"><img id=\"logo\" aria-hidden=\"true\" name=\"logo\" alt=\"Salesforce\" src=\"data:image/svg+xml;base64,%s\"></div><div id=\"header\">Authentication Successful</div><div id=\"message\">You've successfully logged in. You can now close this browser tab or window.</div><div id=\"footer\">&copy; %s Salesforce, Inc. All rights reserved.</div></div></body></html>"], ["serverSfdcImage", "<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
	 viewBox="0 0 262 184" style="enable-background:new 0 0 262 184;" xml:space="preserve">
<style type="text/css">
	.st0{fill:#00A1E0;}
	.st1{fill:#FFFFFF;}
</style>
<title>logo-salesforce</title>
<desc>Created with Sketch.</desc>
<g id="Test-B">
	<g id="Mobile-Nav---Test-B-_x28_0_x29_">
		<g id="Group">
			<g id="logo-salesforce">
				<path id="Fill-1" class="st0" d="M109.2,20.9c8.4-8.7,20.1-14.2,33-14.2c17.2,0,32.1,9.6,40.1,23.8c6.9-3.1,14.6-4.8,22.7-4.8
					c31,0,56,25.3,56,56.5s-25.1,56.5-56,56.5c-3.8,0-7.5-0.4-11-1.1c-7,12.5-20.4,21-35.8,21c-6.4,0-12.5-1.5-17.9-4.1
					c-7.1,16.7-23.7,28.5-43,28.5c-20.1,0-37.3-12.7-43.9-30.6c-2.9,0.6-5.9,0.9-8.9,0.9c-24,0-43.4-19.6-43.4-43.9
					c0-16.2,8.7-30.4,21.7-38c-2.7-6.1-4.2-12.9-4.2-20.1C18.5,23.6,41.2,1,69,1C85.4,1,100,8.8,109.2,20.9"/>
				<path id="Combined-Shape" class="st1" d="M38.7,95.4l1.1-2.9c0.2-0.5,0.5-0.3,0.7-0.2c0.3,0.2,0.5,0.3,0.9,0.6c3.1,2,6,2,6.9,2
					c2.3,0,3.8-1.2,3.8-2.9v-0.1c0-1.8-2.2-2.5-4.8-3.3l-0.6-0.2c-3.5-1-7.3-2.5-7.3-6.9v-0.1c0-4.2,3.4-7.2,8.3-7.2l0.5,0
					c2.9,0,5.6,0.8,7.6,2.1c0.2,0.1,0.4,0.3,0.3,0.6c-0.1,0.3-1,2.6-1.1,2.9c-0.2,0.5-0.7,0.2-0.7,0.2c-1.8-1-4.5-1.7-6.8-1.7
					c-2.1,0-3.4,1.1-3.4,2.6v0.1c0,1.7,2.3,2.5,4.9,3.3l0.5,0.1c3.5,1.1,7.2,2.6,7.2,6.9v0.1c0,4.6-3.3,7.4-8.6,7.4
					c-2.6,0-5.1-0.4-7.8-1.8c-0.5-0.3-1-0.5-1.5-0.9C38.7,95.9,38.5,95.8,38.7,95.4z M116.7,95.4l1.1-2.9c0.2-0.5,0.6-0.3,0.7-0.2
					c0.3,0.2,0.5,0.3,0.9,0.6c3.1,2,6,2,6.9,2c2.3,0,3.8-1.2,3.8-2.9v-0.1c0-1.8-2.2-2.5-4.8-3.3l-0.6-0.2c-3.5-1-7.3-2.5-7.3-6.9
					v-0.1c0-4.2,3.4-7.2,8.3-7.2l0.5,0c2.9,0,5.6,0.8,7.6,2.1c0.2,0.1,0.4,0.3,0.3,0.6c-0.1,0.3-1,2.6-1.1,2.9
					c-0.2,0.5-0.7,0.2-0.7,0.2c-1.8-1-4.5-1.7-6.8-1.7c-2.1,0-3.4,1.1-3.4,2.6v0.1c0,1.7,2.3,2.5,4.9,3.3l0.5,0.1
					c3.5,1.1,7.2,2.6,7.2,6.9v0.1c0,4.6-3.3,7.4-8.6,7.4c-2.6,0-5.1-0.4-7.8-1.8c-0.5-0.3-1-0.5-1.5-0.9
					C116.8,95.9,116.6,95.8,116.7,95.4z M174.5,81.7c0.4,1.5,0.7,3.1,0.7,4.8s-0.2,3.3-0.7,4.8c-0.4,1.5-1.1,2.8-2,3.9
					c-0.9,1.1-2.1,2-3.4,2.6c-1.4,0.6-3,0.9-4.8,0.9c-1.8,0-3.4-0.3-4.8-0.9c-1.4-0.6-2.5-1.5-3.4-2.6c-0.9-1.1-1.6-2.4-2-3.9
					c-0.4-1.5-0.7-3.1-0.7-4.8c0-1.7,0.2-3.3,0.7-4.8c0.4-1.5,1.1-2.8,2-3.9c0.9-1.1,2.1-2,3.4-2.6c1.4-0.6,3-1,4.8-1
					c1.8,0,3.4,0.3,4.8,1c1.4,0.6,2.5,1.5,3.4,2.6C173.4,78.9,174.1,80.2,174.5,81.7z M170,86.4c0-2.6-0.5-4.6-1.4-6
					c-0.9-1.4-2.4-2.1-4.3-2.1c-2,0-3.4,0.7-4.3,2.1c-0.9,1.4-1.4,3.4-1.4,6c0,2.6,0.5,4.6,1.4,6.1c0.9,1.4,2.3,2.1,4.3,2.1
					c2,0,3.4-0.7,4.3-2.1C169.6,91.1,170,89,170,86.4z M211.1,93.9l1.1,3c0.1,0.4-0.2,0.5-0.2,0.5c-1.7,0.7-4,1.1-6.3,1.1
					c-3.9,0-6.8-1.1-8.8-3.3c-2-2.2-3-5.2-3-8.9c0-1.7,0.2-3.3,0.7-4.8c0.5-1.5,1.2-2.8,2.2-3.9c1-1.1,2.2-2,3.6-2.6
					c1.4-0.6,3.1-1,5-1c1.3,0,2.4,0.1,3.3,0.2c1,0.2,2.4,0.5,3,0.8c0.1,0,0.4,0.2,0.3,0.5c-0.4,1.2-0.7,2-1.1,3
					c-0.2,0.5-0.5,0.3-0.5,0.3c-1.5-0.5-2.9-0.7-4.7-0.7c-2.2,0-3.9,0.7-4.9,2.2c-1.1,1.4-1.7,3.3-1.7,5.9c0,2.8,0.7,4.8,1.9,6.1
					c1.2,1.3,2.9,1.9,5.1,1.9c0.9,0,1.7-0.1,2.4-0.2c0.7-0.1,1.4-0.3,2.1-0.6C210.5,93.6,210.9,93.5,211.1,93.9z M233.8,80.8
					c1,3.4,0.5,6.3,0.4,6.5c0,0.4-0.4,0.4-0.4,0.4l-15.1,0c0.1,2.3,0.6,3.9,1.8,5c1.1,1.1,2.8,1.8,5.2,1.8c3.6,0,5.1-0.7,6.2-1.1
					c0,0,0.4-0.1,0.6,0.3l1,2.8c0.2,0.5,0,0.6-0.1,0.7c-0.9,0.5-3.2,1.5-7.6,1.5c-2.1,0-4-0.3-5.5-0.9c-1.5-0.6-2.8-1.4-3.8-2.5
					c-1-1.1-1.7-2.4-2.2-3.8c-0.5-1.5-0.7-3.1-0.7-4.8c0-1.7,0.2-3.3,0.7-4.8c0.4-1.5,1.1-2.8,2-3.9c0.9-1.1,2.1-2,3.5-2.6
					c1.4-0.7,3.1-1,5-1c1.6,0,3.1,0.3,4.3,0.9c0.9,0.4,1.9,1.1,2.9,2.2C232.5,77.9,233.4,79.4,233.8,80.8z M218.8,84h10.7
					c-0.1-1.4-0.4-2.6-1-3.6c-0.9-1.4-2.2-2.2-4.2-2.2c-2,0-3.4,0.8-4.3,2.2C219.4,81.3,219.1,82.5,218.8,84z M113.1,80.8
					c1,3.4,0.5,6.3,0.5,6.5c0,0.4-0.4,0.4-0.4,0.4l-15.1,0c0.1,2.3,0.6,3.9,1.8,5c1.1,1.1,2.8,1.8,5.2,1.8c3.6,0,5.1-0.7,6.2-1.1
					c0,0,0.4-0.1,0.6,0.3l1,2.8c0.2,0.5,0,0.6-0.1,0.7c-0.9,0.5-3.2,1.5-7.6,1.5c-2.1,0-4-0.3-5.5-0.9c-1.5-0.6-2.8-1.4-3.8-2.5
					c-1-1.1-1.7-2.4-2.2-3.8c-0.5-1.5-0.7-3.1-0.7-4.8c0-1.7,0.2-3.3,0.7-4.8c0.4-1.5,1.1-2.8,2-3.9c0.9-1.1,2.1-2,3.5-2.6
					c1.4-0.7,3.1-1,5-1c1.6,0,3.1,0.3,4.3,0.9c0.9,0.4,1.9,1.1,2.9,2.2C111.8,77.9,112.8,79.4,113.1,80.8z M98.1,84h10.8
					c-0.1-1.4-0.4-2.6-1-3.6c-0.9-1.4-2.2-2.2-4.2-2.2c-2,0-3.4,0.8-4.3,2.2C98.7,81.3,98.4,82.5,98.1,84z M71.6,83.2
					c0,0,1.2,0.1,2.5,0.3v-0.6c0-2-0.4-3-1.2-3.6c-0.8-0.6-2.1-1-3.7-1c0,0-3.7,0-6.6,1.5c-0.1,0.1-0.2,0.1-0.2,0.1
					s-0.4,0.1-0.5-0.2l-1.1-2.9c-0.2-0.4,0.1-0.6,0.1-0.6c1.4-1.1,4.6-1.7,4.6-1.7c1.1-0.2,2.9-0.4,4-0.4c3,0,5.3,0.7,6.9,2.1
					c1.6,1.4,2.4,3.6,2.4,6.7l0,13.8c0,0,0,0.4-0.3,0.5c0,0-0.6,0.2-1.1,0.3c-0.5,0.1-2.3,0.5-3.8,0.7c-1.5,0.3-3,0.4-4.6,0.4
					c-1.5,0-2.8-0.1-4-0.4c-1.2-0.3-2.2-0.7-3.1-1.3c-0.8-0.6-1.5-1.4-2-2.4c-0.5-0.9-0.7-2.1-0.7-3.4c0-1.3,0.3-2.5,0.8-3.5
					c0.5-1,1.3-1.8,2.2-2.5c0.9-0.7,2-1.1,3.1-1.5c1.2-0.3,2.4-0.5,3.7-0.5C70.2,83.2,71,83.2,71.6,83.2z M65.6,93.8
					c0,0,1.4,1.1,4.4,0.9c2.2-0.1,4.1-0.5,4.1-0.5v-6.9c0,0-1.9-0.3-4.1-0.3c-3.1,0-4.4,1.1-4.4,1.1c-0.9,0.6-1.3,1.6-1.3,2.9
					c0,0.8,0.2,1.5,0.5,2C64.9,93.2,65,93.4,65.6,93.8z M193.1,75.5c-0.1,0.4-0.9,2.5-1.1,3.2c-0.1,0.3-0.3,0.4-0.6,0.4
					c0,0-0.9-0.2-1.7-0.2c-0.5,0-1.3,0.1-2,0.3c-0.7,0.2-1.3,0.6-1.9,1.1c-0.6,0.5-1,1.3-1.3,2.2c-0.3,0.9-0.5,2.4-0.5,4v11.2
					c0,0.3-0.2,0.5-0.5,0.5h-4c-0.3,0-0.5-0.2-0.5-0.5V75.2c0-0.3,0.2-0.5,0.4-0.5h3.9c0.3,0,0.4,0.2,0.4,0.5V77
					c0.6-0.8,1.6-1.5,2.5-1.9c0.9-0.4,2-0.7,3.9-0.6c1,0.1,2.3,0.3,2.5,0.4C193,75,193.2,75.1,193.1,75.5z M156,65.1
					c0.1,0,0.4,0.2,0.3,0.5l-1.2,3.2c-0.1,0.2-0.2,0.4-0.7,0.2c-0.1,0-0.3-0.1-0.8-0.2c-0.3-0.1-0.8-0.1-1.2-0.1
					c-0.6,0-1.1,0.1-1.6,0.2c-0.5,0.1-0.9,0.4-1.3,0.8c-0.4,0.4-0.8,0.9-1.1,1.6c-0.6,1.6-0.8,3.3-0.8,3.4h4.8
					c0.4,0,0.5,0.2,0.5,0.5l-0.6,3.1c-0.1,0.5-0.5,0.4-0.5,0.4h-5L143.6,98c-0.4,2-0.8,3.7-1.3,5.1c-0.5,1.4-1.1,2.4-2,3.4
					c-0.8,0.9-1.7,1.6-2.8,1.9c-1,0.4-2.3,0.6-3.7,0.6c-0.7,0-1.4,0-2.2-0.2c-0.6-0.1-0.9-0.2-1.4-0.4c-0.2-0.1-0.3-0.3-0.2-0.6
					c0.1-0.3,1-2.7,1.1-3.1c0.2-0.4,0.5-0.2,0.5-0.2c0.3,0.1,0.5,0.2,0.8,0.3c0.4,0.1,0.8,0.1,1.2,0.1c0.7,0,1.3-0.1,1.8-0.3
					c0.6-0.2,1-0.6,1.4-1.1c0.4-0.5,0.7-1.2,1.1-2.1c0.3-0.9,0.6-2.2,0.9-3.7l3.4-18.9h-3.3c-0.4,0-0.5-0.2-0.5-0.5l0.6-3.1
					c0.1-0.5,0.5-0.4,0.5-0.4h3.4l0.2-1c0.5-3,1.5-5.3,3-6.8c1.5-1.5,3.7-2.3,6.4-2.3c0.8,0,1.5,0.1,2.1,0.2
					C155,64.8,155.5,64.9,156,65.1z M88.6,97.6c0,0.3-0.2,0.5-0.4,0.5h-4c-0.3,0-0.4-0.2-0.4-0.5V65.5c0-0.2,0.2-0.5,0.4-0.5h4
					c0.3,0,0.4,0.2,0.4,0.5V97.6z"/>
			</g>
		</g>
	</g>
</g>
</svg>
"]]));
 async function wait(ms = 1000) {
     return new Promise((resolve) => {
         setTimeout(resolve, ms);
@@ -29,7 +27,9 @@ async function makeRequest(options) {
     const rawResponse = await new transport_1.default().httpRequest(options);
     const response = (0, kit_1.parseJsonMap)(rawResponse.body);
     if (response.error) {
-        const err = new sfdxError_1.SfdxError('Request Failed.');
+        const errorDescription = typeof response.error_description === 'string' ? response.error_description : '';
+        const error = typeof response.error === 'string' ? response.error : 'Unknown';
+        const err = new sfError_1.SfError(`Request Failed: ${error} ${errorDescription}`);
         err.data = Object.assign(response, { status: rawResponse.statusCode });
         throw err;
     }
@@ -59,9 +59,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
@@ -82,8 +82,7 @@ class DeviceOauthService extends kit_1.AsyncCreatable {
         const deviceFlowRequestUrl = this.getDeviceFlowRequestUrl();
         const pollingOptions = this.getPollingOptions(deviceFlowRequestUrl, loginData.device_code);
         const interval = kit_1.Duration.seconds(loginData.interval).milliseconds;
-        const response = await this.pollForDeviceApproval(pollingOptions, interval);
-        return response;
+        return this.pollForDeviceApproval(pollingOptions, interval);
     }
     /**
      * Creates and saves new AuthInfo
@@ -91,7 +90,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,
@@ -108,27 +107,27 @@ 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', (0, ts_types_1.ensureString)(this.options.clientId));
-        body.append('response_type', DeviceOauthService.RESPONSE_TYPE);
-        body.append('scope', DeviceOauthService.SCOPE);
+        const form = new FormData();
+        form.append('client_id', (0, ts_types_1.ensureString)(this.options.clientId));
+        form.append('response_type', DeviceOauthService.RESPONSE_TYPE);
+        form.append('scope', DeviceOauthService.SCOPE);
         return {
             url,
-            headers: connection_1.SFDX_HTTP_HEADERS,
+            headers: { ...org_1.SFDX_HTTP_HEADERS, ...form.getHeaders() },
             method: 'POST',
-            body,
+            body: form.getBuffer(),
         };
     }
     getPollingOptions(url, code) {
-        const body = new url_1.URLSearchParams();
-        body.append('client_id', (0, ts_types_1.ensureString)(this.options.clientId));
-        body.append('grant_type', DeviceOauthService.GRANT_TYPE);
-        body.append('code', code);
+        const form = new FormData();
+        form.append('client_id', (0, ts_types_1.ensureString)(this.options.clientId));
+        form.append('grant_type', DeviceOauthService.GRANT_TYPE);
+        form.append('code', code);
         return {
             url,
-            headers: connection_1.SFDX_HTTP_HEADERS,
+            headers: { ...org_1.SFDX_HTTP_HEADERS, ...form.getHeaders() },
             method: 'POST',
-            body,
+            body: form.getBuffer(),
         };
     }
     getDeviceFlowRequestUrl() {
@@ -140,7 +139,7 @@ class DeviceOauthService extends kit_1.AsyncCreatable {
             return await makeRequest(httpRequest);
         }
         catch (e) {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            /* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/restrict-template-expressions */
             const err = e.data;
             if (err.error && err.status === 400 && err.error === 'authorization_pending') {
                 // do nothing because we're still waiting
@@ -155,6 +154,7 @@ class DeviceOauthService extends kit_1.AsyncCreatable {
                 }
                 throw err;
             }
+            /* eslint-enable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/restrict-template-expressions */
         }
     }
     shouldContinuePolling() {
@@ -164,6 +164,7 @@ class DeviceOauthService extends kit_1.AsyncCreatable {
         this.logger.debug('BEGIN POLLING FOR DEVICE APPROVAL');
         let result;
         while (this.shouldContinuePolling()) {
+            // eslint-disable-next-line no-await-in-loop
             result = await this.poll(httpRequest);
             if (result) {
                 this.logger.debug('POLLING FOR DEVICE APPROVAL SUCCESS');
@@ -171,6 +172,7 @@ class DeviceOauthService extends kit_1.AsyncCreatable {
             }
             else {
                 this.logger.debug(`waiting ${interval} ms...`);
+                // eslint-disable-next-line no-await-in-loop
                 await wait(interval);
                 this.pollingCount += 1;
             }

package/lib/exported.d.ts

@@ -1,13 +1,15 @@
 export { OAuth2Config } from 'jsforce';
 export { ConfigFile } from './config/configFile';
+export { TTLConfig } from './config/ttlConfig';
 export { envVars, EnvironmentVariable, SUPPORTED_ENV_VARS, EnvVars } from './config/envVars';
-export { BaseConfigStore, ConfigContents, ConfigEntry, ConfigStore, ConfigValue } from './config/configStore';
-export { GlobalInfo, SfEntry, SfInfo, SfInfoKeys, SfOrg, SfOrgs, SfToken, SfTokens } from './globalInfo';
+export { ConfigContents, ConfigEntry, ConfigStore, ConfigValue } from './config/configStore';
+export { SfTokens, StateAggregator } from './stateAggregator';
 export { DeviceOauthService, DeviceCodeResponse, DeviceCodePollingResponse } from './deviceOauthService';
 export { OrgUsersConfig } from './config/orgUsersConfig';
-export { ConfigPropertyMeta, ConfigPropertyMetaInput, Config, SfdxPropertyKeys, SFDX_ALLOWED_PROPERTIES, } from './config/config';
+export { ConfigPropertyMeta, ConfigPropertyMetaInput, Config, SfdxPropertyKeys, SfConfigProperties, SFDX_ALLOWED_PROPERTIES, SF_ALLOWED_PROPERTIES, } from './config/config';
+export { SandboxRequestCacheEntry, SandboxRequestCache } from './config/sandboxProcessCache';
 export { ConfigInfo, ConfigAggregator } from './config/configAggregator';
-export { AuthFields, AuthInfo, OrgAuthorization } from './org/authInfo';
+export { AuthFields, AuthInfo, AuthSideEffects, OrgAuthorization } from './org/authInfo';
 export { AuthRemover } from './org/authRemover';
 export { Connection, SFDX_HTTP_HEADERS } from './org/connection';
 export { Mode, Global } from './global';
@@ -16,20 +18,21 @@ export { WebOAuthServer } from './webOAuthServer';
 export { SfdcUrl } from './util/sfdcUrl';
 export { getJwtAudienceUrl } from './util/getJwtAudienceUrl';
 export { Fields, FieldValue, LoggerLevel, LoggerLevelValue, LogLine, LoggerOptions, LoggerStream, Logger, } from './logger';
-export { Messages } from './messages';
-export { Org, SandboxProcessObject, StatusEvent, SandboxEvents, SandboxUserAuthResponse, SandboxUserAuthRequest, SandboxRequest, OrgTypes, ResultEvent, ScratchOrgRequest, } from './org';
+export { Messages, StructuredMessage } from './messages';
+export { Org, SandboxProcessObject, StatusEvent, SandboxEvents, SandboxUserAuthResponse, SandboxUserAuthRequest, SandboxRequest, ResumeSandboxRequest, OrgTypes, ResultEvent, ScratchOrgRequest, } from './org';
 export { OrgConfigProperties, ORG_CONFIG_ALLOWED_PROPERTIES } from './org/orgConfigProperties';
-export { PackageDir, NamedPackageDir, PackageDirDependency, SfdxProject, SfdxProjectJson } from './sfdxProject';
-export { SchemaPrinter } from './schema/printer';
+export { PackageDir, NamedPackageDir, PackageDirDependency, SfProject, SfProjectJson } from './sfProject';
 export { SchemaValidator } from './schema/validator';
-export { SfdxError } from './sfdxError';
+export { SchemaPrinter } from './schema/printer';
+export { SfError } from './sfError';
 export { PollingClient } from './status/pollingClient';
 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';
-export { ScratchOrgCreateOptions, ScratchOrgCreateResult, scratchOrgCreate } from './org/scratchOrgCreate';
-export { ScratchOrgInfo } from './org/scratchOrgInfoApi';
-export * from './util/fs';
+export { ScratchOrgCreateOptions, ScratchOrgCreateResult, scratchOrgCreate, scratchOrgResume, } from './org/scratchOrgCreate';
+export { ScratchOrgInfo } from './org/scratchOrgTypes';
+export { ScratchOrgLifecycleEvent, scratchOrgLifecycleEventName, scratchOrgLifecycleStages, } from './org/scratchOrgLifecycleEvents';
+export { ScratchOrgCache } from './org/scratchOrgCache';
 export * from './util/sfdc';
 export * from './util/sfdcUrl';