add flag

descope · Oct 15, 2024 · 88ba4ae · 88ba4ae
1 parent e7624d3
commit 88ba4ae
Show file tree

Hide file tree

Showing 4 changed files with 356 additions and 303 deletions.
diff --git a/packages/sdks/web-component/src/lib/descope-wc/BaseDescopeWc.ts b/packages/sdks/web-component/src/lib/descope-wc/BaseDescopeWc.ts
@@ -331,6 +331,10 @@ class BaseDescopeWc extends BaseClass {
     this.#componentsContext = { ...this.#componentsContext, ...e.detail };
   }
 
+  get isRestartOnError() {
+    return this.getAttribute('restart-on-error') === 'true';
+  }
+
   async getExecutionContext() {
     const { executionContext } = await this.getConfig();
 

diff --git a/packages/sdks/web-component/src/lib/descope-wc/DescopeWc.ts b/packages/sdks/web-component/src/lib/descope-wc/DescopeWc.ts
@@ -186,15 +186,15 @@ class DescopeWc extends BaseDescopeWc {
     return null;
   }
 
-  async #handleFlowReload() {
-    this.loggerWrapper.debug('Trying to reload the flow');
+  async #handleFlowRestart() {
+    this.loggerWrapper.debug('Trying to restart the flow');
     const prevCompVersion = await this.getComponentsVersion();
     this.getConfig.reset();
     const compVersion = await this.getComponentsVersion();
 
     if (prevCompVersion === compVersion) {
       this.loggerWrapper.debug(
-        'Components version was not changed, reloading flow',
+        'Components version was not changed, restarting flow',
       );
       this.flowState.update({
         stepId: null,
@@ -250,10 +250,10 @@ class DescopeWc extends BaseDescopeWc {
     const redirectAuth =
       redirectAuthCallbackUrl && redirectAuthCodeChallenge
         ? {
-            callbackUrl: redirectAuthCallbackUrl,
-            codeChallenge: redirectAuthCodeChallenge,
-            backupCallbackUri: redirectAuthBackupCallbackUri,
-          }
+          callbackUrl: redirectAuthCallbackUrl,
+          codeChallenge: redirectAuthCodeChallenge,
+          backupCallbackUri: redirectAuthBackupCallbackUri,
+        }
         : undefined;
 
     // if there is no execution id we should start a new flow
@@ -634,11 +634,12 @@ class DescopeWc extends BaseDescopeWc {
 
       // E102004 = Flow requested is in old version
       // E103205 = Flow timed out
+      const errorCode = sdkResp?.error?.errorCode
       if (
-        sdkResp?.error?.errorCode === 'E102004' ||
-        sdkResp?.error?.errorCode === 'E103205'
+        (errorCode === 'E102004' || errorCode === 'E103205') &&
+        this.isRestartOnError
       ) {
-        this.#handleFlowReload();
+        this.#handleFlowRestart();
       }
       return;
     }

diff --git a/packages/sdks/web-component/test/helpers/index.test.ts b/packages/sdks/web-component/test/helpers/index.test.ts
@@ -9,7 +9,7 @@ import {
   handleAutoFocus,
   isChromium,
   setRunIdsOnUrl,
-  withMemCache
+  withMemCache,
 } from '../../src/lib/helpers/helpers';
 
 const mockFetch = jest.fn();
@@ -228,7 +228,7 @@ describe('withMemCache', () => {
     const myFnWithMemCache = withMemCache(myFn);
 
     expect(myFnWithMemCache()).toBe('result');
-  })
+  });
 
   it('should cache the fn result', () => {
     const myFn = jest.fn(() => 'result');
@@ -238,7 +238,7 @@ describe('withMemCache', () => {
     myFnWithMemCache();
 
     expect(myFn).toHaveBeenCalledTimes(1);
-  })
+  });
 
   it('should reset the cache when the reset function is called', () => {
     const myFn = jest.fn(() => 'result');
@@ -249,6 +249,5 @@ describe('withMemCache', () => {
     myFnWithMemCache();
 
     expect(myFn).toHaveBeenCalledTimes(2);
-  })
-
-})
+  });
+});