@pubinfo/module-auth 2.0.0-beta.15 → 2.0.0-beta.17

package/dist/index.d.ts

@@ -1,33 +1,38 @@
-import { A as AuthOptions, T as ThirdParty, R as Recordable } from './interface-C_qnbvmk.js';
-export { b as AuthConfig, d as Authorization, F as Fn, a as FnApi, c as ProviderConfig, P as ProviderUserConfig } from './interface-C_qnbvmk.js';
 import { ModuleOptions } from 'pubinfo';
+import { A as AuthConfig, T as ThirdParty, R as Recordable, a as AuthOptions } from './interface-BStwVrS7.js';
+export { d as Authorization, F as Fn, b as FnApi, c as ProviderConfig, P as ProviderUserConfig } from './interface-BStwVrS7.js';
 import 'vue-router';
 
-declare function createAuth(options?: AuthOptions): {
+/**
+ * 初始化
+ */
+declare function createAuth(config?: AuthConfig): {
     /**
      * 前往登录
      * @param id 唯一值
      * @param options 登录时需要传递的参数
      */
-    signIn: (id: ThirdParty, options?: Recordable) => Promise<any>;
+    signIn(id: ThirdParty, options?: Recordable): Promise<any>;
     /**
      * 生成二维码
      * @param id 第三方的唯一值
      * @param options 生成二维码需要传递的参数
      * @param options.id `getElementById`中指定的`id`
      */
-    renderQRCode: (id: ThirdParty, options: {
+    renderQRCode(id: ThirdParty, options: {
         id: string;
-    } & Recordable) => void;
+    } & Recordable): void;
     /**
      * 认证
      * @param id 第三方的唯一值
      */
-    authentication: (id: ThirdParty) => Promise<any>;
+    authentication(id: ThirdParty): Promise<any>;
     /**
-     * 模块配置
+     * 重定向至统一登录页
      */
-    auth: () => ModuleOptions;
+    redirect(): void;
 };
 
-export { AuthOptions, Recordable, ThirdParty, createAuth };
+declare function withModule(auth: ReturnType<typeof createAuth>, options?: AuthOptions): ModuleOptions;
+
+export { AuthConfig, AuthOptions, Recordable, ThirdParty, createAuth, withModule };

package/dist/index.js

@@ -1,6 +1,45 @@
 // src/index.ts
 import { cleanup } from "pubinfo";
 
+// src/pages/auth.ts
+import { useUserStore } from "pubinfo";
+import { defineComponent, h, onMounted, ref } from "vue";
+var PageAuth = defineComponent({
+  props: {
+    type: String,
+    redirectTo: Function,
+    authentication: Function
+  },
+  setup(props) {
+    const userStore = useUserStore();
+    const message = ref("\u6388\u6743\u767B\u5F55\u4E2D...");
+    onMounted(async () => {
+      const res = await props.authentication?.(props.type);
+      if (res?.success) {
+        userStore.setToken(res?.data?.accessToken, res?.data?.refreshToken);
+        props?.redirectTo?.();
+      } else {
+        message.value = res?.msg ?? res?.message;
+      }
+    });
+    return () => {
+      return h(
+        "div",
+        {
+          style: {
+            display: "flex",
+            justifyContent: "center",
+            alignItems: "center",
+            width: "100vw",
+            height: "100vh"
+          }
+        },
+        message.value
+      );
+    };
+  }
+});
+
 // src/core.ts
 function createAuth(config = {}) {
   const {
@@ -85,112 +124,47 @@ function createUrl(provider) {
   return `${url.toString()}?${params.toString()}`;
 }
 
-// src/pages/auth.ts
-import { useUserStore } from "pubinfo";
-import { defineComponent, h, onMounted, ref } from "vue";
-var Auth = defineComponent({
-  props: {
-    type: String,
-    redirectTo: Function,
-    authentication: Function
-  },
-  setup(props) {
-    const userStore = useUserStore();
-    const message = ref("\u6388\u6743\u767B\u5F55\u4E2D...");
-    onMounted(async () => {
-      const res = await props.authentication?.(props.type);
-      if (res?.success) {
-        userStore.setToken(res?.data?.accessToken, res?.data?.refreshToken);
-        props?.redirectTo?.();
-      } else {
-        message.value = res?.msg ?? res?.message;
-      }
-    });
-    return () => {
-      return h(
-        "div",
-        {
-          style: {
-            display: "flex",
-            justifyContent: "center",
-            alignItems: "center",
-            width: "100vw",
-            height: "100vh"
-          }
-        },
-        message.value
-      );
-    };
-  }
-});
-
 // src/index.ts
-function createAuth2(options = {}) {
+function withModule(auth, options = {}) {
+  const { authentication, redirect } = auth;
   const { redirectTo } = options;
-  const { signIn, renderQRCode, authentication, redirect } = createAuth(options);
-  function auth() {
-    return {
-      name: "pubinfo:auth",
-      enforce: "pre",
-      setup(ctx) {
-        const { router } = ctx;
-        const ROUTE_AUTH = {
-          path: "/auth/:type",
-          name: "Auth",
-          component: Auth,
-          meta: {
-            whiteList: true,
-            title: "\u6388\u6743\u767B\u5F55"
-          },
-          props: (route) => ({
-            type: route.params.type,
-            redirectTo() {
-              router.push(redirectTo ?? "/");
-            },
-            authentication
-          })
-        };
-        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.name === "Login") {
-            redirect();
-          }
-        });
-      }
-    };
-  }
-  ;
   return {
-    /**
-     * 前往登录
-     * @param id 唯一值
-     * @param options 登录时需要传递的参数
-     */
-    signIn,
-    /**
-     * 生成二维码
-     * @param id 第三方的唯一值
-     * @param options 生成二维码需要传递的参数
-     * @param options.id `getElementById`中指定的`id`
-     */
-    renderQRCode,
-    /**
-     * 认证
-     * @param id 第三方的唯一值
-     */
-    authentication,
-    /**
-     * 模块配置
-     */
-    auth
+    name: "pubinfo:auth",
+    enforce: "pre",
+    setup(ctx) {
+      const { router } = ctx;
+      const ROUTE_AUTH = {
+        path: "/auth/:type",
+        name: "Auth",
+        component: PageAuth,
+        meta: {
+          whiteList: true,
+          title: "\u6388\u6743\u767B\u5F55"
+        },
+        props: (route) => ({
+          type: route.params.type,
+          redirectTo() {
+            router.push(redirectTo ?? "/");
+          },
+          authentication
+        })
+      };
+      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.name === "Login") {
+          redirect();
+        }
+      });
+    }
   };
 }
 export {
-  createAuth2 as createAuth
+  createAuth,
+  withModule
 };

