@salesforce/core 3.16.0 → 3.16.1

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 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.16.1](https://github.com/forcedotcom/sfdx-core/compare/v3.16.0...v3.16.1) (2022-05-11)
+
+### Bug Fixes
+
+- homedir can change after Core loads ([bb1e4f5](https://github.com/forcedotcom/sfdx-core/commit/bb1e4f5b1f59269f6d48a5389b1d76eeee252db0))
+
 ## [3.16.0](https://github.com/forcedotcom/sfdx-core/compare/v3.15.5...v3.16.0) (2022-05-04)
 
 ### Features

package/lib/crypto/keyChainImpl.js

@@ -317,7 +317,7 @@ 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.SFDX_DIR, 'key.json');
 var SecretField;
 (function (SecretField) {
     SecretField["SERVICE"] = "service";
@@ -331,6 +331,7 @@ async function _writeFile(opts, fn) {
             [SecretField.KEY]: opts.password,
             [SecretField.SERVICE]: opts.service,
         };
+        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(secretFile, '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', [secretFile]));
+                        fn(messages.createError('genericKeychainServiceError', [getSecretFile()]));
                     }
                 }
                 catch (readJsonErr) {
@@ -428,6 +429,7 @@ class GenericUnixKeychainAccess extends GenericKeychainAccess {
                 await cb(err);
             }
             else {
+                const secretFile = getSecretFile();
                 const stats = await fs.promises.stat(secretFile);
                 const octalModeStr = (stats.mode & 0o777).toString(8);
                 const EXPECTED_OCTAL_PERM_VALUE = '600';
@@ -453,7 +455,7 @@ class GenericWindowsKeychainAccess extends GenericKeychainAccess {
             }
             else {
                 try {
-                    await fs.promises.access(secretFile, 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

@@ -33,13 +33,13 @@ export declare class Global {
      *
      * **See** {@link Global.SFDX_STATE_FOLDER}
      */
-    static readonly SFDX_DIR: string;
+    static get SFDX_DIR(): string;
     /**
      * The full system path to the global sf state folder.
      *
      * **See** {@link Global.SF_STATE_FOLDER}
      */
-    static readonly SF_DIR: string;
+    static get SF_DIR(): string;
     /**
      * The full system path to the global log file.
      */

package/lib/global.js

@@ -28,6 +28,22 @@ var Mode;
  * Global constants, methods, and configuration.
  */
 class Global {
+    /**
+     * The full system path to the global sfdx state folder.
+     *
+     * **See** {@link Global.SFDX_STATE_FOLDER}
+     */
+    static get SFDX_DIR() {
+        return path.join(os.homedir(), Global.SFDX_STATE_FOLDER);
+    }
+    /**
+     * The full system path to the global sf state folder.
+     *
+     * **See** {@link Global.SF_STATE_FOLDER}
+     */
+    static get SF_DIR() {
+        return path.join(os.homedir(), Global.SF_STATE_FOLDER);
+    }
     /**
      * Gets the current mode environment variable as a {@link Mode} instance.
      *
@@ -64,18 +80,6 @@ Global.SFDX_STATE_FOLDER = '.sfdx';
  * The global folder in which sf state is stored.
  */
 Global.SF_STATE_FOLDER = '.sf';
-/**
- * The full system path to the global sfdx state folder.
- *
- * **See** {@link Global.SFDX_STATE_FOLDER}
- */
-Global.SFDX_DIR = path.join(os.homedir(), Global.SFDX_STATE_FOLDER);
-/**
- * The full system path to the global sf state folder.
- *
- * **See** {@link Global.SF_STATE_FOLDER}
- */
-Global.SF_DIR = path.join(os.homedir(), Global.SF_STATE_FOLDER);
 /**
  * The full system path to the global log file.
  */

package/package.json

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