Merge pull request #1149 from CruGlobal/2362-okta-fetch-error

[EP-2362] Retry signIn once to mitigate ephemeral fetch errors
CruGlobal · Feb 10, 2025 · 58da428 · 58da428
2 parents 377d6cd + febf200
commit 58da428
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/src/common/components/signUpModal/signUpModal.component.js b/src/common/components/signUpModal/signUpModal.component.js
@@ -539,7 +539,7 @@ class SignUpModalController {
     // Render the widget again to show new step
     // Unfortunately, this removes the error messages, which is why we inject them after rendering
     this.oktaSignInWidget.remove()
-    this.oktaSignInWidget.renderEl(
+    return this.oktaSignInWidget.renderEl(
       { el: '#osw-container' },
       null,
       (error) => {
@@ -550,12 +550,17 @@ class SignUpModalController {
     )
   }
 
-  signIn () {
+  signIn (retrying = false) {
     return this.oktaSignInWidget.showSignInAndRedirect({
       el: '#osw-container'
     }).then(tokens => {
       this.oktaSignInWidget.authClient.handleLoginRedirect(tokens)
     }).catch(error => {
+      if (!retrying) {
+        // Retry once
+        return this.reRenderWidget().then(() => this.signIn(true))
+      }
+
       this.$log.error('Error showing Okta sign in widget.', error)
     })
   }

diff --git a/src/common/components/signUpModal/signUpModal.component.spec.js b/src/common/components/signUpModal/signUpModal.component.spec.js
@@ -1222,11 +1222,12 @@ describe('signUpForm', function () {
       });
     });
 
-    it('should handle an error with $log', (done) => {
-      const error = new Error('Error signing in');
-      jest.spyOn($ctrl.$log, 'error').mockImplementation(() => {});
-      const showSignInAndRedirect = jest.fn().mockRejectedValue(error);
-      const handleLoginRedirect = jest.fn();
+    it('should handle an error with $log and retry once', (done) => {
+      const error = new Error('Error signing in')
+      jest.spyOn($ctrl.$log, 'error').mockImplementation(() => {})
+      jest.spyOn($ctrl, 'reRenderWidget').mockResolvedValue()
+      const showSignInAndRedirect = jest.fn().mockRejectedValue(error)
+      const handleLoginRedirect = jest.fn()
       $ctrl.oktaSignInWidget = {
         showSignInAndRedirect,
         authClient: {
@@ -1235,12 +1236,14 @@ describe('signUpForm', function () {
       }
 
       $ctrl.signIn().then(() => {
-      expect(handleLoginRedirect).not.toHaveBeenCalled()
-      expect($ctrl.$log.error).toHaveBeenCalledWith('Error showing Okta sign in widget.', error)
-      done()
-      });
-    });
-  });
+        expect(handleLoginRedirect).not.toHaveBeenCalled()
+        expect($ctrl.reRenderWidget).toHaveBeenCalledTimes(1)
+        expect($ctrl.$log.error).toHaveBeenCalledTimes(1)
+        expect($ctrl.$log.error).toHaveBeenCalledWith('Error showing Okta sign in widget.', error)
+        done()
+      })
+    })
+  })
 
   describe('loadDonorDetails()', () => {
     const signUpFormData = {