package/dist/{interface-C_qnbvmk.d.ts → interface-BStwVrS7.d.ts}

@@ -3,7 +3,7 @@ import { RouteLocationRaw } from 'vue-router';
 type Recordable = Record<string, any>;
 type Fn<T = any, K = any> = (params?: Recordable & T) => Promise<K> | K;
 type FnApi<T = any> = (params: Recordable & T, baseURL: string) => Promise<any>;
-interface AuthOptions extends AuthConfig {
+interface AuthOptions {
     /** 登录后重定向至 */
     redirectTo?: RouteLocationRaw;
 }
@@ -47,4 +47,4 @@ interface Authorization {
     params?: Recordable;
 }
 
-export type { AuthOptions as A, Fn as F, ProviderUserConfig as P, Recordable as R, ThirdParty as T, FnApi as a, AuthConfig as b, ProviderConfig as c, Authorization as d };
+export type { AuthConfig as A, Fn as F, ProviderUserConfig as P, Recordable as R, ThirdParty as T, AuthOptions as a, FnApi as b, ProviderConfig as c, Authorization as d };

package/dist/providers/4A.d.ts

@@ -1,4 +1,4 @@
-import { P as ProviderUserConfig, c as ProviderConfig } from '../interface-C_qnbvmk.js';
+import { P as ProviderUserConfig, c as ProviderConfig } from '../interface-BStwVrS7.js';
 import 'vue-router';
 
 /**

package/dist/providers/credentials.d.ts

@@ -1,4 +1,4 @@
-import { F as Fn, c as ProviderConfig } from '../interface-C_qnbvmk.js';
+import { F as Fn, c as ProviderConfig } from '../interface-BStwVrS7.js';
 import 'vue-router';
 
 interface CredentialsConfig {

package/dist/providers/ding-zj.d.ts

@@ -1,4 +1,4 @@
-import { P as ProviderUserConfig, c as ProviderConfig } from '../interface-C_qnbvmk.js';
+import { P as ProviderUserConfig, c as ProviderConfig } from '../interface-BStwVrS7.js';
 import 'vue-router';
 
 interface DingZJConfig extends ProviderUserConfig {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pubinfo/module-auth",
   "type": "module",
-  "version": "2.0.0-beta.15",
+  "version": "2.0.0-beta.17",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -20,11 +20,11 @@
     "src"
   ],
   "peerDependencies": {
-    "pubinfo": "2.0.0-beta.15"
+    "pubinfo": "2.0.0-beta.17"
   },
   "devDependencies": {
     "tsup": "^8.4.0",
-    "pubinfo": "2.0.0-beta.15"
+    "pubinfo": "2.0.0-beta.17"
   },
   "scripts": {
     "dev": "tsup --watch src",

package/src/core.ts

@@ -2,7 +2,6 @@ import type { AuthConfig, ProviderUserConfig, Recordable, ThirdParty } from './i
 
 /**
  * 初始化
- * @param config 初始化配置
  */
 export function createAuth(config: AuthConfig = {}) {
   const {

package/src/index.ts

@@ -1,86 +1,57 @@
 import type { ModuleOptions } from 'pubinfo';
 import type { RouteRecordRaw } from 'vue-router';
+import type { createAuth } from './core';
 import type { AuthOptions } from './interface';
 import { cleanup } from 'pubinfo';
-import { createAuth as create } from './core';
-import { Auth } from './pages/auth';
+import { PageAuth } from './pages/auth';
 
-export function createAuth(options: AuthOptions = {}) {
+export function withModule(auth: ReturnType<typeof createAuth>, options: AuthOptions = {}): ModuleOptions {
+  const { authentication, redirect } = auth;
   const { redirectTo } = options;
-  const { signIn, renderQRCode, authentication, redirect } = create(options);
 
-  function auth(): ModuleOptions {
-    return {
-      name: 'pubinfo:auth',
-      enforce: 'pre',
-      setup(ctx) {
-        const { router } = ctx;
-
-        const ROUTE_AUTH: RouteRecordRaw = {
-          path: '/auth/:type',
-          name: 'Auth',
-          component: Auth,
-          meta: {
-            whiteList: true,
-            title: '授权登录',
+  return {
+    name: 'pubinfo: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,
+          redirectTo() {
+            router.push(redirectTo ?? '/');
           },
-          props: (route) => ({
-            type: route.params.type,
-            redirectTo() {
-              router.push(redirectTo ?? '/');
-            },
-            authentication,
-          }),
-        };
+          authentication,
+        }),
+      };
 
-        router.beforeEach(to => {
+      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.name === 'Login') {
-            redirect();
-          }
-        });
-      },
-    };
-  };
-
-  return {
-    /**
-     * 前往登录
-     * @param id 唯一值
-     * @param options 登录时需要传递的参数
-     */
-    signIn,
-
-    /**
-     * 生成二维码
-     * @param id 第三方的唯一值
-     * @param options 生成二维码需要传递的参数
-     * @param options.id `getElementById`中指定的`id`
-     */
-    renderQRCode,
-
-    /**
-     * 认证
-     * @param id 第三方的唯一值
-     */
-    authentication,
-
-    /**
-     * 模块配置
-     */
-    auth,
+        if (!router.hasRoute(ROUTE_AUTH.name!)) {
+          router.addRoute(ROUTE_AUTH);
+          return to.fullPath;
+        }
+
+        // 前往单点登录前，清空登录状态
+        if (to.name === ROUTE_AUTH.name) {
+          cleanup();
+        }
+
+        // 前往登录前，重定向至统一登录页（若有）
+        if (to.name === 'Login') {
+          redirect();
+        }
+      });
+    },
   };
 }
 
+export * from './core';
 export * from './interface';

package/src/interface.ts

@@ -4,7 +4,7 @@ export type Recordable = Record<string, any>;
 export type Fn<T = any, K = any> = (params?: Recordable & T) => Promise<K> | K;
 export type FnApi<T = any> = (params: Recordable & T, baseURL: string) => Promise<any>;
 
-export interface AuthOptions extends AuthConfig {
+export interface AuthOptions {
   /** 登录后重定向至 */
   redirectTo?: RouteLocationRaw
 }

package/src/pages/auth.ts

@@ -1,7 +1,7 @@
 import { useUserStore } from 'pubinfo';
 import { defineComponent, h, onMounted, ref } from 'vue';
 
-export const Auth = defineComponent({
+export const PageAuth = defineComponent({
   props: {
     type: String,
     redirectTo: Function,