@pubinfo/module-auth 2.0.0-beta.31 → 2.0.0-beta.33

package/dist/index.d.ts

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

package/dist/index.js

@@ -1,176 +1,138 @@
-// src/index.ts
-import { cleanup } from "pubinfo";
-
-// src/pages/auth.ts
-import { useUserStore } from "pubinfo";
+import { cleanup, 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
-      );
-    };
-  }
+
+//#region src/pages/auth.ts
+const PageAuth = defineComponent({
+	props: {
+		type: String,
+		redirectTo: Function,
+		authentication: Function
+	},
+	setup(props) {
+		const userStore = useUserStore();
+		const message = ref("授权登录中...");
+		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
+//#endregion
+//#region src/core.ts
+/**
+* 初始化
+*/
 function createAuth(config = {}) {
-  const {
-    baseURL = "",
-    providers = []
-  } = config;
-  function getProvider(id) {
-    const provider = id ? providers.find((provider2) => provider2.id === id) : providers[0];
-    if (!provider) {
-      throw new Error(`Provider '${id}' is not found.`);
-    }
-    return provider;
-  }
-  return {
-    /**
-     * 前往登录
-     * @param id 唯一值
-     * @param options 登录时需要传递的参数
-     */
-    async signIn(id, options) {
-      const provider = getProvider(id);
-      const { type, authorization } = provider;
-      if (typeof authorization === "function") {
-        return await authorization(options);
-      }
-      if (type === "oauth" || type === "custom") {
-        const url = createUrl(provider);
-        window.location.replace(url);
-      }
-    },
-    /**
-     * 生成二维码
-     * @param id 第三方的唯一值
-     * @param options 生成二维码需要传递的参数
-     * @param options.id `getElementById`中指定的`id`
-     */
-    renderQRCode(id, options) {
-      const provider = getProvider(id);
-      const { type, initQRCode } = provider;
-      if (type === "oauth" || type === "custom") {
-        const url = createUrl(provider);
-        initQRCode?.(url, options);
-      }
-    },
-    /**
-     * 认证
-     * @param id 第三方的唯一值
-     */
-    async authentication(id) {
-      const provider = getProvider(id);
-      const { type, callbackUrl } = provider;
-      const qs = window.location.href.split("?")?.[1] ?? "";
-      const params = new URLSearchParams(qs);
-      if (typeof callbackUrl === "function") {
-        return await callbackUrl(Object.fromEntries(params.entries()), baseURL);
-      }
-      if (type === "oauth" || type === "cas" || type === "custom") {
-        const response = await fetch(`${baseURL}${callbackUrl}?${params.toString()}`);
-        return await response.json();
-      }
-    },
-    /**
-     * 重定向至统一登录页
-     */
-    redirect() {
-      const provider = providers.find((provider2) => provider2.type === "cas");
-      if (!provider) {
-        return;
-      }
-      const url = createUrl(provider);
-      window.location.replace(url);
-    }
-  };
+	const { baseURL = "", providers = [] } = config;
+	/**
+	* 获取指定的 `Provider`
+	* @param id
+	*/
+	function getProvider(id) {
+		const provider = id ? providers.find((provider$1) => provider$1.id === id) : providers[0];
+		if (!provider) throw new Error(`Provider '${id}' is not found.`);
+		return provider;
+	}
+	return {
+		async signIn(id, options) {
+			const provider = getProvider(id);
+			const { type, authorization } = provider;
+			if (typeof authorization === "function") return await authorization(options);
+			if (type === "oauth" || type === "custom") {
+				const url = createUrl(provider);
+				window.location.replace(url);
+			}
+		},
+		renderQRCode(id, options) {
+			const provider = getProvider(id);
+			const { type, initQRCode } = provider;
+			if (type === "oauth" || type === "custom") {
+				const url = createUrl(provider);
+				initQRCode?.(url, options);
+			}
+		},
+		async authentication(id) {
+			const provider = getProvider(id);
+			const { type, callbackUrl } = provider;
+			const qs = window.location.href.split("?")?.[1] ?? "";
+			const params = new URLSearchParams(qs);
+			if (typeof callbackUrl === "function") return await callbackUrl(Object.fromEntries(params.entries()), baseURL);
+			if (type === "oauth" || type === "cas" || type === "custom") {
+				const response = await fetch(`${baseURL}${callbackUrl}?${params.toString()}`);
+				return await response.json();
+			}
+		},
+		redirect() {
+			const provider = providers.find((provider$1) => provider$1.type === "cas");
+			if (!provider) return;
+			const url = createUrl(provider);
+			window.location.replace(url);
+		}
+	};
 }
+/**
+* 构建第三方授权登录地址
+* @param provider
+*/
 function createUrl(provider) {
-  const { authorization } = provider;
-  if (typeof authorization === "function") {
-    return "";
-  }
-  const url = new URL(authorization?.url ?? "");
-  const params = new URLSearchParams(authorization?.params ?? {});
-  return `${url.toString()}?${params.toString()}`;
+	const { authorization } = provider;
+	if (typeof authorization === "function") return "";
+	const url = new URL(authorization?.url ?? "");
+	const params = new URLSearchParams(authorization?.params ?? {});
+	return `${url.toString()}?${params.toString()}`;
 }
 
-// src/index.ts
+//#endregion
+//#region src/index.ts
 function withModule(auth, options = {}) {
-  const { authentication, redirect } = auth;
-  const {
-    redirectTo = "/",
-    pages = {}
-  } = options;
-  const {
-    signIn = "/login"
-  } = pages;
-  return {
-    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.path === signIn) {
-          redirect();
-        }
-      });
-    }
-  };
+	const { authentication, redirect } = auth;
+	const { redirectTo = "/", pages = {} } = options;
+	const { signIn = "/login" } = pages;
+	return {
+		name: "pubinfo:auth",
+		enforce: "pre",
+		setup(ctx) {
+			const { router } = ctx;
+			const ROUTE_AUTH = {
+				path: "/auth/:type",
+				name: "Auth",
+				component: PageAuth,
+				meta: {
+					whiteList: true,
+					title: "授权登录"
+				},
+				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.path === signIn) redirect();
+			});
+		}
+	};
 }
