@salesforce/core 7.3.6 → 7.3.8

package/lib/logger/filters.js

@@ -21,6 +21,7 @@ const FILTERED_KEYS = [
     // Any json attribute that contains the words "refresh" and "token" will have the attribute/value hidden
     { name: 'refresh_token', regex: 'refresh[^\'"]*token' },
     { name: 'clientsecret' },
+    { name: 'authcode' },
 ];
 const FILTERED_KEYS_FOR_PROCESSING = FILTERED_KEYS.map((key) => ({
     ...key,
@@ -39,6 +40,8 @@ const replacementFunctions = FILTERED_KEYS_FOR_PROCESSING.flatMap((key) => [
     (input) => input
         .replace(new RegExp(sfdc_1.accessTokenRegex, 'g'), '<REDACTED ACCESS TOKEN>')
         .replace(new RegExp(sfdc_1.sfdxAuthUrlRegex, 'g'), '<REDACTED AUTH URL TOKEN>'),
+    // conditional replacement for clientId: leave the value if it's the PlatformCLI, otherwise redact it
+    (input) => input.replace(/(['"]client.*Id['"])\s*:\s*(['"][^'"]*['"])/gi, (all, key, value) => value.includes('PlatformCLI') ? `${key}:${value}` : `${key}:"<REDACTED CLIENT ID>"`),
 ]);
 const fullReplacementChain = compose(...replacementFunctions);
 /**

package/lib/org/authInfo.js

@@ -49,6 +49,7 @@ const logger_1 = require("../logger/logger");
 const sfError_1 = require("../sfError");
 const sfdc_1 = require("../util/sfdc");
 const stateAggregator_1 = require("../stateAggregator/stateAggregator");
+const filters_1 = require("../logger/filters");
 const messages_1 = require("../messages");
 const sfdcUrl_1 = require("../util/sfdcUrl");
 const connection_1 = require("./connection");
@@ -871,7 +872,14 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
             authFields = await oauth2.requestToken((0, ts_types_1.ensure)(options.authCode));
         }
         catch (err) {
-            throw messages.createError('authCodeExchangeError', [err.message]);
+            const msg = err instanceof Error ? `${err.name}::${err.message}` : typeof err === 'string' ? err : 'UNKNOWN';
+            const redacted = (0, filters_1.filterSecrets)(options);
+            throw sfError_1.SfError.create({
+                message: messages.getMessage('authCodeExchangeError', [msg]),
+                name: 'AuthCodeExchangeError',
+                ...(err instanceof Error ? { cause: err } : {}),
+                data: ((0, ts_types_1.isArray)(redacted) ? redacted[0] : redacted),
+            });
         }
         const { orgId } = parseIdUrl(authFields.id);
         let username = this.getUsername();

package/package.json

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