@salesforce/core-bundle 8.8.4 → 8.8.6

package/lib/index.js

@@ -12310,7 +12310,7 @@ var require_package2 = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@salesforce/core-bundle",
-      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",
@@ -13148,25 +13148,29 @@ var require_keyChain = __commonJS({
     var messages = new messages_12.Messages("@salesforce/core-bundle", "encryption", /* @__PURE__ */ 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: %s"], ["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."], ["v1CryptoWithV2KeyWarning", 'The SF_CRYPTO_V2 environment variable was set to "false" but a v2 crypto key was detected. v1 crypto can only be used with a v1 key. Unset the SF_CRYPTO_V2 environment variable.'], ["v2CryptoWithV1KeyWarning", 'SF_CRYPTO_V2 was set to "true" but a v1 crypto key was detected. v2 crypto can only be used with a v2 key. To generate a v2 key:\n\n1. Logout of all orgs: `sf org logout --all`\n2. Delete the sfdx keychain entry (account: local, service: sfdx). If `SF_USE_GENERIC_UNIX_KEYCHAIN=true` env var is set, you can delete the `key.json` file.\n3. Set `SF_CRYPTO_V2=true` env var.\n4. Re-Authenticate with your orgs using the CLI org login commands.']]));
     var retrieveKeychain = async (platform) => {
       const logger = await logger_12.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")) {
-        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")) {
-        if (shouldUseGenericUnixKeychain) {
+        if (useGenericUnixKeychainVar) {
+          logger.debug(`platform: ${platform}. Using generic Unix keychain.`);
           return keyChainImpl_1.keyChainImpl.generic_unix;
         } else {
           try {
+            logger.debug(`platform: ${platform}. Using Linux keychain.`);
             await keyChainImpl_1.keyChainImpl.linux.validateProgram();
             return keyChainImpl_1.keyChainImpl.linux;
           } catch (e) {
+            logger.debug(`platform: ${platform}. Using generic Unix keychain.`);
             return keyChainImpl_1.keyChainImpl.generic_unix;
           }
         }
@@ -15927,7 +15931,7 @@ var require_aliasAccessor = __commonJS({
         try {
           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 = /* @__PURE__ */ new Map();
             await (0, promises_1.mkdir)((0, node_path_1.dirname)(this.fileLocation), { recursive: true });
             await this.saveAliasStoreToFile();
@@ -16042,6 +16046,7 @@ var require_orgAccessor = __commonJS({
     var logger_12 = require_logger();
     var messages_12 = require_messages();
     var lifecycleEvents_12 = require_lifecycleEvents();
+    var sfError_12 = require_sfError();
     function chunk(array, chunkSize) {
       const final = [];
       for (let i = 0, len = array.length; i < len; i += chunkSize)
@@ -16066,9 +16071,11 @@ var require_orgAccessor = __commonJS({
           this.configs.set(username, config);
           return this.get(username, decrypt);
         } catch (err) {
-          if (err instanceof Error && err.name === "JsonParseError") {
+          const error = sfError_12.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;
         }
       }
@@ -16086,7 +16093,13 @@ var require_orgAccessor = __commonJS({
               const config = await this.initAuthFile(username);
               this.configs.set(username, config);
             } catch (e) {
-              await lifecycleEvents_12.Lifecycle.getInstance().emitWarning(`The auth file for ${username} is invalid.`);
+              const error = sfError_12.SfError.wrap(e);
+              let warningMsg = `The auth file for ${username} is invalid.`;
+              if (error.message) {
+                warningMsg += ` Due to: ${error.message}`;
+              }
+              await lifecycleEvents_12.Lifecycle.getInstance().emitWarning(warningMsg);
+              this.logger.debug(`Error when reading auth file for user: ${username} due to: ${error.name}:${error.message}`);
             }
           });
           await Promise.all(promises);
@@ -16220,8 +16233,12 @@ var require_orgAccessor = __commonJS({
           const contents = this.contents.get(username) ?? {};
           await this.read(username, false, false);
           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-bundle",
-  "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",