fix(javascript-sdk): change pkce utility to return storage function

Author: cerebrl

packages/javascript-sdk/src/oauth2-client/state-pkce.ts

@@ -28,12 +28,10 @@ export function generateAndStoreAuthUrlValues(options: GenerateAndStoreAuthUrlVa
     verifier,
   };
 
-  if (options.login === 'redirect') {
-    // Since `login` is configured for "redirect", store authorize values and redirect
-    sessionStorage.setItem(storageKey, JSON.stringify(authorizeUrlOptions));
-  }
-
-  return { state, verifier, authorizeUrlOptions };
+  return [
+    authorizeUrlOptions,
+    () => sessionStorage.setItem(storageKey, JSON.stringify(authorizeUrlOptions)),
+  ] as const;
 }
 
 /**

packages/javascript-sdk/src/token-manager/index.ts

@@ -125,7 +125,7 @@ abstract class TokenManager {
     /**
      * Generate state and verifier for PKCE
      */
-    const { authorizeUrlOptions } = generateAndStoreAuthUrlValues({
+    const [pkceValues, storePkceValues] = generateAndStoreAuthUrlValues({
       ...config,
       clientId,
       prefix,
@@ -138,7 +138,7 @@ abstract class TokenManager {
     try {
       // Check expected browser support
       // To support legacy browsers, iframe works best with short timeout
-      const parsedUrl = new URL(await OAuth2Client.getAuthCodeByIframe(authorizeUrlOptions));
+      const parsedUrl = new URL(await OAuth2Client.getAuthCodeByIframe(pkceValues));
 
       // Throw if we have an error param or have no authorization code
       if (parsedUrl.searchParams.get('error')) {
@@ -180,16 +180,19 @@ abstract class TokenManager {
         throw err;
       }
 
-      const authorizeUrl = await OAuth2Client.createAuthorizeUrl(authorizeUrlOptions);
+      const authorizeUrl = await OAuth2Client.createAuthorizeUrl(pkceValues);
+
+      // Before redirecting, store PKCE values
+      storePkceValues();
 
       return location.assign(authorizeUrl);
     }
     /**
      * Exchange authorization code for tokens
      */
     return await this.tokenExchange(options, {
-      state: authorizeUrlOptions.state,
-      verifier: authorizeUrlOptions.verifier,
+      state: pkceValues.state,
+      verifier: pkceValues.verifier,
     });
   }