@salesforce/core 3.19.6-dev.0 → 3.20.2

package/CHANGELOG.md

@@ -2,6 +2,25 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [3.20.2](https://github.com/forcedotcom/sfdx-core/compare/v3.20.1...v3.20.2) (2022-06-13)
+
+### Bug Fixes
+
+- instanceUrl config now using org-instance-url ([54cb450](https://github.com/forcedotcom/sfdx-core/commit/54cb450c53f3db5352d9f0fdb83d33dce1da728e))
+
+### [3.20.1](https://github.com/forcedotcom/sfdx-core/compare/v3.19.5...v3.20.1) (2022-06-08)
+
+### Features
+
+- cause a publish from previous skip ([069c366](https://github.com/forcedotcom/sfdx-core/commit/069c36646f5dc10a4172868ef7b5f9cd82ef7503))
+- safer caching for nuts ([fa0af41](https://github.com/forcedotcom/sfdx-core/commit/fa0af41451a4363c84e9713685c8ece439acf3bc))
+
+## [3.20.0](https://github.com/forcedotcom/sfdx-core/compare/v3.19.6-dev.0...v3.20.0) (2022-06-08)
+
+### Features
+
+- cache crypto keys by homedir ([dcd493e](https://github.com/forcedotcom/sfdx-core/commit/dcd493e7745bb2717da3a4ed9aff528a51391be6))
+
 ### [3.19.6-dev.0](https://github.com/forcedotcom/sfdx-core/compare/v3.19.5...v3.19.6-dev.0) (2022-06-07)
 
 ### Features

package/lib/crypto/crypto.js

@@ -16,6 +16,7 @@ const kit_1 = require("@salesforce/kit");
 const logger_1 = require("../logger");
 const messages_1 = require("../messages");
 const cache_1 = require("../util/cache");
+const global_1 = require("../global");
 const keyChain_1 = require("./keyChain");
 const secureBuffer_1 = require("./secureBuffer");
 const TAG_DELIMITER = ':';
@@ -49,20 +50,21 @@ const keychainPromises = {
      * @param account The keychain account name.
      */
     getPassword(_keychain, service, account) {
-        const sb = cache_1.Cache.get(`${service}:${account}`);
+        const cacheKey = `${global_1.Global.DIR}:${service}:${account}`;
+        const sb = cache_1.Cache.get(cacheKey);
         if (!sb) {
             return new Promise((resolve, reject) => {
                 return _keychain.getPassword({ service, account }, (err, password) => {
                     if (err)
                         return reject(err);
-                    cache_1.Cache.set(`${service}:${account}`, makeSecureBuffer(password));
+                    cache_1.Cache.set(cacheKey, makeSecureBuffer(password));
                     return resolve({ username: account, password: (0, ts_types_1.ensure)(password) });
                 });
             });
         }
         else {
             const pw = sb.value((buffer) => buffer.toString('utf8'));
-            cache_1.Cache.set(`${service}:${account}`, makeSecureBuffer(pw));
+            cache_1.Cache.set(cacheKey, makeSecureBuffer(pw));
             return new Promise((resolve) => {
                 return resolve({ username: account, password: (0, ts_types_1.ensure)(pw) });
             });

package/lib/crypto/keyChainImpl.js

@@ -317,6 +317,7 @@ const _darwinImpl = {
         }
     },
 };
+const getSecretFile = () => path.join(global_1.Global.DIR, 'key.json');
 var SecretField;
 (function (SecretField) {
     SecretField["SERVICE"] = "service";
@@ -330,7 +331,7 @@ async function _writeFile(opts, fn) {
             [SecretField.KEY]: opts.password,
             [SecretField.SERVICE]: opts.service,
         };
-        const secretFile = path.join(global_1.Global.DIR, 'key.json');
+        const secretFile = getSecretFile();
         await mkdirp(path.dirname(secretFile));
         await fs.promises.writeFile(secretFile, JSON.stringify(contents, null, 4), { mode: '600' });
         fn(null, contents);
@@ -341,7 +342,7 @@ async function _writeFile(opts, fn) {
 }
 async function _readFile() {
     // The file and access is validated before this method is called
-    const fileContents = (0, kit_1.parseJsonMap)(await fs.promises.readFile(path.join(global_1.Global.DIR, 'key.json'), 'utf8'));
+    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]),
@@ -368,7 +369,7 @@ 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', [path.join(global_1.Global.DIR, 'key.json')]));
+                        fn(messages.createError('genericKeychainServiceError', [getSecretFile()]));
                     }
                 }
                 catch (readJsonErr) {
@@ -428,7 +429,7 @@ class GenericUnixKeychainAccess extends GenericKeychainAccess {
                 await cb(err);
             }
             else {
-                const secretFile = path.join(global_1.Global.DIR, 'key.json');
+                const secretFile = getSecretFile();
                 const stats = await fs.promises.stat(secretFile);
                 const octalModeStr = (stats.mode & 0o777).toString(8);
                 const EXPECTED_OCTAL_PERM_VALUE = '600';
@@ -454,7 +455,7 @@ class GenericWindowsKeychainAccess extends GenericKeychainAccess {
             }
             else {
                 try {
-                    await fs.promises.access(path.join(global_1.Global.DIR, 'key.json'), fs.constants.R_OK | fs.constants.W_OK);
+                    await fs.promises.access(getSecretFile(), fs.constants.R_OK | fs.constants.W_OK);
                     await cb(null);
                 }
                 catch (e) {

package/lib/global.d.ts

@@ -45,7 +45,7 @@ export declare class Global {
      */
     static get SF_DIR(): string;
     /**
-     * The  full system path to the preferred global state folder
+     * The full system path to the preferred global state folder
      */
     static get DIR(): string;
     /**
@@ -53,7 +53,7 @@ export declare class Global {
      */
     static readonly LOG_FILE_PATH: string;
     /**
-     * Gets the curr ent mode environment variable as a {@link Mode} instance.
+     * Gets the current mode environment variable as a {@link Mode} instance.
      *
      * ```
      * console.log(Global.getEnvironmentMode() === Mode.PRODUCTION);

package/lib/global.js

@@ -45,13 +45,13 @@ class Global {
         return path.join(os.homedir(), Global.SF_STATE_FOLDER);
     }
     /**
-     * The  full system path to the preferred global state folder
+     * The full system path to the preferred global state folder
      */
     static get DIR() {
         return path.join(os.homedir(), Global.SFDX_STATE_FOLDER);
     }
     /**
-     * Gets the curr ent mode environment variable as a {@link Mode} instance.
+     * Gets the current mode environment variable as a {@link Mode} instance.
      *
      * ```
      * console.log(Global.getEnvironmentMode() === Mode.PRODUCTION);

package/lib/org/authInfo.js

@@ -562,7 +562,8 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         }
     }
     getInstanceUrl(options, aggregator) {
-        const instanceUrl = (0, ts_types_1.getString)(options, 'instanceUrl') || aggregator.getPropertyValue('instanceUrl');
+        const instanceUrl = (0, ts_types_1.getString)(options, 'instanceUrl') ||
+            aggregator.getPropertyValue(orgConfigProperties_1.OrgConfigProperties.ORG_INSTANCE_URL);
         return instanceUrl || sfdcUrl_1.SfdcUrl.PRODUCTION;
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "3.19.6-dev.0",
+  "version": "3.20.2",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",