@huyooo/ui 2.2.7 → 3.0.2

package/dist/types/api/auth.generated.d.ts

@@ -1351,6 +1351,19 @@ export type Api = {
                 };
             };
         };
+        oauth: {
+            session: {
+                exchange: {
+                    /** 用社交登录回调中的一次性 code 换取 access / refresh token */
+                    post: {
+                        body: {
+                            code: string;
+                        };
+                        return: any;
+                    };
+                };
+            };
+        };
         refresh: {
             /** 使用 refreshToken 刷新 JWT */
             post: {
@@ -3488,6 +3501,16 @@ export interface ApiClient {
                 }, config?: RequestConfig) => RequestBuilder<any>;
             };
         };
+        oauth: {
+            session: {
+                exchange: {
+                    /** 用社交登录回调中的一次性 code 换取 access / refresh token */
+                    post: (body: {
+                        code: string;
+                    }, config?: RequestConfig) => RequestBuilder<any>;
+                };
+            };
+        };
         refresh: {
             /** 使用 refreshToken 刷新 JWT */
             post: (body: {

package/dist/useAuthkitAuth-DSC6QSKm.js

@@ -0,0 +1,300 @@
+import { ref as u, computed as m, nextTick as M, readonly as $ } from "vue";
+import { o as D, g as f, r as G, s as R } from "./apiClients-8_c5cDW5.js";
+import { u as K } from "./useAuthkitAppsAuthPageInfo-mv7hOnhi.js";
+const p = u(!1), g = u(!1);
+let I;
+const N = "请先阅读并同意用户协议与隐私政策", Y = {
+  required: !1,
+  userServiceAgreement: !1,
+  privacyPolicy: !1
+};
+function y() {
+  I && clearTimeout(I), g.value = !1, M(() => {
+    g.value = !0, I = setTimeout(() => {
+      g.value = !1;
+    }, 450);
+  });
+}
+function z(e) {
+  return [{
+    validator: (t, r) => {
+      if (!e()) {
+        r();
+        return;
+      }
+      if (t === !0) {
+        r();
+        return;
+      }
+      y(), r(N);
+    }
+  }];
+}
+function H() {
+  const {
+    appsData: e
+  } = K(), t = m(() => e.value.registrationTerms ?? Y), r = m(() => {
+    var n;
+    return ((n = e.value.signUpAuth) == null ? void 0 : n.enabled) !== !1;
+  }), o = m(() => r.value && !t.value.required);
+  function i() {
+    return r.value && t.value.required;
+  }
+  function d() {
+    return i();
+  }
+  function T() {
+    p.value = !1;
+  }
+  function v() {
+    return !d() || p.value ? !0 : (y(), !1);
+  }
+  function S(n) {
+    p.value = n;
+  }
+  function k(n) {
+    const s = m(() => n === "signUp" ? i() : d()), h = m(() => z(() => s.value));
+    return {
+      showTermsField: s,
+      termsRules: h
+    };
+  }
+  return {
+    acceptedTerms: p,
+    termsShaking: g,
+    registrationTerms: t,
+    signUpAuthEnabled: r,
+    registrationBlocked: o,
+    requiresAcceptanceForSignUp: i,
+    requiresAcceptanceForOAuth: d,
+    resetAcceptedTerms: T,
+    shakeTerms: y,
+    syncAcceptedTerms: S,
+    ensureTermsAcceptedForSignIn: v,
+    useTermsFormField: k
+  };
+}
+const c = u("signIn"), j = /* @__PURE__ */ new Set(), F = /* @__PURE__ */ new Set(), E = /* @__PURE__ */ new Set(), b = /* @__PURE__ */ new Set(), a = u(null), V = "jwtToken";
+function O() {
+  try {
+    const e = localStorage.getItem(V);
+    if (e)
+      return a.value = e, !0;
+  } catch (e) {
+    console.warn("Failed to access localStorage:", e);
+  }
+  return !1;
+}
+typeof window < "u" && O();
+let l = null;
+function J() {
+  return l !== null;
+}
+function Q(e) {
+  e.searchParams.delete("loginCode"), window.history.replaceState({}, "", `${e.pathname}${e.search}${e.hash}`);
+}
+async function W(e) {
+  const {
+    data: t,
+    error: r
+  } = await f().auth.auth.oauth.session.exchange.post({
+    code: e
+  });
+  if (r || !(t != null && t.jwtToken))
+    return console.warn("OAuth session exchange failed:", r), null;
+  const o = {
+    jwtToken: t.jwtToken,
+    refreshToken: t.refreshToken ?? null,
+    userId: t.userId ?? null,
+    appId: t.appId ?? null,
+    needBindIdentity: t.needBindIdentity === !0
+  };
+  return o.refreshToken ? R({
+    jwtToken: o.jwtToken,
+    refreshToken: o.refreshToken
+  }) : P(o.jwtToken), _(o), o;
+}
+async function q() {
+  if (l)
+    return l;
+  const e = (async () => {
+    try {
+      const r = new URL(window.location.href), o = r.searchParams.get("loginCode");
+      if (!o) return null;
+      const i = await W(o);
+      return i ? (Q(r), i) : null;
+    } catch (r) {
+      return console.warn("Failed to handle OAuth callback:", r), null;
+    }
+  })();
+  l = e;
+  const t = await e;
+  return !t && l === e && (l = null), t;
+}
+async function X() {
+  return await q() ? !0 : O();
+}
+function x() {
+  return a.value || O() ? a.value : null;
+}
+function P(e) {
+  a.value = e;
+  try {
+    localStorage.setItem(V, e);
+  } catch (t) {
+    console.warn("Failed to save token to localStorage:", t);
+  }
+}
+function A(e) {
+  e.refreshToken ? R({
+    jwtToken: e.jwtToken,
+    refreshToken: e.refreshToken
+  }) : P(e.jwtToken), _(e);
+}
+function Z() {
+  a.value = null, re();
+}
+D(Z);
+function U() {
+  G();
+}
+async function ee() {
+  if (!x())
+    return U(), !0;
+  const {
+    error: e
+  } = await f().auth.auth.signOut.post();
+  return U(), !e;
+}
+function w(e, t) {
+  return e.add(t), () => {
+    e.delete(t);
+  };
+}
+function _(e) {
+  j.forEach((t) => {
+    t(e);
+  });
+}
+function ne() {
+  F.forEach((e) => void e());
+}
+function te() {
+  E.forEach((e) => void e());
+}
+function re() {
+  b.forEach((e) => void e());
+}
+function oe(e) {
+  return w(j, e);
+}
+function se(e) {
+  return w(F, e);
+}
+function ie(e) {
+  return w(E, e);
+}
+function ue(e) {
+  return w(b, e);
+}
+function fe() {
+  const e = u(!1), t = u(!1), r = u(!1);
+  async function o(n) {
+    e.value = !0;
+    const {
+      data: s,
+      error: h
+    } = await f().auth.auth.signIn.unified.post({
+      identifier: n.identifier || n.email || "",
+      password: n.password,
+      code: n.code,
+      emailVerifyId: n.emailVerifyId,
+      method: n.method || "password"
+    });
+    if (e.value = !1, h || !s)
+      return;
+    A(s);
+  }
+  function i(n) {
+    A(n);
+  }
+  async function d(n) {
+    const {
+      resetAcceptedTerms: s,
+      acceptedTerms: h,
+      requiresAcceptanceForSignUp: C
+    } = H();
+    t.value = !0;
+    const L = C() ? h.value : void 0, {
+      error: B
+    } = n.type === "phone" ? await f().auth.auth.signUp.phone.post({
+      phone: n.phone || "",
+      code: n.code || "",
+      password: n.password,
+      inviteCode: n.inviteCode,
+      acceptedTerms: L === !0
+    }) : await f().auth.auth.signUp.post({
+      email: n.email || "",
+      userToken: n.userToken || "",
+      emailVerifyId: n.emailVerifyId || "",
+      password: n.password || "",
+      inviteCode: n.inviteCode,
+      acceptedTerms: L === !0
+    });
+    t.value = !1, !B && (s(), c.value = "signIn", ne());
+  }
+  async function T(n) {
+    r.value = !0;
+    const {
+      error: s
+    } = await f().auth.auth.resetPassword.post({
+      method: n.method || "email",
+      email: n.email,
+      phone: n.phone,
+      userToken: n.userToken,
+      code: n.code,
+      emailVerifyId: n.emailVerifyId,
+      password: n.password
+    });
+    r.value = !1, !s && (c.value = "signIn", te());
+  }
+  function v() {
+    c.value = "signUp";
+  }
+  function S() {
+    c.value = "resetPassword";
+  }
+  function k() {
+    c.value = "signIn";
+  }
+  return {
+    signInSubmit: o,
+    passkeySignInSubmit: i,
+    signUpSubmit: d,
+    resetPasswordSubmit: T,
+    currentView: c,
+    authSignInLoading: e,
+    authSignUpLoading: t,
+    resetPasswordLoading: r,
+    switchSignUp: v,
+    switchResetPassword: S,
+    switchSignIn: k,
+    onSignIn: oe,
+    onSignUp: se,
+    onResetPassword: ie,
+    onSignOut: ue,
+    jwtToken: $(a),
+    getToken: x,
+    setToken: P,
+    completeSignIn: A,
+    restoreSession: X,
+    consumeOAuthLoginCallback: q,
+    hasOAuthLoginConsumeStarted: J,
+    clearAuth: U,
+    signOut: ee
+  };
+}
+export {
+  H as a,
+  fe as u
+};

package/dist/{useAuthkitUsersProfile-DyjCmUka.js → useAuthkitUsersProfile-DSd5VA3_.js}

@@ -1,6 +1,6 @@
 import { ref as a, computed as i } from "vue";
 import { g as p } from "./apiClients-8_c5cDW5.js";
-import { u as l } from "./useAuthkitAuth-HqXgYzfZ.js";
+import { u as l } from "./useAuthkitAuth-DSC6QSKm.js";
 const e = a(null), n = a(!1), u = a(!1), s = a(!1);
 function v() {
   s.value = !0;

package/dist/{useEnsureAuthenticated-CpZcAqLg.js → useEnsureAuthenticated-COQKiCLk.js}

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

package/dist/{useRoutePermission-BCXxvMoU.js → useRoutePermission-DgQlbUBI.js}

@@ -1,7 +1,7 @@
 import { computed as g, ref as T, watch as k } from "vue";
 import { useRouter as R, useRoute as $ } from "vue-router";
 import { u as w } from "./useAuthkitAppsAuthPageInfo-mv7hOnhi.js";
-import { u as I } from "./useAuthkitUsersProfile-DyjCmUka.js";
+import { u as I } from "./useAuthkitUsersProfile-DSd5VA3_.js";
 import { g as C } from "./runtime-CDEl4QQl.js";
 function j(e, r = "default") {
   const t = document;

package/dist/{useSubscriptionCheckout-D8W6v3YG.js → useSubscriptionCheckout-LrwlCr84.js}

@@ -3,7 +3,7 @@ import { d as V } from "./useBillingStatusOptions-C8fwW-AI.js";
 import { g as $ } from "./apiClients-8_c5cDW5.js";
 /* empty css               */
 import { Message as b } from "@arco-design/web-vue";
-import { u as _ } from "./useEnsureAuthenticated-CpZcAqLg.js";
+import { u as _ } from "./useEnsureAuthenticated-COQKiCLk.js";
 function D(e) {
   var u;
   const i = (u = e == null ? void 0 : e.metadata) == null ? void 0 : u.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-K5_YUkGs.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-Bal7vFj8.js";
 export {
   a as UserAccountMenu,
   n as UserAvatar,

package/package.json

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

package/dist/useAuthkitAuth-HqXgYzfZ.js

@@ -1,273 +0,0 @@
-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-8_c5cDW5.js";
-import { u as D } from "./useAuthkitAppsAuthPageInfo-mv7hOnhi.js";
-const g = u(!1), w = u(!1);
-let I;
-const G = "请先阅读并同意用户协议与隐私政策", K = {
-  required: !1,
-  userServiceAgreement: !1,
-  privacyPolicy: !1
-};
-function A() {
-  I && clearTimeout(I), w.value = !1, _(() => {
-    w.value = !0, I = setTimeout(() => {
-      w.value = !1;
-    }, 450);
-  });
-}
-function N(e) {
-  return [{
-    validator: (r, t) => {
-      if (!e()) {
-        t();
-        return;
-      }
-      if (r === !0) {
-        t();
-        return;
-      }
-      A(), t(G);
-    }
-  }];
-}
-function Y() {
-  const {
-    appsData: e
-  } = D(), r = h(() => e.value.registrationTerms ?? K), t = h(() => {
-    var n;
-    return ((n = e.value.signUpAuth) == null ? void 0 : n.enabled) !== !1;
-  }), l = h(() => t.value && !r.value.required);
-  function s() {
-    return t.value && r.value.required;
-  }
-  function i() {
-    return s();
-  }
-  function f() {
-    g.value = !1;
-  }
-  function d() {
-    return !i() || g.value ? !0 : (A(), !1);
-  }
-  function v(n) {
-    g.value = n;
-  }
-  function S(n) {
-    const o = h(() => n === "signUp" ? s() : i()), p = h(() => N(() => o.value));
-    return {
-      showTermsField: o,
-      termsRules: p
-    };
-  }
-  return {
-    acceptedTerms: g,
-    termsShaking: w,
-    registrationTerms: r,
-    signUpAuthEnabled: t,
-    registrationBlocked: l,
-    requiresAcceptanceForSignUp: s,
-    requiresAcceptanceForOAuth: i,
-    resetAcceptedTerms: f,
-    shakeTerms: A,
-    syncAcceptedTerms: v,
-    ensureTermsAcceptedForSignIn: d,
-    useTermsFormField: S
-  };
-}
-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(b);
-    if (e)
-      return a.value = e, !0;
-  } catch (e) {
-    console.warn("Failed to access localStorage:", e);
-  }
-  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"), s = e.searchParams.get("appId"), i = e.searchParams.get("needBindIdentity") === "true";
-    t ? F({
-      jwtToken: r,
-      refreshToken: t
-    }) : 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: s,
-      needBindIdentity: i
-    }), !0;
-  } catch (e) {
-    return console.warn("Failed to handle OAuth callback:", e), !1;
-  }
-}
-function H() {
-  return z() ? !0 : U();
-}
-function q() {
-  return a.value || U() ? a.value : null;
-}
-function P(e) {
-  a.value = e;
-  try {
-    localStorage.setItem(b, e);
-  } catch (r) {
-    console.warn("Failed to save token to localStorage:", r);
-  }
-}
-function k(e) {
-  e.refreshToken ? F({
-    jwtToken: e.jwtToken,
-    refreshToken: e.refreshToken
-  }) : P(e.jwtToken), C(e);
-}
-function J() {
-  a.value = null, Z();
-}
-M(J);
-function y() {
-  $();
-}
-async function Q() {
-  if (!q())
-    return y(), !0;
-  const {
-    error: e
-  } = await m().auth.auth.signOut.post();
-  return y(), !e;
-}
-function T(e, r) {
-  return e.add(r), () => {
-    e.delete(r);
-  };
-}
-function C(e) {
-  O.forEach((r) => {
-    r(e);
-  });
-}
-function W() {
-  L.forEach((e) => void e());
-}
-function X() {
-  j.forEach((e) => void e());
-}
-function Z() {
-  V.forEach((e) => void e());
-}
-function ee(e) {
-  return T(O, e);
-}
-function ne(e) {
-  return T(L, e);
-}
-function re(e) {
-  return T(j, e);
-}
-function te(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: o,
-      error: p
-    } = await m().auth.auth.signIn.unified.post({
-      identifier: n.identifier || n.email || "",
-      password: n.password,
-      code: n.code,
-      emailVerifyId: n.emailVerifyId,
-      method: n.method || "password"
-    });
-    if (e.value = !1, p || !o)
-      return;
-    k(o);
-  }
-  function s(n) {
-    k(n);
-  }
-  async function i(n) {
-    const {
-      resetAcceptedTerms: o,
-      acceptedTerms: p,
-      requiresAcceptanceForSignUp: R
-    } = Y();
-    r.value = !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: E === !0
-    }) : await m().auth.auth.signUp.post({
-      email: n.email || "",
-      userToken: n.userToken || "",
-      emailVerifyId: n.emailVerifyId || "",
-      password: n.password || "",
-      inviteCode: n.inviteCode,
-      acceptedTerms: E === !0
-    });
-    r.value = !1, !B && (o(), c.value = "signIn", W());
-  }
-  async function f(n) {
-    t.value = !0;
-    const {
-      error: o
-    } = await m().auth.auth.resetPassword.post({
-      method: n.method || "email",
-      email: n.email,
-      phone: n.phone,
-      userToken: n.userToken,
-      code: n.code,
-      emailVerifyId: n.emailVerifyId,
-      password: n.password
-    });
-    t.value = !1, !o && (c.value = "signIn", X());
-  }
-  function d() {
-    c.value = "signUp";
-  }
-  function v() {
-    c.value = "resetPassword";
-  }
-  function S() {
-    c.value = "signIn";
-  }
-  return {
-    signInSubmit: l,
-    passkeySignInSubmit: s,
-    signUpSubmit: i,
-    resetPasswordSubmit: f,
-    currentView: c,
-    authSignInLoading: e,
-    authSignUpLoading: r,
-    resetPasswordLoading: t,
-    switchSignUp: d,
-    switchResetPassword: v,
-    switchSignIn: S,
-    onSignIn: ee,
-    onSignUp: ne,
-    onResetPassword: re,
-    onSignOut: te,
-    jwtToken: x(a),
-    getToken: q,
-    setToken: P,
-    completeSignIn: k,
-    restoreSession: H,
-    clearAuth: y,
-    signOut: Q
-  };
-}
-export {
-  Y as a,
-  ue as u
-};