@das-fed/utils 6.4.0-dev.52 → 6.4.0-dev.53

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

@@ -1917,14 +1917,14 @@ let Ct = (e = 21) => {
   }
   return t;
 };
-const kt = (e) => new URL(location.href).searchParams.get(e), F = {
+const kt = (e) => new URL(location.href).searchParams.get(e), B = {
   oauth: "/api/justauth/oauth-server/v1/visitor/oauth/authorize",
   // 重定向到登录页
   logoutCurpage: "/api/justauth/oauth-server/v1/visitor/logout-curpage",
   // 清除登录信息
   token: "/api/justauth/oauth-server/v1/visitor/oauth/token"
   // 通过code获取token
-}, { baseURL: Ze, noRedireLogin: vr = !1 } = Re(), Fr = "/application", $ = location.origin + Fr, v = {
+}, { baseURL: Ze, noRedireLogin: vr = !1 } = Re(), Fr = "/application", $ = location.origin + Fr, F = {
   response_type: "code",
   scope: "sever",
   client_id: "sys",
@@ -1952,25 +1952,25 @@ localStorage.getItem("idelTime") && Nt(Number(localStorage.getItem("idelTime")))
 const Ir = async () => {
   const e = kt("code") || "";
   if (!e) return H();
-  const { redirectUri: t } = B().getData(), n = Ye(location.href, "kingdee_token") || "";
+  const { redirectUri: t } = v().getData(), n = Ye(location.href, "kingdee_token") || "";
   let r = {};
   const o = {
     grant_type: "authorization_code",
     code: e,
-    client_id: v.client_id,
-    client_secret: v.client_secret,
+    client_id: F.client_id,
+    client_secret: F.client_secret,
     redirect_uri: t || $,
     timestamp: (/* @__PURE__ */ new Date()).getTime(),
     nonce: Ct()
   };
   n && (sessionStorage.setItem("kingdee_token", n), o.redirect_uri = `${o.redirect_uri}?kingdee_token=${n}`);
   try {
-    await b.create().get(F.token, { baseURL: Ze });
+    await b.create().get(B.token, { baseURL: Ze });
   } catch {
   }
   try {
     r = await b.create().post(
-      F.token,
+      B.token,
       {},
       {
         baseURL: Ze,
@@ -1987,15 +1987,15 @@ const Ir = async () => {
       refreshToken: c,
       info: r.data
     };
-    B().save(l), await et(s);
+    v().save(l), await et(s);
     const u = Number(f) - (/* @__PURE__ */ new Date()).getTime();
     return u && u > 0 && (Nt(u), u && localStorage.setItem("idelTime", u.toString())), Br(), s;
   } catch {
-    return J({ ...v, redirect_uri: t || $ });
+    return J({ ...F, redirect_uri: t || $ });
   }
 }, M = Y(!1), Wr = async (e) => {
   if (e.public) return "";
-  if (Pt.value) return J({ ...v, redirect_uri: $ });
+  if (Pt.value) return J({ ...F, redirect_uri: $ });
   if (M.value)
     return await new Promise(async (o) => {
       Se(
@@ -2008,13 +2008,13 @@ const Ir = async () => {
         }
       );
     });
-  const { accessTokenExpiredAt: t } = B().getData(), n = kt("code") || "";
+  const { accessTokenExpiredAt: t } = v().getData(), n = kt("code") || "";
   if ((!H() || t === 0) && !n)
-    return J({ ...v, redirect_uri: $ });
+    return J({ ...F, redirect_uri: $ });
   let r = H();
   M.value = !0;
   try {
-    typeof t == "number" && t > 0 && +/* @__PURE__ */ new Date() + 6e4 > t && (r = await jr(v)), r = await Ir(), M.value = !1;
+    typeof t == "number" && t > 0 && +/* @__PURE__ */ new Date() + 6e4 > t && (r = await jr(F)), r = await Ir(), M.value = !1;
   } catch {
     M.value = !1;
   }
@@ -2024,19 +2024,19 @@ const Ir = async () => {
   const { baseURL: t, ssoLocale: n } = Re();
   if (Ee) return Ee(e);
   e.logout = "true", n && (e.locale = "locale");
-  const r = Object.keys(e).filter((s) => s !== "client_secret").map((s) => `${s}=${e[s]}`).join("&"), o = `${t}${F.oauth}?${r}`;
-  localStorage.clear(), sessionStorage.clear(), B().save({ redirectUri: e.redirect_uri }), b.create().get(F.logoutCurpage, { baseURL: t }), window.__isAutoCloseApp = !1, location.replace(o);
+  const r = Object.keys(e).filter((s) => s !== "client_secret").map((s) => `${s}=${e[s]}`).join("&"), o = `${t}${B.oauth}?${r}`;
+  localStorage.removeItem("idelTime"), sessionStorage.clear(), v().remove(), v().save({ redirectUri: e.redirect_uri }), b.create().get(B.logoutCurpage, { baseURL: t }), window.__isAutoCloseApp = !1, location.replace(o);
 };
 Dr(J);
 const jr = async (e) => {
-  const { baseURL: t } = Re(), { refreshToken: n, redirectUri: r } = B().getData();
+  const { baseURL: t } = Re(), { refreshToken: n, redirectUri: r } = v().getData();
   try {
-    await b.create().get(F.token, { baseURL: t });
+    await b.create().get(B.token, { baseURL: t });
   } catch {
   }
   try {
     const o = await b.create().post(
-      F.token,
+      B.token,
       {},
       {
         baseURL: t,
@@ -2055,11 +2055,11 @@ const jr = async (e) => {
       refreshToken: c,
       info: o.data
     };
-    return B().save(f), await et(s), s;
+    return v().save(f), await et(s), s;
   } catch {
     return J({ ...e, redirect_uri: r || $ });
   }
-}, B = () => ({
+}, v = () => ({
   getData: () => ({
     accessToken: H(),
     accessTokenExpiredAt: Q("accessTokenExpiredAt") ? Number(Q("accessTokenExpiredAt")) : "",
@@ -2084,8 +2084,8 @@ export {
   kt as getQuery,
   Wr as getToken,
   Ir as getTokenFromCode,
-  v as getTokenParams,
+  F as getTokenParams,
   J as login,
   $ as real_uri,
-  B as tokenStorage
+  v as tokenStorage
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/utils",
-  "version": "6.4.0-dev.52",
+  "version": "6.4.0-dev.53",
   "description": "",
   "type": "module",
   "main": "./index.js",
@@ -9,7 +9,7 @@
   "license": "ISC",
   "dependencies": {
     "@antv/x6": "^2.18.1",
-    "@das-fed/utils": "6.4.0-dev.52",
+    "@das-fed/utils": "6.4.0-dev.53",
     "@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": "6.4.0-dev.52",
-    "@das-fed/web": "6.4.0-dev.52",
+    "@das-fed/cli": "6.4.0-dev.53",
+    "@das-fed/web": "6.4.0-dev.53",
     "@types/js-cookie": "^3.0.6",
     "@types/lodash-es": "^4.17.12",
     "@types/qs": "^6.9.15",