@pubinfo-pr/module-auth 0.203.2 → 0.203.4

package/dist/auth.d.ts

@@ -1,9 +1,4 @@
 import type { ModuleOptions } from 'pubinfo-pr';
 import type { AuthClient as AuthClientInstance } from './core';
-import type { AuthOptions, CreateAuthModule, PluginOptions } from './interface';
-export declare const AuthClient: AuthClientInstance;
-/**
- * @deprecated 请使用 `createAuthModule` 和 `createAuth` 替换
- */
-export declare function auth<Plugins extends PluginOptions[]>(options: AuthOptions<Plugins>): ModuleOptions;
+import type { CreateAuthModule } from './interface';
 export declare function createAuthModule(authClient: AuthClientInstance, options?: CreateAuthModule): ModuleOptions;

package/dist/context.d.ts

@@ -0,0 +1,4 @@
+import type { App } from 'vue';
+import type { AuthClient as AuthClientInstance } from './core';
+export declare function createAuthClientContext(app: App, authClient: AuthClientInstance): void;
+export declare function useAuthClientContext(): AuthClientInstance;

package/dist/deprecated.d.ts

@@ -0,0 +1,8 @@
+import type { ModuleOptions } from 'pubinfo-pr';
+import type { AuthClient as AuthClientInstance } from './core';
+import type { AuthOptions, PluginOptions } from './interface';
+export declare const AuthClient: AuthClientInstance;
+/**
+ * @deprecated 请使用 `createAuthModule` 和 `createAuth` 替换
+ */
+export declare function auth<Plugins extends PluginOptions[]>(options: AuthOptions<Plugins>): ModuleOptions;

package/dist/index.d.ts

@@ -1,22 +1,23 @@
-export * from './auth';
+export { createAuthModule } from './auth';
 export { LoginWithFourA } from './components/LoginWithFourA';
 export { createAuth } from './core';
+export { auth } from './deprecated';
 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

@@ -1,5 +1,5 @@
 import { cleanup, defineIconModule, defineRouteModule, useUserStore } from "pubinfo-pr";
-import { defineComponent, h, onMounted, ref } from "vue";
+import { defineComponent, h, inject, onMounted, ref } from "vue";
 import { useRoute, useRouter } from "vue-router";
 var _virtual_pubinfo_resolver_default = {
 	icons: {},
@@ -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: {
@@ -68,7 +71,7 @@ const PageAuth = defineComponent({
 		authenticate: Function
 	},
 	setup(e) {
-		let t = useUserStore(), n = useRoute(), i = useRouter(), c = ref("授权登录中...");
+		let t = useUserStore(), n = useRoute(), i = useRouter(), o = ref("授权登录中...");
 		return onMounted(async () => {
 			let r = await e.authenticate?.(e.type);
 			if (r?.success) {
@@ -79,14 +82,14 @@ const PageAuth = defineComponent({
 					return;
 				}
 				e?.redirectTo?.();
-			} else c.value = r?.msg ?? r?.message;
+			} else o.value = r?.msg ?? r?.message;
 		}), () => h("div", { style: {
 			display: "flex",
 			justifyContent: "center",
 			alignItems: "center",
 			width: "100vw",
 			height: "100vh"
-		} }, c.value);
+		} }, o.value);
 	}
 });
 var authClient;
@@ -134,13 +137,22 @@ function auth(t) {
 		}
 	};
 }