-export {
-  createAuth,
-  withModule
-};
+
+//#endregion
+export { createAuth, withModule };

package/dist/interface-CSPrYibH.d.ts

@@ -0,0 +1,56 @@
+import { RouteLocationRaw } from "vue-router";
+
+//#region src/interface.d.ts
+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 {
+  /** 登录后重定向至 */
+  redirectTo?: RouteLocationRaw;
+  /** 页面配置 */
+  pages?: {
+    /** 默认登录页 */
+    signIn?: RouteLocationRaw;
+  };
+}
+interface AuthConfig {
+  /** 接口的baseURL */
+  baseURL?: string;
+  providers?: ProviderConfig[];
+}
+/** 第三方类型 */
+type ThirdParty = string;
+type ProviderUserConfig = Partial<ProviderConfig>;
+interface ProviderConfig {
+  /** 唯一值 */
+  id: string;
+  /** 名称 */
+  name: string;
+  /**
+   * 协议类型
+   * - `oauth` 第三方授权登录
+   * - `cas` 统一账号登录
+   * - `custom` 自定义
+   */
+  type: 'oauth' | 'cas' | 'custom';
+  /** 授权登录地址 */
+  authorization?: Authorization | Fn;
+  /** `client_id` */
+  clientId?: string;
+  /** `redirect_uri` */
+  redirectUri?: string;
+  /** 授权登录接口 */
+  callbackUrl?: string | FnApi;
+  /** 初始化二维码 */
+  initQRCode?: (url: string, params: {
+    id: string;
+  } & Recordable) => Promise<void> | void;
+}
+interface Authorization {
+  /** 授权登录地址 */
+  url: string;
+  /** 授权登录参数 */
+  params?: Recordable;
+}
+//#endregion
+export { AuthConfig, AuthOptions, Authorization, Fn, FnApi, ProviderConfig, ProviderUserConfig, Recordable, ThirdParty };

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

@@ -1,9 +1,10 @@
-import { P as ProviderUserConfig, c as ProviderConfig } from '../interface-XUOeLcLn.js';
-import 'vue-router';
+import { ProviderConfig, ProviderUserConfig } from "../interface-CSPrYibH.js";
+
+//#region src/providers/4A.d.ts
 
 /**
  * 4A登录
  */
 declare function FourA(options: ProviderUserConfig): ProviderConfig;
-
-export { FourA as default };
+//#endregion
+export { FourA as default };

package/dist/providers/4A.js

