@huyooo/ui 2.0.6 → 2.0.8

package/dist/upload.js

@@ -1,5 +1,5 @@
-import { _ as o } from "./Upload.vue_vue_type_script_setup_true_lang-oa6LJgCY.js";
-import { b as s, d as p } from "./runtime-qs4IasEB.js";
+import { _ as o } from "./Upload.vue_vue_type_script_setup_true_lang-CgZQOZYt.js";
+import { b as s, d as p } from "./runtime-Dp7MgwhI.js";
 export {
   o as Upload,
   s as createBrowserCosTransport,

package/dist/{useAuthkitAuth-BPTZUSkM.js → useAuthkitAuth-cHrJMM8E.js}

@@ -1,5 +1,5 @@
-import { ref as u, computed as p, nextTick as _, readonly as x } from "vue";
-import { o as M, g as m, r as $, s as E } from "./apiClients-Ctcq8NZs.js";
+import { ref as u, computed as h, nextTick as _, readonly as x } from "vue";
+import { o as M, g as m, r as $, s as F } from "./apiClients-Ctcq8NZs.js";
 import { u as D } from "./useAuthkitAppsAuthPageInfo-DZ1p-P3Q.js";
 const g = u(!1), w = u(!1);
 let I;
@@ -33,15 +33,15 @@ function N(e) {
 function Y() {
   const {
     appsData: e
-  } = D(), r = p(() => e.value.registrationTerms ?? K), t = p(() => {
+  } = D(), r = h(() => e.value.registrationTerms ?? K), t = h(() => {
     var n;
     return ((n = e.value.signUpAuth) == null ? void 0 : n.enabled) !== !1;
-  }), l = p(() => t.value && !r.value.required);
-  function o() {
+  }), l = h(() => t.value && !r.value.required);
+  function s() {
     return t.value && r.value.required;
   }
   function i() {
-    return o();
+    return s();
   }
   function f() {
     g.value = !1;
@@ -53,10 +53,10 @@ function Y() {
     g.value = n;
   }
   function S(n) {
-    const s = p(() => n === "signUp" ? o() : i()), h = p(() => N(() => s.value));
+    const o = h(() => n === "signUp" ? s() : i()), p = h(() => N(() => o.value));
     return {
-      showTermsField: s,
-      termsRules: h
+      showTermsField: o,
+      termsRules: p
     };
   }
   return {
@@ -65,7 +65,7 @@ function Y() {
     registrationTerms: r,
     signUpAuthEnabled: t,
     registrationBlocked: l,
-    requiresAcceptanceForSignUp: o,
+    requiresAcceptanceForSignUp: s,
     requiresAcceptanceForOAuth: i,
     resetAcceptedTerms: f,
     shakeTerms: A,
@@ -74,10 +74,10 @@ function Y() {
     useTermsFormField: S
   };
 }
-const c = u("signIn"), F = /* @__PURE__ */ new Set(), O = /* @__PURE__ */ new Set(), L = /* @__PURE__ */ new Set(), j = /* @__PURE__ */ new Set(), a = u(null), V = "jwtToken";
-function b() {
+const c = u("signIn"), O = /* @__PURE__ */ new Set(), L = /* @__PURE__ */ new Set(), j = /* @__PURE__ */ new Set(), V = /* @__PURE__ */ new Set(), a = u(null), b = "jwtToken";
+function U() {
   try {
-    const e = localStorage.getItem(V);
+    const e = localStorage.getItem(b);
     if (e)
       return a.value = e, !0;
   } catch (e) {
@@ -85,20 +85,21 @@ function b() {
   }
   return !1;
 }
+typeof window < "u" && U();
 function z() {
   try {
     const e = new URL(window.location.href), r = e.searchParams.get("token");
     if (!r) return !1;
-    const t = e.searchParams.get("refreshToken"), l = e.searchParams.get("userId"), o = e.searchParams.get("appId"), i = e.searchParams.get("needBindIdentity") === "true";
-    t ? E({
+    const t = e.searchParams.get("refreshToken"), l = e.searchParams.get("userId"), s = e.searchParams.get("appId"), i = e.searchParams.get("needBindIdentity") === "true";
+    t ? F({
       jwtToken: r,
       refreshToken: t
-    }) : U(r), ["token", "refreshToken", "userId", "appId", "needBindIdentity", "expiresIn"].forEach((d) => e.searchParams.delete(d));
+    }) : P(r), ["token", "refreshToken", "userId", "appId", "needBindIdentity", "expiresIn"].forEach((d) => e.searchParams.delete(d));
     const f = `${e.pathname}${e.search}${e.hash}`;
     return window.history.replaceState({}, "", f), C({
       jwtToken: r,
       userId: l,
-      appId: o,
+      appId: s,
       needBindIdentity: i
     }), !0;
   } catch (e) {
@@ -106,24 +107,24 @@ function z() {
   }
 }
 function H() {
-  return z() ? !0 : b();
+  return z() ? !0 : U();
 }
 function q() {
-  return a.value || b() ? a.value : null;
+  return a.value || U() ? a.value : null;
 }
-function U(e) {
+function P(e) {
   a.value = e;
   try {
-    localStorage.setItem(V, e);
+    localStorage.setItem(b, e);
   } catch (r) {
     console.warn("Failed to save token to localStorage:", r);
   }
 }
 function k(e) {
-  e.refreshToken ? E({
+  e.refreshToken ? F({
     jwtToken: e.jwtToken,
     refreshToken: e.refreshToken
-  }) : U(e.jwtToken), C(e);
+  }) : P(e.jwtToken), C(e);
 }
 function J() {
   a.value = null, Z();
@@ -146,38 +147,38 @@ function T(e, r) {
   };
 }
 function C(e) {
-  F.forEach((r) => {
+  O.forEach((r) => {
     r(e);
   });
 }
 function W() {
-  O.forEach((e) => void e());
+  L.forEach((e) => void e());
 }
 function X() {
-  L.forEach((e) => void e());
+  j.forEach((e) => void e());
 }
 function Z() {
-  j.forEach((e) => void e());
+  V.forEach((e) => void e());
 }
 function ee(e) {
-  return T(F, e);
+  return T(O, e);
 }
 function ne(e) {
-  return T(O, e);
+  return T(L, e);
 }
 function re(e) {
-  return T(L, e);
+  return T(j, e);
 }
 function te(e) {
-  return T(j, e);
+  return T(V, e);
 }
 function ue() {
   const e = u(!1), r = u(!1), t = u(!1);
   async function l(n) {
     e.value = !0;
     const {
-      data: s,
-      error: h
+      data: o,
+      error: p
     } = await m().auth.auth.signIn.unified.post({
       identifier: n.identifier || n.email || "",
       password: n.password,
@@ -185,42 +186,42 @@ function ue() {
       emailVerifyId: n.emailVerifyId,
       method: n.method || "password"
     });
-    if (e.value = !1, h || !s)
+    if (e.value = !1, p || !o)
       return;
-    k(s);
+    k(o);
   }
-  function o(n) {
+  function s(n) {
     k(n);
   }
   async function i(n) {
     const {
-      resetAcceptedTerms: s,
-      acceptedTerms: h,
-      requiresAcceptanceForSignUp: P
+      resetAcceptedTerms: o,
+      acceptedTerms: p,
+      requiresAcceptanceForSignUp: R
     } = Y();
     r.value = !0;
-    const R = P() ? h.value : void 0, {
+    const E = R() ? p.value : void 0, {
       error: B
     } = n.type === "phone" ? await m().auth.auth.signUp.phone.post({
       phone: n.phone || "",
       code: n.code || "",
       password: n.password,
       inviteCode: n.inviteCode,
-      acceptedTerms: R === !0
+      acceptedTerms: E === !0
     }) : await m().auth.auth.signUp.post({
       email: n.email || "",
       userToken: n.userToken || "",
       emailVerifyId: n.emailVerifyId || "",
       password: n.password || "",
       inviteCode: n.inviteCode,
-      acceptedTerms: R === !0
+      acceptedTerms: E === !0
     });
-    r.value = !1, !B && (s(), c.value = "signIn", W());
+    r.value = !1, !B && (o(), c.value = "signIn", W());
   }
   async function f(n) {
     t.value = !0;
     const {
-      error: s
+      error: o
     } = await m().auth.auth.resetPassword.post({
       method: n.method || "email",
       email: n.email,
@@ -230,7 +231,7 @@ function ue() {
       emailVerifyId: n.emailVerifyId,
       password: n.password
     });
-    t.value = !1, !s && (c.value = "signIn", X());
+    t.value = !1, !o && (c.value = "signIn", X());
   }
   function d() {
     c.value = "signUp";
@@ -243,7 +244,7 @@ function ue() {
   }
   return {
     signInSubmit: l,
-    passkeySignInSubmit: o,
+    passkeySignInSubmit: s,
     signUpSubmit: i,
     resetPasswordSubmit: f,
     currentView: c,
@@ -259,7 +260,7 @@ function ue() {
     onSignOut: te,
     jwtToken: x(a),
     getToken: q,
-    setToken: U,
+    setToken: P,
     completeSignIn: k,
     restoreSession: H,
     clearAuth: y,

package/dist/useAuthkitUsersProfile-CTd6PP-a.js

@@ -0,0 +1,50 @@
+import { ref as a, computed as o } from "vue";
+import { g as f } from "./apiClients-Ctcq8NZs.js";
+import { u as s } from "./useAuthkitAuth-cHrJMM8E.js";
+const e = a(null), n = a(!1), u = a(!1);
+function c(t) {
+  return t === 401 || t === 40101;
+}
+const v = o(() => !!e.value), h = o(() => {
+  if (!u.value)
+    return "pending";
+  if (e.value)
+    return "authenticated";
+  const {
+    getToken: t
+  } = s();
+  return t() ? "authenticated" : "unauthenticated";
+});
+async function d() {
+  const {
+    getToken: t,
+    clearAuth: i
+  } = s();
+  if (!t()) {
+    e.value = null, u.value = !0;
+    return;
+  }
+  n.value = !0, u.value = !1;
+  const {
+    data: l,
+    error: r
+  } = await f().auth.users.profile.post({});
+  n.value = !1, l ? e.value = l : c(r == null ? void 0 : r.code) && (e.value = null, console.warn("认证已过期，清除认证状态"), i()), u.value = !0;
+}
+function p() {
+  e.value = null, n.value = !1, u.value = !0;
+}
+function P() {
+  return {
+    userProfile: e,
+    loading: n,
+    usersProfileReady: u,
+    isLoggedIn: v,
+    authSessionState: h,
+    fetchUserProfile: d,
+    clearUserProfile: p
+  };
+}
+export {
+  P as u
+};

package/dist/{useEnsureAuthenticated-CncOvj2H.js → useEnsureAuthenticated-C8qS8DLL.js}

@@ -1,5 +1,5 @@
 import { computed as f } from "vue";
-import { u as r } from "./useAuthkitAuth-BPTZUSkM.js";
+import { u as r } from "./useAuthkitAuth-cHrJMM8E.js";
 import { u as d } from "./apiClients-Ctcq8NZs.js";
 const A = "jwtToken";
 let e = null, i = !1;

package/dist/{useLegalDocs-BZlntAI7.js → useLegalDocs-C4qk5CTb.js}

@@ -1,6 +1,6 @@
 import { computed as f } from "vue";
 import { u as d } from "./useAuthkitAppsAuthPageInfo-DZ1p-P3Q.js";
-import { g as L } from "./runtime-qs4IasEB.js";
+import { g as L } from "./runtime-Dp7MgwhI.js";
 const c = {
   userServiceAgreement: "用户服务协议",
   privacyPolicy: "隐私协议",

package/dist/{usePageSEO-DwhbUUjW.js → usePageSEO-Dl6_kBWP.js}

@@ -2,7 +2,7 @@
 import "./apiClients-Ctcq8NZs.js";
 import { Message as y } from "@arco-design/web-vue";
 import { ref as a, computed as s, toValue as A } from "vue";
-import { u as N } from "./runtime-qs4IasEB.js";
+import { u as N } from "./runtime-Dp7MgwhI.js";
 import { useHead as g, useSeoMeta as w } from "@unhead/vue";
 import { useRoute as E } from "vue-router";
 function M(t) {

package/dist/{useRoutePermission-BrQX7NTq.js → useRoutePermission-B_g-WmDZ.js}

@@ -1,12 +1,13 @@
-import { ref as I, computed as w, watch as S } from "vue";
-import { useRouter as M, useRoute as T } from "vue-router";
-import { u as k } from "./useAuthkitAppsAuthPageInfo-DZ1p-P3Q.js";
-import { u as L } from "./useAuthkitUsersProfile-CW_exa7E.js";
-const y = I({
+import { ref as w, computed as k, watch as S } from "vue";
+import { useRouter as I, useRoute as T } from "vue-router";
+import { u as M } from "./useAuthkitAppsAuthPageInfo-DZ1p-P3Q.js";
+import { u as L } from "./useAuthkitUsersProfile-CTd6PP-a.js";
+import { u as K } from "./useAuthkitAuth-cHrJMM8E.js";
+const y = w({
   key: "",
   name: ""
 });
-function z() {
+function B() {
   function e(r, t) {
     y.value.key = r, y.value.name = t;
   }
@@ -15,7 +16,7 @@ function z() {
     setActiveDoc: e
   };
 }
-function j(e, r = "default") {
+function F(e, r = "default") {
   const t = document;
   if (t && typeof t.startViewTransition == "function") {
     const n = document.body;
@@ -30,7 +31,7 @@ function j(e, r = "default") {
   } else
     e();
 }
-function K(e) {
+function O(e) {
   const r = /* @__PURE__ */ new Set();
   r.add(e);
   const t = e.split("/").filter(Boolean);
@@ -38,18 +39,18 @@ function K(e) {
     r.add(`/${t.slice(0, n).join("/")}`);
   return [...r];
 }
-function R(e, r) {
+function g(e, r) {
   const t = new Set(r);
-  return t.has("*") ? !0 : K(e).some((n) => t.has(n));
+  return t.has("*") ? !0 : O(e).some((n) => t.has(n));
 }
-function O(e, r) {
+function W(e, r) {
   const t = e.endsWith("/") ? e.slice(0, -1) : e;
-  return t === "" ? !1 : R(t, r) || r.some((n) => n === t ? !0 : n.startsWith(`${t}/`));
+  return t === "" ? !1 : g(t, r) || r.some((n) => n === t ? !0 : n.startsWith(`${t}/`));
 }
 function C(e, r) {
   return Array.isArray(e == null ? void 0 : e.menuTypes) ? e.menuTypes.includes(r) : !1;
 }
-function B(e, r, t) {
+function N(e, r, t) {
   for (let n = e.length - 1; n >= 0; n--) {
     const f = e[n];
     if (C(f.meta, r))
@@ -57,14 +58,14 @@ function B(e, r, t) {
   }
   return t;
 }
-function g(e) {
+function A(e) {
   return e.split("?")[0].split("#")[0];
 }
-function F(e, r, t) {
-  const n = g(r), f = (t == null ? void 0 : t.returnParentOnChildMatch) ?? !1;
+function U(e, r, t) {
+  const n = A(r), f = (t == null ? void 0 : t.returnParentOnChildMatch) ?? !1;
   function d(c, p) {
     for (const a of c) {
-      if (g(a.path) === p)
+      if (A(a.path) === p)
         return a.path;
       if (a.children && a.children.length > 0) {
         const s = d(a.children, p);
@@ -78,11 +79,11 @@ function F(e, r, t) {
   if (m)
     return m;
   for (const c of e) {
-    const p = g(c.path);
+    const p = A(c.path);
     if (n.startsWith(p + "/") || n === p) {
       if (c.children && c.children.length > 0)
         for (const a of c.children) {
-          const v = g(a.path);
+          const v = A(a.path);
           if (n.startsWith(v + "/") || n === v)
             return f ? c.path : a.path;
         }
@@ -91,22 +92,22 @@ function F(e, r, t) {
   }
   return t != null && t.fallback ? t.fallback(n) : n;
 }
-function N(e) {
-  const r = M(), {
+function q(e) {
+  const r = I(), {
     appsData: t
-  } = k(), {
+  } = M(), {
     isLoggedIn: n,
     userProfile: f
-  } = L(), d = w(() => {
+  } = L(), d = k(() => {
     var s;
     return !n.value || !f.value ? [] : ((s = f.value.permissions) == null ? void 0 : s.map((u) => u.permissionKey)) || [];
   });
   function m(s) {
     const u = (t.value.publicRoutes || []).map((l) => l.permissionKey);
-    return R(s, u);
+    return g(s, u);
   }
   function c(s) {
-    return n.value ? R(s, d.value) : !1;
+    return n.value ? g(s, d.value) : !1;
   }
   function p(s) {
     var u;
@@ -125,7 +126,7 @@ function N(e) {
       const i = o.meta;
       if (C(i, u)) {
         const P = o.path;
-        if (m(P) || O(P, d.value)) {
+        if (m(P) || W(P, d.value)) {
           const h = {
             name: (i == null ? void 0 : i.menuName) || (i == null ? void 0 : i.title) || (typeof o.name == "string" ? o.name : o.path),
             path: o.path,
@@ -134,8 +135,8 @@ function N(e) {
             hidden: i == null ? void 0 : i.hidden
           };
           if (o.children && o.children.length > 0) {
-            const A = a(o.children, u);
-            A.length > 0 && (h.children = A);
+            const R = a(o.children, u);
+            R.length > 0 && (h.children = R);
           }
           l.push(h);
         }
@@ -147,7 +148,7 @@ function N(e) {
     return l;
   }
   return {
-    menus: w(() => {
+    menus: k(() => {
       if (!e)
         return [];
       const s = r.getRoutes(), u = s.find((h) => h.path === "/"), l = u != null && u.children ? u.children.map((h) => p(h)) : [], o = new Set(l.map((h) => h.path)), P = s.filter((h) => h.path === "/" || h.path === "/:catchAll(.*)" || o.has(h.path) ? !1 : h.path.split("/").filter((D) => D).length === 1).map(p), b = [...l, ...P];
@@ -158,25 +159,25 @@ function N(e) {
     isLoggedIn: n
   };
 }
-function U() {
-  const e = M(), r = T(), {
+function E() {
+  const e = I(), r = T(), {
     appsData: t,
     appsAuthPageInfoSuccess: n
-  } = k(), {
+  } = M(), {
     userProfile: f,
     isLoggedIn: d,
     usersProfileReady: m
-  } = L(), c = I(!1);
+  } = L(), c = w(!1);
   function p(s) {
     const u = t.value.publicRoutes || [];
-    return R(s, u.map((l) => l.permissionKey));
+    return g(s, u.map((l) => l.permissionKey));
   }
   function a(s) {
     var l;
     if (!d.value || !f.value)
       return !1;
     const u = ((l = f.value.permissions) == null ? void 0 : l.map((o) => o.permissionKey)) || [];
-    return R(s, u);
+    return g(s, u);
   }
   function v(s) {
     if (!n.value) {
@@ -192,6 +193,13 @@ function U() {
       return;
     }
     if (!d.value) {
+      const {
+        getToken: u
+      } = K();
+      if (u()) {
+        c.value = !0;
+        return;
+      }
       e.replace("/"), c.value = !1;
       return;
     }
@@ -208,11 +216,11 @@ function U() {
   };
 }
 export {
-  B as a,
-  N as b,
-  U as c,
-  F as f,
-  g,
-  z as u,
-  j as w
+  N as a,
+  q as b,
+  E as c,
+  U as f,
+  A as g,
+  B as u,
+  F as w
 };

package/dist/{useSubscriptionCheckout-BDDCRxSs.js → useSubscriptionCheckout-CYU2Ke0y.js}

@@ -3,7 +3,7 @@ import { d as z } from "./useBillingStatusOptions-Br-iL77Z.js";
 import { g as $ } from "./apiClients-Ctcq8NZs.js";
 /* empty css               */
 import { Message as h } from "@arco-design/web-vue";
-import { u as H } from "./useEnsureAuthenticated-CncOvj2H.js";
+import { u as H } from "./useEnsureAuthenticated-C8qS8DLL.js";
 function D(e) {
   var i;
   const r = (i = e == null ? void 0 : e.metadata) == null ? void 0 : i.originalPrice;

package/dist/user.js

@@ -1,4 +1,4 @@
-import { U as a, a as n, b as r, c as t, d as U, _ as u, e as i, f as M, g as o, h as m, i as I, j as c, k as d, l as b, m as f } from "./UserMenuInvitationsItem.vue_vue_type_script_setup_true_lang-DqgwJ7r3.js";
+import { U as a, a as n, b as r, c as t, d as U, _ as u, e as i, f as M, g as o, h as m, i as I, j as c, k as d, l as b, m as f } from "./UserMenuInvitationsItem.vue_vue_type_script_setup_true_lang-BdibAudA.js";
 export {
   a as UserAccountMenu,
   n as UserAvatar,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huyooo/ui",
-  "version": "2.0.6",
+  "version": "2.0.8",
   "private": false,
   "type": "module",
   "files": [