phx-react 1.3.1582 → 1.3.1583

package/dist/cjs/components/Func/getCookieSession.js

@@ -1,23 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = PHXFuncGetCookieSession;
+const tslib_1 = require("tslib");
 const constants_1 = require("../../utils/constants");
 const helpers_1 = require("../../helpers/helpers");
 const sessionStore_1 = require("./sessionStore");
 const save_local_storage_1 = require("./save-local-storage");
+const js_cookie_1 = tslib_1.__importDefault(require("js-cookie"));
 function PHXFuncGetCookieSession() {
-    let sessionInfo;
     const cachedSession = (0, sessionStore_1.getSession)();
     if (cachedSession)
         return cachedSession;
-    if (typeof window !== 'undefined') {
-        sessionInfo = (0, save_local_storage_1.getLocalStorage)(constants_1.COOKIE_SESSION_SIGN_IN);
-    }
-    if (sessionInfo) {
-        const sessionInfoDecrypt = (0, helpers_1.decryptCookie)(JSON.parse(sessionInfo));
+    if (typeof window === 'undefined')
+        return null;
+    try {
+        let sessionInfo = null;
+        const data = (0, save_local_storage_1.getLocalStorage)(constants_1.COOKIE_SESSION_SIGN_IN);
+        if (data) {
+            sessionInfo = JSON.parse(data);
+        }
+        if (!sessionInfo) {
+            const cookieValue = js_cookie_1.default.get(constants_1.COOKIE_SESSION_SIGN_IN);
+            if (cookieValue) {
+                sessionInfo = cookieValue;
+            }
+        }
+        if (!sessionInfo)
+            return null;
+        const sessionInfoDecrypt = (0, helpers_1.decryptCookie)(sessionInfo);
+        if (!sessionInfoDecrypt)
+            return null;
         (0, sessionStore_1.setSession)(sessionInfoDecrypt);
         return sessionInfoDecrypt;
     }
-    return null;
+    catch (error) {
+        console.warn('Session error:', error);
+        return null;
+    }
 }
 //# sourceMappingURL=getCookieSession.js.map

package/dist/cjs/components/Func/getCookieSession.js.map

@@ -1 +1 @@
-{"version":3,"file":"getCookieSession.js","sourceRoot":"","sources":["../../../../src/components/Func/getCookieSession.ts"],"names":[],"mappings":";;AAiCA,0CAcC;AA/CD,qDAA8D;AAC9D,mDAAqD;AACrD,iDAAuD;AACvD,6DAAsD;AA8BtD,SAAwB,uBAAuB;IAC7C,IAAI,WAAW,CAAA;IACf,MAAM,aAAa,GAAG,IAAA,yBAAU,GAAE,CAAA;IAClC,IAAI,aAAa;QAAE,OAAO,aAAa,CAAA;IAEvC,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;QAClC,WAAW,GAAG,IAAA,oCAAe,EAAS,kCAAsB,CAAC,CAAA;IAC/D,CAAC;IACD,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,kBAAkB,GAAG,IAAA,uBAAa,EAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAA;QACjE,IAAA,yBAAU,EAAC,kBAAkB,CAAC,CAAA;QAC9B,OAAO,kBAAkB,CAAA;IAC3B,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC"}
+{"version":3,"file":"getCookieSession.js","sourceRoot":"","sources":["../../../../src/components/Func/getCookieSession.ts"],"names":[],"mappings":";;AAkCA,0CAyBC;;AA3DD,qDAA8D;AAC9D,mDAAqD;AACrD,iDAAuD;AACvD,6DAAsD;AACtD,kEAA+B;AA8B/B,SAAwB,uBAAuB;IAC7C,MAAM,aAAa,GAAG,IAAA,yBAAU,GAAE,CAAA;IAClC,IAAI,aAAa;QAAE,OAAO,aAAa,CAAA;IACvC,IAAI,OAAO,MAAM,KAAK,WAAW;QAAE,OAAO,IAAI,CAAA;IAC9C,IAAI,CAAC;QACH,IAAI,WAAW,GAAQ,IAAI,CAAA;QAC3B,MAAM,IAAI,GAAG,IAAA,oCAAe,EAAS,kCAAsB,CAAC,CAAA;QAC5D,IAAI,IAAI,EAAE,CAAC;YACT,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAChC,CAAC;QACD,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,WAAW,GAAG,mBAAO,CAAC,GAAG,CAAC,kCAAsB,CAAC,CAAA;YACvD,IAAI,WAAW,EAAE,CAAC;gBAChB,WAAW,GAAG,WAAW,CAAA;YAC3B,CAAC;QACH,CAAC;QACD,IAAI,CAAC,WAAW;YAAE,OAAO,IAAI,CAAA;QAC7B,MAAM,kBAAkB,GAAG,IAAA,uBAAa,EAAC,WAAW,CAAC,CAAA;QACrD,IAAI,CAAC,kBAAkB;YAAE,OAAO,IAAI,CAAA;QACpC,IAAA,yBAAU,EAAC,kBAAkB,CAAC,CAAA;QAC9B,OAAO,kBAAkB,CAAA;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAA;QACrC,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC"}

package/dist/esm/components/Func/getCookieSession.js

@@ -2,19 +2,36 @@ import { COOKIE_SESSION_SIGN_IN } from '../../utils/constants';
 import { decryptCookie } from '../../helpers/helpers';
 import { getSession, setSession } from './sessionStore';
 import { getLocalStorage } from './save-local-storage';
+import Cookies from 'js-cookie';
 export default function PHXFuncGetCookieSession() {
-    let sessionInfo;
     const cachedSession = getSession();
     if (cachedSession)
         return cachedSession;
-    if (typeof window !== 'undefined') {
-        sessionInfo = getLocalStorage(COOKIE_SESSION_SIGN_IN);
-    }
-    if (sessionInfo) {
-        const sessionInfoDecrypt = decryptCookie(JSON.parse(sessionInfo));
+    if (typeof window === 'undefined')
+        return null;
+    try {
+        let sessionInfo = null;
+        const data = getLocalStorage(COOKIE_SESSION_SIGN_IN);
+        if (data) {
+            sessionInfo = JSON.parse(data);
+        }
+        if (!sessionInfo) {
+            const cookieValue = Cookies.get(COOKIE_SESSION_SIGN_IN);
+            if (cookieValue) {
+                sessionInfo = cookieValue;
+            }
+        }
+        if (!sessionInfo)
+            return null;
+        const sessionInfoDecrypt = decryptCookie(sessionInfo);
+        if (!sessionInfoDecrypt)
+            return null;
         setSession(sessionInfoDecrypt);
         return sessionInfoDecrypt;
     }
-    return null;
+    catch (error) {
+        console.warn('Session error:', error);
+        return null;
+    }
 }
 //# sourceMappingURL=getCookieSession.js.map

package/dist/esm/components/Func/getCookieSession.js.map

@@ -1 +1 @@
-{"version":3,"file":"getCookieSession.js","sourceRoot":"","sources":["../../../../src/components/Func/getCookieSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AA8BtD,MAAM,CAAC,OAAO,UAAU,uBAAuB;IAC7C,IAAI,WAAW,CAAA;IACf,MAAM,aAAa,GAAG,UAAU,EAAE,CAAA;IAClC,IAAI,aAAa;QAAE,OAAO,aAAa,CAAA;IAEvC,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;QAClC,WAAW,GAAG,eAAe,CAAS,sBAAsB,CAAC,CAAA;IAC/D,CAAC;IACD,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,kBAAkB,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAA;QACjE,UAAU,CAAC,kBAAkB,CAAC,CAAA;QAC9B,OAAO,kBAAkB,CAAA;IAC3B,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC"}
+{"version":3,"file":"getCookieSession.js","sourceRoot":"","sources":["../../../../src/components/Func/getCookieSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,OAAO,MAAM,WAAW,CAAA;AA8B/B,MAAM,CAAC,OAAO,UAAU,uBAAuB;IAC7C,MAAM,aAAa,GAAG,UAAU,EAAE,CAAA;IAClC,IAAI,aAAa;QAAE,OAAO,aAAa,CAAA;IACvC,IAAI,OAAO,MAAM,KAAK,WAAW;QAAE,OAAO,IAAI,CAAA;IAC9C,IAAI,CAAC;QACH,IAAI,WAAW,GAAQ,IAAI,CAAA;QAC3B,MAAM,IAAI,GAAG,eAAe,CAAS,sBAAsB,CAAC,CAAA;QAC5D,IAAI,IAAI,EAAE,CAAC;YACT,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAChC,CAAC;QACD,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAA;YACvD,IAAI,WAAW,EAAE,CAAC;gBAChB,WAAW,GAAG,WAAW,CAAA;YAC3B,CAAC;QACH,CAAC;QACD,IAAI,CAAC,WAAW;YAAE,OAAO,IAAI,CAAA;QAC7B,MAAM,kBAAkB,GAAG,aAAa,CAAC,WAAW,CAAC,CAAA;QACrD,IAAI,CAAC,kBAAkB;YAAE,OAAO,IAAI,CAAA;QACpC,UAAU,CAAC,kBAAkB,CAAC,CAAA;QAC9B,OAAO,kBAAkB,CAAA;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAA;QACrC,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phx-react",
-  "version": "1.3.1582",
+  "version": "1.3.1583",
   "description": "PHX REACT",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",