@@ -1,22 +1,25 @@
-// src/providers/4A.ts
+//#region src/providers/4A.ts
+/**
+* 4A登录
+*/
 function FourA(options) {
-  const { clientId, redirectUri } = options;
-  return {
-    id: "4A",
-    name: "4A\u767B\u5F55",
-    type: "oauth",
-    authorization: {
-      url: "http://134.108.76.137:7001/index",
-      params: {
-        response_type: "code",
-        client_id: clientId,
-        redirect_uri: redirectUri
-      }
-    },
-    callbackUrl: "/bs/loginBy4a",
-    ...options
-  };
+	const { clientId, redirectUri } = options;
+	return {
+		id: "4A",
+		name: "4A登录",
+		type: "oauth",
+		authorization: {
+			url: "http://134.108.76.137:7001/index",
+			params: {
+				response_type: "code",
+				client_id: clientId,
+				redirect_uri: redirectUri
+			}
+		},
+		callbackUrl: "/bs/loginBy4a",
+		...options
+	};
 }
-export {
-  FourA as default
-};
+
+//#endregion
+export { FourA as default };

package/dist/providers/credentials.d.ts

@@ -1,12 +1,12 @@
-import { F as Fn, c as ProviderConfig } from '../interface-XUOeLcLn.js';
-import 'vue-router';
+import { Fn, ProviderConfig } from "../interface-CSPrYibH.js";
 
+//#region src/providers/credentials.d.ts
 interface CredentialsConfig {
-    authorize: Fn<any>;
+  authorize: Fn<any>;
 }
 /**
  * 凭证登录
  */
 declare function Credentials(options: CredentialsConfig): ProviderConfig;
-
-export { Credentials as default };
+//#endregion
+export { Credentials as default };

package/dist/providers/credentials.js

@@ -1,13 +1,16 @@
-// src/providers/credentials.ts
+//#region src/providers/credentials.ts
+/**
+* 凭证登录
+*/
 function Credentials(options) {
-  const { authorize } = options;
-  return {
-    id: "credentials",
-    name: "\u51ED\u8BC1\u767B\u5F55",
-    type: "custom",
-    authorization: authorize
-  };
+	const { authorize } = options;
+	return {
+		id: "credentials",
+		name: "凭证登录",
+		type: "custom",
+		authorization: authorize
+	};
 }
-export {
-  Credentials as default
-};
+
+//#endregion
+export { Credentials as default };

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

@@ -1,17 +1,17 @@
-import { P as ProviderUserConfig, c as ProviderConfig } from '../interface-XUOeLcLn.js';
-import 'vue-router';
+import { ProviderConfig, ProviderUserConfig } from "../interface-CSPrYibH.js";
 
+//#region src/providers/ding-zj.d.ts
 interface DingZJConfig extends ProviderUserConfig {
-    /**
-     * 登录方式
-     * - `redirect` 跳转浙政钉的扫码页面
-     * - `embed` 内嵌浙政钉的登录二维码
-     */
-    mode: 'redirect' | 'embed';
+  /**
+   * 登录方式
+   * - `redirect` 跳转浙政钉的扫码页面
+   * - `embed` 内嵌浙政钉的登录二维码
+   */
+  mode: 'redirect' | 'embed';
 }
 /**
  * 浙政钉扫码登录
  */
 declare function DingZJ(options: DingZJConfig): ProviderConfig;
-
-export { DingZJ as default };
+//#endregion
+export { DingZJ as default };

package/dist/providers/ding-zj.js

