@salesforce/core 8.8.4 → 8.8.6

package/lib/crypto/keyChain.js

@@ -21,35 +21,39 @@ const messages = new messages_1.Messages('@salesforce/core', 'encryption', new M
  */
 const retrieveKeychain = async (platform) => {
     const logger = await logger_1.Logger.child('keyChain');
-    logger.debug(`platform: ${platform}`);
     const useGenericUnixKeychainVar = kit_1.env.getBoolean('SF_USE_GENERIC_UNIX_KEYCHAIN');
-    const shouldUseGenericUnixKeychain = useGenericUnixKeychainVar && useGenericUnixKeychainVar;
     if (platform.startsWith('win')) {
+        logger.debug(`platform: ${platform}. Using generic Windows keychain.`);
         return keyChainImpl_1.keyChainImpl.generic_windows;
     }
     else if (platform.includes('darwin')) {
         // OSX can use the generic keychain. This is useful when running under an
         // automation user.
-        if (shouldUseGenericUnixKeychain) {
+        if (useGenericUnixKeychainVar) {
+            logger.debug(`platform: ${platform}. Using generic Unix keychain.`);
             return keyChainImpl_1.keyChainImpl.generic_unix;
         }
         else {
+            logger.debug(`platform: ${platform}. Using Darwin native keychain.`);
             return keyChainImpl_1.keyChainImpl.darwin;
         }
     }
     else if (platform.includes('linux')) {
         // Use the generic keychain if specified
-        if (shouldUseGenericUnixKeychain) {
+        if (useGenericUnixKeychainVar) {
+            logger.debug(`platform: ${platform}. Using generic Unix keychain.`);
             return keyChainImpl_1.keyChainImpl.generic_unix;
         }
         else {
             // otherwise try and use the builtin keychain
             try {
+                logger.debug(`platform: ${platform}. Using Linux keychain.`);
                 await keyChainImpl_1.keyChainImpl.linux.validateProgram();
                 return keyChainImpl_1.keyChainImpl.linux;
             }
             catch (e) {
                 // If the builtin keychain is not available use generic
+                logger.debug(`platform: ${platform}. Using generic Unix keychain.`);
                 return keyChainImpl_1.keyChainImpl.generic_unix;
             }
         }

package/lib/stateAggregator/accessors/aliasAccessor.js

@@ -143,7 +143,7 @@ class AliasAccessor extends kit_1.AsyncOptionalCreatable {
             this.aliasStore = fileContentsRawToAliasStore(await (0, promises_1.readFile)(this.fileLocation, 'utf-8'));
         }
         catch (e) {
-            if (e instanceof Error && 'code' in e && e.code === 'ENOENT') {
+            if (e instanceof Error && 'code' in e && typeof e.code === 'string' && ['ENOENT', 'ENOTDIR'].includes(e.code)) {
                 this.aliasStore = new Map();
                 await (0, promises_1.mkdir)((0, node_path_1.dirname)(this.fileLocation), { recursive: true });
                 await this.saveAliasStoreToFile();

package/lib/stateAggregator/accessors/orgAccessor.js

@@ -39,6 +39,7 @@ const global_1 = require("../../global");
 const logger_1 = require("../../logger/logger");
 const messages_1 = require("../../messages");
 const lifecycleEvents_1 = require("../../lifecycleEvents");
+const sfError_1 = require("../../sfError");
 function chunk(array, chunkSize) {
     const final = [];
     for (let i = 0, len = array.length; i < len; i += chunkSize)
@@ -64,9 +65,11 @@ class BaseOrgAccessor extends kit_1.AsyncOptionalCreatable {
             return this.get(username, decrypt);
         }
         catch (err) {
-            if (err instanceof Error && err.name === 'JsonParseError') {
+            const error = sfError_1.SfError.wrap(err);
+            if (['JsonParseError', 'GenericKeychainInvalidPermsError'].includes(error.name)) {
                 throw err;
             }
+            this.logger.debug(`Error when reading auth file for user: ${username} due to: ${error.name}:${error.message}`);
             return null;
         }
     }
@@ -85,7 +88,13 @@ class BaseOrgAccessor extends kit_1.AsyncOptionalCreatable {
                     this.configs.set(username, config);
                 }
                 catch (e) {
-                    await lifecycleEvents_1.Lifecycle.getInstance().emitWarning(`The auth file for ${username} is invalid.`);
+                    const error = sfError_1.SfError.wrap(e);
+                    let warningMsg = `The auth file for ${username} is invalid.`;
+                    if (error.message) {
+                        warningMsg += ` Due to: ${error.message}`;
+                    }
+                    await lifecycleEvents_1.Lifecycle.getInstance().emitWarning(warningMsg);
+                    this.logger.debug(`Error when reading auth file for user: ${username} due to: ${error.name}:${error.message}`);
                 }
             });
             // eslint-disable-next-line no-await-in-loop
@@ -222,10 +231,14 @@ class BaseOrgAccessor extends kit_1.AsyncOptionalCreatable {
         else {
             const contents = this.contents.get(username) ?? {};
             await this.read(username, false, false);
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             const readConfig = this.configs.get(username);
-            readConfig.setContentsFromObject(contents);
-            return (await readConfig.write());
+            if (readConfig) {
+                readConfig.setContentsFromObject(contents);
+                return (await readConfig.write());
+            }
+            else {
+                this.logger.debug(`Failed to write auth file for ${username}. readConfig not found.`);
+            }
         }
     }
     async init() {

package/package.json

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