conexys-elements 1.1.1 → 1.1.3

package/dist/index.js

@@ -263,22 +263,31 @@ const config$4 = {
 let USE_COOKIES_FOR_AUTH = false;
 let SESSION_EXPIRATION = 365;
 let isConfigInitialized = false;
-const initializeAuthConfig = async configLogs => {
-  if (isConfigInitialized) return;
-  const baseURL = Url + 'getsettings';
-  try {
-    await serviceData(baseURL, {
-      keys: 'type_session'
-    }, config$4, value => {
-      USE_COOKIES_FOR_AUTH = value === 'cookie';
+let initPromise = null;
+const initializeAuthConfig = configLogs => {
+  if (initPromise) return initPromise;
+  initPromise = (async () => {
+    if (isConfigInitialized) return;
+    const baseURL = Url + 'getsettings';
+    try {
+      await serviceData(baseURL, {
+        keys: 'type_session'
+      }, config$4, value => {
+        USE_COOKIES_FOR_AUTH = value === 'cookie';
+        isConfigInitialized = true;
+      }, configLogs);
+    } catch (error) {
+      logConsole(configLogs, 'error', 'Error loading authentication configuration:', error);
+    } finally {
       isConfigInitialized = true;
-    }, configLogs);
-  } catch (error) {
-    logConsole(configLogs, 'error', 'Error loading authentication configuration:', error);
-    isConfigInitialized = true;
-  }
+    }
+  })();
+  return initPromise;
 };
 const authStorage = {
+  initialize(configLogs) {
+    return initializeAuthConfig(configLogs);
+  },
   setAuthToken(token, configLogs) {
     initializeAuthConfig(configLogs);
     if (USE_COOKIES_FOR_AUTH) {
@@ -291,9 +300,10 @@ const authStorage = {
     initializeAuthConfig(configLogs);
     if (USE_COOKIES_FOR_AUTH) {
       return this.getCookie('cxauthxc');
-    } else {
-      return localStorage.getItem('cxauthxc');
     }
+    const local = localStorage.getItem('cxauthxc');
+    if (local !== null) return local;
+    return this.getCookie('cxauthxc');
   },
   setSessionId(sessionId, configLogs) {
     initializeAuthConfig(configLogs);
@@ -307,9 +317,10 @@ const authStorage = {
     initializeAuthConfig(configLogs);
     if (USE_COOKIES_FOR_AUTH) {
       return this.getCookie('cx_session');
-    } else {
-      return localStorage.getItem('cx_session');
     }
+    const local = localStorage.getItem('cx_session');
+    if (local !== null) return local;
+    return this.getCookie('cx_session');
   },
   removeAuthData(configLogs) {
     initializeAuthConfig(configLogs);
@@ -325,7 +336,8 @@ const authStorage = {
     const date = new Date();
     date.setTime(date.getTime() + days * 24 * 60 * 60 * 1000);
     const expires = `expires=${date.toUTCString()}`;
-    document.cookie = `${name}=${value};${expires};path=/;SameSite=Strict;Secure`;
+    const secure = window.location.protocol === 'https:' ? ';Secure' : '';
+    document.cookie = `${name}=${value};${expires};path=/;SameSite=Strict${secure}`;
   },
   getCookie(name) {
     const nameEQ = `${name}=`;
@@ -10147,8 +10159,8 @@ const initializeSharedServices = () => {
     },
     getAuthData: () => {
       return {
-        sessionID: localStorage.getItem('cx_session'),
-        authToken: localStorage.getItem('cxauthxc')
+        sessionID: authStorage.getSessionId(configLogs),
+        authToken: authStorage.getAuthToken(configLogs)
       };
     }
   };