egova-admin-jssdk 0.1.0 → 0.1.1

package/dist/service/index.js

@@ -74,7 +74,8 @@ export function getPublicKey() {
  */
 export async function changeUserCryptogram(oldPwd, newPwd) {
     if (!saltData.publicKey) {
-        const publicKeyRes = await getPublicKey();
+        const bodyReponse = await getPublicKey();
+        const publicKeyRes = bodyReponse?.data || {};
         if (publicKeyRes && !publicKeyRes.hasError) {
             const data = publicKeyRes.result?.data || [];
             if (data && data.length === 2) {

package/lib/egova-admin-jssdk.mjs

@@ -6,7 +6,7 @@ import { random as j, merge as d, isNil as m } from "lodash-es";
 import P from "crypto-js";
 import O from "qs";
 import { sm4 as K, sm2 as v } from "sm-crypto";
-/*! egova-admin-jssdk v0.0.11 */
+/*! egova-admin-jssdk v0.1.1 */
 function C(r) {
   return r instanceof Element ? "element" : Object.prototype.toString.call(r).replace(/\[object\s(.+)\]/, "$1").toLowerCase();
 }
@@ -44,11 +44,11 @@ class N {
    */
   getRandomPassword(t) {
     const e = "ABCDEFGHIJKLMNOPQRSTUVWXYZ", n = "abcdefghijklmnopqrstuvwxyz", o = "0123456789", s = ".~!@#$%^&*)(_+}{|:?><", i = e + n + o + s;
-    let a = "";
-    a += this.getRandomChar(e), a += this.getRandomChar(n), a += this.getRandomChar(o), a += this.getRandomChar(s);
-    for (let c = a.length; c < t; c++)
-      a += this.getRandomChar(i);
-    return a = a.split("").sort(() => j(!0) - 0.5).join(""), a;
+    let c = "";
+    c += this.getRandomChar(e), c += this.getRandomChar(n), c += this.getRandomChar(o), c += this.getRandomChar(s);
+    for (let a = c.length; a < t; a++)
+      c += this.getRandomChar(i);
+    return c = c.split("").sort(() => j(!0) - 0.5).join(""), c;
   }
   getRandomChar(t) {
     const e = Math.floor(j(!0) * t.length);
@@ -67,7 +67,7 @@ class H {
     return t.replace(/([^:]|^)\/{2,}/g, "$1/");
   }
 }
-const R = new H();
+const T = new H();
 class _ {
   constructor(t) {
     /**
@@ -179,8 +179,8 @@ class _ {
     try {
       const { pathname: e, origin: n } = new URL(t, window.location.origin), o = this.urlSearchParams(t), s = this.generateSignatureOption();
       d(o, s);
-      const i = this.sortParamByKey(o), c = `${R.cleanUrl(`/${e}`)}?${i}`, p = this.cryptoHash(c);
-      t = `${n}${c}&signature=${p}`;
+      const i = this.sortParamByKey(o), a = `${T.cleanUrl(`/${e}`)}?${i}`, p = this.cryptoHash(a);
+      t = `${n}${a}&signature=${p}`;
     } catch {
       console.error("签名失败，请使用有效的链接", t);
     }
@@ -195,25 +195,25 @@ class _ {
   signatureConfig(t) {
     var e, n, o, s;
     try {
-      const a = ((e = t.method) == null ? void 0 : e.toUpperCase()) === "GET", c = t.data, p = c !== null && typeof c == "object", y = ((o = (n = t.headers) == null ? void 0 : n["Content-Type"]) == null ? void 0 : o.toString()) || "", g = y.includes("multipart/form-data");
+      const c = ((e = t.method) == null ? void 0 : e.toUpperCase()) === "GET", a = t.data, p = a !== null && typeof a == "object", y = ((o = (n = t.headers) == null ? void 0 : n["Content-Type"]) == null ? void 0 : o.toString()) || "", g = y.includes("multipart/form-data");
       let u = y.includes("application/json");
-      !a && !y && p && (u = !0), d(t, { headers: { "App-Id": this.appIdCode.id } });
+      !c && !y && p && (u = !0), d(t, { headers: { "App-Id": this.appIdCode.id } });
       const f = {}, x = this.urlSearchParams(t.url);
       if (d(f, x), !m(t.params)) {
         const S = t.params;
         this.removeNilValue(S), t.params = S, d(f, O.parse(O.stringify(S)));
       }
-      !m(c) && p && !g && !u && d(f, c);
+      !m(a) && p && !g && !u && d(f, a);
       const A = this.generateSignatureOption();
       d(f, A);
       let b = this.sortParamByKey(f);
       if (u) {
-        const S = JSON.stringify(c);
-        this.isStringOverKB(S, 128) || (p ? b += this.formatEncodeValue(S) : b += this.formatEncodeValue(c));
+        const S = JSON.stringify(a);
+        this.isStringOverKB(S, 128) || (p ? b += this.formatEncodeValue(S) : b += this.formatEncodeValue(a));
       }
       let E = "";
       (s = t.url) != null && s.startsWith("http") ? E = t.url : E = `${t.baseURL}/${t.url || ""}`;
-      const { pathname: U } = new URL(E, window.location.origin), B = `${R.cleanUrl(`/${U}`)}?${b}`;
+      const { pathname: U } = new URL(E, window.location.origin), B = `${T.cleanUrl(`/${U}`)}?${b}`;
       A.signature = this.cryptoHash(B), t.params = d({}, t.params, A);
     } catch (i) {
       console.error("签名失败", i);
@@ -279,17 +279,17 @@ class z {
     return P.enc.Hex.stringify(e);
   }
 }
-const I = new z(W), T = /* @__PURE__ */ new Map(), J = [
+const I = new z(W), R = /* @__PURE__ */ new Map(), J = [
   {
     type: "sm2WithSalt",
     encrypt: (r, t) => {
       const { type: e, publicKey: n } = t || {};
       if (!e || !n) return;
-      let o = T.get(e);
-      (!o || o === "") && (o = I.cryptRandom(16), T.set(e, o));
-      const s = I.cryptRandom(16), i = I.cryptRandom(3), a = v.doEncrypt(i + o, n, 1), c = K.encrypt(r, o, { iv: s, mode: "cbc" });
-      if (a && c) {
-        const p = a, y = s + c;
+      let o = R.get(e);
+      (!o || o === "") && (o = I.cryptRandom(16), R.set(e, o));
+      const s = I.cryptRandom(16), i = I.cryptRandom(3), c = v.doEncrypt(i + o, n, 1), a = K.encrypt(r, o, { iv: s, mode: "cbc" });
+      if (c && a) {
+        const p = c, y = s + a;
         return {
           data: p + y
         };
@@ -298,7 +298,7 @@ const I = new z(W), T = /* @__PURE__ */ new Map(), J = [
   }
 ];
 function q(r, t) {
-  var s, i, a, c, p, y;
+  var s, i, c, a, p, y;
   const e = r, { changeContentTypeEnabled: n } = t || {}, o = {
     type: $.type,
     publicKey: $.publicKey
@@ -310,8 +310,8 @@ function q(r, t) {
     const u = e.data;
     if (m(u))
       return e;
-    let x = u !== null && typeof u == "object" && Object.prototype.toString.call(u) === "[object FormData]" || ((a = (i = e.headers) == null ? void 0 : i["Content-Type"]) == null ? void 0 : a.includes("multipart/form-data"));
-    if (x || (x = u instanceof FormData || typeof (u == null ? void 0 : u.append) == "function" && typeof (u == null ? void 0 : u.entries) == "function"), x || ((p = (c = e.headers) == null ? void 0 : c["Content-Type"]) == null ? void 0 : p.includes("application/x-www-form-urlencoded")))
+    let x = u !== null && typeof u == "object" && Object.prototype.toString.call(u) === "[object FormData]" || ((c = (i = e.headers) == null ? void 0 : i["Content-Type"]) == null ? void 0 : c.includes("multipart/form-data"));
+    if (x || (x = u instanceof FormData || typeof (u == null ? void 0 : u.append) == "function" && typeof (u == null ? void 0 : u.entries) == "function"), x || ((p = (a = e.headers) == null ? void 0 : a["Content-Type"]) == null ? void 0 : p.includes("application/x-www-form-urlencoded")))
       return e;
     const b = o.type;
     if (b && b === "sm2WithSalt") {
@@ -413,9 +413,9 @@ function X() {
 async function dt(r, t) {
   var o, s;
   if (!w.publicKey) {
-    const i = await X();
-    if (i && !i.hasError) {
-      const a = ((o = i.result) == null ? void 0 : o.data) || [];
+    const i = await X(), c = (i == null ? void 0 : i.data) || {};
+    if (!c.hasError) {
+      const a = ((o = c.result) == null ? void 0 : o.data) || [];
       a.length === 2 && (w.type = a[0], w.publicKey = a[1]);
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "egova-admin-jssdk",
-    "version": "0.1.0",
+    "version": "0.1.1",
     "private": false,
     "scripts": {
         "build": "run-p type-check build-lib build-type",