@@ -1,59 +1,58 @@
-// src/providers/ding-zj.ts
+//#region src/providers/ding-zj.ts
+/**
+* 浙政钉扫码登录
+*/
 function DingZJ(options) {
-  const { clientId, redirectUri } = options;
-  const authorization = {
-    /** 跳转外部页面 */
-    redirect: {
-      url: "https://openplatform-pro.ding.zj.gov.cn/oauth2/auth.htm",
-      params: {
-        response_type: "code",
-        client_id: clientId,
-        redirect_uri: redirectUri,
-        scope: "get_user_info",
-        authType: "QRCODE"
-      }
-    },
-    /** 内嵌二维码 */
-    embed: {
-      url: "https://login-pro.ding.zj.gov.cn/oauth2/auth.htm",
-      params: {
-        response_type: "code",
-        client_id: clientId,
-        redirect_uri: redirectUri,
-        scope: "get_user_info",
-        authType: "QRCODE",
-        embedMode: "true"
-      }
-    }
-  };
-  const initQRCode = (url, options2) => {
-    const target = document.getElementById(options2.id);
-    if (!target) {
-      throw new Error(`\u672A\u627E\u5230id\u4E3A${options2.id}\u7684DOM\u5143\u7D20`);
-    }
-    const iframe = document.createElement("iframe");
-    iframe.src = url;
-    iframe.width = "200";
-    iframe.height = "200";
-    document.appendChild(iframe);
-    window.addEventListener("message", (e) => {
-      if (options2.redirectUri) {
-        const url2 = new URL(options2.redirectUri);
-        url2.search = new URLSearchParams(e.data).toString();
-        window.location.href = url2.toString();
-      }
-    });
-  };
-  return {
-    id: "ding-zj",
-    name: "\u6D59\u653F\u9489\u767B\u5F55",
-    type: "oauth",
-    authorization: authorization[options.mode],
-    callbackUrl: "/bs/loginByDingZJ",
-    initQRCode: options.mode === "embed" ? initQRCode : void 0,
-    ...options
-  };
+	const { clientId, redirectUri } = options;
+	const authorization = {
+		redirect: {
+			url: "https://openplatform-pro.ding.zj.gov.cn/oauth2/auth.htm",
+			params: {
+				response_type: "code",
+				client_id: clientId,
+				redirect_uri: redirectUri,
+				scope: "get_user_info",
+				authType: "QRCODE"
+			}
+		},
+		embed: {
+			url: "https://login-pro.ding.zj.gov.cn/oauth2/auth.htm",
+			params: {
+				response_type: "code",
+				client_id: clientId,
+				redirect_uri: redirectUri,
+				scope: "get_user_info",
+				authType: "QRCODE",
+				embedMode: "true"
+			}
+		}
+	};
+	const initQRCode = (url, options$1) => {
+		const target = document.getElementById(options$1.id);
+		if (!target) throw new Error(`未找到id为${options$1.id}的DOM元素`);
+		const iframe = document.createElement("iframe");
+		iframe.src = url;
+		iframe.width = "200";
+		iframe.height = "200";
+		document.appendChild(iframe);
+		window.addEventListener("message", (e) => {
+			if (options$1.redirectUri) {
+				const url$1 = new URL(options$1.redirectUri);
+				url$1.search = new URLSearchParams(e.data).toString();
+				window.location.href = url$1.toString();
+			}
+		});
+	};
+	return {
+		id: "ding-zj",
+		name: "浙政钉登录",
+		type: "oauth",
+		authorization: authorization[options.mode],
+		callbackUrl: "/bs/loginByDingZJ",
+		initQRCode: options.mode === "embed" ? initQRCode : void 0,
+		...options
+	};
 }
-export {
-  DingZJ as default
-};
+
+//#endregion
+export { DingZJ as default };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pubinfo/module-auth",
   "type": "module",
-  "version": "2.0.0-beta.31",
+  "version": "2.0.0-beta.33",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -20,14 +20,13 @@
     "src"
   ],
   "peerDependencies": {
-    "pubinfo": "2.0.0-beta.31"
+    "pubinfo": "2.0.0-beta.33"
   },
   "devDependencies": {
-    "tsup": "^8.5.0",
-    "pubinfo": "2.0.0-beta.31"
+    "pubinfo": "2.0.0-beta.33"
   },
   "scripts": {
-    "dev": "tsup --watch src",
-    "build": "tsup"
+    "dev": "tsdown --watch src",
+    "build": "tsdown"
   }
 }

package/dist/interface-XUOeLcLn.d.ts

@@ -1,55 +0,0 @@
-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 {
-    /** 登录后重定向至 */
-    redirectTo?: RouteLocationRaw;
-    /** 页面配置 */
-    pages?: {
-        /** 默认登录页 */
-        signIn?: RouteLocationRaw;
-    };
-}
-interface AuthConfig {
-    /** 接口的baseURL */
-    baseURL?: string;
-    providers?: ProviderConfig[];
-}
-/** 第三方类型 */
-type ThirdParty = string;
-type ProviderUserConfig = Partial<ProviderConfig>;
-interface ProviderConfig {
-    /** 唯一值 */
-    id: string;
-    /** 名称 */
-    name: string;
-    /**
-     * 协议类型
-     * - `oauth` 第三方授权登录
-     * - `cas` 统一账号登录
-     * - `custom` 自定义
-     */
-    type: 'oauth' | 'cas' | 'custom';
-    /** 授权登录地址 */
-    authorization?: Authorization | Fn;
-    /** `client_id` */
-    clientId?: string;
-    /** `redirect_uri` */
-    redirectUri?: string;
-    /** 授权登录接口 */
-    callbackUrl?: string | FnApi;
-    /** 初始化二维码 */
-    initQRCode?: (url: string, params: {
-        id: string;
-    } & Recordable) => Promise<void> | void;
-}
-interface Authorization {
-    /** 授权登录地址 */
-    url: string;
-    /** 授权登录参数 */
-    params?: Recordable;
-}
-
-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 };