saasufy-components 8.2.0 → 8.2.2

package/input-provider.js

@@ -2,7 +2,8 @@ import {
   debouncer,
   renderTemplate,
   updateConsumerElements,
-  convertStringToFieldParams
+  convertStringToFieldParams,
+  convertStringToFieldTypeValues
 } from './utils.js';
 
 const DEFAULT_DEBOUNCE_DELAY = 800;
@@ -136,18 +137,13 @@ class InputProvider extends HTMLElement {
     this.inputElement = document.createElement(elementType);
     if (type === 'select') {
       if (options != null) {
-        let {
-          fieldNames: optionNames,
-          fieldValues: optionValues
-        } = convertStringToFieldParams(options, true, true);
-
-        let optionElements = optionNames
-          .map((optionName) => {
-            let optionValue = optionValues[optionName] || optionName;
-            if (optionName === placeholder) {
-              return `<option value="" selected class="select-default-option">${optionName}</option>`;
+        let fieldTypeValues = convertStringToFieldTypeValues(options, true, true);
+        let optionElements = fieldTypeValues
+          .map((option) => {
+            if (option.field === placeholder) {
+              return `<option value="" selected class="select-default-option">${option.field}</option>`;
             }
-            return `<option value="${optionValue}">${optionName}</option>`;
+            return `<option value="${option.value}">${option.field}</option>`;
           })
           .join('');
         this.inputElement.innerHTML = optionElements;

package/model-input.js

@@ -3,6 +3,7 @@ import {
   debouncer,
   updateConsumerElements,
   convertStringToFieldParams,
+  convertStringToFieldTypeValues,
   formatError
 } from './utils.js';
 import AGModel from '/node_modules/ag-model/ag-model.js';
@@ -207,18 +208,13 @@ class ModelInput extends SocketConsumer {
     let optionList = null;
     if (type === 'select') {
       if (options != null) {
-        let {
-          fieldNames: optionNames,
-          fieldValues: optionValues
-        } = convertStringToFieldParams(options, true, true);
-
-        let optionElements = optionNames
-          .map((optionName) => {
-            let optionValue = optionValues[optionName] || optionName;
-            if (optionName === placeholder) {
-              return `<option value="" selected class="select-default-option">${optionName}</option>`;
+        let fieldTypeValues = convertStringToFieldTypeValues(options, true, true);
+        let optionElements = fieldTypeValues
+          .map((option) => {
+            if (option.field === placeholder) {
+              return `<option value="" selected class="select-default-option">${option.field}</option>`;
             }
-            return `<option value="${optionValue}">${optionName}</option>`;
+            return `<option value="${option.value}">${option.field}</option>`;
           })
           .join('');
         this.inputElement.innerHTML = optionElements;

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.2",
   "description": "Components for Saasufy.",
   "main": "index.js",
   "scripts": {

package/utils.js

@@ -462,10 +462,10 @@ export function getTypeCastFunction(type) {
   return typeCastFunctions[type] || ((value) => value);
 }
 
-export function convertStringToFieldParams(string, allowEmpty, unescapeEqual) {
+export function convertStringToFieldTypeValues(string, allowEmpty, unescapeEqual) {
   let partsRegExp = allowEmpty ? fieldPartsRegExpWithEmpty : fieldPartsRegExp;
   let parts = ((string || '').match(partsRegExp) || []).map(field => field.trim());
-  let fieldTypeValues = parts.map((part) => {
+  return parts.map((part) => {
     let subParts;
     if (unescapeEqual) {
       subParts = part.split(unescapedEqualRegExp).map(unescapeEqualSigns);
@@ -473,25 +473,29 @@ export function convertStringToFieldParams(string, allowEmpty, unescapeEqual) {
       subParts = part.split(unescapedEqualRegExp);
     }
     let nameType = (subParts[0] || '').split(':');
-    let name = nameType[0];
+    let field = nameType[0];
     let type = nameType[1] || 'text';
     let value = subParts.slice(1).join('=').replace(quotedContentRegExp, '$1');
     return {
-      name,
+      field,
       type,
       value
     }
   });
-  let fieldNames = fieldTypeValues.map(item => item.name);
+}
+
+export function convertStringToFieldParams(string, allowEmpty, unescapeEqual) {
+  let fieldTypeValues = convertStringToFieldTypeValues(string, allowEmpty, unescapeEqual);
+  let fieldNames = fieldTypeValues.map(item => item.field);
   let fieldTypes = Object.fromEntries(
-    fieldTypeValues.map(item => [ item.name, item.type ])
+    fieldTypeValues.map(item => [ item.field, item.type ])
   );
   let fieldValues = Object.fromEntries(
     fieldTypeValues.map(
       (item) => {
-        let type = fieldTypes[item.name];
+        let type = fieldTypes[item.field];
         let Type = getTypeCastFunction(type);
-        return [ item.name, Type(item.value) ];
+        return [ item.field, Type(item.value) ];
       }
     )
   );