@pubinfo/module-auth 2.1.7 → 2.1.9

package/dist/interface.d.ts

@@ -1,7 +1,7 @@
-import { RouteLocationRaw } from '../../../node_modules/.pnpm/vue-router@4.5.1_vue@3.5.17_typescript@5.8.3_/node_modules/vue-router';
+import type { RouteLocationRaw } from 'vue-router';
 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 type FnApi<T = any, R = any> = (params: Recordable & T, baseURL: string) => Promise<R>;
 export interface AuthOptions {
     /** 登录后默认重定向至 */
     redirectTo?: RouteLocationRaw | Fn;
@@ -37,7 +37,7 @@ export interface ProviderOptions {
     /** 授权登录地址 */
     signIn?: Authorization | Fn;
     /** 授权登录接口 */
-    authenticate?: string | FnApi;
+    authenticate?: string | FnApi<any, LoginResponse>;
     /** 初始化二维码 */
     initQRCode?: (url: string, params: {
         id: string;
@@ -49,3 +49,12 @@ export interface Authorization {
     /** 授权登录参数 */
     params?: Recordable;
 }
+export interface LoginResponse {
+    success?: boolean;
+    data: {
+        accessToken: string;
+        refreshToken: string;
+        [key: string]: any;
+    };
+    msg?: string;
+}

package/dist/pages/auth.d.ts

@@ -1,11 +1,11 @@
-export declare const PageAuth: import('../../../../node_modules/.pnpm/vue@3.5.17_typescript@5.8.3/node_modules/vue').DefineComponent<import('../../../../node_modules/.pnpm/vue@3.5.17_typescript@5.8.3/node_modules/vue').ExtractPropTypes<{
+export declare const PageAuth: import("vue").DefineComponent<globalThis.ExtractPropTypes<{
     type: StringConstructor;
     redirectTo: FunctionConstructor;
     authenticate: FunctionConstructor;
-}>, () => import('../../../../node_modules/.pnpm/vue@3.5.17_typescript@5.8.3/node_modules/vue').VNode<import('../../../../node_modules/.pnpm/vue@3.5.17_typescript@5.8.3/node_modules/vue').RendererNode, import('../../../../node_modules/.pnpm/vue@3.5.17_typescript@5.8.3/node_modules/vue').RendererElement, {
+}>, () => globalThis.VNode<import("vue").RendererNode, import("vue").RendererElement, {
     [key: string]: any;
-}>, {}, {}, {}, import('../../../../node_modules/.pnpm/vue@3.5.17_typescript@5.8.3/node_modules/vue').ComponentOptionsMixin, import('../../../../node_modules/.pnpm/vue@3.5.17_typescript@5.8.3/node_modules/vue').ComponentOptionsMixin, {}, string, import('../../../../node_modules/.pnpm/vue@3.5.17_typescript@5.8.3/node_modules/vue').PublicProps, Readonly<import('../../../../node_modules/.pnpm/vue@3.5.17_typescript@5.8.3/node_modules/vue').ExtractPropTypes<{
+}>, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<globalThis.ExtractPropTypes<{
     type: StringConstructor;
     redirectTo: FunctionConstructor;
     authenticate: FunctionConstructor;
-}>> & Readonly<{}>, {}, {}, {}, {}, string, import('../../../../node_modules/.pnpm/vue@3.5.17_typescript@5.8.3/node_modules/vue').ComponentProvideOptions, true, {}, any>;
+}>> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

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

@@ -1,4 +1,4 @@
-import { ProviderOptions, ProviderUserOptions } from '../interface';
+import type { ProviderOptions, ProviderUserOptions } from '../interface';
 export interface FourAOptions extends ProviderUserOptions {
     /** `client_id` */
     clientId?: string;

package/dist/providers/4A.js

@@ -1,21 +1,19 @@
-function i(e) {
-  const { clientId: t, redirectUri: r } = e;
-  return {
-    id: "4A",
-    name: "4A登录",
-    type: "oauth",
-    signIn: {
-      url: "http://134.108.76.137:7001/index",
-      params: {
-        response_type: "code",
-        client_id: t,
-        redirect_uri: r
-      }
-    },
-    authenticate: "/bs/loginBy4a",
-    ...e
-  };
+function FourA(e) {
+	let { clientId: t, redirectUri: n } = e;
+	return {
+		id: "4A",
+		name: "4A登录",
+		type: "oauth",
+		signIn: {
+			url: "http://134.108.76.137:7001/index",
+			params: {
+				response_type: "code",
+				client_id: t,
+				redirect_uri: n
+			}
+		},
+		authenticate: "/bs/loginBy4a",
+		...e
+	};
 }
-export {
-  i as default
-};
+export { FourA as default };

package/dist/providers/credentials.d.ts

@@ -1,4 +1,4 @@
-import { ProviderOptions, ProviderUserOptions } from '../interface';
+import type { ProviderOptions, ProviderUserOptions } from '../interface';
 export interface CredentialsOptions extends ProviderUserOptions {
 }
 /**

package/dist/providers/credentials.js

@@ -1,11 +1,9 @@
-function t(e) {
-  return {
-    id: "credentials",
-    name: "凭证登录",
-    type: "custom",
-    ...e
-  };
+function Credentials(e) {
+	return {
+		id: "credentials",
+		name: "凭证登录",
+		type: "custom",
+		...e
+	};
 }
-export {
-  t as default
-};
+export { Credentials as default };

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

@@ -1,4 +1,4 @@
-import { ProviderOptions, ProviderUserOptions } from '../interface';
+import type { ProviderOptions, ProviderUserOptions } from '../interface';
 export interface DingZJOptions extends ProviderUserOptions {
     /**
      * 登录方式

package/dist/providers/ding-zj.js

@@ -1,49 +1,44 @@
-function g(e) {
-  const { clientId: i, redirectUri: n } = e, a = {
-    /** 跳转外部页面 */
-    redirect: {
-      url: "https://openplatform-pro.ding.zj.gov.cn/oauth2/auth.htm",
-      params: {
-        response_type: "code",
-        client_id: i,
-        redirect_uri: n,
-        scope: "get_user_info",
-        authType: "QRCODE"
-      }
-    },
-    /** 内嵌二维码 */
-    embed: {
-      url: "https://login-pro.ding.zj.gov.cn/oauth2/auth.htm",
-      params: {
-        response_type: "code",
-        client_id: i,
-        redirect_uri: n,
-        scope: "get_user_info",
-        authType: "QRCODE",
-        embedMode: "true"
-      }
-    }
-  }, o = (c, t) => {
-    if (!document.getElementById(t.id))
-      throw new Error(`未找到id为${t.id}的DOM元素`);
-    const r = document.createElement("iframe");
-    r.src = c, r.width = "200", r.height = "200", document.appendChild(r), window.addEventListener("message", (s) => {
-      if (t.redirectUri) {
-        const d = new URL(t.redirectUri);
-        d.search = new URLSearchParams(s.data).toString(), window.location.href = d.toString();
-      }
-    });
-  };
-  return {
-    id: "ding-zj",
-    name: "浙政钉登录",
-    type: "oauth",
-    signIn: a[e.mode],
-    authenticate: "/bs/loginByDingZJ",
-    initQRCode: e.mode === "embed" ? o : void 0,
-    ...e
-  };
+function DingZJ(e) {
+	let { clientId: t, redirectUri: n } = e;
+	return {
+		id: "ding-zj",
+		name: "浙政钉登录",
+		type: "oauth",
+		signIn: {
+			redirect: {
+				url: "https://openplatform-pro.ding.zj.gov.cn/oauth2/auth.htm",
+				params: {
+					response_type: "code",
+					client_id: t,
+					redirect_uri: n,
+					scope: "get_user_info",
+					authType: "QRCODE"
+				}
+			},
+			embed: {
+				url: "https://login-pro.ding.zj.gov.cn/oauth2/auth.htm",
+				params: {
+					response_type: "code",
+					client_id: t,
+					redirect_uri: n,
+					scope: "get_user_info",
+					authType: "QRCODE",
+					embedMode: "true"
+				}
+			}
+		}[e.mode],
+		authenticate: "/bs/loginByDingZJ",
+		initQRCode: e.mode === "embed" ? (e, t) => {
+			if (!document.getElementById(t.id)) throw Error(`未找到id为${t.id}的DOM元素`);
+			let n = document.createElement("iframe");
+			n.src = e, n.width = "200", n.height = "200", document.appendChild(n), window.addEventListener("message", (e) => {
+				if (t.redirectUri) {
+					let n = new URL(t.redirectUri);
+					n.search = new URLSearchParams(e.data).toString(), window.location.href = n.toString();
+				}
+			});
+		} : void 0,
+		...e
+	};
 }
-export {
-  g as default
-};
+export { DingZJ as default };

package/dist/providers/sso.d.ts

@@ -1,4 +1,4 @@
-import { ProviderOptions, ProviderUserOptions } from '../interface';
+import type { ProviderOptions, ProviderUserOptions } from '@/interface';
 export interface SsoOptions extends ProviderUserOptions {
     /**
      * 登录类型，根据调用 `/app/oauth/generateCode` 接口时传递的 `grantType` 参数值判断：

package/dist/providers/sso.js

@@ -1,23 +1,18 @@
-function o(t = {}) {
-  const { loginType: e = "defaultOauth2" } = t;
-  return {
-    id: "sso",
-    name: "SSO统一账号登录",
-    type: "custom",
-    authenticate: async (a, n) => await (await fetch(
-      `${n}/auth/ssoLogin`,
-      {
-        headers: { "Content-Type": "application/json" },
-        method: "POST",
-        body: JSON.stringify({
-          ...a,
-          loginType: e
-        })
-      }
-    )).json(),
-    ...t
-  };
+function Sso(e = {}) {
+	let { loginType: t = "defaultOauth2" } = e;
+	return {
+		id: "sso",
+		name: "SSO统一账号登录",
+		type: "custom",
+		authenticate: async (e, n) => await (await fetch(`${n}/auth/ssoLogin`, {
+			headers: { "Content-Type": "application/json" },
+			method: "POST",
+			body: JSON.stringify({
+				...e,
+				loginType: t
+			})
+		})).json(),
+		...e
+	};
 }
-export {
-  o as default
-};
+export { Sso as default };

package/package.json

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

package/src/interface.ts

@@ -2,7 +2,7 @@ import type { RouteLocationRaw } from 'vue-router';
 
 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 type FnApi<T = any, R = any> = (params: Recordable & T, baseURL: string) => Promise<R>;
 
 export interface AuthOptions {
   /** 登录后默认重定向至 */
@@ -50,7 +50,7 @@ export interface ProviderOptions {
   signIn?: Authorization | Fn
 
   /** 授权登录接口 */
-  authenticate?: string | FnApi
+  authenticate?: string | FnApi<any, LoginResponse>
 
   /** 初始化二维码 */
   initQRCode?: (url: string, params: { id: string } & Recordable) => Promise<void> | void
@@ -63,3 +63,13 @@ export interface Authorization {
   /** 授权登录参数 */
   params?: Recordable
 }
+
+export interface LoginResponse {
+  success?: boolean
+  data: {
+    accessToken: string
+    refreshToken: string
+    [key: string]: any
+  }
+  msg?: string
+}