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

package/create-api-service/sso/index.d.ts

@@ -5,6 +5,7 @@ declare const getTokenParams: any;
 declare const getTokenFromCode: () => unknown;
 declare const getToken: (config: any) => unknown;
 declare const login: (_params: any) => any;
+declare const refreshToken: (params: any) => unknown;
 declare const tokenStorage: () => {
     getData: () => {
         accessToken: any;
@@ -12,12 +13,13 @@ declare const tokenStorage: () => {
         refreshToken: any;
     };
     save: (data: {
-        accessToken?: string | null;
-        exp?: number;
-        accessTokenExpiredAt?: number;
-        refreshToken?: string | null;
-        info?: any;
+        accessToken: string | null;
+        exp: number;
+        accessTokenExpiredAt: number;
+        expires_in: number;
+        refreshToken: string | null;
+        info: any;
     }) => void;
     remove: () => void;
 };
-export { getTokenParams, getTokenFromCode, real_uri, getQuery, getToken, tokenStorage, login };
+export { getTokenParams, getTokenFromCode, real_uri, getQuery, getToken, tokenStorage, login, refreshToken };

package/create-api-service/sso/index.js

@@ -243,10 +243,10 @@ const _n = (e) => {
   asap: kn,
   isIterable: Pn
 };
-function w(e, t, n, r, o) {
+function y(e, t, n, r, o) {
   Error.call(this), Error.captureStackTrace ? Error.captureStackTrace(this, this.constructor) : this.stack = new Error().stack, this.message = e, this.name = "AxiosError", t && (this.code = t), n && (this.config = n), r && (this.request = r), o && (this.response = o, this.status = o.status ? o.status : null);
 }
-c.inherits(w, Error, {
+c.inherits(y, Error, {
   toJSON: function() {
     return {
       // Standard
@@ -267,7 +267,7 @@ c.inherits(w, Error, {
     };
   }
 });
-const ht = w.prototype, mt = {};
+const ht = y.prototype, mt = {};
 [
   "ERR_BAD_OPTION_VALUE",
   "ERR_BAD_OPTION",
@@ -285,13 +285,13 @@ const ht = w.prototype, mt = {};
 ].forEach((e) => {
   mt[e] = { value: e };
 });
-Object.defineProperties(w, mt);
+Object.defineProperties(y, mt);
 Object.defineProperty(ht, "isAxiosError", { value: !0 });
-w.from = (e, t, n, r, o, s) => {
+y.from = (e, t, n, r, o, s) => {
   const i = Object.create(ht);
   return c.toFlatObject(e, i, function(f) {
     return f !== Error.prototype;
-  }, (a) => a !== "isAxiosError"), w.call(i, e.message, t, n, r, o), i.cause = e, i.name = e.name, s && Object.assign(i, s), i;
+  }, (a) => a !== "isAxiosError"), y.call(i, e.message, t, n, r, o), i.cause = e, i.name = e.name, s && Object.assign(i, s), i;
 };
 const Ln = null;
 function ge(e) {
@@ -318,8 +318,8 @@ function ue(e, t, n) {
     metaTokens: !0,
     dots: !1,
     indexes: !1
-  }, !1, function(y, h) {
-    return !c.isUndefined(h[y]);
+  }, !1, function(m, h) {
+    return !c.isUndefined(h[m]);
   });
   const r = n.metaTokens, o = n.visitor || l, s = n.dots, i = n.indexes, f = (n.Blob || typeof Blob < "u" && Blob) && c.isSpecCompliantForm(t);
   if (!c.isFunction(o))
@@ -331,42 +331,42 @@ function ue(e, t, n) {
     if (c.isBoolean(p))
       return p.toString();
     if (!f && c.isBlob(p))
-      throw new w("Blob is not supported. Use a Buffer instead.");
+      throw new y("Blob is not supported. Use a Buffer instead.");
     return c.isArrayBuffer(p) || c.isTypedArray(p) ? f && typeof Blob == "function" ? new Blob([p]) : Buffer.from(p) : p;
   }
-  function l(p, y, h) {
+  function l(p, m, h) {
     let E = p;
     if (p && !h && typeof p == "object") {
-      if (c.endsWith(y, "{}"))
-        y = r ? y : y.slice(0, -2), p = JSON.stringify(p);
-      else if (c.isArray(p) && Un(p) || (c.isFileList(p) || c.endsWith(y, "[]")) && (E = c.toArray(p)))
-        return y = yt(y), E.forEach(function(S, k) {
+      if (c.endsWith(m, "{}"))
+        m = r ? m : m.slice(0, -2), p = JSON.stringify(p);
+      else if (c.isArray(p) && Un(p) || (c.isFileList(p) || c.endsWith(m, "[]")) && (E = c.toArray(p)))
+        return m = yt(m), E.forEach(function(S, k) {
           !(c.isUndefined(S) || S === null) && t.append(
             // eslint-disable-next-line no-nested-ternary
-            i === !0 ? De([y], k, s) : i === null ? y : y + "[]",
+            i === !0 ? De([m], k, s) : i === null ? m : m + "[]",
             u(S)
           );
         }), !1;
     }
-    return ge(p) ? !0 : (t.append(De(h, y, s), u(p)), !1);
+    return ge(p) ? !0 : (t.append(De(h, m, s), u(p)), !1);
   }
-  const d = [], m = Object.assign(Nn, {
+  const d = [], w = Object.assign(Nn, {
     defaultVisitor: l,
     convertValue: u,
     isVisitable: ge
   });
-  function g(p, y) {
+  function g(p, m) {
     if (!c.isUndefined(p)) {
       if (d.indexOf(p) !== -1)
-        throw Error("Circular reference detected in " + y.join("."));
+        throw Error("Circular reference detected in " + m.join("."));
       d.push(p), c.forEach(p, function(E, R) {
         (!(c.isUndefined(E) || E === null) && o.call(
           t,
           E,
           c.isString(R) ? R.trim() : R,
-          y,
-          m
-        )) === !0 && g(E, y ? y.concat(R) : [R]);
+          m,
+          w
+        )) === !0 && g(E, m ? m.concat(R) : [R]);
       }), d.pop();
     }
   }
@@ -582,7 +582,7 @@ const Q = {
         return JSON.parse(t);
       } catch (a) {
         if (i)
-          throw a.name === "SyntaxError" ? w.from(a, w.ERR_BAD_RESPONSE, this, null, this.response) : a;
+          throw a.name === "SyntaxError" ? y.from(a, y.ERR_BAD_RESPONSE, this, null, this.response) : a;
       }
     }
     return t;
@@ -825,16 +825,16 @@ function Rt(e) {
   return !!(e && e.__CANCEL__);
 }
 function M(e, t, n) {
-  w.call(this, e ?? "canceled", w.ERR_CANCELED, t, n), this.name = "CanceledError";
+  y.call(this, e ?? "canceled", y.ERR_CANCELED, t, n), this.name = "CanceledError";
 }
-c.inherits(M, w, {
+c.inherits(M, y, {
   __CANCEL__: !0
 });
 function St(e, t, n) {
   const r = n.config.validateStatus;
-  !n.status || !r || r(n.status) ? e(n) : t(new w(
+  !n.status || !r || r(n.status) ? e(n) : t(new y(
     "Request failed with status code " + n.status,
-    [w.ERR_BAD_REQUEST, w.ERR_BAD_RESPONSE][Math.floor(n.status / 100) - 4],
+    [y.ERR_BAD_REQUEST, y.ERR_BAD_RESPONSE][Math.floor(n.status / 100) - 4],
     n.config,
     n.request,
     n
@@ -851,13 +851,13 @@ function er(e, t) {
   return t = t !== void 0 ? t : 1e3, function(f) {
     const u = Date.now(), l = r[s];
     i || (i = u), n[o] = f, r[o] = u;
-    let d = s, m = 0;
+    let d = s, w = 0;
     for (; d !== o; )
-      m += n[d++], d = d % e;
+      w += n[d++], d = d % e;
     if (o = (o + 1) % e, o === s && (s = (s + 1) % e), u - i < t)
       return;
     const g = l && u - l;
-    return g ? Math.round(m * 1e3 / g) : void 0;
+    return g ? Math.round(w * 1e3 / g) : void 0;
   };
 }
 function tr(e, t) {
@@ -942,14 +942,14 @@ const Me = (e) => e instanceof _ ? { ...e } : e;
 function B(e, t) {
   t = t || {};
   const n = {};
-  function r(u, l, d, m) {
-    return c.isPlainObject(u) && c.isPlainObject(l) ? c.merge.call({ caseless: m }, u, l) : c.isPlainObject(l) ? c.merge({}, l) : c.isArray(l) ? l.slice() : l;
+  function r(u, l, d, w) {
+    return c.isPlainObject(u) && c.isPlainObject(l) ? c.merge.call({ caseless: w }, u, l) : c.isPlainObject(l) ? c.merge({}, l) : c.isArray(l) ? l.slice() : l;
   }
-  function o(u, l, d, m) {
+  function o(u, l, d, w) {
     if (c.isUndefined(l)) {
       if (!c.isUndefined(u))
-        return r(void 0, u, d, m);
-    } else return r(u, l, d, m);
+        return r(void 0, u, d, w);
+    } else return r(u, l, d, w);
   }
   function s(u, l) {
     if (!c.isUndefined(l))
@@ -999,8 +999,8 @@ function B(e, t) {
     headers: (u, l, d) => o(Me(u), Me(l), d, !0)
   };
   return c.forEach(Object.keys({ ...e, ...t }), function(l) {
-    const d = f[l] || o, m = d(e[l], t[l], l);
-    c.isUndefined(m) && d !== a || (n[l] = m);
+    const d = f[l] || o, w = d(e[l], t[l], l);
+    c.isUndefined(w) && d !== a || (n[l] = w);
   }), n;
 }
 const Ot = (e) => {
@@ -1029,8 +1029,8 @@ const Ot = (e) => {
     const o = Ot(e);
     let s = o.data;
     const i = _.from(o.headers).normalize();
-    let { responseType: a, onUploadProgress: f, onDownloadProgress: u } = o, l, d, m, g, p;
-    function y() {
+    let { responseType: a, onUploadProgress: f, onDownloadProgress: u } = o, l, d, w, g, p;
+    function m() {
       g && g(), p && p(), o.cancelToken && o.cancelToken.unsubscribe(l), o.signal && o.signal.removeEventListener("abort", l);
     }
     let h = new XMLHttpRequest();
@@ -1049,34 +1049,34 @@ const Ot = (e) => {
         request: h
       };
       St(function(F) {
-        n(F), y();
+        n(F), m();
       }, function(F) {
-        r(F), y();
+        r(F), m();
       }, O), h = null;
     }
     "onloadend" in h ? h.onloadend = E : h.onreadystatechange = function() {
       !h || h.readyState !== 4 || h.status === 0 && !(h.responseURL && h.responseURL.indexOf("file:") === 0) || setTimeout(E);
     }, h.onabort = function() {
-      h && (r(new w("Request aborted", w.ECONNABORTED, e, h)), h = null);
+      h && (r(new y("Request aborted", y.ECONNABORTED, e, h)), h = null);
     }, h.onerror = function() {
-      r(new w("Network Error", w.ERR_NETWORK, e, h)), h = null;
+      r(new y("Network Error", y.ERR_NETWORK, e, h)), h = null;
     }, h.ontimeout = function() {
       let k = o.timeout ? "timeout of " + o.timeout + "ms exceeded" : "timeout exceeded";
       const O = o.transitional || bt;
-      o.timeoutErrorMessage && (k = o.timeoutErrorMessage), r(new w(
+      o.timeoutErrorMessage && (k = o.timeoutErrorMessage), r(new y(
         k,
-        O.clarifyTimeoutError ? w.ETIMEDOUT : w.ECONNABORTED,
+        O.clarifyTimeoutError ? y.ETIMEDOUT : y.ECONNABORTED,
         e,
         h
       )), h = null;
     }, s === void 0 && i.setContentType(null), "setRequestHeader" in h && c.forEach(i.toJSON(), function(k, O) {
       h.setRequestHeader(O, k);
-    }), c.isUndefined(o.withCredentials) || (h.withCredentials = !!o.withCredentials), a && a !== "json" && (h.responseType = o.responseType), u && ([m, p] = re(u, !0), h.addEventListener("progress", m)), f && h.upload && ([d, g] = re(f), h.upload.addEventListener("progress", d), h.upload.addEventListener("loadend", g)), (o.cancelToken || o.signal) && (l = (S) => {
+    }), c.isUndefined(o.withCredentials) || (h.withCredentials = !!o.withCredentials), a && a !== "json" && (h.responseType = o.responseType), u && ([w, p] = re(u, !0), h.addEventListener("progress", w)), f && h.upload && ([d, g] = re(f), h.upload.addEventListener("progress", d), h.upload.addEventListener("loadend", g)), (o.cancelToken || o.signal) && (l = (S) => {
       h && (r(!S || S.type ? new M(null, e, h) : S), h.abort(), h = null);
     }, o.cancelToken && o.cancelToken.subscribe(l), o.signal && (o.signal.aborted ? l() : o.signal.addEventListener("abort", l)));
     const R = Yn(o.url);
     if (R && T.protocols.indexOf(R) === -1) {
-      r(new w("Unsupported protocol " + R + ":", w.ERR_BAD_REQUEST, e));
+      r(new y("Unsupported protocol " + R + ":", y.ERR_BAD_REQUEST, e));
       return;
     }
     h.send(s || null);
@@ -1089,11 +1089,11 @@ const Ot = (e) => {
       if (!o) {
         o = !0, a();
         const l = u instanceof Error ? u : this.reason;
-        r.abort(l instanceof w ? l : new M(l instanceof Error ? l.message : l));
+        r.abort(l instanceof y ? l : new M(l instanceof Error ? l.message : l));
       }
     };
     let i = t && setTimeout(() => {
-      i = null, s(new w(`timeout ${t} of ms exceeded`, w.ETIMEDOUT));
+      i = null, s(new y(`timeout ${t} of ms exceeded`, y.ETIMEDOUT));
     }, t);
     const a = () => {
       e && (i && clearTimeout(i), i = null, e.forEach((u) => {
@@ -1147,8 +1147,8 @@ const Ot = (e) => {
         }
         let d = l.byteLength;
         if (n) {
-          let m = s += d;
-          n(m);
+          let w = s += d;
+          n(w);
         }
         f.enqueue(new Uint8Array(l));
       } catch (u) {
@@ -1183,7 +1183,7 @@ const Ot = (e) => {
 le && ((e) => {
   ["text", "arrayBuffer", "blob", "formData", "stream"].forEach((t) => {
     !oe[t] && (oe[t] = c.isFunction(e[t]) ? (n) => n[t]() : (n, r) => {
-      throw new w(`Response type '${t}' is not supported`, w.ERR_NOT_SUPPORT, r);
+      throw new y(`Response type '${t}' is not supported`, y.ERR_NOT_SUPPORT, r);
     });
   });
 })(new Response());
@@ -1217,11 +1217,11 @@ const hr = async (e) => {
     responseType: u,
     headers: l,
     withCredentials: d = "same-origin",
-    fetchOptions: m
+    fetchOptions: w
   } = Ot(e);
   u = u ? (u + "").toLowerCase() : "text";
   let g = cr([o, s && s.toAbortSignal()], i), p;
-  const y = g && g.unsubscribe && (() => {
+  const m = g && g.unsubscribe && (() => {
     g.unsubscribe();
   });
   let h;
@@ -1243,7 +1243,7 @@ const hr = async (e) => {
     c.isString(d) || (d = d ? "include" : "omit");
     const E = "credentials" in Request.prototype;
     p = new Request(t, {
-      ...m,
+      ...w,
       signal: g,
       method: n.toUpperCase(),
       headers: l.normalize().toJSON(),
@@ -1251,9 +1251,9 @@ const hr = async (e) => {
       duplex: "half",
       credentials: E ? d : void 0
     });
-    let R = await fetch(p, m);
+    let R = await fetch(p, w);
     const S = Ee && (u === "stream" || u === "response");
-    if (Ee && (a || S && y)) {
+    if (Ee && (a || S && m)) {
       const O = {};
       ["status", "statusText", "headers"].forEach((Ne) => {
         O[Ne] = R[Ne];
@@ -1264,14 +1264,14 @@ const hr = async (e) => {
       ) || [];
       R = new Response(
         He(R.body, $e, F, () => {
-          X && X(), y && y();
+          X && X(), m && m();
         }),
         O
       );
     }
     u = u || "text";
     let k = await oe[c.findKey(oe, u) || "text"](R, e);
-    return !S && y && y(), await new Promise((O, P) => {
+    return !S && m && m(), await new Promise((O, P) => {
       St(O, P, {
         data: k,
         headers: _.from(R.headers),
@@ -1282,12 +1282,12 @@ const hr = async (e) => {
       });
     });
   } catch (E) {
-    throw y && y(), E && E.name === "TypeError" && /Load failed|fetch/i.test(E.message) ? Object.assign(
-      new w("Network Error", w.ERR_NETWORK, e, p),
+    throw m && m(), E && E.name === "TypeError" && /Load failed|fetch/i.test(E.message) ? Object.assign(
+      new y("Network Error", y.ERR_NETWORK, e, p),
       {
         cause: E.cause || E
       }
-    ) : w.from(E, E && E.code, e, p);
+    ) : y.from(E, E && E.code, e, p);
   }
 }), Re = {
   http: Ln,
@@ -1313,7 +1313,7 @@ const ze = (e) => `- ${e}`, wr = (e) => c.isFunction(e) || e === null || e === !
       n = e[s];
       let i;
       if (r = n, !wr(n) && (r = Re[(i = String(n)).toLowerCase()], r === void 0))
-        throw new w(`Unknown adapter '${i}'`);
+        throw new y(`Unknown adapter '${i}'`);
       if (r)
         break;
       o[i || "#" + s] = r;
@@ -1325,7 +1325,7 @@ const ze = (e) => `- ${e}`, wr = (e) => c.isFunction(e) || e === null || e === !
       let i = t ? s.length > 1 ? `since :
 ` + s.map(ze).join(`
 `) : " " + ze(s[0]) : "as no adapter specified";
-      throw new w(
+      throw new y(
         "There is no suitable adapter to dispatch the request " + i,
         "ERR_NOT_SUPPORT"
       );
@@ -1369,9 +1369,9 @@ fe.transitional = function(t, n, r) {
   }
   return (s, i, a) => {
     if (t === !1)
-      throw new w(
+      throw new y(
         o(i, " has been removed" + (n ? " in " + n : "")),
-        w.ERR_DEPRECATED
+        y.ERR_DEPRECATED
       );
     return n && !Ve[i] && (Ve[i] = !0), t ? t(s, i, a) : !0;
   };
@@ -1381,7 +1381,7 @@ fe.spelling = function(t) {
 };
 function gr(e, t, n) {
   if (typeof e != "object")
-    throw new w("options must be an object", w.ERR_BAD_OPTION_VALUE);
+    throw new y("options must be an object", y.ERR_BAD_OPTION_VALUE);
   const r = Object.keys(e);
   let o = r.length;
   for (; o-- > 0; ) {
@@ -1389,11 +1389,11 @@ function gr(e, t, n) {
     if (i) {
       const a = e[s], f = a === void 0 || i(a, s, e);
       if (f !== !0)
-        throw new w("option " + s + " must be " + f, w.ERR_BAD_OPTION_VALUE);
+        throw new y("option " + s + " must be " + f, y.ERR_BAD_OPTION_VALUE);
       continue;
     }
     if (n !== !0)
-      throw new w("Unknown option " + s, w.ERR_BAD_OPTION);
+      throw new y("Unknown option " + s, y.ERR_BAD_OPTION);
   }
 }
 const te = {
@@ -1460,28 +1460,28 @@ let I = class {
     ), n.headers = _.concat(i, s);
     const a = [];
     let f = !0;
-    this.interceptors.request.forEach(function(y) {
-      typeof y.runWhen == "function" && y.runWhen(n) === !1 || (f = f && y.synchronous, a.unshift(y.fulfilled, y.rejected));
+    this.interceptors.request.forEach(function(m) {
+      typeof m.runWhen == "function" && m.runWhen(n) === !1 || (f = f && m.synchronous, a.unshift(m.fulfilled, m.rejected));
     });
     const u = [];
-    this.interceptors.response.forEach(function(y) {
-      u.push(y.fulfilled, y.rejected);
+    this.interceptors.response.forEach(function(m) {
+      u.push(m.fulfilled, m.rejected);
     });
-    let l, d = 0, m;
+    let l, d = 0, w;
     if (!f) {
       const p = [Je.bind(this), void 0];
-      for (p.unshift(...a), p.push(...u), m = p.length, l = Promise.resolve(n); d < m; )
+      for (p.unshift(...a), p.push(...u), w = p.length, l = Promise.resolve(n); d < w; )
         l = l.then(p[d++], p[d++]);
       return l;
     }
-    m = a.length;
+    w = a.length;
     let g = n;
-    for (d = 0; d < m; ) {
-      const p = a[d++], y = a[d++];
+    for (d = 0; d < w; ) {
+      const p = a[d++], m = a[d++];
       try {
         g = p(g);
       } catch (h) {
-        y.call(this, h);
+        m.call(this, h);
         break;
       }
     }
@@ -1490,7 +1490,7 @@ let I = class {
     } catch (p) {
       return Promise.reject(p);
     }
-    for (d = 0, m = u.length; d < m; )
+    for (d = 0, w = u.length; d < w; )
       l = l.then(u[d++], u[d++]);
     return l;
   }
@@ -1686,7 +1686,7 @@ b.CancelToken = br;
 b.isCancel = Rt;
 b.VERSION = Ct;
 b.toFormData = ue;
-b.AxiosError = w;
+b.AxiosError = y;
 b.Cancel = b.CanceledError;
 b.all = function(t) {
   return Promise.all(t);
@@ -1808,12 +1808,12 @@ function _r(e, t = !0, n = !0, r = !1) {
     s && (clearTimeout(s), s = void 0, a(), a = Oe);
   };
   return (d) => {
-    const m = Ue(e), g = Date.now() - o, p = () => f = d();
-    return u(), m <= 0 ? (o = Date.now(), p()) : (g > m && (n || !i) ? (o = Date.now(), p()) : t && (f = new Promise((y, h) => {
-      a = r ? h : y, s = setTimeout(() => {
-        o = Date.now(), i = !0, y(p()), u();
-      }, Math.max(0, m - g));
-    })), !n && !s && (s = setTimeout(() => i = !0, m)), i = !1, f);
+    const w = Ue(e), g = Date.now() - o, p = () => f = d();
+    return u(), w <= 0 ? (o = Date.now(), p()) : (g > w && (n || !i) ? (o = Date.now(), p()) : t && (f = new Promise((m, h) => {
+      a = r ? h : m, s = setTimeout(() => {
+        o = Date.now(), i = !0, m(p()), u();
+      }, Math.max(0, w - g));
+    })), !n && !s && (s = setTimeout(() => i = !0, w)), i = !1, f);
   };
 }
 function xr(e) {
@@ -1835,8 +1835,8 @@ function Qe(...e) {
   Array.isArray(n) || (n = [n]), Array.isArray(r) || (r = [r]);
   const s = [], i = () => {
     s.forEach((l) => l()), s.length = 0;
-  }, a = (l, d, m, g) => (l.addEventListener(d, m, g), () => l.removeEventListener(d, m, g)), f = xe(() => [kr(t), Ue(o)], ([l, d]) => {
-    i(), l && s.push(...n.flatMap((m) => r.map((g) => a(l, m, g, d))));
+  }, a = (l, d, w, g) => (l.addEventListener(d, w, g), () => l.removeEventListener(d, w, g)), f = xe(() => [kr(t), Ue(o)], ([l, d]) => {
+    i(), l && s.push(...n.flatMap((w) => r.map((g) => a(l, w, g, d))));
   }, { immediate: !0, flush: "post" }), u = () => {
     f(), i();
   };
@@ -1859,8 +1859,8 @@ function Ur(e = Lr, t = {}) {
   });
   if (s) {
     const d = s.document;
-    for (const m of o)
-      Qe(s, m, l, { passive: !0 });
+    for (const w of o)
+      Qe(s, w, l, { passive: !0 });
     r && Qe(d, "visibilitychange", () => {
       d.hidden || l();
     });
@@ -2051,16 +2051,17 @@ const Hr = async () => {
         }
       }
     );
-    const { access_token: a = "", refresh_token: f = "", exp: u = 0, refresh_exp: l = 0 } = s.data, d = {
+    const { access_token: a = "", refresh_token: f = "", exp: u = 0, refresh_exp: l = 0, expires_in: d = 0 } = s.data, w = {
       accessToken: a,
       exp: Number(u),
       accessTokenExpiredAt: Number(u),
       refreshToken: f,
+      expires_in: Number(d),
       info: s.data
     };
-    J().save(d), await st(a);
-    const m = Number(l) - (/* @__PURE__ */ new Date()).getTime();
-    return m && m > 0 && (It(m), m && localStorage.setItem("idelTime", m.toString())), t && (window.__isAutoCloseApp = !1, window.location.replace(decodeURIComponent(t))), a;
+    J().save(w), await st(a);
+    const g = Number(l) - (/* @__PURE__ */ new Date()).getTime();
+    return g && g > 0 && (It(g), g && localStorage.setItem("idelTime", g.toString())), t && (window.__isAutoCloseApp = !1, window.location.replace(decodeURIComponent(t))), a;
   } catch {
     return v({ ...N, redirect_uri: U });
   }
@@ -2158,14 +2159,15 @@ const Jr = async (e) => {
           nonce: Ft()
         }
       }
-    ), { access_token: o = "", refresh_token: s = "", exp: i = 0 } = r.data, a = {
+    ), { access_token: o = "", refresh_token: s = "", exp: i = 0, expires_in: a = 0 } = r.data, f = {
       accessToken: o,
       exp: Number(i),
       accessTokenExpiredAt: Number(i),
+      expires_in: Number(a),
       refreshToken: s,
       info: r.data
     };
-    return J().save(a), await st(o), o;
+    return J().save(f), await st(o), o;
   } catch {
     return v({ ...e, redirect_uri: U });
   }
@@ -2179,6 +2181,7 @@ const Jr = async (e) => {
     Ht(e.accessToken ?? "", {
       exp: e.exp,
       accessTokenExpiredAt: e.accessTokenExpiredAt,
+      expires_in: e.expires_in,
       refreshToken: e.refreshToken
     }), zt(e);
   },
@@ -2193,5 +2196,6 @@ export {
   N as getTokenParams,
   v as login,
   U as real_uri,
+  Jr as refreshToken,
   J as tokenStorage
 };

package/esm-map.json

@@ -143,5 +143,6 @@
   "calcTextWidth": "/common-tools/calc-text-width/index",
   "getFileExtension": "/common-tools/get-file-extension/index",
   "getLanguages": "/common-info/index",
-  "appendQueryParams": "/common-tools/get-url-params/index"
+  "appendQueryParams": "/common-tools/get-url-params/index",
+  "refreshToken": "/create-api-service/sso/index"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/utils",
-  "version": "7.1.0-dev.12",
+  "version": "7.1.0-dev.13",
   "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.12",
+    "@das-fed/utils": "7.1.0-dev.13",
     "@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.12",
-    "@das-fed/web": "7.1.0-dev.12",
+    "@das-fed/cli": "7.1.0-dev.13",
+    "@das-fed/web": "7.1.0-dev.13",
     "@types/js-cookie": "^3.0.6",
     "@types/lodash-es": "^4.17.12",
     "@types/qs": "^6.9.15",

package/token-tools/index.d.ts

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