login-authorization-v2 2.1.8 → 2.1.9-beta.1

package/dist/index.d.ts

@@ -21,6 +21,6 @@ export declare const make: (config: MakeFnParams) => {
         staffEndpoint: boolean;
         url: string;
     }[]>;
-    logout: () => Promise<import("axios").AxiosResponse<any, any>>;
+    logout: () => Promise<void>;
 };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,kBAAkB,CAAA;AAChC,cAAc,aAAa,CAAA;AAO3B,OAAO,EAAE,KAAK,EAAE,KAAK,UAAU,EAAc,MAAM,EAAiB,MAAM,aAAa,CAAA;AAGvF,KAAK,YAAY,GAAG;IAClB,UAAU,EAAE,UAAU,CAAA;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB,CAAA;AAKD,KAAK,YAAY,GAAG;IAClB,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAOD,eAAO,MAAM,IAAI,GAAI,QAAQ,YAAY;uBAuCb,YAAY;;;;;;;;;CA+GvC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,kBAAkB,CAAA;AAChC,cAAc,aAAa,CAAA;AAO3B,OAAO,EAAE,KAAK,EAAE,KAAK,UAAU,EAAc,MAAM,EAAiB,MAAM,aAAa,CAAA;AAGvF,KAAK,YAAY,GAAG;IAClB,UAAU,EAAE,UAAU,CAAA;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB,CAAA;AAKD,KAAK,YAAY,GAAG;IAClB,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAOD,eAAO,MAAM,IAAI,GAAI,QAAQ,YAAY;uBAuCb,YAAY;;;;;;;;;CAyGvC,CAAA"}

package/dist/index.esm.js

