@pubinfo-pr/module-auth 0.203.2 → 0.203.3

package/dist/index.d.ts

@@ -3,20 +3,20 @@ export { LoginWithFourA } from './components/LoginWithFourA';
 export { createAuth } from './core';
 export * from './interface';
 /**
- * @deprecated 认证, 请使用 `AuthClient.authenticate` 方法替代
+ * @deprecated 认证, 请使用 `authClient.authenticate` 方法替代
  */
 export declare const authenticate: (id: import("./interface").ThirdParty) => Promise<any>;
 /**
- * @deprecated 重定向至统一登录页, 请使用 `AuthClient.redirect` 方法替代
+ * @deprecated 重定向至统一登录页, 请使用 `authClient.redirect` 方法替代
  */
 export declare const redirect: () => void;
 /**
- * @deprecated 生成二维码, 请使用 `AuthClient.renderQRCode` 方法替代
+ * @deprecated 生成二维码, 请使用 `authClient.renderQRCode` 方法替代
  */
 export declare const renderQRCode: (id: import("./interface").ThirdParty, options: {
     id: string;
 } & import("./interface").Recordable) => void;
 /**
- * @deprecated 前往登录, 请使用 `AuthClient.signIn` 方法替代
+ * @deprecated 前往登录, 请使用 `authClient.signIn` 方法替代
  */
 export declare const signIn: (id: import("./interface").ThirdParty, options?: import("./interface").Recordable) => Promise<any> | any;

package/dist/index.js

@@ -22,10 +22,13 @@ function createAuth(e) {
 		if (!t) throw Error(`Provider '${e}' is not found.`);
 		return t;
 	}
