@huyooo/ui 0.5.58 → 0.5.59

package/dist/{auth-CDARHcht.js → auth-bwwc2iT8.js}

@@ -1,12 +1,12 @@
 /* empty css               */
-import { Message as u } from "@arco-design/web-vue";
+import { Message as l } from "@arco-design/web-vue";
 import k from "axios";
 import { ref as m } from "vue";
-function S(e, r = 3) {
-  const t = e.indexOf("@");
-  if (t > 1) {
-    const o = e.slice(0, r), i = e.slice(t);
-    return o + "***" + i;
+function A(e, r = 3) {
+  const o = e.indexOf("@");
+  if (o > 1) {
+    const a = e.slice(0, r), u = e.slice(o);
+    return a + "***" + u;
   }
   return e;
 }
@@ -17,38 +17,39 @@ function p() {
     console.warn("Failed to clear localStorage:", e);
   }
 }
-function g() {
+function b() {
   try {
     return localStorage.getItem("refreshToken");
   } catch (e) {
     return console.warn("Failed to get refreshToken from localStorage:", e), null;
   }
 }
-function b(e) {
+function g(e) {
   try {
     localStorage.setItem("jwtToken", e);
   } catch (r) {
     console.warn("Failed to update jwtToken in localStorage:", r);
   }
 }
-let s = {
+let t = {
   appId: "",
   prefixUrl: "",
   authPrefixUrl: "",
+  oauthCallbackUrl: "",
   avatarBucketId: "68350c206888f565dc7d09e9",
   feedbackBucketId: "6826e4db6888f565dc775dce",
   bucket: "ones-1358549778",
   region: "ap-beijing",
   web3formsAccessKey: "72604aac-d55e-4df0-9bcf-31b2206b3753"
 }, T = {};
-function U(e) {
+function S(e) {
   Object.assign(T, e);
 }
 function B(e) {
-  s.appId = e.appId, s.prefixUrl = e.prefixUrl, s.authPrefixUrl = e.authPrefixUrl, e.avatarBucketId !== void 0 && (s.avatarBucketId = e.avatarBucketId), e.feedbackBucketId !== void 0 && (s.feedbackBucketId = e.feedbackBucketId), e.bucket !== void 0 && (s.bucket = e.bucket), e.region !== void 0 && (s.region = e.region), e.web3formsAccessKey !== void 0 && (s.web3formsAccessKey = e.web3formsAccessKey);
+  t.appId = e.appId, t.prefixUrl = e.prefixUrl, t.authPrefixUrl = e.authPrefixUrl, e.oauthCallbackUrl !== void 0 ? t.oauthCallbackUrl = e.oauthCallbackUrl : typeof window < "u" && (t.oauthCallbackUrl = `${window.location.origin}/auth/callback`), e.avatarBucketId !== void 0 && (t.avatarBucketId = e.avatarBucketId), e.feedbackBucketId !== void 0 && (t.feedbackBucketId = e.feedbackBucketId), e.bucket !== void 0 && (t.bucket = e.bucket), e.region !== void 0 && (t.region = e.region), e.web3formsAccessKey !== void 0 && (t.web3formsAccessKey = e.web3formsAccessKey);
 }
 const I = m(!1);
-function P() {
+function w() {
   return {
     show: I
   };
@@ -63,106 +64,106 @@ const n = k.create({
 let f = !1, d = [];
 function h(e, r = null) {
   d.forEach(({
-    resolve: t,
-    reject: o
+    resolve: o,
+    reject: a
   }) => {
-    e ? o(e) : t(r);
+    e ? a(e) : o(r);
   }), d = [];
 }
-async function w() {
+async function P() {
   var r;
-  const e = g();
+  const e = b();
   if (!e)
     throw new Error("No refresh token available");
   try {
-    const t = await j(e), {
-      data: o
-    } = t;
-    if (o.success && ((r = o.data) != null && r.jwtToken))
-      return b(o.data.jwtToken), o.data.refreshToken && localStorage.setItem("refreshToken", o.data.refreshToken), o.data.jwtToken;
-    throw new Error(o.message || "Token refresh failed");
-  } catch (t) {
-    throw console.error("Token refresh failed:", t), p(), t;
+    const o = await U(e), {
+      data: a
+    } = o;
+    if (a.success && ((r = a.data) != null && r.jwtToken))
+      return g(a.data.jwtToken), a.data.refreshToken && localStorage.setItem("refreshToken", a.data.refreshToken), a.data.jwtToken;
+    throw new Error(a.message || "Token refresh failed");
+  } catch (o) {
+    throw console.error("Token refresh failed:", o), p(), o;
   }
 }
 n.interceptors.request.use((e) => {
   console.log(e, "configconfig");
   const r = localStorage.getItem("jwtToken");
-  return r && e.headers && (e.headers.authorization = `Bearer ${r}`), e.headers && !("app-id" in e.headers) && (e.headers["app-id"] = s.appId), e;
+  return r && e.headers && (e.headers.authorization = `Bearer ${r}`), e.headers && !("app-id" in e.headers) && (e.headers["app-id"] = t.appId), e;
 }, (e) => Promise.reject(e));
 n.interceptors.response.use(async (e) => {
   const r = (e == null ? void 0 : e.data) || {}, {
-    message: t,
-    success: o,
-    code: i
+    message: o,
+    success: a,
+    code: u
   } = r;
-  if (console.log(r, "dsdsds"), o)
+  if (console.log(r, "dsdsds"), a)
     return r;
-  if (i === 40101) {
+  if (u === 40101) {
     console.log(e, "response");
     const c = e.config;
     if (f)
-      return new Promise((a, l) => {
+      return new Promise((s, i) => {
         d.push({
-          resolve: a,
-          reject: l
+          resolve: s,
+          reject: i
         });
-      }).then((a) => (c.headers && (c.headers.authorization = `Bearer ${a}`), n(c))).catch((a) => Promise.reject(a));
+      }).then((s) => (c.headers && (c.headers.authorization = `Bearer ${s}`), n(c))).catch((s) => Promise.reject(s));
     c._retry = !0, f = !0;
     try {
-      const a = await w();
-      return h(null, a), c.headers && (c.headers.authorization = `Bearer ${a}`), n(c);
-    } catch (a) {
-      h(a, null), p();
+      const s = await P();
+      return h(null, s), c.headers && (c.headers.authorization = `Bearer ${s}`), n(c);
+    } catch (s) {
+      h(s, null), p();
       const {
-        show: l
-      } = P();
-      return l.value = !0, Promise.reject(a);
+        show: i
+      } = w();
+      return i.value = !0, Promise.reject(s);
     } finally {
       f = !1;
     }
   } else
-    return u.error(t || "请求失败"), Promise.reject(r);
+    return l.error(o || "请求失败"), Promise.reject(r);
 }, (e) => {
   if (e.response) {
     const {
       data: r
     } = e.response, {
-      message: t
+      message: o
     } = r || {};
-    console.log(e.response, "error.response"), console.error("Error Response:", e.response), u.error(t || "服务错误");
-  } else e.request ? (console.error("Error Request:", e.request), u.error("网络错误，请检查网络连接")) : (console.error("Error Message:", e.message), u.error(e.message || "服务错误"));
+    console.log(e.response, "error.response"), console.error("Error Response:", e.response), l.error(o || "服务错误");
+  } else e.request ? (console.error("Error Request:", e.request), l.error("网络错误，请检查网络连接")) : (console.error("Error Message:", e.message), l.error(e.message || "服务错误"));
   return Promise.reject(e);
 });
 function E(e) {
   return n({
-    url: `${s.authPrefixUrl}/restfulApi/auth/signIn`,
+    url: `${t.authPrefixUrl}/restfulApi/auth/signIn`,
     method: "post",
     data: e
   });
 }
-function R(e) {
+function $(e) {
   return n({
-    url: `${s.authPrefixUrl}/restfulApi/auth/resetPassword`,
+    url: `${t.authPrefixUrl}/restfulApi/auth/resetPassword`,
     method: "post",
     data: e
   });
 }
-function $(e) {
+function R(e) {
   return n({
-    url: `${s.authPrefixUrl}/restfulApi/auth/signUp`,
+    url: `${t.authPrefixUrl}/restfulApi/auth/signUp`,
     method: "post",
     data: e
   });
 }
 function q(e) {
   return n({
-    url: `${s.authPrefixUrl}/restfulApi/oauth2/authorize`,
+    url: `${t.authPrefixUrl}/restfulApi/oauth2/authorize`,
     method: "post",
     data: e
   });
 }
-function j(e) {
+function U(e) {
   return n({
     url: "/restfulApi/auth/refresh",
     method: "post",
@@ -173,14 +174,14 @@ function j(e) {
 }
 export {
   T as a,
-  U as b,
+  S as b,
   n as c,
-  R as d,
-  $ as e,
+  $ as d,
+  R as e,
   E as f,
-  s as g,
-  S as h,
+  t as g,
+  A as h,
   q as o,
   B as s,
-  P as u
+  w as u
 };

package/dist/authkit.d.ts

@@ -9,6 +9,7 @@ export { default as AuthkitSignUp } from './components/Authkit/Auth/AuthkitSignU
 export { default as AuthkitAuthorize } from './components/Authkit/Auth/AuthkitAuthorize.vue';
 export { default as AuthkitOAuthItem } from './components/Authkit/Auth/AuthkitOAuthItem.vue';
 export { default as AuthkitOAuthList } from './components/Authkit/Auth/AuthkitOAuthList.vue';
+export { default as AuthkitOAuthCallback } from './components/Authkit/Auth/AuthkitOAuthCallback.vue';
 export { default as AuthkitPasswordUpdateAndVerify } from './components/Authkit/Auth/AuthkitPasswordUpdateAndVerify.vue';
 export { default as AuthkitResetPassword } from './components/Authkit/Auth/AuthkitResetPassword.vue';
 export { default as AuthkitPasswordAuth } from './components/Authkit/Auth/AuthkitPasswordAuth.vue';
@@ -27,5 +28,6 @@ export { useAuthkitAuth } from './composables/Authkit/useAuthkitAuth';
 export { useAuthkitAuthModal } from './composables/Authkit/useAuthkitAuthModal';
 export { useAuthkitUsersProfile } from './composables/Authkit/useAuthkitUsersProfile';
 export { useAuthkitCreateAndUpdate } from './composables/Authkit/useAuthkitCreateAndUpdate';
+export { useAuthkitOAuth } from './composables/Authkit/useAuthkitOAuth';
 export type * from './types/auth';
 export type { AppsData, PublicRoute } from './types/app';

package/dist/authkit.js

@@ -1,37 +1,39 @@
-import { A as a, a as s, c as u, b as A, n as h, E as e, k as r, l as o, _ as k, O as n, f as d, o as p, P as f, j as m, R as P, S, i as g, m as l, d as w, e as U, g as c, h as x } from "./AuthkitAuthModal-BVXtE_sP.js";
-import { A as y, a as E } from "./AuthkitAuthorize-Cu6_4HoY.js";
-import { u as C } from "./useAuthkitAppsAuthPageInfo-h9CL-MmH.js";
-import { u as V, a as b } from "./useAuthkitUsersProfile-B_uMdnat.js";
-import { u as B } from "./auth-CDARHcht.js";
-import { u as j } from "./useAuthkitCreateAndUpdate-Bsl_uyGQ.js";
+import { A as a, a as s, c as u, b as A, n as h, E as e, k, l as r, _ as o, O as n, f as d, o as p, P as f, j as m, R as P, S as l, i as S, m as g, d as w, e as c, g as U, h as x, u as O } from "./AuthkitAuthModal-BSvtvlyj.js";
+import { A as b, a as y, b as C } from "./AuthkitOAuthCallback-DQ1RAKyR.js";
+import { u as R } from "./useAuthkitAppsAuthPageInfo-CzZmhPMm.js";
+import { u as v, a as B } from "./useAuthkitUsersProfile-hZ9L3rYe.js";
+import { u as j } from "./auth-bwwc2iT8.js";
+import { u as G } from "./useAuthkitCreateAndUpdate-Co5wMbv7.js";
 export {
   a as AuthkitAppSetting,
   s as AuthkitAuth,
-  y as AuthkitAuthContainer,
+  b as AuthkitAuthContainer,
   u as AuthkitAuthModal,
   A as AuthkitAuthTitle,
-  E as AuthkitAuthorize,
+  y as AuthkitAuthorize,
   h as AuthkitEmailBinding,
   e as AuthkitEmailUpdate,
-  r as AuthkitEmailVerify,
-  o as AuthkitGithubBinding,
-  k as AuthkitOAuthItem,
+  k as AuthkitEmailVerify,
+  r as AuthkitGithubBinding,
+  C as AuthkitOAuthCallback,
+  o as AuthkitOAuthItem,
   n as AuthkitOAuthList,
   d as AuthkitPasswordAuth,
   p as AuthkitPasswordUpdate,
   f as AuthkitPasswordUpdateAndVerify,
   m as AuthkitPersonalInformation,
   P as AuthkitResetPassword,
-  S as AuthkitSendVerifyCode,
-  g as AuthkitServiceAgreementAndPrivacyProtection,
-  l as AuthkitSetPassword,
+  l as AuthkitSendVerifyCode,
+  S as AuthkitServiceAgreementAndPrivacyProtection,
+  g as AuthkitSetPassword,
   w as AuthkitSignIn,
-  U as AuthkitSignUp,
-  c as AuthkitSwitchSignIn,
+  c as AuthkitSignUp,
+  U as AuthkitSwitchSignIn,
   x as AuthkitSwitchSignUpOrResetPassword,
-  C as useAuthkitAppsAuthPageInfo,
-  V as useAuthkitAuth,
-  B as useAuthkitAuthModal,
-  j as useAuthkitCreateAndUpdate,
-  b as useAuthkitUsersProfile
+  R as useAuthkitAppsAuthPageInfo,
+  v as useAuthkitAuth,
+  j as useAuthkitAuthModal,
+  G as useAuthkitCreateAndUpdate,
+  O as useAuthkitOAuth,
+  B as useAuthkitUsersProfile
 };

package/dist/common/globalConfig.d.ts

@@ -13,6 +13,8 @@ export interface HuyoooUIConfig {
     prefixUrl: string;
     /** 认证 API前缀 */
     authPrefixUrl: string;
+    /** OAuth 回调地址（可选，默认当前域名 + /auth/callback） */
+    oauthCallbackUrl: string;
     avatarBucketId: string;
     feedbackBucketId: string;
     /** 默认存储桶名称 */
@@ -34,6 +36,8 @@ export declare function setGlobalConfig(newConfig: {
     prefixUrl: string;
     /** 认证 API前缀 */
     authPrefixUrl: string;
+    /** OAuth 回调地址（可选，默认当前域名 + /auth/callback） */
+    oauthCallbackUrl?: string;
     avatarBucketId?: string;
     feedbackBucketId?: string;
     /** 默认存储桶名称 */

package/dist/common.js

@@ -1,4 +1,4 @@
-import { A as s, a as o, C as t, D as r, G as p, H as n, b as l, L as u, S as C, W as d } from "./WidthContainer-VdifT6ZJ.js";
+import { A as s, a as o, C as t, D as r, G as p, H as n, b as l, L as u, S as C, W as d } from "./WidthContainer-DiEkVFtH.js";
 import { C as i, a as f } from "./CollapseItem-Cw1vcdLu.js";
 import { C as x, E as H } from "./CustomTable-B8i1SbFB.js";
 import { M, a as g } from "./Menu-BjWB9hre.js";

package/dist/components/Authkit/Auth/AuthkitOAuthCallback.vue.d.ts

@@ -0,0 +1,22 @@
+type __VLS_Props = {
+    /** 登录成功后的默认跳转路径 */
+    defaultRedirect?: string;
+    /** 加载时显示的文本 */
+    loadingText?: string;
+};
+declare const _default: import('vue').DefineComponent<__VLS_Props, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {} & {
+    success: (data: {
+        token: string;
+        userId: string;
+        appId: string;
+    }) => any;
+    error: (message: string) => any;
+}, string, import('vue').PublicProps, Readonly<__VLS_Props> & Readonly<{
+    onSuccess?: ((data: {
+        token: string;
+        userId: string;
+        appId: string;
+    }) => any) | undefined;
+    onError?: ((message: string) => any) | undefined;
+}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, HTMLDivElement>;
+export default _default;

package/dist/components/Authkit/Auth/AuthkitOAuthList.vue.d.ts

@@ -19,7 +19,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         default: () => string;
     };
 }>> & Readonly<{}>, {
-    size: FormSizeType;
     appId: string;
+    size: FormSizeType;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, HTMLDivElement>;
 export default _default;

package/dist/components/InfiniteLoading.vue.d.ts

@@ -54,8 +54,8 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     onInfinite?: ((...args: any[]) => any) | undefined;
 }>, {
     loading: boolean;
-    finished: boolean;
     loadingText: string;
+    finished: boolean;
     finishedText: string;
     showFinishedText: boolean;
     threshold: number;

package/dist/composables/Authkit/useAuthkitAuth.d.ts

@@ -1,3 +1,4 @@
+declare function handleOAuthCallback(): boolean;
 declare function initializeAuth(): boolean;
 declare function getToken(): string | null;
 declare function setToken(token: string): void;
@@ -38,5 +39,6 @@ export declare function useAuthkitAuth(): {
     setToken: typeof setToken;
     initializeAuth: typeof initializeAuth;
     clearAuth: typeof clearAuth;
+    handleOAuthCallback: typeof handleOAuthCallback;
 };
 export {};

package/dist/composables/Authkit/useAuthkitOAuth.d.ts

@@ -1,10 +1,20 @@
-/** GitHub OAuth 登录（多租户支持） */
+/** 获取当前 OAuth 回调地址 */
+declare function getOAuthCallbackUrl(): string;
+/** 发起 OAuth 登录（通用方法） */
+declare function startOAuth(provider: 'github' | 'google' | 'microsoft', options?: {
+    referrerId?: string;
+}): Promise<void>;
+/** GitHub OAuth 登录 */
 declare function githubAuth(referrerId?: string): void;
-declare function googleAuth(): void;
-declare function microsoftAuth(): void;
+/** Google OAuth 登录 */
+declare function googleAuth(referrerId?: string): void;
+/** Microsoft OAuth 登录 */
+declare function microsoftAuth(referrerId?: string): void;
 export declare function useAuthkitOAuth(): {
     githubAuth: typeof githubAuth;
     googleAuth: typeof googleAuth;
     microsoftAuth: typeof microsoftAuth;
+    startOAuth: typeof startOAuth;
+    getOAuthCallbackUrl: typeof getOAuthCallbackUrl;
 };
 export {};

package/dist/composables.js

@@ -1,12 +1,12 @@
-import { u as a, a as o } from "./useAuthkitUsersProfile-B_uMdnat.js";
-import { g as u, a as r, s as i, b as n, u as f } from "./auth-CDARHcht.js";
-import { u as p } from "./useAuthkitAppsAuthPageInfo-h9CL-MmH.js";
-import { u as h } from "./useAuthkitCreateAndUpdate-Bsl_uyGQ.js";
-import { u as d } from "./useMessageNotifications-CAiVf4PX.js";
-import { u as x, a as C } from "./useDownloads-05u8toS3.js";
-import { u as P } from "./useTableHandle-aJOWPWFL.js";
-import { b as k, f as M, g as O, u as w, a as E, c as S, e as U, d as v, w as D } from "./useSEO-D5sci2ek.js";
-import { u as R } from "./useUploadCos-DKh-eczm.js";
+import { u as a, a as o } from "./useAuthkitUsersProfile-hZ9L3rYe.js";
+import { g as u, a as r, s as i, b as n, u as f } from "./auth-bwwc2iT8.js";
+import { u as p } from "./useAuthkitAppsAuthPageInfo-CzZmhPMm.js";
+import { u as h } from "./useAuthkitCreateAndUpdate-Co5wMbv7.js";
+import { u as d } from "./useMessageNotifications-BT84SOgI.js";
+import { u as x, a as C } from "./useDownloads-C0V_Sjr9.js";
+import { u as P } from "./useTableHandle-DaKaAKAH.js";
+import { b as k, f as M, g as O, u as w, a as E, c as S, e as U, d as v, w as D } from "./useSEO-DT8VkGVt.js";
+import { u as R } from "./useUploadCos-_xwV40NS.js";
 export {
   k as findActiveMenuPath,
   M as findMenuPath,

package/dist/feedback.js

@@ -1,6 +1,6 @@
-import { _ as b, a as s, F as d, b as F, c, d as o, R as t } from "./FeedbackModal-CLRw0hmp.js";
-import { C as r } from "./Clipboard-CXQgZeZq.js";
-import { F as m, a as n, c as f, b as i, d as p } from "./FeedbackItem-BZ3zskgs.js";
+import { _ as b, a as s, F as d, b as F, c, d as o, R as t } from "./FeedbackModal-DWJmFtvY.js";
+import { C as r } from "./Clipboard-BAn3vQlX.js";
+import { F as m, a as n, c as f, b as i, d as p } from "./FeedbackItem-B9lo9J0G.js";
 export {
   r as Clipboard,
   b as FeedbackBubbleEnd,