@kevisual/api 0.0.56 → 0.0.57

package/dist/query-login-node.d.ts

@@ -153,12 +153,12 @@ declare class QueryLogin<T extends Cache = Cache> extends BaseQuery {
      * 登陆成功，需要获取用户信息进行缓存
      * @param param0
      */
-    beforeSetLoginUser({ accessToken, refreshToken, check401, accessTokenExpiresIn }: {
+    beforeSetLoginUser(opts: {
         accessTokenExpiresIn?: number;
         accessToken?: string;
         refreshToken?: string;
         check401?: boolean;
-    }): Promise<void>;
+    }): Promise<Result<User>>;
     /**
      * 刷新token
      * @param refreshToken
@@ -215,15 +215,7 @@ declare class QueryLogin<T extends Cache = Cache> extends BaseQuery {
      * 检查本地用户，如果本地用户存在，则返回本地用户，否则返回null
      * @returns
      */
-    checkLocalUser(): Promise<{
-        avatar?: string;
-        description?: string;
-        id?: string;
-        needChangePassword?: boolean;
-        orgs?: string[];
-        type?: string;
-        username?: string;
-    } | null>;
+    checkLocalUser(): Promise<User | null>;
     /**
      * 检查本地token是否存在，简单的判断是否已经属于登陆状态
      * @returns

package/dist/query-login-node.js

@@ -970,7 +970,8 @@ class QueryLogin extends BaseQuery {
       }
     }
   }
-  async beforeSetLoginUser({ accessToken, refreshToken, check401, accessTokenExpiresIn }) {
+  async beforeSetLoginUser(opts) {
+    const { accessToken, refreshToken, check401, accessTokenExpiresIn } = opts;
     if (accessToken && refreshToken) {
       const resUser = await this.getMe(accessToken, check401);
       if (resUser.code === 200) {
@@ -988,7 +989,12 @@ class QueryLogin extends BaseQuery {
           console.error("登录失败");
         }
       }
+      return resUser;
     }
+    return {
+      code: 400,
+      message: "登录失败"
+    };
   }
   async queryRefreshToken(refreshToken) {
     const _refreshToken = refreshToken || this.cacheStore.getRefreshToken();

package/dist/query-login.d.ts

@@ -153,12 +153,12 @@ declare class QueryLogin<T extends Cache = Cache> extends BaseQuery {
      * 登陆成功，需要获取用户信息进行缓存
      * @param param0
      */
-    beforeSetLoginUser({ accessToken, refreshToken, check401, accessTokenExpiresIn }: {
+    beforeSetLoginUser(opts: {
         accessTokenExpiresIn?: number;
         accessToken?: string;
         refreshToken?: string;
         check401?: boolean;
-    }): Promise<void>;
+    }): Promise<Result<User>>;
     /**
      * 刷新token
      * @param refreshToken
@@ -215,15 +215,7 @@ declare class QueryLogin<T extends Cache = Cache> extends BaseQuery {
      * 检查本地用户，如果本地用户存在，则返回本地用户，否则返回null
      * @returns
      */
-    checkLocalUser(): Promise<{
-        avatar?: string;
-        description?: string;
-        id?: string;
-        needChangePassword?: boolean;
-        orgs?: string[];
-        type?: string;
-        username?: string;
-    } | null>;
+    checkLocalUser(): Promise<User | null>;
     /**
      * 检查本地token是否存在，简单的判断是否已经属于登陆状态
      * @returns

package/dist/query-login.js

@@ -970,7 +970,8 @@ class QueryLogin extends BaseQuery {
       }
     }
   }
-  async beforeSetLoginUser({ accessToken, refreshToken, check401, accessTokenExpiresIn }) {
+  async beforeSetLoginUser(opts) {
+    const { accessToken, refreshToken, check401, accessTokenExpiresIn } = opts;
     if (accessToken && refreshToken) {
       const resUser = await this.getMe(accessToken, check401);
       if (resUser.code === 200) {
@@ -988,7 +989,12 @@ class QueryLogin extends BaseQuery {
           console.error("登录失败");
         }
       }
+      return resUser;
     }
+    return {
+      code: 400,
+      message: "登录失败"
+    };
   }
   async queryRefreshToken(refreshToken) {
     const _refreshToken = refreshToken || this.cacheStore.getRefreshToken();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/api",
-  "version": "0.0.56",
+  "version": "0.0.57",
   "description": "",
   "main": "mod.ts",
   "scripts": {

package/query/query-login/login-cache.ts

@@ -16,7 +16,7 @@ export interface Cache {
    */
   init?: () => Promise<any>;
 }
-type User = {
+export type User = {
   avatar?: string;
   description?: string;
   id?: string;

package/query/query-login/query-login.ts

@@ -1,6 +1,6 @@
 import { Query, BaseQuery } from '@kevisual/query';
 import type { Result, DataOpts } from '@kevisual/query/query';
-import { LoginCacheStore, CacheStore } from './login-cache.ts';
+import { LoginCacheStore, CacheStore, User } from './login-cache.ts';
 import { Cache } from './login-cache.ts';
 import { BaseLoad } from '@kevisual/load';
 export type QueryLoginOpts<T extends Cache = Cache> = {
@@ -128,7 +128,8 @@ export class QueryLogin<T extends Cache = Cache> extends BaseQuery {
    * 登陆成功，需要获取用户信息进行缓存
    * @param param0
    */
-  async beforeSetLoginUser({ accessToken, refreshToken, check401, accessTokenExpiresIn }: { accessTokenExpiresIn?: number, accessToken?: string; refreshToken?: string; check401?: boolean }) {
+  async beforeSetLoginUser(opts: { accessTokenExpiresIn?: number, accessToken?: string; refreshToken?: string; check401?: boolean }): Promise<Result<User>> {
+    const { accessToken, refreshToken, check401, accessTokenExpiresIn } = opts;
     if (accessToken && refreshToken) {
       const resUser = await this.getMe(accessToken, check401);
       if (resUser.code === 200) {
@@ -146,7 +147,12 @@ export class QueryLogin<T extends Cache = Cache> extends BaseQuery {
           console.error('登录失败');
         }
       }
+      return resUser;
     }
+    return {
+      code: 400,
+      message: '登录失败',
+    };
   }
   /**
    * 刷新token