@salesforce/core 8.32.5 → 8.32.6-eca.1

package/lib/org/authInfo.js

@@ -726,11 +726,18 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
             else {
                 if (this.options.parentUsername) {
                     const parentFields = await this.loadDecryptedAuthFromConfig(this.options.parentUsername);
-                    options.clientId = parentFields.clientId;
+                    if (process.env.SF_SCRATCH_SIGNUP_CONNECTED_APP) {
+                        // When the signup app is overridden, use it as the clientId for the auth code exchange
+                        // and skip copying the parent's privateKey so we don't fall into the JWT flow.
+                        options.clientId = process.env.SF_SCRATCH_SIGNUP_CONNECTED_APP;
+                    }
+                    else {
+                        options.clientId = parentFields.clientId;
+                    }
                     if (process.env.SFDX_CLIENT_SECRET) {
                         options.clientSecret = process.env.SFDX_CLIENT_SECRET;
                     }
-                    else {
+                    else if (!process.env.SF_SCRATCH_SIGNUP_CONNECTED_APP) {
                         // Grab whatever flow is defined
                         Object.assign(options, {
                             clientSecret: parentFields.clientSecret,

package/lib/org/scratchOrgInfoApi.js

@@ -60,11 +60,13 @@ const getOrgInstanceAuthority = function (scratchOrgInfoComplete, hubOrgLoginUrl
  */
 const buildOAuth2Options = async (options) => {
     const logger = await logger_1.Logger.child('buildOAuth2Options');
-    const isJwtFlow = !!options.hubOrg.getConnection().getAuthInfoFields().privateKey;
+    const signupAppOverridden = !!process.env.SF_SCRATCH_SIGNUP_CONNECTED_APP;
+    const isJwtFlow = !signupAppOverridden && !!options.hubOrg.getConnection().getAuthInfoFields().privateKey;
     const oauth2Options = {
         loginUrl: getOrgInstanceAuthority(options.scratchOrgInfoComplete, options.hubOrg.getField(org_1.Org.Fields.LOGIN_URL), options.signupTargetLoginUrl),
     };
     logger.debug(`isJwtFlow: ${isJwtFlow}`);
+    logger.debug(`signupAppOverridden: ${signupAppOverridden}`);
     logger.debug(`using resolved loginUrl: ${oauth2Options.loginUrl ?? '<undefined>'}`);
     if (isJwtFlow && !process.env.SFDX_CLIENT_SECRET) {
         oauth2Options.privateKeyFile = options.hubOrg.getConnection().getAuthInfoFields().privateKey;

package/lib/org/scratchOrgInfoGenerator.js

@@ -151,11 +151,11 @@ const generateScratchOrgInfo = async ({ hubOrg, scratchOrgInfoPayload, nonamespa
     return {
         ...payload,
         orgName: scratchOrgInfoPayload.orgName ?? 'Company',
-        // we already have the info, and want to get rid of configApi, so this doesn't use that
-        connectedAppCallbackUrl: `http://localhost:${await webOAuthServer_1.WebOAuthServer.determineOauthPort()}/OauthRedirect`,
+        connectedAppCallbackUrl: process.env.SF_SCRATCH_SIGNUP_CALLBACK_URL ??
+            `http://localhost:${await webOAuthServer_1.WebOAuthServer.determineOauthPort()}/OauthRedirect`,
         ...(!nonamespace && namespace ? { namespace } : {}),
-        // Use the Hub org's client ID value, if one wasn't provided to us, or the default
         connectedAppConsumerKey: scratchOrgInfoPayload.connectedAppConsumerKey ??
+            process.env.SF_SCRATCH_SIGNUP_CONNECTED_APP ??
             hubOrg.getConnection().getAuthInfoFields().clientId ??
             authInfo_1.DEFAULT_CONNECTED_APP_INFO.clientId,
         package2AncestorIds: !ignoreAncestorIds && sfProject?.hasPackages()

package/package.json

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