@choiceform/shared-auth 0.1.17 → 0.1.18

package/dist/types/user.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../src/types/user.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,kBAAkB;AAClB,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,aAAa;AACb,MAAM,WAAW,WAAW;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,MAAM,CAAA;IACb,aAAa,EAAE,OAAO,CAAA;IACtB,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,oBAAoB;IACpB,sBAAsB,CAAC,EAAE,MAAM,CAAA;IAC/B,oBAAoB;IACpB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,mBAAmB,CAAA;IAC9B,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,0BAA0B;AAC1B,MAAM,WAAW,OAAO;IACtB,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,EAAE,EAAE,MAAM,CAAA;IACV,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,WAAW,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,MAAM,CAAA;CACf"}
+{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../src/types/user.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,kBAAkB;AAClB,MAAM,WAAW,mBAAmB;IAClC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;IACtB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAED,aAAa;AACb,MAAM,WAAW,WAAW;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,MAAM,CAAA;IACb,aAAa,EAAE,OAAO,CAAA;IACtB,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,gCAAgC;IAChC,sBAAsB,CAAC,EAAE,MAAM,CAAA;IAC/B,gCAAgC;IAChC,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,kCAAkC;IAClC,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,EAAE,mBAAmB,CAAA;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,0BAA0B;AAC1B,MAAM,WAAW,OAAO;IACtB,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,EAAE,EAAE,MAAM,CAAA;IACV,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,WAAW,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,MAAM,CAAA;CACf"}

package/dist/utils/auth-utils.d.ts

@@ -0,0 +1,60 @@
+/**
+ * 认证工具函数
+ */
+/**
+ * 验证邮箱格式
+ *
+ * @param email - 要验证的邮箱
+ * @returns 如果是有效的邮箱格式返回 true，否则返回 false
+ */
+export declare function isValidEmail(email: string): boolean;
+/**
+ * Better Auth 已知错误代码
+ */
+export declare const AUTH_ERROR_CODES: readonly ["PASSWORD_TOO_SHORT", "PASSWORD_TOO_LONG", "INVALID_EMAIL_OR_PASSWORD", "INVALID_EMAIL", "INVALID_PASSWORD", "USER_NOT_FOUND", "USER_ALREADY_EXISTS", "EMAIL_NOT_VERIFIED", "TOO_MANY_REQUESTS", "INVALID_TOKEN", "SESSION_EXPIRED", "UNAUTHORIZED", "FORBIDDEN", "METADATA_IS_REQUIRED"];
+export type AuthErrorCode = (typeof AUTH_ERROR_CODES)[number];
+/**
+ * 解析的认证错误结构
+ */
+export interface ParsedAuthError {
+    /** 错误代码（如果有） */
+    code: AuthErrorCode | null;
+    /** 是否是已知的错误代码 */
+    isKnownError: boolean;
+    /** 原始错误消息 */
+    message: string;
+}
+/**
+ * 解析 Better Auth 错误
+ *
+ * 支持的格式：
+ * - JSON: {"code":"PASSWORD_TOO_SHORT","message":"..."}
+ * - 纯文本错误消息
+ *
+ * 注意：此函数只解析错误，不翻译。翻译由项目自行处理。
+ *
+ * @param error - 错误字符串
+ * @returns 解析后的错误结构
+ */
+export declare function parseAuthError(error: string | null): ParsedAuthError;
+/**
+ * 检查错误是否是 token 过期
+ */
+export declare function isTokenExpiredError(error: string | ParsedAuthError | null): boolean;
+/**
+ * 从用户名生成邮箱本地部分（注册时如果没有提供 name，使用 email 前缀）
+ */
+export declare function getNameFromEmail(email: string): string;
+/**
+ * 构建带参数的 URL
+ */
+export declare function buildAuthUrl(basePath: string, params: Record<string, string | undefined | null>): string;
+/**
+ * 构建相对路径带参数
+ */
+export declare function buildAuthPath(path: string, params: Record<string, string | undefined | null>): string;
+/**
+ * 清除 URL 中的认证相关参数
+ */
+export declare function clearAuthParams(): void;
+//# sourceMappingURL=auth-utils.d.ts.map

package/dist/utils/auth-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"auth-utils.d.ts","sourceRoot":"","sources":["../../src/utils/auth-utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAGnD;AAED;;GAEG;AACH,eAAO,MAAM,gBAAgB,qSAenB,CAAA;AAEV,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAA;AAE7D;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,gBAAgB;IAChB,IAAI,EAAE,aAAa,GAAG,IAAI,CAAA;IAC1B,iBAAiB;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,aAAa;IACb,OAAO,EAAE,MAAM,CAAA;CAChB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,eAAe,CAsCpE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,GAAG,OAAO,CAcnF;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC,GAChD,MAAM,CAUR;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC,GAChD,MAAM,CAWR;AAED;;GAEG;AACH,wBAAgB,eAAe,IAAI,IAAI,CAiBtC"}

package/dist/utils/auth-utils.js

@@ -0,0 +1,146 @@
+/**
+ * 认证工具函数
+ */
+/**
+ * 验证邮箱格式
+ *
+ * @param email - 要验证的邮箱
+ * @returns 如果是有效的邮箱格式返回 true，否则返回 false
+ */
+export function isValidEmail(email) {
+    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+    return emailRegex.test(email);
+}
+/**
+ * Better Auth 已知错误代码
+ */
+export const AUTH_ERROR_CODES = [
+    "PASSWORD_TOO_SHORT",
+    "PASSWORD_TOO_LONG",
+    "INVALID_EMAIL_OR_PASSWORD",
+    "INVALID_EMAIL",
+    "INVALID_PASSWORD",
+    "USER_NOT_FOUND",
+    "USER_ALREADY_EXISTS",
+    "EMAIL_NOT_VERIFIED",
+    "TOO_MANY_REQUESTS",
+    "INVALID_TOKEN",
+    "SESSION_EXPIRED",
+    "UNAUTHORIZED",
+    "FORBIDDEN",
+    "METADATA_IS_REQUIRED",
+];
+/**
+ * 解析 Better Auth 错误
+ *
+ * 支持的格式：
+ * - JSON: {"code":"PASSWORD_TOO_SHORT","message":"..."}
+ * - 纯文本错误消息
+ *
+ * 注意：此函数只解析错误，不翻译。翻译由项目自行处理。
+ *
+ * @param error - 错误字符串
+ * @returns 解析后的错误结构
+ */
+export function parseAuthError(error) {
+    if (!error) {
+        return { code: null, message: "", isKnownError: false };
+    }
+    // 尝试解析 JSON 格式的错误
+    try {
+        const parsed = JSON.parse(error);
+        if (parsed.code && typeof parsed.code === "string") {
+            const code = parsed.code;
+            const isKnown = AUTH_ERROR_CODES.includes(code);
+            return {
+                code: isKnown ? code : null,
+                message: parsed.message || error,
+                isKnownError: isKnown,
+            };
+        }
+    }
+    catch {
+        // 不是 JSON 格式
+    }
+    // 检查错误消息是否包含已知的错误代码
+    for (const code of AUTH_ERROR_CODES) {
+        if (error.includes(code)) {
+            return {
+                code,
+                message: error,
+                isKnownError: true,
+            };
+        }
+    }
+    // 返回原始错误消息
+    return {
+        code: null,
+        message: error,
+        isKnownError: false,
+    };
+}
+/**
+ * 检查错误是否是 token 过期
+ */
+export function isTokenExpiredError(error) {
+    if (!error)
+        return false;
+    const parsed = typeof error === "string" ? parseAuthError(error) : error;
+    if (parsed.code === "INVALID_TOKEN" || parsed.code === "SESSION_EXPIRED") {
+        return true;
+    }
+    if (parsed.message.includes("expired")) {
+        return true;
+    }
+    return false;
+}
+/**
+ * 从用户名生成邮箱本地部分（注册时如果没有提供 name，使用 email 前缀）
+ */
+export function getNameFromEmail(email) {
+    return email.split("@")[0] || "";
+}
+/**
+ * 构建带参数的 URL
+ */
+export function buildAuthUrl(basePath, params) {
+    const url = new URL(basePath, window.location.origin);
+    for (const [key, value] of Object.entries(params)) {
+        if (value !== undefined && value !== null) {
+            url.searchParams.set(key, value);
+        }
+    }
+    return url.toString();
+}
+/**
+ * 构建相对路径带参数
+ */
+export function buildAuthPath(path, params) {
+    const searchParams = new URLSearchParams();
+    for (const [key, value] of Object.entries(params)) {
+        if (value !== undefined && value !== null) {
+            searchParams.set(key, value);
+        }
+    }
+    const queryString = searchParams.toString();
+    return queryString ? `${path}?${queryString}` : path;
+}
+/**
+ * 清除 URL 中的认证相关参数
+ */
+export function clearAuthParams() {
+    if (typeof window === "undefined")
+        return;
+    const url = new URL(window.location.href);
+    const paramsToRemove = ["token", "isNew", "type", "error"];
+    let hasChanges = false;
+    for (const param of paramsToRemove) {
+        if (url.searchParams.has(param)) {
+            url.searchParams.delete(param);
+            hasChanges = true;
+        }
+    }
+    if (hasChanges) {
+        window.history.replaceState({}, "", url.pathname + url.search);
+    }
+}

package/dist/utils/index.d.ts

@@ -4,4 +4,5 @@
 export { toISOString } from "./date";
 export { isDev, getEnvVar, getAuthBaseUrl } from "./env";
 export { extractSessionUser } from "./user-mapper";
+export { isValidEmail, parseAuthError, isTokenExpiredError, getNameFromEmail, buildAuthUrl, buildAuthPath, clearAuthParams, AUTH_ERROR_CODES, type AuthErrorCode, type ParsedAuthError, } from "./auth-utils";
 //# sourceMappingURL=index.d.ts.map

package/dist/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AACpC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AACpC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAClD,OAAO,EACL,YAAY,EACZ,cAAc,EACd,mBAAmB,EACnB,gBAAgB,EAChB,YAAY,EACZ,aAAa,EACb,eAAe,EACf,gBAAgB,EAChB,KAAK,aAAa,EAClB,KAAK,eAAe,GACrB,MAAM,cAAc,CAAA"}

package/dist/utils/index.js

@@ -4,3 +4,4 @@
 export { toISOString } from "./date";
 export { isDev, getEnvVar, getAuthBaseUrl } from "./env";
 export { extractSessionUser } from "./user-mapper";
+export { isValidEmail, parseAuthError, isTokenExpiredError, getNameFromEmail, buildAuthUrl, buildAuthPath, clearAuthParams, AUTH_ERROR_CODES, } from "./auth-utils";

package/dist/utils/user-mapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user-mapper.d.ts","sourceRoot":"","sources":["../../src/utils/user-mapper.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAuB,MAAM,UAAU,CAAA;AAEhE;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,OAAO,GAAG,WAAW,GAAG,IAAI,CAyC5E"}
+{"version":3,"file":"user-mapper.d.ts","sourceRoot":"","sources":["../../src/utils/user-mapper.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAuB,MAAM,UAAU,CAAA;AAEhE;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,OAAO,GAAG,WAAW,GAAG,IAAI,CA0C5E"}

package/dist/utils/user-mapper.js

@@ -47,7 +47,8 @@ export function extractSessionUser(responseData) {
         inherentOrganizationId: user.inherentOrganizationId,
         inherentTeamId: user.inherentTeamId,
         lastLoginAt: session?.createdAt ? String(session.createdAt) : undefined,
-        metadata: user.metadata,
+        lastLoginMethod: user.lastLoginMethod,
+        metadata: user.metadata ?? {},
         name: user.name ?? "",
         role: user.role,
         updatedAt: String(user.updatedAt ?? ""),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@choiceform/shared-auth",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "description": "Shared authentication package for Choiceform projects",
   "type": "module",
   "main": "./dist/index.js",
@@ -20,6 +20,8 @@
     "build": "tsc",
     "dev": "tsc --watch",
     "clean": "rimraf dist",
+    "test": "vitest run",
+    "test:watch": "vitest",
     "prepublishOnly": "pnpm run build"
   },
   "repository": {
@@ -51,9 +53,15 @@
     "react-dom": ">=18.0.0"
   },
   "devDependencies": {
+    "@legendapp/state": "v3.0.0-beta.26",
+    "@testing-library/react": "^16.3.0",
     "@types/react": "18.2.71",
     "@types/react-dom": "18.2.22",
+    "happy-dom": "^18.0.1",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
+    "rimraf": "^6.0.1",
     "typescript": "^5.5.3",
-    "rimraf": "^6.0.1"
+    "vitest": "^3.2.4"
   }
 }