@das-fed/utils 7.1.0-dev.11 → 7.1.0-dev.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/utils",
-  "version": "7.1.0-dev.11",
+  "version": "7.1.0-dev.12",
   "description": "",
   "type": "module",
   "main": "./index.js",
@@ -9,7 +9,7 @@
   "license": "ISC",
   "dependencies": {
     "@antv/x6": "^2.18.1",
-    "@das-fed/utils": "7.1.0-dev.11",
+    "@das-fed/utils": "7.1.0-dev.12",
     "@vue/shared": "^3.4.21",
     "@vueuse/core": "^9.6.0",
     "axios": "^1.6.7",
@@ -21,8 +21,8 @@
     "vue": "^3.4.21"
   },
   "devDependencies": {
-    "@das-fed/cli": "7.1.0-dev.11",
-    "@das-fed/web": "7.1.0-dev.11",
+    "@das-fed/cli": "7.1.0-dev.12",
+    "@das-fed/web": "7.1.0-dev.12",
     "@types/js-cookie": "^3.0.6",
     "@types/lodash-es": "^4.17.12",
     "@types/qs": "^6.9.15",

package/token-tools/index.d.ts

@@ -2,6 +2,7 @@ declare const accessTokenExpiredAtKey = "accessTokenExpiredAt";
 declare const refreshTokenKey = "refreshToken";
 declare const redirectUriKey = "redirectUri";
 declare const accessTokenInfoKey = "tokenInfo";
+declare const expKey = "exp";
 /**
  * 获取token
  * @returns token
@@ -10,7 +11,8 @@ export declare const getAccessToken: () => string;
 /**
  * 获取tokenInfo相关信息
  */
-export declare const getAccessTokenInfo: (key: typeof accessTokenExpiredAtKey | typeof refreshTokenKey | typeof redirectUriKey | typeof accessTokenInfoKey) => any;
+type TokenInfoKey = typeof accessTokenExpiredAtKey | typeof refreshTokenKey | typeof redirectUriKey | typeof accessTokenInfoKey | typeof expKey;
+export declare const getAccessTokenInfo: (key: TokenInfoKey) => any;
 /**
  * 存入token、tokenInfo
  * @param token

package/token-tools/index.js

@@ -1,13 +1,13 @@
 /*! js-cookie v3.0.5 | MIT */
-function l(e) {
+function g(e) {
   for (var t = 1; t < arguments.length; t++) {
     var n = arguments[t];
-    for (var g in n)
-      e[g] = n[g];
+    for (var l in n)
+      e[l] = n[l];
   }
   return e;
 }
-var k = {
+var S = {
   read: function(e) {
     return e[0] === '"' && (e = e.slice(1, -1)), e.replace(/(%[\dA-F]{2})+/gi, decodeURIComponent);
   },
@@ -18,23 +18,23 @@ var k = {
     );
   }
 };
-function d(e, t) {
+function p(e, t) {
   function n(r, i, o) {
     if (!(typeof document > "u")) {
-      o = l({}, t, o), typeof o.expires == "number" && (o.expires = new Date(Date.now() + o.expires * 864e5)), o.expires && (o.expires = o.expires.toUTCString()), r = encodeURIComponent(r).replace(/%(2[346B]|5E|60|7C)/g, decodeURIComponent).replace(/[()]/g, escape);
+      o = g({}, t, o), typeof o.expires == "number" && (o.expires = new Date(Date.now() + o.expires * 864e5)), o.expires && (o.expires = o.expires.toUTCString()), r = encodeURIComponent(r).replace(/%(2[346B]|5E|60|7C)/g, decodeURIComponent).replace(/[()]/g, escape);
       var c = "";
       for (var s in o)
         o[s] && (c += "; " + s, o[s] !== !0 && (c += "=" + o[s].split(";")[0]));
       return document.cookie = r + "=" + e.write(i, r) + c;
     }
   }
-  function g(r) {
+  function l(r) {
     if (!(typeof document > "u" || arguments.length && !r)) {
       for (var i = document.cookie ? document.cookie.split("; ") : [], o = {}, c = 0; c < i.length; c++) {
-        var s = i[c].split("="), I = s.slice(1).join("=");
+        var s = i[c].split("="), k = s.slice(1).join("=");
         try {
           var f = decodeURIComponent(s[0]);
-          if (o[f] = e.read(I, f), r === f)
+          if (o[f] = e.read(k, f), r === f)
             break;
         } catch {
         }
@@ -45,21 +45,21 @@ function d(e, t) {
   return Object.create(
     {
       set: n,
-      get: g,
+      get: l,
       remove: function(r, i) {
         n(
           r,
           "",
-          l({}, i, {
+          g({}, i, {
             expires: -1
           })
         );
       },
       withAttributes: function(r) {
-        return d(this.converter, l({}, this.attributes, r));
+        return p(this.converter, g({}, this.attributes, r));
       },
       withConverter: function(r) {
-        return d(l({}, this.converter, r), this.attributes);
+        return p(g({}, this.converter, r), this.attributes);
       }
     },
     {
@@ -68,16 +68,16 @@ function d(e, t) {
     }
   );
 }
-var p = d(k, { path: "/" });
-const a = "accessToken", m = "accessTokenExpiredAt", v = "refreshToken", u = "redirectUri", S = "csrf-token", h = () => localStorage.getItem(a) ?? p.get(a) ?? sessionStorage.getItem(a) ?? "", C = (e) => localStorage.getItem(e) ?? p.get(e) ?? sessionStorage.getItem(e) ?? "", x = (e, t = {}) => {
+var d = p(S, { path: "/" });
+const a = "accessToken", m = "accessTokenExpiredAt", v = "refreshToken", u = "redirectUri", I = "exp", T = "csrf-token", x = () => localStorage.getItem(a) ?? d.get(a) ?? sessionStorage.getItem(a) ?? "", C = (e) => localStorage.getItem(e) ?? d.get(e) ?? sessionStorage.getItem(e) ?? "", U = (e, t = {}) => {
   var n;
-  (n = window.webConfig) != null && n.disableSaveToken || (localStorage.setItem(a, e), localStorage.setItem(m, t.accessTokenExpiredAt ?? "0"), localStorage.setItem(v, t.refreshToken ?? ""), t.redirectUri && localStorage.setItem(u, t.redirectUri));
-}, U = () => {
-  localStorage.removeItem(a), localStorage.removeItem(m), localStorage.removeItem(v), localStorage.removeItem(u), localStorage.removeItem(S);
+  (n = window.webConfig) != null && n.disableSaveToken || (localStorage.setItem(a, e), localStorage.setItem(m, t.accessTokenExpiredAt ?? 0), localStorage.setItem(I, t.exp ?? 0), localStorage.setItem(v, t.refreshToken ?? 0), t.redirectUri && localStorage.setItem(u, t.redirectUri));
+}, A = () => {
+  localStorage.removeItem(a), localStorage.removeItem(m), localStorage.removeItem(I), localStorage.removeItem(v), localStorage.removeItem(u), localStorage.removeItem(T);
 };
 export {
-  h as getAccessToken,
+  x as getAccessToken,
   C as getAccessTokenInfo,
-  U as removeAccessToken,
-  x as setAccessToken
+  A as removeAccessToken,
+  U as setAccessToken
 };