@kevisual/api 0.0.56 → 0.0.58

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

@@ -141,6 +141,14 @@ declare class QueryLogin<T extends Cache = Cache> extends BaseQuery {
     loginByWechat(data: {
         code: string;
     }): Promise<any>;
+    /**
+     * cnb登录， 适用于cnb的登录方式， 需要后端配合， 传入cnbToken， 后端验证cnbToken的有效性，并返回accessToken和refreshToken
+     * @param data
+     * @returns
+     */
+    loginByCnb(data: {
+        cnbToken: string;
+    }): Promise<any>;
     /**
      * 检测微信登录，登陆成功后，调用onSuccess，否则调用onError
      * @param param0
@@ -153,12 +161,18 @@ 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 刷新token，如果不传，则从缓存中获取
+     * @returns
+     */
+    refreshLoginUser(refreshToken?: string): Promise<any>;
     /**
      * 刷新token
      * @param refreshToken
@@ -215,21 +229,13 @@ 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
      */
     checkLocalToken(): Promise<boolean>;
-    checkTokenValid(): Promise<boolean>;
+    checkTokenValid(): Promise<null | string>;
     /**
      * 检查本地用户列表
      * @returns

package/dist/query-login-node.js

@@ -957,6 +957,21 @@ class QueryLogin extends BaseQuery {
     }
     return res;
   }
+  async loginByCnb(data) {
+    const res = await this.post({
+      path: "user",
+      key: "cnb-login",
+      payload: {
+        data
+      }
+    });
+    if (res.code === 200) {
+      const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
+      this.storage.setItem("token", accessToken || "");
+      await this.beforeSetLoginUser({ accessToken, refreshToken, accessTokenExpiresIn });
+    }
+    return res;
+  }
   async checkWechat({ onSuccess, onError }) {
     const url = new URL(window.location.href);
     const code = url.searchParams.get("code");
@@ -970,7 +985,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,10 +1004,24 @@ class QueryLogin extends BaseQuery {
           console.error("登录失败");
         }
       }
+      return resUser;
     }
+    return {
+      code: 400,
+      message: "登录失败"
+    };
+  }
+  async refreshLoginUser(refreshToken) {
+    const res = await this.queryRefreshToken(refreshToken);
+    if (res.code === 200) {
+      const { accessToken, refreshToken: refreshToken2, accessTokenExpiresIn } = res?.data || {};
+      this.storage.setItem("token", accessToken || "");
+      await this.beforeSetLoginUser({ accessToken, refreshToken: refreshToken2, accessTokenExpiresIn, check401: false });
+    }
+    return res;
   }
   async queryRefreshToken(refreshToken) {
-    const _refreshToken = refreshToken || this.cacheStore.getRefreshToken();
+    const _refreshToken = refreshToken || await this.cacheStore.getRefreshToken();
     let data = { refreshToken: _refreshToken };
     if (!_refreshToken) {
       await this.cacheStore.clearCurrentUser();
@@ -1090,7 +1120,19 @@ class QueryLogin extends BaseQuery {
     return !!token;
   }
   async checkTokenValid() {
-    return this.cacheStore.getIsExpired();
+    const token = this.storage.getItem("token");
+    if (!token) {
+      return null;
+    }
+    const isExpired = await this.cacheStore.getIsExpired();
+    if (isExpired) {
+      const res = await this.refreshLoginUser();
+      if (res.code === 200) {
+        return res.data?.accessToken || null;
+      }
+      return null;
+    }
+    return token;
   }
   async getToken() {
     const token = this.storage.getItem("token");

package/dist/query-login.d.ts

@@ -141,6 +141,14 @@ declare class QueryLogin<T extends Cache = Cache> extends BaseQuery {
     loginByWechat(data: {
         code: string;
     }): Promise<any>;
+    /**
+     * cnb登录， 适用于cnb的登录方式， 需要后端配合， 传入cnbToken， 后端验证cnbToken的有效性，并返回accessToken和refreshToken
+     * @param data
+     * @returns
+     */
+    loginByCnb(data: {
+        cnbToken: string;
+    }): Promise<any>;
     /**
      * 检测微信登录，登陆成功后，调用onSuccess，否则调用onError
      * @param param0
@@ -153,12 +161,18 @@ 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 刷新token，如果不传，则从缓存中获取
+     * @returns
+     */
+    refreshLoginUser(refreshToken?: string): Promise<any>;
     /**
      * 刷新token
      * @param refreshToken
@@ -215,21 +229,13 @@ 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
      */
     checkLocalToken(): Promise<boolean>;
-    checkTokenValid(): Promise<boolean>;
+    checkTokenValid(): Promise<null | string>;
     /**
      * 检查本地用户列表
      * @returns

package/dist/query-login.js

@@ -957,6 +957,21 @@ class QueryLogin extends BaseQuery {
     }
     return res;
   }
+  async loginByCnb(data) {
+    const res = await this.post({
+      path: "user",
+      key: "cnb-login",
+      payload: {
+        data
+      }
+    });
+    if (res.code === 200) {
+      const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
+      this.storage.setItem("token", accessToken || "");
+      await this.beforeSetLoginUser({ accessToken, refreshToken, accessTokenExpiresIn });
+    }
+    return res;
+  }
   async checkWechat({ onSuccess, onError }) {
     const url = new URL(window.location.href);
     const code = url.searchParams.get("code");
@@ -970,7 +985,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,10 +1004,24 @@ class QueryLogin extends BaseQuery {
           console.error("登录失败");
         }
       }
+      return resUser;
     }
+    return {
+      code: 400,
+      message: "登录失败"
+    };
+  }
+  async refreshLoginUser(refreshToken) {
+    const res = await this.queryRefreshToken(refreshToken);
+    if (res.code === 200) {
+      const { accessToken, refreshToken: refreshToken2, accessTokenExpiresIn } = res?.data || {};
+      this.storage.setItem("token", accessToken || "");
+      await this.beforeSetLoginUser({ accessToken, refreshToken: refreshToken2, accessTokenExpiresIn, check401: false });
+    }
+    return res;
   }
   async queryRefreshToken(refreshToken) {
-    const _refreshToken = refreshToken || this.cacheStore.getRefreshToken();
+    const _refreshToken = refreshToken || await this.cacheStore.getRefreshToken();
     let data = { refreshToken: _refreshToken };
     if (!_refreshToken) {
       await this.cacheStore.clearCurrentUser();
@@ -1090,7 +1120,19 @@ class QueryLogin extends BaseQuery {
     return !!token;
   }
   async checkTokenValid() {
-    return this.cacheStore.getIsExpired();
+    const token = this.storage.getItem("token");
+    if (!token) {
+      return null;
+    }
+    const isExpired = await this.cacheStore.getIsExpired();
+    if (isExpired) {
+      const res = await this.refreshLoginUser();
+      if (res.code === 200) {
+        return res.data?.accessToken || null;
+      }
+      return null;
+    }
+    return token;
   }
   async getToken() {
     const token = this.storage.getItem("token");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/api",
-  "version": "0.0.56",
+  "version": "0.0.58",
   "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> = {
@@ -107,6 +107,26 @@ export class QueryLogin<T extends Cache = Cache> extends BaseQuery {
     }
     return res;
   }
+  /**
+   * cnb登录， 适用于cnb的登录方式， 需要后端配合， 传入cnbToken， 后端验证cnbToken的有效性，并返回accessToken和refreshToken
+   * @param data 
+   * @returns 
+   */
+  async loginByCnb(data: { cnbToken: string }) {
+    const res = await this.post<QueryLoginResult>({
+      path: 'user',
+      key: 'cnb-login',
+      payload: {
+        data: data
+      }
+    });
+    if (res.code === 200) {
+      const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
+      this.storage.setItem('token', accessToken || '');
+      await this.beforeSetLoginUser({ accessToken, refreshToken, accessTokenExpiresIn });
+    }
+    return res;
+  }
   /**
    * 检测微信登录，登陆成功后，调用onSuccess，否则调用onError
    * @param param0
@@ -128,7 +148,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 +167,26 @@ export class QueryLogin<T extends Cache = Cache> extends BaseQuery {
           console.error('登录失败');
         }
       }
+      return resUser;
     }
+    return {
+      code: 400,
+      message: '登录失败',
+    };
+  }
+  /**
+   * 刷新登录用户，获取新的token，并更新用户信息
+   * @param refreshToken 刷新token，如果不传，则从缓存中获取
+   * @returns 
+   */
+  async refreshLoginUser(refreshToken?: string) {
+    const res = await this.queryRefreshToken(refreshToken);
+    if (res.code === 200) {
+      const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
+      this.storage.setItem('token', accessToken || '');
+      await this.beforeSetLoginUser({ accessToken, refreshToken, accessTokenExpiresIn, check401: false });
+    }
+    return res;
   }
   /**
    * 刷新token
@@ -154,7 +194,7 @@ export class QueryLogin<T extends Cache = Cache> extends BaseQuery {
    * @returns
    */
   async queryRefreshToken(refreshToken?: string) {
-    const _refreshToken = refreshToken || this.cacheStore.getRefreshToken();
+    const _refreshToken = refreshToken || (await this.cacheStore.getRefreshToken());
     let data = { refreshToken: _refreshToken };
     if (!_refreshToken) {
       await this.cacheStore.clearCurrentUser();
@@ -305,8 +345,21 @@ export class QueryLogin<T extends Cache = Cache> extends BaseQuery {
     const token = this.storage.getItem('token');
     return !!token;
   }
-  async checkTokenValid() {
-    return this.cacheStore.getIsExpired();
+  async checkTokenValid(): Promise<null | string> {
+    const token = this.storage.getItem('token');
+    if (!token) {
+      return null;
+    }
+    const isExpired = await this.cacheStore.getIsExpired();
+    if (isExpired) {
+      const res = await this.refreshLoginUser()
+      if (res.code === 200) {
+        // 刷新成功，返回新的token
+        return res.data?.accessToken || null;
+      }
+      return null;
+    }
+    return token;
   }
   /**
    * 检查本地用户列表