@huyooo/ui 2.2.4 → 3.0.0

package/dist/common/globalConfig.d.ts

@@ -29,6 +29,8 @@ export interface HuyoooUIConfig {
     pricingUrl: string;
     /** 自定义打开价格页逻辑（可选；例如桌面端切换到内置订阅页） */
     openPricing?: () => void;
+    /** 路由无权限时的回退地址（默认 `/`；有定价的产品可自行设为 /Pricing） */
+    accessDeniedUrl: string;
     avatarBucketId: string;
     feedbackBucketId: string;
     /** 默认存储桶名称 */
@@ -70,6 +72,8 @@ export interface CreateHuyoooUIOptions {
     pricingUrl?: string;
     /** 自定义打开价格页逻辑；优先级高于 pricingUrl */
     openPricing?: () => void;
+    /** 路由无权限时的回退地址（可选，默认 `/`） */
+    accessDeniedUrl?: string;
     avatarBucketId?: string;
     feedbackBucketId?: string;
     /** 默认存储桶名称 */
@@ -95,6 +99,7 @@ export declare function createHuyoooRuntimeConfig(options: CreateHuyoooUIOptions
     webhookPrefixUrl: string;
     pricingUrl: string;
     openPricing: (() => void) | undefined;
+    accessDeniedUrl: string;
     avatarBucketId: string;
     feedbackBucketId: string;
     bucket: string;

package/dist/common.js

@@ -1,4 +1,4 @@
-import { A as s, a as o, C as r, D as t, G as p, H as n, b as l, S as m, W as u } from "./WidthContainer-PjmYnZwk.js";
+import { A as s, a as o, C as r, D as t, G as p, H as n, b as l, S as m, W as u } from "./WidthContainer-BEeYYOat.js";
 import { C as d, a as f } from "./CollapseItem-DUzZA6tx.js";
 import { C as x, E as b } from "./CustomTable-B1KjkixL.js";
 import { L } from "./Logo-B9DFBxDU.js";

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

@@ -29,7 +29,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         default: string;
     };
 }>> & Readonly<{}>, {
-    color: string;
     prefix: string;
+    color: string;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, SVGSVGElement>;
 export default _default;

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

@@ -1,5 +1,5 @@
 /** 社交登录 OAuth 回调 URL 上可能出现的 query 参数 */
-export declare const OAUTH_CALLBACK_QUERY_KEYS: readonly ["token", "refreshToken", "userId", "appId", "error", "needBindIdentity", "bindSuccess", "provider", "expiresIn"];
+export declare const OAUTH_CALLBACK_QUERY_KEYS: readonly ["loginCode", "error", "bindSuccess", "provider"];
 export declare function hasOAuthCallbackParams(url: URL): boolean;
 /** 清除 OAuth 回调参数并返回清理后的站内路径 */
 export declare function cleanOAuthCallbackParams(url: URL): string;

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

@@ -1,6 +1,15 @@
+import { PublicRoute } from '../../types/app';
 /** 生成当前路由可匹配的权限 key 候选（含父级） */
 export declare function resolveRoutePermissionCandidates(path: string): string[];
-/** 用户权限是否覆盖该路由（精确或父级） */
+/** 用户权限是否覆盖该路由（精确或父级）——与角色 permissionKey 约定一致 */
 export declare function hasRoutePermission(path: string, permissionKeys: string[]): boolean;
+/** 从 publicRoutes 取出仅精确匹配的公开 key（由服务端 publicMatch 声明） */
+export declare function resolvePublicExactMatchKeys(publicRoutes: PublicRoute[]): string[];
+/**
+ * 是否可按公开权限访问。
+ * - prefix（默认）：公开 key 可覆盖子路径（如 /Blog → /Blog/xxx）
+ * - exact：仅精确匹配（由 authPageInfo.publicRoutes[].publicMatch 声明）
+ */
+export declare function isPublicRouteAccess(path: string, publicRoutes: PublicRoute[]): boolean;
 /** 菜单权限：路由本身或其任一子路由权限均可展示 */
 export declare function hasMenuPermission(menuPath: string, permissionKeys: string[]): boolean;

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

@@ -12,6 +12,7 @@ export declare function useAuthkitAppsAuthPageInfo(): {
             name: string;
             permissionKey: string;
             description: string;
+            publicMatch?: import('../../types/app').PublicRouteMatch | undefined;
         }[];
         oauth: {
             google: {
@@ -99,6 +100,7 @@ export declare function useAuthkitAppsAuthPageInfo(): {
             name: string;
             permissionKey: string;
             description: string;
+            publicMatch?: import('../../types/app').PublicRouteMatch | undefined;
         }[];
         oauth: {
             google: {

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

@@ -1,24 +1,33 @@
 /**
  * 登录成功后触发的数据负载
  * - signIn 成功：来自接口返回的 data
- * - OAuth 回调成功：来自 URL 参数 + token
+ * - OAuth 回调成功：来自 loginCode 兑换结果
  */
 export interface SignInResult {
     jwtToken: string;
     refreshToken?: string | null;
     userId?: string | null;
     appId?: string | null;
+    needBindIdentity?: boolean;
     /** 接口返回的其他字段透传 */
     [key: string]: unknown;
 }
 type SignInListener = (data: SignInResult) => void | Promise<void>;
 type VoidListener = () => void | Promise<void>;
 type Cleanup = () => void;
+/** 是否已开始消费 OAuth 登录回调（用于 URL 被提前清理后仍能完成跳转） */
+declare function hasOAuthLoginConsumeStarted(): boolean;
 /**
- * 恢复一次会话：先尝试 OAuth 回调（一次性），再尝试 localStorage token。
+ * 消费 OAuth 登录回调（loginCode → POST exchange）。
+ * 成功返回 SignInResult；无 loginCode / 失败返回 null。
+ * error、bindSuccess 等非登录态参数不在此处理。
+ */
+declare function consumeOAuthLoginCallback(): Promise<SignInResult | null>;
+/**
+ * 恢复一次会话：先尝试 OAuth 回调（一次性），再尝试本地 token。
  * 任一路径成功返回 true，宿主据此判断是否需要拉取 userProfile。
  */
-declare function restoreSession(): boolean;
+declare function restoreSession(): Promise<boolean>;
 declare function getToken(): string | null;
 declare function setToken(token: string): void;
 declare function completeSignIn(data: SignInResult): void;
@@ -79,6 +88,8 @@ export declare function useAuthkitAuth(): {
     setToken: typeof setToken;
     completeSignIn: typeof completeSignIn;
     restoreSession: typeof restoreSession;
+    consumeOAuthLoginCallback: typeof consumeOAuthLoginCallback;
+    hasOAuthLoginConsumeStarted: typeof hasOAuthLoginConsumeStarted;
     clearAuth: typeof clearAuth;
     signOut: typeof signOut;
 };

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

@@ -1,5 +1,16 @@
+/**
+ * 路由访问控制（对齐 auth-server，不阻塞渲染）：
+ *
+ * 真相源：
+ * - authPageInfo.publicRoutes ← permissions(isPublic=true)，含 publicMatch
+ * - profile.permissions ← 用户角色绑定的 permissionKey（≈ 路由 path）
+ *
+ * 规则：
+ * 1. 命中公开路由 → 放行（publicMatch=exact 不级联子路径）
+ * 2. 应用配置或会话未就绪 → 先渲染，就绪后再判
+ * 3. 否则需登录且 hasRoutePermission；不满足 → accessDeniedUrl（默认 `/`）
+ */
 export declare function useRoutePermission(): {
-    isChecking: import('vue').Ref<boolean, boolean>;
     isRoutePublic: (path: string) => boolean;
     hasPermission: (path: string) => boolean;
 };

package/dist/composables.d.ts

@@ -17,6 +17,7 @@ export { withViewTransition } from './composables/viewTransitions';
 export { useDownloads } from './composables/useDownloads';
 export { useAuthMenu, findMenuPath, findActiveMenuPath, getPathOnly } from './composables/Authkit/useAuthMenu';
 export { useRoutePermission } from './composables/Authkit/useRoutePermission';
+export { isPublicRouteAccess, hasRoutePermission, hasMenuPermission, resolveRoutePermissionCandidates, resolvePublicExactMatchKeys, } from './composables/Authkit/resolveRoutePermission';
 export { useAppSEO } from './composables/SEO/useAppSEO';
 export { usePageSEO } from './composables/SEO/usePageSEO';
 export type { AppSEOConfig, PageSEOConfig } from './types/seo';

package/dist/composables.js

@@ -1,56 +1,61 @@
-import { u as a } from "./useAuthkitAuth-C0fVP17l.js";
+import { u as a } from "./useAuthkitAuth-CO61XogP.js";
 import { u as t } from "./apiClients-8_c5cDW5.js";
-import { L as r, a as i, b as n, i as p, o as f, r as l, c as m, u as c } from "./useLegalDocs-BCWvu1ft.js";
-import { f as A } from "./fetchAuthPageAboutUs-D5w21LkF.js";
-import { u as d } from "./useAuthkitUsersProfile-BvldvaRx.js";
-import { u as L } from "./useAuthkitAppsAuthPageInfo-KHO1mJvF.js";
-import { f as P, a as b, g as O, u as S, b as C, c as U, d as k, w as M } from "./useRoutePermission-BuKMkOTK.js";
-import { u as T } from "./useAuthkitCreateAndUpdate-CYIcEuub.js";
-import { u as E } from "./useMessageNotifications-BXimltcx.js";
-import { c as y, g as B, a as H, s as I, u as _ } from "./runtime-B_xhJ3i8.js";
-import { u as F, a as K, b as N, c as V, d as Y } from "./usePageSEO-D7eyLr8d.js";
-import { u as q } from "./useUserMenu-ClPBlvaM.js";
-import { u as J, a as Q } from "./useSubscriptionCheckout-BHI3y7Cx.js";
-import { c as X, u as Z, a as $, b as ee } from "./useBillingStatusOptions-C8fwW-AI.js";
+import { L as r, a as i, b as n, i as p, o as l, r as c, c as f, u as m } from "./useLegalDocs-DUbab5R9.js";
+import { f as A } from "./fetchAuthPageAboutUs--dArFYk6.js";
+import { u as d } from "./useAuthkitUsersProfile-CF7t2Y7T.js";
+import { u as P } from "./useAuthkitAppsAuthPageInfo-mv7hOnhi.js";
+import { f as L, a as D, g as O, h as R, b as S, i as C, r as M, c as v, u as U, d as k, e as E, j as T, w as y } from "./useRoutePermission-Bvn-J8bp.js";
+import { u as B } from "./useAuthkitCreateAndUpdate-CYIcEuub.js";
+import { u as I } from "./useMessageNotifications-BXimltcx.js";
+import { c as G, g as K, a as j, s as F, u as N } from "./runtime-CDEl4QQl.js";
+import { u as Y, a as q, b as z, c as J, d as Q } from "./usePageSEO-D8CocvOJ.js";
+import { u as X } from "./useUserMenu-ClPBlvaM.js";
+import { u as $, a as ss } from "./useSubscriptionCheckout-Bic8vKgm.js";
+import { c as as, u as os, a as ts, b as us } from "./useBillingStatusOptions-C8fwW-AI.js";
 export {
   r as LEGAL_DOCS,
   i as LEGAL_DOC_KEYS,
   n as buildBuiltinLegalDocUrl,
-  X as createBillingStatusOptions,
-  y as createHuyoooUI,
+  as as createBillingStatusOptions,
+  G as createHuyoooUI,
   A as fetchAuthPageAboutUs,
-  P as findActiveMenuPath,
-  b as findMenuPath,
-  B as getHuyoooRuntime,
+  L as findActiveMenuPath,
+  D as findMenuPath,
+  K as getHuyoooRuntime,
   O as getPathOnly,
-  H as globalThemeRef,
+  j as globalThemeRef,
+  R as hasMenuPermission,
+  S as hasRoutePermission,
   p as isLegalDocConfigured,
-  f as openLegalDocTarget,
-  l as resolveLegalAppId,
-  m as resolveLegalDocTargetFromData,
-  I as setTheme,
-  S as useActiveDoc,
-  C as useAppBrand,
-  F as useAppSEO,
-  U as useAuthMenu,
-  L as useAuthkitAppsAuthPageInfo,
+  C as isPublicRouteAccess,
+  l as openLegalDocTarget,
+  c as resolveLegalAppId,
+  f as resolveLegalDocTargetFromData,
+  M as resolvePublicExactMatchKeys,
+  v as resolveRoutePermissionCandidates,
+  F as setTheme,
+  U as useActiveDoc,
+  k as useAppBrand,
+  Y as useAppSEO,
+  E as useAuthMenu,
+  P as useAuthkitAppsAuthPageInfo,
   a as useAuthkitAuth,
   t as useAuthkitAuthModal,
-  T as useAuthkitCreateAndUpdate,
+  B as useAuthkitCreateAndUpdate,
   d as useAuthkitUsersProfile,
-  J as useBillingPlans,
-  K as useCommonCreateAndUpdate,
-  N as useDownloads,
-  _ as useHuyoooRuntime,
-  Z as useInvoiceStatusOptions,
-  c as useLegalDocs,
-  E as useMessageNotifications,
-  V as usePageSEO,
-  $ as usePointsRechargeStatusOptions,
-  ee as useRefundStatusOptions,
-  k as useRoutePermission,
-  Q as useSubscriptionCheckout,
-  Y as useTableHandle,
-  q as useUserMenu,
-  M as withViewTransition
+  $ as useBillingPlans,
+  q as useCommonCreateAndUpdate,
+  z as useDownloads,
+  N as useHuyoooRuntime,
+  os as useInvoiceStatusOptions,
+  m as useLegalDocs,
+  I as useMessageNotifications,
+  J as usePageSEO,
+  ts as usePointsRechargeStatusOptions,
+  us as useRefundStatusOptions,
+  T as useRoutePermission,
+  ss as useSubscriptionCheckout,
+  Q as useTableHandle,
+  X as useUserMenu,
+  y as withViewTransition
 };

package/dist/feedback.js

@@ -1,4 +1,4 @@
-import { B as b, a as s, F as d, b as F, _ as o, c, R as t, V as r } from "./FeedbackModal.vue_vue_type_script_setup_true_lang-C7vaGD4R.js";
+import { B as b, a as s, F as d, b as F, _ as o, c, R as t, V as r } from "./FeedbackModal.vue_vue_type_script_setup_true_lang-BXqxUXuu.js";
 import { C as i } from "./index-D9YtlhTa.js";
 import { F as m, a as f, b as n, c as p } from "./FeedbackItem-BP-SiJ2u.js";
 export {

package/dist/{fetchAuthPageAboutUs-D5w21LkF.js → fetchAuthPageAboutUs--dArFYk6.js}

@@ -1,5 +1,5 @@
-import { n as i } from "./useAuthkitAppsAuthPageInfo-KHO1mJvF.js";
-import { g as a } from "./runtime-B_xhJ3i8.js";
+import { n as i } from "./useAuthkitAppsAuthPageInfo-mv7hOnhi.js";
+import { g as a } from "./runtime-CDEl4QQl.js";
 async function p(o) {
   if (!o)
     return null;