@salesforce/core 8.28.3 → 8.28.4

package/lib/org/org.js

@@ -53,7 +53,7 @@ const authInfo_1 = require("./authInfo");
 const scratchOrgCreate_1 = require("./scratchOrgCreate");
 const orgConfigProperties_1 = require("./orgConfigProperties");
 ;
-const messages = new messages_1.Messages('@salesforce/core', 'org', new Map([["notADevHub", "The provided dev hub username %s is not a valid dev hub."], ["noUsernameFound", "No username found."], ["noDevHubFound", "Unable to associate this scratch org with a DevHub."], ["deleteOrgHubError", "The Dev Hub org cannot be deleted."], ["insufficientAccessToDelete", "You do not have the appropriate permissions to delete a scratch org. Please contact your Salesforce admin."], ["scratchOrgNotFound", "Attempting to delete an expired or deleted org"], ["sandboxDeleteFailed", "The sandbox org deletion failed with a result of %s."], ["sandboxNotFound", "We can't find a SandboxProcess for the sandbox %s."], ["sandboxInfoCreateFailed", "The sandbox org creation failed with a result of %s."], ["sandboxInfoRefreshFailed", "The sandbox org refresh failed with a result of %s."], ["missingAuthUsername", "The sandbox %s does not have an authorized username."], ["orgPollingTimeout", "Sandbox status is %s; timed out waiting for completion."], ["NotFoundOnDevHub", "The scratch org does not belong to the dev hub username %s."], ["AuthInfoOrgIdUndefined", "AuthInfo orgId is undefined."], ["sandboxCreateNotComplete", "The sandbox creation has not completed."], ["SandboxProcessNotFoundBySandboxName", "We can't find a SandboxProcess with the SandboxName %s."], ["MultiSandboxProcessNotFoundBySandboxName", "We found more than one SandboxProcess with the SandboxName %s."], ["sandboxNotResumable", "The sandbox %s cannot resume with status of %s."], ["FrontdoorURLError", "Failed to generate a frontdoor URL."], ["FlowIdNotFound", "ID not found for Flow %s."], ["CustomObjectIdNotFound", "ID not found for custom object %s."], ["ApexClassIdNotFound", "ID not found for Apex class %s."]]));
+const messages = new messages_1.Messages('@salesforce/core', 'org', new Map([["notADevHub", "The provided dev hub username %s is not a valid dev hub."], ["noUsernameFound", "No username found."], ["noDevHubFound", "Unable to associate this scratch org with a DevHub."], ["deleteOrgHubError", "The Dev Hub org cannot be deleted."], ["insufficientAccessToDelete", "You do not have the appropriate permissions to delete a scratch org. Please contact your Salesforce admin."], ["scratchOrgNotFound", "Attempting to delete an expired or deleted org"], ["sandboxDeleteFailed", "The sandbox org deletion failed with a result of %s."], ["sandboxNotFound", "We can't find a SandboxProcess for the sandbox %s."], ["sandboxInfoCreateFailed", "The sandbox org creation failed with a result of %s."], ["sandboxInfoRefreshFailed", "The sandbox org refresh failed with a result of %s."], ["missingAuthUsername", "The sandbox %s does not have an authorized username."], ["orgPollingTimeout", "Sandbox status is %s; timed out waiting for completion."], ["NotFoundOnDevHub", "The scratch org does not belong to the dev hub username %s."], ["AuthInfoOrgIdUndefined", "AuthInfo orgId is undefined."], ["sandboxCreateNotComplete", "The sandbox creation has not completed."], ["sandboxAuthNotComplete", "The sandbox org completed successfully, but the local authentication file could not be written: %s. Run \"org resume sandbox\" again to retry authentication."], ["sandboxAuthIncomplete", "The sandbox org completed, but the authentication endpoint is not ready yet (INVALID_STATUS: %s). Run \"org resume sandbox\" to retry."], ["SandboxProcessNotFoundBySandboxName", "We can't find a SandboxProcess with the SandboxName %s."], ["MultiSandboxProcessNotFoundBySandboxName", "We found more than one SandboxProcess with the SandboxName %s."], ["sandboxNotResumable", "The sandbox %s cannot resume with status of %s."], ["FrontdoorURLError", "Failed to generate a frontdoor URL."], ["FlowIdNotFound", "ID not found for Flow %s."], ["CustomObjectIdNotFound", "ID not found for custom object %s."], ["ApexClassIdNotFound", "ID not found for Apex class %s."]]));
 var OrgTypes;
 (function (OrgTypes) {
     OrgTypes["Scratch"] = "scratch";
@@ -405,7 +405,11 @@ class Org extends kit_1.AsyncOptionalCreatable {
                         return sandboxCreationProgress;
                     }
                     catch (err) {
-                        // eat the error, we don't want to throw an error if we can't write the file
+                        const authError = err instanceof Error ? err : new Error(String(err));
+                        this.logger.debug('Failed to write sandbox auth file', authError.message);
+                        const sfError = messages.createError('sandboxAuthNotComplete', [authError.message]);
+                        sfError.cause = authError;
+                        throw sfError;
                     }
                 }
             }
@@ -1340,8 +1344,21 @@ class Org extends kit_1.AsyncOptionalCreatable {
         const pollingClient = await pollingClient_1.PollingClient.create({
             poll: async () => {
                 const sandboxProcessObj = await this.querySandboxProcessById(options.sandboxProcessObj.Id);
-                // check to see if sandbox can authenticate via sandboxAuth endpoint
-                const sandboxInfo = await this.sandboxSignupComplete(sandboxProcessObj);
+                let sandboxInfo;
+                try {
+                    // check to see if sandbox can authenticate via sandboxAuth endpoint
+                    sandboxInfo = await this.sandboxSignupComplete(sandboxProcessObj);
+                }
+                catch (err) {
+                    const error = err instanceof Error ? err : sfError_1.SfError.wrap((0, ts_types_1.isString)(err) ? err : 'unknown');
+                    if (error.name === 'SandboxAuthIncompleteError') {
+                        this.logger.debug('Sandbox auth returned INVALID_STATUS, will retry', error.message);
+                        waitingOnAuth = true;
+                    }
+                    else {
+                        throw error;
+                    }
+                }
                 if (sandboxInfo) {
                     await lifecycleEvents_1.Lifecycle.getInstance().emit(SandboxEvents.EVENT_AUTH, sandboxInfo);
                     try {
@@ -1433,11 +1450,11 @@ class Org extends kit_1.AsyncOptionalCreatable {
             // In that case, the sandboxAuth call will throw a specific exception.
             if (error?.name === 'INVALID_STATUS') {
                 this.logger.debug('Error while authenticating the user:', error.message);
+                const sfError = messages.createError('sandboxAuthIncomplete', [error.message]);
+                sfError.cause = error;
+                throw sfError;
             }
-            else {
-                // If it fails for any unexpected reason, rethrow
-                throw error;
-            }
+            throw error;
         }
     }
     validateWaitOptions(options) {

package/messages/org.md

@@ -58,6 +58,14 @@ AuthInfo orgId is undefined.
 
 The sandbox creation has not completed.
 
+# sandboxAuthNotComplete
+
+The sandbox org completed successfully, but the local authentication file could not be written: %s. Run "org resume sandbox" again to retry authentication.
+
+# sandboxAuthIncomplete
+
+The sandbox org completed, but the authentication endpoint is not ready yet (INVALID_STATUS: %s). Run "org resume sandbox" to retry.
+
 # SandboxProcessNotFoundBySandboxName
 
 We can't find a SandboxProcess with the SandboxName %s.

package/package.json

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