@das-fed/utils 7.0.7-hot.22 → 7.0.7-hot.23

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

@@ -130,7 +130,7 @@ const un = (e, t, n, { allOwnKeys: r } = {}) => (K(t, (o, i) => {
     let s;
     (s = t(o, i, e)) !== !1 && (r[i] = s || o);
   }), Object.defineProperties(e, r);
-}, Sn = (e) => {
+}, Rn = (e) => {
   dt(e, (t, n) => {
     if (A(e) && ["arguments", "caller", "callee"].indexOf(n) !== -1)
       return !1;
@@ -145,7 +145,7 @@ const un = (e, t, n, { allOwnKeys: r } = {}) => (K(t, (o, i) => {
       });
     }
   });
-}, Rn = (e, t) => {
+}, Sn = (e, t) => {
   const n = {}, r = (o) => {
     o.forEach((i) => {
       n[i] = !0;
@@ -227,8 +227,8 @@ const _n = (e) => {
   hasOwnProp: De,
   // an alias to avoid ESLint no-prototype-builtins detection
   reduceDescriptors: dt,
-  freezeMethods: Sn,
-  toObjectSet: Rn,
+  freezeMethods: Rn,
+  toObjectSet: Sn,
   toCamelCase: bn,
   noop: Tn,
   toFiniteNumber: On,
@@ -340,11 +340,11 @@ function ue(e, t, n) {
       if (a.endsWith(m, "{}"))
         m = r ? m : m.slice(0, -2), p = JSON.stringify(p);
       else if (a.isArray(p) && Un(p) || (a.isFileList(p) || a.endsWith(m, "[]")) && (E = a.toArray(p)))
-        return m = yt(m), E.forEach(function(R, C) {
-          !(a.isUndefined(R) || R === null) && t.append(
+        return m = yt(m), E.forEach(function(S, C) {
+          !(a.isUndefined(S) || S === null) && t.append(
             // eslint-disable-next-line no-nested-ternary
             s === !0 ? Fe([m], C, i) : s === null ? m : m + "[]",
-            u(R)
+            u(S)
           );
         }), !1;
     }
@@ -359,14 +359,14 @@ function ue(e, t, n) {
     if (!a.isUndefined(p)) {
       if (d.indexOf(p) !== -1)
         throw Error("Circular reference detected in " + m.join("."));
-      d.push(p), a.forEach(p, function(E, S) {
+      d.push(p), a.forEach(p, function(E, R) {
         (!(a.isUndefined(E) || E === null) && o.call(
           t,
           E,
-          a.isString(S) ? S.trim() : S,
+          a.isString(R) ? R.trim() : R,
           m,
           w
-        )) === !0 && g(E, m ? m.concat(S) : [S]);
+        )) === !0 && g(E, m ? m.concat(R) : [R]);
       }), d.pop();
     }
   }
@@ -821,7 +821,7 @@ function he(e, t) {
     i = c.call(n, i, o.normalize(), t ? t.status : void 0);
   }), o.normalize(), i;
 }
-function St(e) {
+function Rt(e) {
   return !!(e && e.__CANCEL__);
 }
 function M(e, t, n) {
@@ -830,7 +830,7 @@ function M(e, t, n) {
 a.inherits(M, y, {
   __CANCEL__: !0
 });
-function Rt(e, t, n) {
+function St(e, t, n) {
   const r = n.config.validateStatus;
   !n.status || !r || r(n.status) ? e(n) : t(new y(
     "Request failed with status code " + n.status,
@@ -1038,17 +1038,17 @@ const Ot = (e) => {
     function E() {
       if (!h)
         return;
-      const R = _.from(
+      const S = _.from(
         "getAllResponseHeaders" in h && h.getAllResponseHeaders()
       ), O = {
         data: !c || c === "text" || c === "json" ? h.responseText : h.response,
         status: h.status,
         statusText: h.statusText,
-        headers: R,
+        headers: S,
         config: e,
         request: h
       };
-      Rt(function(N) {
+      St(function(N) {
         n(N), m();
       }, function(N) {
         r(N), m();
@@ -1071,12 +1071,12 @@ const Ot = (e) => {
       )), h = null;
     }, i === void 0 && s.setContentType(null), "setRequestHeader" in h && a.forEach(s.toJSON(), function(C, O) {
       h.setRequestHeader(O, C);
-    }), a.isUndefined(o.withCredentials) || (h.withCredentials = !!o.withCredentials), c && c !== "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 = (R) => {
-      h && (r(!R || R.type ? new M(null, e, h) : R), h.abort(), h = null);
+    }), a.isUndefined(o.withCredentials) || (h.withCredentials = !!o.withCredentials), c && c !== "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 S = Yn(o.url);
-    if (S && T.protocols.indexOf(S) === -1) {
-      r(new y("Unsupported protocol " + S + ":", y.ERR_BAD_REQUEST, e));
+    const R = Yn(o.url);
+    if (R && T.protocols.indexOf(R) === -1) {
+      r(new y("Unsupported protocol " + R + ":", y.ERR_BAD_REQUEST, e));
       return;
     }
     h.send(i || null);
@@ -1251,32 +1251,32 @@ const hr = async (e) => {
       duplex: "half",
       credentials: E ? d : void 0
     });
-    let S = await fetch(p, w);
-    const R = Ee && (u === "stream" || u === "response");
-    if (Ee && (c || R && m)) {
+    let R = await fetch(p, w);
+    const S = Ee && (u === "stream" || u === "response");
+    if (Ee && (c || S && m)) {
       const O = {};
       ["status", "statusText", "headers"].forEach((Ne) => {
-        O[Ne] = S[Ne];
+        O[Ne] = R[Ne];
       });
-      const P = a.toFiniteNumber(S.headers.get("content-length")), [N, X] = c && je(
+      const P = a.toFiniteNumber(R.headers.get("content-length")), [N, X] = c && je(
         P,
         re(qe(c), !0)
       ) || [];
-      S = new Response(
-        Me(S.body, $e, N, () => {
+      R = new Response(
+        Me(R.body, $e, N, () => {
           X && X(), m && m();
         }),
         O
       );
     }
     u = u || "text";
-    let C = await oe[a.findKey(oe, u) || "text"](S, e);
-    return !R && m && m(), await new Promise((O, P) => {
-      Rt(O, P, {
+    let C = await oe[a.findKey(oe, u) || "text"](R, e);
+    return !S && m && m(), await new Promise((O, P) => {
+      St(O, P, {
         data: C,
-        headers: _.from(S.headers),
-        status: S.status,
-        statusText: S.statusText,
+        headers: _.from(R.headers),
+        status: R.status,
+        statusText: R.statusText,
         config: e,
         request: p
       });
@@ -1289,12 +1289,12 @@ const hr = async (e) => {
       }
     ) : y.from(E, E && E.code, e, p);
   }
-}), Se = {
+}), Re = {
   http: Ln,
   xhr: ar,
   fetch: yr
 };
-a.forEach(Se, (e, t) => {
+a.forEach(Re, (e, t) => {
   if (e) {
     try {
       Object.defineProperty(e, "name", { value: t });
@@ -1312,7 +1312,7 @@ const ze = (e) => `- ${e}`, wr = (e) => a.isFunction(e) || e === null || e === !
     for (let i = 0; i < t; i++) {
       n = e[i];
       let s;
-      if (r = n, !wr(n) && (r = Se[(s = String(n)).toLowerCase()], r === void 0))
+      if (r = n, !wr(n) && (r = Re[(s = String(n)).toLowerCase()], r === void 0))
         throw new y(`Unknown adapter '${s}'`);
       if (r)
         break;
@@ -1332,7 +1332,7 @@ const ze = (e) => `- ${e}`, wr = (e) => a.isFunction(e) || e === null || e === !
     }
     return r;
   },
-  adapters: Se
+  adapters: Re
 };
 function me(e) {
   if (e.cancelToken && e.cancelToken.throwIfRequested(), e.signal && e.signal.aborted)
@@ -1349,7 +1349,7 @@ function Je(e) {
       r
     ), r.headers = _.from(r.headers), r;
   }, function(r) {
-    return St(r) || (me(e), r && r.response && (r.response.data = he.call(
+    return Rt(r) || (me(e), r && r.response && (r.response.data = he.call(
       e,
       e.transformResponse,
       r.response
@@ -1607,10 +1607,10 @@ function Er(e) {
     return e.apply(null, n);
   };
 }
-function Sr(e) {
+function Rr(e) {
   return a.isObject(e) && e.isAxiosError === !0;
 }
-const Re = {
+const Se = {
   Continue: 100,
   SwitchingProtocols: 101,
   Processing: 102,
@@ -1675,8 +1675,8 @@ const Re = {
   NotExtended: 510,
   NetworkAuthenticationRequired: 511
 };
-Object.entries(Re).forEach(([e, t]) => {
-  Re[t] = e;
+Object.entries(Se).forEach(([e, t]) => {
+  Se[t] = e;
 });
 function Pt(e) {
   const t = new I(e), n = it(I.prototype.request, t);
@@ -1688,7 +1688,7 @@ const b = Pt(Q);
 b.Axios = I;
 b.CanceledError = M;
 b.CancelToken = br;
-b.isCancel = St;
+b.isCancel = Rt;
 b.VERSION = xt;
 b.toFormData = ue;
 b.AxiosError = y;
@@ -1697,12 +1697,12 @@ b.all = function(t) {
   return Promise.all(t);
 };
 b.spread = Er;
-b.isAxiosError = Sr;
+b.isAxiosError = Rr;
 b.mergeConfig = B;
 b.AxiosHeaders = _;
 b.formToJSON = (e) => Et(a.isHTMLForm(e) ? new FormData(e) : e);
 b.getAdapter = kt.getAdapter;
-b.HttpStatusCode = Re;
+b.HttpStatusCode = Se;
 b.default = b;
 const {
   Axios: to,
@@ -1731,7 +1731,7 @@ function G(e) {
   }
   return e;
 }
-var Rr = {
+var Sr = {
   read: function(e) {
     return e[0] === '"' && (e = e.slice(1, -1)), e.replace(/(%[\dA-F]{2})+/gi, decodeURIComponent);
   },
@@ -1792,7 +1792,7 @@ function Te(e, t) {
     }
   );
 }
-var Tr = Te(Rr, { path: "/" }), We;
+var Tr = Te(Sr, { path: "/" }), We;
 const Lt = typeof window < "u", Or = (e) => typeof e == "string", Ke = () => +Date.now(), Oe = () => {
 };
 Lt && ((We = window == null ? void 0 : window.navigator) != null && We.userAgent) && /iP(ad|hone|od)/.test(window.navigator.userAgent);
@@ -1951,61 +1951,63 @@ const F = (e) => new URL(location.href).searchParams.get(e), _e = (e) => {
 }, qr = async () => {
   const e = F("authorizer") || "";
   if (console.log("authorizer====", e), _e(["authorizer"]), e === "feishu") {
-    if (console.log("window.tt===", window.tt), !window.tt) return "";
-    const n = await (async () => {
-      const r = nt.feishu.ssoParam, o = await b.create().get(r, {
+    if (!window.tt) return "";
+    const t = async () => {
+      const n = nt.feishu.ssoParam;
+      return (await b.create().get(n, {
         baseURL: tt,
         params: {
           source: "feishu",
           fieldKey: "appId"
         }
-      });
-      return console.log("getAppID===", o), o.data || "";
-    })();
-    return new Promise((r) => {
-      const o = async (s) => {
+      })).data || "";
+    };
+    return new Promise(async (n) => {
+      const r = async (s) => {
         try {
           const c = nt.feishu.login, f = await b.create().post(
             c,
             {},
             {
               baseURL: tt,
-              params: {}
+              params: { code: s }
             }
-          ), { access_token: u = "", expires_in: l = 0, refresh_token: d = "" } = f.data, w = {
+          );
+          console.log("login success", f.data);
+          const { access_token: u = "", expires_in: l = 0, refresh_token: d = "" } = f.data, w = {
             accessToken: u,
             accessTokenExpiredAt: +/* @__PURE__ */ new Date() + Number(l) * 1e3,
             refreshToken: d,
             info: f.data
           };
-          q().save(w), await xe(u), r(u);
+          q().save(w), await xe(u), n(u);
         } catch (c) {
-          console.error(c), v({ ...U, redirect_uri: L }), r("");
+          console.error(c), v({ ...U, redirect_uri: L }), n("");
         }
-      }, i = () => {
+      }, o = await t(), i = () => {
         window.tt.requestAuthCode({
-          appId: n,
+          appId: o,
           success: (s) => {
             const { code: c } = s;
-            o();
+            r(c);
           },
           fail: (s) => {
-            console.error("requestAuthCode fail", s), v({ ...U, redirect_uri: L }), r("");
+            console.error("requestAuthCode fail", s), v({ ...U, redirect_uri: L }), n("");
           }
         });
       };
-      window.tt.requestAccess ? window.tt.requestAccess({
-        appID: n,
+      window.tt.requestAccess ? (console.log("appId===", o), window.tt.requestAccess({
+        appID: o,
         scopeList: [],
         success: (s) => {
           const { code: c } = s;
-          o();
+          console.log("requestAccess success", s), r(c);
         },
         fail: (s) => {
           const { errno: c } = s;
-          c === 103 ? i() : (console.error("requestAccess fail", s), v({ ...U, redirect_uri: L }), r(""));
+          c === 103 ? i() : (console.error("requestAccess fail", s), v({ ...U, redirect_uri: L }), n(""));
         }
-      }) : i();
+      })) : i();
     });
   }
   return "";
@@ -2035,6 +2037,7 @@ const F = (e) => new URL(location.href).searchParams.get(e), _e = (e) => {
 localStorage.getItem("idelTime") && It(Number(localStorage.getItem("idelTime")));
 let ot = "";
 const Mr = async () => {
+  debugger;
   const e = F("code") || "", t = F("redirect_url") || "/", n = F("kingdee_token") || "", r = F("loginType") || "";
   if (r && localStorage.setItem("loginType", r), !e) return z();
   if (e === ot)

package/package.json

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