-	let a = {
+	let a = { data: {} }, o = {
 		async signIn(e, t) {
 			let n = i(e);
-			if (typeof n.signIn == "function") return await n.signIn(t);
+			if (typeof n.signIn == "function") {
+				let e = await n.signIn(t);
+				return a.data = e, e;
+			}
 			if (["oauth", "custom"].includes(n.type)) {
 				let e = createUrlByProvider(n);
 				window.location.replace(e);
@@ -58,8 +61,8 @@ function createAuth(e) {
 		},
 		getProvider: i
 	};
-	for (let e of r) Object.assign(a, e.extend?.({}));
-	return a;
+	for (let e of r) Object.assign(o, e.extend?.(a));
+	return o;
 }
 const PageAuth = defineComponent({
 	props: {

package/dist/interface.d.ts

@@ -25,10 +25,13 @@ export interface CreateAuthModule {
         signIn?: RouteLocationRaw;
     };
 }
+export interface PluginContext {
+    data: Recordable;
+}
 export interface PluginOptions<Extend = any> {
     /** 唯一值 */
     id: string;
-    extend?: (context: any) => Extend;
+    extend?: (context: PluginContext) => Extend;
 }
 /** 第三方类型 */
 export type ThirdParty = string;

package/dist/plugins/two-factor.d.ts

@@ -8,9 +8,19 @@ interface TwoFactorExtend {
         }>;
     };
 }
-export interface TwoFactorOptions {
-    /** 请求实例 */
+interface DefaultOptOptions {
     request: RequestInstance;
+    sendOtp?: TwoFactorExtend['twoFactor']['sendOtp'];
+    verifyOtp?: TwoFactorExtend['twoFactor']['verifyOtp'];
 }
+interface CustomOptOptions {
+    request: never;
+    sendOtp: TwoFactorExtend['twoFactor']['sendOtp'];
+    verifyOtp: TwoFactorExtend['twoFactor']['verifyOtp'];
+}
+export type TwoFactorOptions = DefaultOptOptions | CustomOptOptions;
+/**
+ * `双因子认证插件`
+ */
 export declare function twoFactor(options: TwoFactorOptions): PluginOptions<TwoFactorExtend>;
 export {};

package/dist/plugins.js

@@ -1,23 +1,26 @@
 function twoFactor(e) {
-	let { request: t } = e;
+	let { request: t, sendOtp: n, verifyOtp: r } = e;
 	return {
 		id: "two-factor",
-		extend() {
+		extend(e) {
 			return { twoFactor: {
-				sendOtp(e) {
-					return t.Post("/auth/2fa/prepare", {
+				sendOtp: (r) => {
+					let i = e.data?.data?.login2faCode;
+					return n ? n(r) : t.Post("/auth/2fa/prepare", {
 						fa2Type: "sms",
-						login2faCode: void 0,
-						...e
+						login2faCode: i,
+						...r
 					});
 				},
-				verifyOtp(e) {
-					let { code: n, ...r } = e ?? {};
+				verifyOtp: (n) => {
+					let i = e.data?.data?.login2faCode;
+					if (r) return r(n);
+					let { code: a, ...o } = n ?? {};
 					return t.Post("/auth/2fa/verify", {
 						fa2Type: "sms",
-						login2faCode: void 0,
-						verifyCode: n,
-						...r
+						login2faCode: i,
+						verifyCode: a,
+						...o
 					});
 				}
 			} };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pubinfo-pr/module-auth",
   "type": "module",
-  "version": "0.203.2",
+  "version": "0.203.3",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -31,10 +31,10 @@
     "node": "^20.19.0 || >=22.12.0"
   },
   "peerDependencies": {
-    "pubinfo-pr": "0.203.2"
+    "pubinfo-pr": "0.203.3"
   },
   "devDependencies": {
-    "pubinfo-pr": "0.203.2"
+    "pubinfo-pr": "0.203.3"
   },
   "scripts": {
     "dev": "pubinfo build --watch",

package/src/core.ts

@@ -1,4 +1,4 @@
-import type { PluginOptions, ProviderOptions, Recordable, ThirdParty } from './interface';
+import type { PluginContext, PluginOptions, ProviderOptions, Recordable, ThirdParty } from './interface';
 import { createUrl, createUrlByProvider } from './helper';
 
 export interface CreateAuthOptions<Plugins extends PluginOptions[]> {
@@ -68,6 +68,10 @@ export function createAuth<Plugins extends PluginOptions[]>(options: CreateAuthO
     return provider;
   }
 
+  const context: PluginContext = {
+    data: {},
+  };
+
   const authClient = {
     /**
      * 前往登录
@@ -78,7 +82,9 @@ export function createAuth<Plugins extends PluginOptions[]>(options: CreateAuthO
       const provider = getProvider(id);
 
       if (typeof provider.signIn === 'function') {
-        return await provider.signIn(options);
+        const res = await provider.signIn(options);
+        context.data = res;
+        return res;
       }
 
       if (['oauth', 'custom'].includes(provider.type)) {
@@ -147,7 +153,7 @@ export function createAuth<Plugins extends PluginOptions[]>(options: CreateAuthO
   };
 
   for (const plugin of plugins) {
-    Object.assign(authClient, plugin.extend?.({}));
+    Object.assign(authClient, plugin.extend?.(context));
   }
 
   return authClient as AuthClient & PluginExtend<Plugins>;

package/src/index.ts

@@ -6,21 +6,21 @@ export { createAuth } from './core';
 export * from './interface';
 
 /**
- * @deprecated 认证, 请使用 `AuthClient.authenticate` 方法替代
+ * @deprecated 认证, 请使用 `authClient.authenticate` 方法替代
  */
 export const authenticate = AuthClient.authenticate;
 
 /**
- * @deprecated 重定向至统一登录页, 请使用 `AuthClient.redirect` 方法替代
+ * @deprecated 重定向至统一登录页, 请使用 `authClient.redirect` 方法替代
  */
 export const redirect = AuthClient.redirect;
 
 /**
- * @deprecated 生成二维码, 请使用 `AuthClient.renderQRCode` 方法替代
+ * @deprecated 生成二维码, 请使用 `authClient.renderQRCode` 方法替代
  */
 export const renderQRCode = AuthClient.renderQRCode;
 
 /**
- * @deprecated 前往登录, 请使用 `AuthClient.signIn` 方法替代
+ * @deprecated 前往登录, 请使用 `authClient.signIn` 方法替代
  */
 export const signIn = AuthClient.signIn;

package/src/interface.ts

@@ -33,11 +33,15 @@ export interface CreateAuthModule {
   }
 }
 
+export interface PluginContext {
+  data: Recordable
+}
+
 export interface PluginOptions<Extend = any> {
   /** 唯一值 */
   id: string
 
-  extend?: (context: any) => Extend
+  extend?: (context: PluginContext) => Extend
 }
 
 /** 第三方类型 */

package/src/plugins/two-factor.ts

@@ -8,42 +8,62 @@ interface TwoFactorExtend {
   }
 }
 
-export interface TwoFactorOptions {
-  /** 请求实例 */
+interface DefaultOptOptions {
   request: RequestInstance
+  sendOtp?: TwoFactorExtend['twoFactor']['sendOtp']
+  verifyOtp?: TwoFactorExtend['twoFactor']['verifyOtp']
 }
 
+interface CustomOptOptions {
+  request: never
+  sendOtp: TwoFactorExtend['twoFactor']['sendOtp']
+  verifyOtp: TwoFactorExtend['twoFactor']['verifyOtp']
+}
+
+export type TwoFactorOptions = DefaultOptOptions | CustomOptOptions;
+
+/**
+ * `双因子认证插件`
+ */
 export function twoFactor(options: TwoFactorOptions): PluginOptions<TwoFactorExtend> {
-  const { request } = options;
+  const { request, sendOtp, verifyOtp } = options;
 
   return {
     id: 'two-factor',
-    extend() {
-      // TODO 通过 context 拿到账号密码登录接口返回的值
-      let login2faCode;
+    extend(context) {
+      const twoFactor: TwoFactorExtend['twoFactor'] = {
+        sendOtp: (payload) => {
+          const login2faCode = context.data?.data?.login2faCode;
+          if (sendOtp) {
+            return sendOtp(payload);
+          }
 
-      return {
-        twoFactor: {
-          sendOtp(payload) {
-            return request.Post('/auth/2fa/prepare', {
-              fa2Type: 'sms',
-              login2faCode,
-              ...payload,
-            });
-          },
-
-          verifyOtp(payload) {
-            const { code, ...params } = payload ?? {};
-
-            return request.Post('/auth/2fa/verify', {
-              fa2Type: 'sms',
-              login2faCode,
-              verifyCode: code,
-              ...params,
-            });
-          },
+          return request.Post('/auth/2fa/prepare', {
+            fa2Type: 'sms',
+            login2faCode,
+            ...payload,
+          });
+        },
+
+        verifyOtp: (payload) => {
+          const login2faCode = context.data?.data?.login2faCode;
+          if (verifyOtp) {
+            return verifyOtp(payload);
+          }
+
+          const { code, ...params } = payload ?? {};
+          return request.Post('/auth/2fa/verify', {
+            fa2Type: 'sms',
+            login2faCode,
+            verifyCode: code,
+            ...params,
+          });
         },
       };
+
+      return {
+        twoFactor,
+      };
     },
   };
 }