saasufy-components 8.2.0 → 8.2.1

package/oauth-handler.js

@@ -43,10 +43,13 @@ class OAuthHandler extends SocketConsumer {
       return;
     };
 
-    let stateParts = expectedOAuthState.split('-');
+    let relevantStates = expectedOAuthState
+      .split(',')
+      .filter(expectedState => expectedState && expectedState.split('-')[0] === provider);
+    
     // Do not process. The state may have been set for a different provider
     // which is handled on the same page.
-    if (stateParts[0] !== provider) return;
+    if (!relevantStates.length) return;
 
     let codeParamName = this.getAttribute('code-param-name') || 'code';
     let stateParamName = this.getAttribute('state-param-name') || 'state';
@@ -62,8 +65,8 @@ class OAuthHandler extends SocketConsumer {
       let socket = this.getSocket();
 
       history.replaceState({}, document.title, location.pathname);
-
-      if (state === expectedOAuthState) {
+      
+      if (relevantStates.some(expectedState => expectedState === state)) {
         try {
           await socket.invoke('log-in-oauth', { provider, data: { code, ...extraData } });
         } catch (error) {

package/oauth-link.js

@@ -75,8 +75,23 @@ class OAuthLink extends HTMLElement {
     let useLocalStorage = this.hasAttribute('use-local-storage');
     let stateSize = Number(this.getAttribute('state-size') || 20);
     let storageKey = this.getAttribute('state-storage-key') || 'oauth.state';
+    
+    let storage = useLocalStorage ? localStorage : sessionStorage;
+    let existingState = storage.getItem(storageKey);
+    let stateList;
+    if (existingState) {
+      stateList = existingState.split(',').filter(Boolean);
+      let maxStateCount = Number(this.getAttribute('max-state-count') ?? 20);
+      if (stateList.length >= maxStateCount) {
+        stateList.pop();
+      }
+    } else {
+      stateList = []
+    }
     this.state = `${provider}-${generateRandomHexString(stateSize)}`;
-    (useLocalStorage ? localStorage : sessionStorage).setItem(storageKey, this.state);
+    stateList.unshift(this.state);
+
+    storage.setItem(storageKey, stateList.join(','));
 
     this.shadowRoot.innerHTML = `
       <slot name="item"></slot>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "saasufy-components",
-  "version": "8.2.0",
+  "version": "8.2.1",
   "description": "Components for Saasufy.",
   "main": "index.js",
   "scripts": {