@choiceform/shared-auth 0.1.14 → 0.1.16

package/dist/hooks/use-auth-init.js

@@ -1,41 +1,69 @@
 import { useEffect } from "react";
+/**
+ * 初始化认证状态（非 hook 版本）
+ * 可在 React Router 的 clientLoader 中调用
+ *
+ * @returns 是否已认证
+ */
+export async function initializeAuth(auth) {
+    const { authActions, tokenStorage, authStore } = auth;
+    // 如果已经初始化，直接返回
+    if (authStore.isLoaded.get()) {
+        return authStore.isAuthenticated.get();
+    }
+    // 检查 URL 中的 token
+    const urlParams = new URLSearchParams(window.location.search);
+    let tokenFromUrl = urlParams.get("token");
+    if (tokenFromUrl) {
+        // URL 中的 token 可能被编码，尝试解码
+        try {
+            tokenFromUrl = decodeURIComponent(tokenFromUrl);
+        }
+        catch {
+            // 解码失败，使用原值
+        }
+        // 立即清理 URL 中的 token 参数（避免暴露）
+        urlParams.delete("token");
+        const newUrl = urlParams.toString()
+            ? `${window.location.pathname}?${urlParams.toString()}`
+            : window.location.pathname;
+        window.history.replaceState({}, "", newUrl);
+        // 使用 token 获取 session
+        try {
+            await authActions.fetchSessionWithToken(tokenFromUrl);
+            return authStore.isAuthenticated.get();
+        }
+        catch {
+            // Token 无效，继续检查 localStorage
+        }
+    }
+    // 检查 localStorage 中是否有存储的 token
+    const storedToken = tokenStorage.get();
+    if (storedToken) {
+        try {
+            await authActions.fetchSessionWithToken(storedToken);
+            return authStore.isAuthenticated.get();
+        }
+        catch {
+            // Token 无效，初始化为未认证状态
+            await authActions.initialize(null, true);
+            return false;
+        }
+    }
+    // 没有 token，标记为已加载
+    await authActions.initialize(null, true);
+    return false;
+}
 /**
  * 认证初始化 hook
  * 在应用启动时检查 URL 中的 token 或 localStorage 中的 token
+ *
+ * 注意：在 React Router Framework 模式下，应使用 initializeAuth 函数
+ * 在 clientLoader 中调用，而不是使用此 hook
  */
 export function useAuthInit(auth) {
     useEffect(() => {
-        async function initializeAuth() {
-            const { authActions, tokenStorage } = auth;
-            // 检查 URL 中的 token
-            const urlParams = new URLSearchParams(window.location.search);
-            let tokenFromUrl = urlParams.get("token");
-            if (tokenFromUrl) {
-                if (decodeURIComponent(tokenFromUrl) === tokenFromUrl) {
-                    tokenFromUrl = encodeURIComponent(tokenFromUrl);
-                }
-                // 立即清理 URL 中的 token 参数（避免暴露）
-                urlParams.delete("token");
-                const newUrl = urlParams.toString()
-                    ? `${window.location.pathname}?${urlParams.toString()}`
-                    : window.location.pathname;
-                window.history.replaceState({}, "", newUrl);
-                // 使用 token 获取 session
-                await authActions.fetchSessionWithToken(tokenFromUrl);
-            }
-            else {
-                // 检查 localStorage 中是否有存储的 token
-                const storedToken = tokenStorage.get();
-                if (storedToken) {
-                    await authActions.fetchSessionWithToken(storedToken);
-                }
-                else {
-                    // 没有 token，标记为已加载
-                    await authActions.initialize(null, true);
-                }
-            }
-        }
-        initializeAuth().catch((error) => {
+        initializeAuth(auth).catch((error) => {
             console.error("Failed to initialize auth:", error);
             // 即使认证初始化失败，也标记为已加载
             auth.authActions.initialize(null, true);

package/dist/index.d.ts

@@ -1,22 +1,19 @@
 /**
  * @choiceform/shared-auth
- * 共享认证包 - 用于 Choiceform 项目的统一认证解决方案
+ * 共享认证包
  */
-export { createAuth } from "./core";
-export type { AuthInstance } from "./core";
+export { createAuth, type AuthInstance } from "./core";
+export { initAuth } from "./init";
 export { defaultAuthConfig } from "./config";
-export type { AuthConfig } from "./config";
-export type { SessionUser, Session, AuthState } from "./types";
-export { createAuthStore } from "./store/state";
-export { createAuthActions } from "./store/actions";
+export type { SessionUser, SessionUserMetadata, Session, AuthState, AuthConfig, BetterAuthPlugin, DefaultAuthConfig, UpdateUserRequest, MagicLinkRequest, SignInWithMagicLink, CompanionTeamOptions, AuthClientMethods, AuthClientSignIn, Organization, FullOrganization, CreateOrganizationRequest, UpdateOrganizationRequest, DeleteOrganizationRequest, SetActiveOrganizationRequest, CheckSlugRequest, MemberRole, Member, MemberUser, MemberWithUser, RemoveMemberRequest, UpdateMemberRoleRequest, InvitationStatus, Invitation, InvitationDetail, InviteMemberRequest, CancelInvitationRequest, AcceptInvitationRequest, RejectInvitationRequest, InvitationResponse, Team, CreateTeamRequest, UpdateTeamRequest, DeleteTeamRequest, SetActiveTeamRequest, TeamMember, AddTeamMemberRequest, RemoveTeamMemberRequest, ListTeamMembersRequest, } from "./types";
+export { createAuthStore, createTokenStorage } from "./store/state";
+export { createAuthActions, type AuthActions } from "./store/actions";
 export { createAuthComputed } from "./store/computed";
-export type { TokenStorage } from "./store/state";
-export type { AuthActions } from "./store/actions";
-export { getCurrentUser, getCurrentUserId, getCurrentUserIdSafe, isAuthenticated, isLoading, isLoaded, waitForAuth, getAuthToken, getAuthHeaders, handle401Response, createApiClient, createUserManager, createBoundAuthUtils, } from "./store/utils";
-export { AuthSync } from "./components/auth-sync";
-export { ProtectedRoute } from "./components/protected-route";
-export { SignInPage } from "./components/sign-in-page";
-export { useAuthInit } from "./hooks/use-auth-init";
+export { createBoundAuthUtils, createUserManager, getAuthHeaders, getAuthHeadersSync, getAuthToken, getAuthTokenSync, getCurrentUser, getCurrentUserId, handle401Response, isAuthenticated, isLoaded, isLoading, waitForAuth, } from "./store/utils";
+export { createApiClient, createAuthApi, createOrganizationApi, createTeamApi, parseErrorResponse, } from "./api";
+export type { ApiClient, ApiClientConfig, ApiResponse, TokenStorage, UnauthorizedHandler, AuthApi, OrganizationApi, TeamApi, } from "./api";
+export { setupCompanionTeam } from "./services";
+export { getEnvVar, getAuthBaseUrl, extractSessionUser } from "./utils";
+export { useAuthInit, initializeAuth } from "./hooks/use-auth-init";
 export { createAuthClientFromConfig } from "./lib/auth-client";
-export { initAuth } from "./init";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,YAAY,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAG1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA;AAC5C,YAAY,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAG1C,YAAY,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAG9D,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AACrD,YAAY,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AACjD,YAAY,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAGlD,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,oBAAoB,EACpB,eAAe,EACf,SAAS,EACT,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,cAAc,EACd,iBAAiB,EACjB,eAAe,EACf,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,eAAe,CAAA;AAGtB,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAGtD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAGnD,OAAO,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAA;AAG9D,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,EAAE,UAAU,EAAE,KAAK,YAAY,EAAE,MAAM,QAAQ,CAAA;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA;AAM5C,YAAY,EACV,WAAW,EACX,mBAAmB,EACnB,OAAO,EACP,SAAS,EACT,UAAU,EACV,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,EAChB,mBAAmB,EACnB,oBAAoB,EACpB,iBAAiB,EACjB,gBAAgB,EAEhB,YAAY,EACZ,gBAAgB,EAChB,yBAAyB,EACzB,yBAAyB,EACzB,yBAAyB,EACzB,4BAA4B,EAC5B,gBAAgB,EAChB,UAAU,EACV,MAAM,EACN,UAAU,EACV,cAAc,EACd,mBAAmB,EACnB,uBAAuB,EACvB,gBAAgB,EAChB,UAAU,EACV,gBAAgB,EAChB,mBAAmB,EACnB,uBAAuB,EACvB,uBAAuB,EACvB,uBAAuB,EACvB,kBAAkB,EAElB,IAAI,EACJ,iBAAiB,EACjB,iBAAiB,EACjB,iBAAiB,EACjB,oBAAoB,EACpB,UAAU,EACV,oBAAoB,EACpB,uBAAuB,EACvB,sBAAsB,GACvB,MAAM,SAAS,CAAA;AAMhB,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AACnE,OAAO,EAAE,iBAAiB,EAAE,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAA;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AACrD,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EACjB,cAAc,EACd,kBAAkB,EAClB,YAAY,EACZ,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,iBAAiB,EACjB,eAAe,EACf,QAAQ,EACR,SAAS,EACT,WAAW,GACZ,MAAM,eAAe,CAAA;AAMtB,OAAO,EACL,eAAe,EACf,aAAa,EACb,qBAAqB,EACrB,aAAa,EACb,kBAAkB,GACnB,MAAM,OAAO,CAAA;AAEd,YAAY,EACV,SAAS,EACT,eAAe,EACf,WAAW,EACX,YAAY,EACZ,mBAAmB,EACnB,OAAO,EACP,eAAe,EACf,OAAO,GACR,MAAM,OAAO,CAAA;AAMd,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAM/C,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAMvE,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAMnE,OAAO,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAA"}

package/dist/index.js

@@ -1,24 +1,37 @@
 /**
  * @choiceform/shared-auth
- * 共享认证包 - 用于 Choiceform 项目的统一认证解决方案
+ * 共享认证包
  */
-// 核心功能
+// ============================================================
+// 核心
+// ============================================================
 export { createAuth } from "./core";
-// 配置
+export { initAuth } from "./init";
 export { defaultAuthConfig } from "./config";
+// ============================================================
 // Store
-export { createAuthStore } from "./store/state";
+// ============================================================
+export { createAuthStore, createTokenStorage } from "./store/state";
 export { createAuthActions } from "./store/actions";
 export { createAuthComputed } from "./store/computed";
-// Utils
-export { getCurrentUser, getCurrentUserId, getCurrentUserIdSafe, isAuthenticated, isLoading, isLoaded, waitForAuth, getAuthToken, getAuthHeaders, handle401Response, createApiClient, createUserManager, createBoundAuthUtils, } from "./store/utils";
-// 组件
-export { AuthSync } from "./components/auth-sync";
-export { ProtectedRoute } from "./components/protected-route";
-export { SignInPage } from "./components/sign-in-page";
+export { createBoundAuthUtils, createUserManager, getAuthHeaders, getAuthHeadersSync, getAuthToken, getAuthTokenSync, getCurrentUser, getCurrentUserId, handle401Response, isAuthenticated, isLoaded, isLoading, waitForAuth, } from "./store/utils";
+// ============================================================
+// API
+// ============================================================
+export { createApiClient, createAuthApi, createOrganizationApi, createTeamApi, parseErrorResponse, } from "./api";
+// ============================================================
+// 服务
+// ============================================================
+export { setupCompanionTeam } from "./services";
+// ============================================================
+// 工具
+// ============================================================
+export { getEnvVar, getAuthBaseUrl, extractSessionUser } from "./utils";
+// ============================================================
 // Hooks
-export { useAuthInit } from "./hooks/use-auth-init";
+// ============================================================
+export { useAuthInit, initializeAuth } from "./hooks/use-auth-init";
+// ============================================================
 // Better Auth Client
+// ============================================================
 export { createAuthClientFromConfig } from "./lib/auth-client";
-// 快速初始化
-export { initAuth } from "./init";