@@ -34,14 +34,6 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-const NO_ACCESS_TOKEN = 'Access token not found';
-const INVALID_ACCESS_TOKEN = 'Invalid access token';
-const INVALID_REFRESH_TOKEN = 'Invalid refresh token';
-const NO_REFRESH_TOKEN = 'Refresh token not found';
-const NO_MODULE_BASE_URL = 'Module base URL is required';
-const INVALID_TENANT_ID = 'Invalid tenant ID';
-const INVALID_BRAND = 'Invalid brand';
-
 const isHttps = window.location.protocol === 'https:';
 const makeSetCookieFn = (key, options) => {
     const index = window.location.hostname.indexOf('.');
@@ -57,55 +49,31 @@ const makeSetCookieFn = (key, options) => {
 };
 const setIdTokenFront = makeSetCookieFn('idTokenFront', { secure: isHttps, sameSite: 'Lax' });
 const setIdTokenBack = makeSetCookieFn('idTokenBack', { secure: isHttps, sameSite: 'Lax' });
-const getIdTokenFront = () => Cookie.get('idTokenFront');
-const getIdTokenBack = () => Cookie.get('idTokenBack');
 const setRefreshTokenFront = makeSetCookieFn('refreshTokenFront', { secure: isHttps, sameSite: 'Lax' });
 const setRefreshTokenBack = makeSetCookieFn('refreshTokenBack', { secure: isHttps, sameSite: 'Lax' });
-const getRefreshTokenFront = () => Cookie.get('refreshTokenFront');
-const getRefreshTokenBack = () => Cookie.get('refreshTokenBack');
 const setRefreshToken = (token) => {
+    setRefreshTokenFront(null);
+    setRefreshTokenBack(null);
     if (!token) {
-        setIdTokenBack(null);
-        setIdTokenFront(null);
-        makeSetCookieFn('refresh_token')(null);
+        makeSetCookieFn('refresh_token', { secure: isHttps })(null);
         return;
     }
-    const splits = token.split('.');
-    if (splits.length < 5)
-        throw new Error(INVALID_REFRESH_TOKEN);
-    const refreshTokenFront = splits[0] + '.' + splits[1];
-    const refreshTokenBack = splits[2] + '.' + splits[3] + '.' + splits[4];
-    setRefreshTokenFront(refreshTokenFront);
-    setRefreshTokenBack(refreshTokenBack);
-    makeSetCookieFn('refresh_token')(null);
-    // makeSetCookieFn('refresh_token')(token)
+    makeSetCookieFn('refresh_token', { secure: isHttps })(token);
 };
 const setAccessToken = (token) => {
+    setIdTokenFront(null);
+    setIdTokenBack(null);
     if (!token) {
-        setIdTokenBack(null);
-        setIdTokenFront(null);
-        makeSetCookieFn('access_token')(null);
+        makeSetCookieFn('access_token', { secure: isHttps })(null);
         return;
     }
-    const splits = token.split('.');
-    if (splits.length < 3)
-        throw new Error(INVALID_ACCESS_TOKEN);
-    const idTokenFront = splits[0] + '.' + splits[1];
-    const idTokenBack = splits[2] || '';
-    setIdTokenFront(idTokenFront);
-    setIdTokenBack(idTokenBack);
-    makeSetCookieFn('access_token')(null);
-    // makeSetCookieFn('access_token')(token)
+    makeSetCookieFn('access_token', { secure: isHttps })(token);
 };
 const getAccessToken = () => {
-    if (!getIdTokenFront() || !getIdTokenBack())
-        return '';
-    return getIdTokenFront() + '.' + getIdTokenBack();
+    return Cookie.get('access_token');
 };
 const getRefreshToken = () => {
-    if (!getRefreshTokenFront() || !getRefreshTokenBack())
-        return '';
-    return getRefreshTokenFront() + '.' + getRefreshTokenBack();
+    return Cookie.get('refresh_token');
 };
 const setSystemType = makeSetCookieFn('currentSystemType');
 const getSystemType = () => Cookie.get('currentSystemType');
@@ -142,6 +110,12 @@ const getUrlParam = (key, href) => {
     return searchParams.get(key);
 };
 
+const NO_ACCESS_TOKEN = 'Access token not found';
+const NO_REFRESH_TOKEN = 'Refresh token not found';
+const NO_MODULE_BASE_URL = 'Module base URL is required';
+const INVALID_TENANT_ID = 'Invalid tenant ID';
+const INVALID_BRAND = 'Invalid brand';
+
 const isMobile = () => {
     const ua = navigator.userAgent;
     return /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(ua);
@@ -267,7 +241,7 @@ const initInstance = () => __awaiter(void 0, void 0, void 0, function* () {
     });
     instance.interceptors.response.use((response) => {
         if (response.data.code !== 200) {
-            return Promise.reject(response);
+            return Promise.reject(response.data.msg);
         }
         return response;
     }, (error) => {
@@ -391,16 +365,6 @@ const make = (config) => {
         }
         timer = setInterval(() => {
             fetchRefreshTokenHTTP(refreshToken)
-                .catch(error => {
-                clearRefreshTokenTimer();
-                setAccessToken(null);
-                setRefreshToken(null);
-                if (config.moduleName === 'App') {
-                    throw error;
-                }
-                window.location.href = config.loginPageUrl;
-                throw error;
-            })
                 .then(resp => {
                 const { content: { idToken } } = resp.data;
                 setAccessToken(idToken);
@@ -412,12 +376,16 @@ const make = (config) => {
                     clearRefreshTokenTimer();
                     return logout();
                 }
+            })
+                .catch(error => {
+                clearRefreshTokenTimer();
+                throw error;
             });
         }, 1e3 * 60 * 3); // 3 minutes
     };
     const logout = () => {
         return fetchLogoutHTTP({ refreshToken: getRefreshToken() })
-            .finally(() => {
+            .then(() => {
             clearRefreshTokenTimer();
             setAccessToken(null);
             setRefreshToken(null);

package/dist/index.umd.js

@@ -36,14 +36,6 @@
         return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
     };
 
-    const NO_ACCESS_TOKEN = 'Access token not found';
-    const INVALID_ACCESS_TOKEN = 'Invalid access token';
-    const INVALID_REFRESH_TOKEN = 'Invalid refresh token';
-    const NO_REFRESH_TOKEN = 'Refresh token not found';
-    const NO_MODULE_BASE_URL = 'Module base URL is required';
-    const INVALID_TENANT_ID = 'Invalid tenant ID';
-    const INVALID_BRAND = 'Invalid brand';
-
     const isHttps = window.location.protocol === 'https:';
     const makeSetCookieFn = (key, options) => {
         const index = window.location.hostname.indexOf('.');
@@ -59,55 +51,31 @@
     };
     const setIdTokenFront = makeSetCookieFn('idTokenFront', { secure: isHttps, sameSite: 'Lax' });
     const setIdTokenBack = makeSetCookieFn('idTokenBack', { secure: isHttps, sameSite: 'Lax' });
-    const getIdTokenFront = () => Cookie.get('idTokenFront');
-    const getIdTokenBack = () => Cookie.get('idTokenBack');
     const setRefreshTokenFront = makeSetCookieFn('refreshTokenFront', { secure: isHttps, sameSite: 'Lax' });
     const setRefreshTokenBack = makeSetCookieFn('refreshTokenBack', { secure: isHttps, sameSite: 'Lax' });
-    const getRefreshTokenFront = () => Cookie.get('refreshTokenFront');
-    const getRefreshTokenBack = () => Cookie.get('refreshTokenBack');
     const setRefreshToken = (token) => {
+        setRefreshTokenFront(null);
+        setRefreshTokenBack(null);
         if (!token) {
-            setIdTokenBack(null);
-            setIdTokenFront(null);
-            makeSetCookieFn('refresh_token')(null);
+            makeSetCookieFn('refresh_token', { secure: isHttps })(null);
             return;
         }
-        const splits = token.split('.');
-        if (splits.length < 5)
-            throw new Error(INVALID_REFRESH_TOKEN);
-        const refreshTokenFront = splits[0] + '.' + splits[1];
-        const refreshTokenBack = splits[2] + '.' + splits[3] + '.' + splits[4];
-        setRefreshTokenFront(refreshTokenFront);
-        setRefreshTokenBack(refreshTokenBack);
-        makeSetCookieFn('refresh_token')(null);
-        // makeSetCookieFn('refresh_token')(token)
+        makeSetCookieFn('refresh_token', { secure: isHttps })(token);
     };
     const setAccessToken = (token) => {
+        setIdTokenFront(null);
+        setIdTokenBack(null);
         if (!token) {
-            setIdTokenBack(null);
-            setIdTokenFront(null);
-            makeSetCookieFn('access_token')(null);
+            makeSetCookieFn('access_token', { secure: isHttps })(null);
             return;
         }
-        const splits = token.split('.');
-        if (splits.length < 3)
-            throw new Error(INVALID_ACCESS_TOKEN);
-        const idTokenFront = splits[0] + '.' + splits[1];
-        const idTokenBack = splits[2] || '';
-        setIdTokenFront(idTokenFront);
-        setIdTokenBack(idTokenBack);
-        makeSetCookieFn('access_token')(null);
-        // makeSetCookieFn('access_token')(token)
+        makeSetCookieFn('access_token', { secure: isHttps })(token);
     };
     const getAccessToken = () => {
-        if (!getIdTokenFront() || !getIdTokenBack())
-            return '';
-        return getIdTokenFront() + '.' + getIdTokenBack();
+        return Cookie.get('access_token');
     };
     const getRefreshToken = () => {
-        if (!getRefreshTokenFront() || !getRefreshTokenBack())
-            return '';
-        return getRefreshTokenFront() + '.' + getRefreshTokenBack();
+        return Cookie.get('refresh_token');
     };
     const setSystemType = makeSetCookieFn('currentSystemType');
     const getSystemType = () => Cookie.get('currentSystemType');
@@ -144,6 +112,12 @@
         return searchParams.get(key);
     };
 
+    const NO_ACCESS_TOKEN = 'Access token not found';
+    const NO_REFRESH_TOKEN = 'Refresh token not found';
+    const NO_MODULE_BASE_URL = 'Module base URL is required';
+    const INVALID_TENANT_ID = 'Invalid tenant ID';
+    const INVALID_BRAND = 'Invalid brand';
+
     const isMobile = () => {
         const ua = navigator.userAgent;
         return /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(ua);
@@ -269,7 +243,7 @@
         });
         instance.interceptors.response.use((response) => {
             if (response.data.code !== 200) {
-                return Promise.reject(response);
+                return Promise.reject(response.data.msg);
             }
             return response;
         }, (error) => {
@@ -393,16 +367,6 @@
             }
             timer = setInterval(() => {
                 fetchRefreshTokenHTTP(refreshToken)
-                    .catch(error => {
-                    clearRefreshTokenTimer();
-                    setAccessToken(null);
-                    setRefreshToken(null);
-                    if (config.moduleName === 'App') {
-                        throw error;
-                    }
-                    window.location.href = config.loginPageUrl;
-                    throw error;
-                })
                     .then(resp => {
                     const { content: { idToken } } = resp.data;
                     setAccessToken(idToken);
@@ -414,12 +378,16 @@
                         clearRefreshTokenTimer();
                         return logout();
                     }
+                })
+                    .catch(error => {
+                    clearRefreshTokenTimer();
+                    throw error;
                 });
             }, 1e3 * 60 * 3); // 3 minutes
         };
         const logout = () => {
             return fetchLogoutHTTP({ refreshToken: getRefreshToken() })
-                .finally(() => {
+                .then(() => {
                 clearRefreshTokenTimer();
                 setAccessToken(null);
                 setRefreshToken(null);

package/dist/src/compatible.d.ts

@@ -2,7 +2,7 @@
  *  这个文件是写一些兼容的方法，避免各个项目做出大量调整
  */
 export declare const setIdToken: (token: string | null) => void;
-export declare const getIdToken: () => string;
+export declare const getIdToken: () => string | undefined;
 export declare const setCookie: (name: string, value: string | undefined | null, domain: string, path?: string, time?: number) => void;
 export declare const clearLoginCookie: () => void;
 export declare const getCookie: (c_name: string) => string | null;

package/dist/src/compatible.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compatible.d.ts","sourceRoot":"","sources":["../../src/compatible.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,eAAO,MAAM,UAAU,gCAAiB,CAAA;AACxC,eAAO,MAAM,UAAU,cAAiB,CAAA;AAExC,eAAO,MAAM,SAAS,GACpB,MAAM,MAAM,EACZ,OAAO,MAAM,GAAG,SAAS,GAAG,IAAI,EAChC,QAAQ,MAAM,EACd,OAAM,MAAY,EAClB,aAA+B,SAUhC,CAAA;AACD,eAAO,MAAM,gBAAgB,YAG5B,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,QAAQ,MAAM,kBAKvC,CAAA;AAGD,eAAO,MAAM,WAAW,GAAI,KAAK,MAAM,EAAE,OAAO,MAAM,kBAMrD,CAAA"}
+{"version":3,"file":"compatible.d.ts","sourceRoot":"","sources":["../../src/compatible.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,eAAO,MAAM,UAAU,gCAAiB,CAAA;AACxC,eAAO,MAAM,UAAU,0BAAiB,CAAA;AAExC,eAAO,MAAM,SAAS,GACpB,MAAM,MAAM,EACZ,OAAO,MAAM,GAAG,SAAS,GAAG,IAAI,EAChC,QAAQ,MAAM,EACd,OAAM,MAAY,EAClB,aAA+B,SAUhC,CAAA;AACD,eAAO,MAAM,gBAAgB,YAG5B,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,QAAQ,MAAM,kBAKvC,CAAA;AAGD,eAAO,MAAM,WAAW,GAAI,KAAK,MAAM,EAAE,OAAO,MAAM,kBAMrD,CAAA"}

package/dist/src/cookie.d.ts

@@ -1,8 +1,8 @@
 export type CookieKeys = 'access_token' | 'refresh_token' | 'idTokenFront' | 'idTokenBack' | 'refreshTokenFront' | 'refreshTokenBack' | 'currentSystemType';
 export declare const setRefreshToken: (token: string | null) => void;
 export declare const setAccessToken: (token: string | null) => void;
-export declare const getAccessToken: () => string;
-export declare const getRefreshToken: () => string;
+export declare const getAccessToken: () => string | undefined;
+export declare const getRefreshToken: () => string | undefined;
 export declare const setSystemType: (value: string | null) => void;
 export declare const getSystemType: () => string | undefined;
 //# sourceMappingURL=cookie.d.ts.map

package/dist/src/cookie.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cookie.d.ts","sourceRoot":"","sources":["../../src/cookie.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,UAAU,GACpB,cAAc,GACZ,eAAe,GACf,cAAc,GACd,aAAa,GACb,mBAAmB,GACnB,kBAAkB,GAClB,mBAAmB,CAAA;AAkCvB,eAAO,MAAM,eAAe,GAAI,OAAO,MAAM,GAAG,IAAI,SAiBnD,CAAA;AACD,eAAO,MAAM,cAAc,GAAI,OAAO,MAAM,GAAG,IAAI,SAiBlD,CAAA;AAED,eAAO,MAAM,cAAc,cAG1B,CAAA;AACD,eAAO,MAAM,eAAe,cAG3B,CAAA;AAED,eAAO,MAAM,aAAa,UArET,MAAM,GAAG,IAAI,SAqEmC,CAAA;AACjE,eAAO,MAAM,aAAa,0BAAwC,CAAA"}
+{"version":3,"file":"cookie.d.ts","sourceRoot":"","sources":["../../src/cookie.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,UAAU,GACpB,cAAc,GACZ,eAAe,GACf,cAAc,GACd,aAAa,GACb,mBAAmB,GACnB,kBAAkB,GAClB,mBAAmB,CAAA;AA6BvB,eAAO,MAAM,eAAe,GAAI,OAAO,MAAM,GAAG,IAAI,SAQnD,CAAA;AACD,eAAO,MAAM,cAAc,GAAI,OAAO,MAAM,GAAG,IAAI,SAQlD,CAAA;AAED,eAAO,MAAM,cAAc,0BAE1B,CAAA;AACD,eAAO,MAAM,eAAe,0BAE3B,CAAA;AAED,eAAO,MAAM,aAAa,UA5CT,MAAM,GAAG,IAAI,SA4CmC,CAAA;AACjE,eAAO,MAAM,aAAa,0BAAwC,CAAA"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "login-authorization-v2",
-  "version": "2.1.8",
+  "version": "2.1.9-beta.1",
   "engines": {
     "node": "^20"
   },