+var key = Symbol("auth");
+function createAuthClientContext(e, t) {
+	e.provide(key, t);
+}
+function useAuthClientContext() {
+	return inject(key, AuthClient);
+}
 function createAuthModule(t, n = {}) {
 	let { redirectTo: r = "/", pages: i = {} } = n, { signIn: a = "/login" } = i;
 	return {
 		name: "pubinfo-pr:auth",
 		enforce: "pre",
 		setup(n) {
-			let { router: i } = n, o = {
+			let { router: i, app: o } = n;
+			createAuthClientContext(o, t);
+			let s = {
 				path: "/auth/:type",
 				name: "Auth",
 				component: PageAuth,
@@ -161,8 +173,8 @@ function createAuthModule(t, n = {}) {
 				})
 			};
 			i.beforeEach((n) => {
-				if (!i.hasRoute(o.name)) return i.addRoute(o), n.fullPath;
-				n.name === o.name && cleanup(), n.path === a && t.redirect();
+				if (!i.hasRoute(s.name)) return i.addRoute(s), n.fullPath;
+				n.name === s.name && cleanup(), n.path === a && t.redirect();
 			});
 		}
 	};
@@ -176,7 +188,7 @@ const RedirectLogin = defineComponent({
 		color: String
 	},
 	setup(e) {
-		let t = AuthClient.getProvider(e.id);
+		let t = useAuthClientContext(), n = t.getProvider(e.id);
 		return () => h("div", [h("div", { style: { padding: "3rem" } }, h("img", {
 			src: e.src,
 			class: "w-full"
@@ -193,8 +205,8 @@ const RedirectLogin = defineComponent({
 				letterSpacing: "0.1em",
 				backgroundColor: e.color
 			},
-			onClick: () => AuthClient.signIn(t.id)
-		}, `前往${t.name}`)]);
+			onClick: () => t.signIn(n.id)
+		}, `前往${n.name}`)]);
 	}
 }), LoginWithFourA = defineComponent({
 	name: "LoginWithFourA",
@@ -212,4 +224,4 @@ const RedirectLogin = defineComponent({
 });
 defineRouteModule("auth", _virtual_pubinfo_resolver_default.pages), defineIconModule("auth", _virtual_pubinfo_resolver_default.icons);
 const authenticate = AuthClient.authenticate, redirect = AuthClient.redirect, renderQRCode = AuthClient.renderQRCode, signIn = AuthClient.signIn;
-export { AuthClient, LoginWithFourA, auth, authenticate, createAuth, createAuthModule, redirect, renderQRCode, signIn };
+export { LoginWithFourA, auth, authenticate, createAuth, createAuthModule, redirect, renderQRCode, signIn };

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.4",
   "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.4"
   },
   "devDependencies": {
-    "pubinfo-pr": "0.203.2"
+    "pubinfo-pr": "0.203.4"
   },
   "scripts": {
     "dev": "pubinfo build --watch",

package/src/auth.ts

@@ -1,89 +1,11 @@
 import type { ModuleOptions } from 'pubinfo-pr';
 import type { RouteRecordRaw } from 'vue-router';
 import type { AuthClient as AuthClientInstance } from './core';
-import type { AuthOptions, CreateAuthModule, PluginOptions } from './interface';
+import type { CreateAuthModule } from './interface';
 import { cleanup } from 'pubinfo-pr';
-import { createAuth } from './core';
+import { createAuthClientContext } from './context';
 import { PageAuth } from './pages/auth';
 
-let authClient!: AuthClientInstance;
-
-export const AuthClient: AuthClientInstance = {
-  signIn: (...args) => authClient.signIn(...args),
-  authenticate: (...args) => authClient.authenticate(...args),
-  renderQRCode: (...args) => authClient.renderQRCode(...args),
-  redirect: (...args) => authClient.redirect(...args),
-  getProvider: (...args) => authClient.getProvider(...args),
-};
-
-/**
- * @deprecated 请使用 `createAuthModule` 和 `createAuth` 替换
- */
-export function auth<Plugins extends PluginOptions[]>(options: AuthOptions<Plugins>): ModuleOptions {
-  const {
-    redirectTo = '/',
-    pages = {},
-    baseURL,
-    providers,
-    plugins,
-  } = options;
-  const { signIn = '/login' } = pages;
-
-  authClient = createAuth<Plugins>({
-    baseURL,
-    providers,
-    plugins,
-  });
-
-  return {
-    name: 'pubinfo-pr:auth',
-    enforce: 'pre',
-    setup(ctx) {
-      const { router } = ctx;
-
-      const ROUTE_AUTH: RouteRecordRaw = {
-        path: '/auth/:type',
-        name: 'Auth',
-        component: PageAuth,
-        meta: {
-          whiteList: true,
-          title: '授权登录',
-        },
-        props: route => ({
-          type: route.params.type,
-          authenticate: authClient.authenticate,
-          redirectTo() {
-            if (typeof redirectTo === 'function') {
-              redirectTo();
-              return;
-            }
-
-            router.push(redirectTo);
-          },
-        }),
-      };
-
-      router.beforeEach((to) => {
-        // 注册静态页面
-        if (!router.hasRoute(ROUTE_AUTH.name!)) {
-          router.addRoute(ROUTE_AUTH);
-          return to.fullPath;
-        }
-
-        // 前往单点登录前，清空登录状态
-        if (to.name === ROUTE_AUTH.name) {
-          cleanup();
-        }
-
-        // 前往登录前，重定向至统一登录页（若有）
-        if (to.path === signIn) {
-          authClient.redirect();
-        }
-      });
-    },
-  };
-}
-
 export function createAuthModule(authClient: AuthClientInstance, options: CreateAuthModule = {}): ModuleOptions {
   const {
     redirectTo = '/',
@@ -95,7 +17,8 @@ export function createAuthModule(authClient: AuthClientInstance, options: Create
     name: 'pubinfo-pr:auth',
     enforce: 'pre',
     setup(ctx) {
-      const { router } = ctx;
+      const { router, app } = ctx;
+      createAuthClientContext(app, authClient);
 
       const ROUTE_AUTH: RouteRecordRaw = {
         path: '/auth/:type',

package/src/components/RedirectLogin/index.ts

@@ -1,5 +1,5 @@
 import { defineComponent, h } from 'vue';
-import { AuthClient } from '@/auth';
+import { useAuthClientContext } from '@/context';
 
 export const RedirectLogin = defineComponent({
   name: 'RedirectLogin',
@@ -9,7 +9,9 @@ export const RedirectLogin = defineComponent({
     color: String,
   },
   setup(props) {
-    const provider = AuthClient.getProvider(props.id);
+    const authClient = useAuthClientContext();
+    const provider = authClient.getProvider(props.id);
+
     return () => {
       return h('div', [
         h(
@@ -32,7 +34,7 @@ export const RedirectLogin = defineComponent({
               letterSpacing: '0.1em',
               backgroundColor: props.color,
             },
-            onClick: () => AuthClient.signIn(provider.id),
+            onClick: () => authClient.signIn(provider.id),
           },
           `前往${provider.name}`,
         ),

package/src/context.ts

@@ -0,0 +1,14 @@
+import type { App } from 'vue';
+import type { AuthClient as AuthClientInstance } from './core';
+import { inject } from 'vue';
+import { AuthClient } from './deprecated';
+
+const key = Symbol('auth');
+
+export function createAuthClientContext(app: App, authClient: AuthClientInstance) {
+  app.provide(key, authClient);
+}
+
+export function useAuthClientContext() {
+  return inject(key, AuthClient) as AuthClientInstance;
+}

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/deprecated.ts

@@ -0,0 +1,85 @@
+import type { ModuleOptions } from 'pubinfo-pr';
+import type { RouteRecordRaw } from 'vue-router';
+import type { AuthClient as AuthClientInstance } from './core';
+import type { AuthOptions, PluginOptions } from './interface';
+import { cleanup } from 'pubinfo-pr';
+import { createAuth } from './core';
+import { PageAuth } from './pages/auth';
+
+let authClient!: AuthClientInstance;
+
+export const AuthClient: AuthClientInstance = {
+  signIn: (...args) => authClient.signIn(...args),
+  authenticate: (...args) => authClient.authenticate(...args),
+  renderQRCode: (...args) => authClient.renderQRCode(...args),
+  redirect: (...args) => authClient.redirect(...args),
+  getProvider: (...args) => authClient.getProvider(...args),
+};
+
+/**
+ * @deprecated 请使用 `createAuthModule` 和 `createAuth` 替换
+ */
+export function auth<Plugins extends PluginOptions[]>(options: AuthOptions<Plugins>): ModuleOptions {
+  const {
+    redirectTo = '/',
+    pages = {},
+    baseURL,
+    providers,
+    plugins,
+  } = options;
+  const { signIn = '/login' } = pages;
+
+  authClient = createAuth<Plugins>({
+    baseURL,
+    providers,
+    plugins,
+  });
+
+  return {
+    name: 'pubinfo-pr:auth',
+    enforce: 'pre',
+    setup(ctx) {
+      const { router } = ctx;
+
+      const ROUTE_AUTH: RouteRecordRaw = {
+        path: '/auth/:type',
+        name: 'Auth',
+        component: PageAuth,
+        meta: {
+          whiteList: true,
+          title: '授权登录',
+        },
+        props: route => ({
+          type: route.params.type,
+          authenticate: authClient.authenticate,
+          redirectTo() {
+            if (typeof redirectTo === 'function') {
+              redirectTo();
+              return;
+            }
+
+            router.push(redirectTo);
+          },
+        }),
+      };
+
+      router.beforeEach((to) => {
+        // 注册静态页面
+        if (!router.hasRoute(ROUTE_AUTH.name!)) {
+          router.addRoute(ROUTE_AUTH);
+          return to.fullPath;
+        }
+
+        // 前往单点登录前，清空登录状态
+        if (to.name === ROUTE_AUTH.name) {
+          cleanup();
+        }
+
+        // 前往登录前，重定向至统一登录页（若有）
+        if (to.path === signIn) {
+          authClient.redirect();
+        }
+      });
+    },
+  };
+}

package/src/index.ts

@@ -1,26 +1,27 @@
-import { AuthClient } from './auth';
+import { AuthClient } from './deprecated';
 
-export * from './auth';
+export { createAuthModule } from './auth';
 export { LoginWithFourA } from './components/LoginWithFourA';
 export { createAuth } from './core';
+export { auth } from './deprecated';
 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,
+      };
     },
   };
 }