@kevisual/api 0.0.57 → 0.0.59

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
@@ -159,12 +167,24 @@ declare class QueryLogin<T extends Cache = Cache> extends BaseQuery {
         refreshToken?: string;
         check401?: boolean;
     }): Promise<Result<User>>;
+    /**
+     * 刷新登录用户，获取新的token，并更新用户信息
+     * @param refreshToken 刷新token，如果不传，则从缓存中获取
+     * @returns
+     */
+    refreshLoginUser(opts?: {
+        refreshToken?: string;
+        accessToken?: string;
+    }): Promise<any>;
     /**
      * 刷新token
      * @param refreshToken
      * @returns
      */
-    queryRefreshToken(refreshToken?: string): Promise<any>;
+    queryRefreshToken(opts?: {
+        refreshToken?: string;
+        accessToken?: string;
+    }): Promise<any>;
     /**
      * 检查401错误，并刷新token, 如果refreshToken存在，则刷新token, 否则返回401
      * 拦截请求，请使用run401Action， 不要直接使用 afterCheck401ToRefreshToken
@@ -221,7 +241,7 @@ declare class QueryLogin<T extends Cache = Cache> extends BaseQuery {
      * @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");
@@ -996,9 +1011,26 @@ class QueryLogin extends BaseQuery {
       message: "登录失败"
     };
   }
-  async queryRefreshToken(refreshToken) {
-    const _refreshToken = refreshToken || this.cacheStore.getRefreshToken();
-    let data = { refreshToken: _refreshToken };
+  async refreshLoginUser(opts) {
+    const res = await this.queryRefreshToken(opts);
+    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;
+  }
+  async queryRefreshToken(opts) {
+    const refreshToken = opts?.refreshToken;
+    let accessToken = opts?.accessToken;
+    const _refreshToken = refreshToken || await this.cacheStore.getRefreshToken();
+    let data = {};
+    if (accessToken) {
+      data.accessToken = accessToken;
+    }
+    if (_refreshToken) {
+      data.refreshToken = _refreshToken;
+    }
     if (!_refreshToken) {
       await this.cacheStore.clearCurrentUser();
       return {
@@ -1018,7 +1050,7 @@ class QueryLogin extends BaseQuery {
     if (response?.code === 401) {
       const hasRefreshToken = await that.cacheStore.getRefreshToken();
       if (hasRefreshToken) {
-        const res = await that.queryRefreshToken(hasRefreshToken);
+        const res = await that.queryRefreshToken({ refreshToken: hasRefreshToken });
         if (res.code === 200) {
           const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
           that.storage.setItem("token", accessToken || "");
@@ -1096,7 +1128,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
@@ -159,12 +167,24 @@ declare class QueryLogin<T extends Cache = Cache> extends BaseQuery {
         refreshToken?: string;
         check401?: boolean;
     }): Promise<Result<User>>;
+    /**
+     * 刷新登录用户，获取新的token，并更新用户信息
+     * @param refreshToken 刷新token，如果不传，则从缓存中获取
+     * @returns
+     */
+    refreshLoginUser(opts?: {
+        refreshToken?: string;
+        accessToken?: string;
+    }): Promise<any>;
     /**
      * 刷新token
      * @param refreshToken
      * @returns
      */
-    queryRefreshToken(refreshToken?: string): Promise<any>;
+    queryRefreshToken(opts?: {
+        refreshToken?: string;
+        accessToken?: string;
+    }): Promise<any>;
     /**
      * 检查401错误，并刷新token, 如果refreshToken存在，则刷新token, 否则返回401
      * 拦截请求，请使用run401Action， 不要直接使用 afterCheck401ToRefreshToken
@@ -221,7 +241,7 @@ declare class QueryLogin<T extends Cache = Cache> extends BaseQuery {
      * @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");
@@ -996,9 +1011,26 @@ class QueryLogin extends BaseQuery {
       message: "登录失败"
     };
   }
-  async queryRefreshToken(refreshToken) {
-    const _refreshToken = refreshToken || this.cacheStore.getRefreshToken();
-    let data = { refreshToken: _refreshToken };
+  async refreshLoginUser(opts) {
+    const res = await this.queryRefreshToken(opts);
+    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;
+  }
+  async queryRefreshToken(opts) {
+    const refreshToken = opts?.refreshToken;
+    let accessToken = opts?.accessToken;
+    const _refreshToken = refreshToken || await this.cacheStore.getRefreshToken();
+    let data = {};
+    if (accessToken) {
+      data.accessToken = accessToken;
+    }
+    if (_refreshToken) {
+      data.refreshToken = _refreshToken;
+    }
     if (!_refreshToken) {
       await this.cacheStore.clearCurrentUser();
       return {
@@ -1018,7 +1050,7 @@ class QueryLogin extends BaseQuery {
     if (response?.code === 401) {
       const hasRefreshToken = await that.cacheStore.getRefreshToken();
       if (hasRefreshToken) {
-        const res = await that.queryRefreshToken(hasRefreshToken);
+        const res = await that.queryRefreshToken({ refreshToken: hasRefreshToken });
         if (res.code === 200) {
           const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
           that.storage.setItem("token", accessToken || "");
@@ -1096,7 +1128,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.57",
+  "version": "0.0.59",
   "description": "",
   "main": "mod.ts",
   "scripts": {

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

@@ -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
@@ -154,14 +174,36 @@ export class QueryLogin<T extends Cache = Cache> extends BaseQuery {
       message: '登录失败',
     };
   }
+  /**
+   * 刷新登录用户，获取新的token，并更新用户信息
+   * @param refreshToken 刷新token，如果不传，则从缓存中获取
+   * @returns 
+   */
+  async refreshLoginUser(opts?: { refreshToken?: string, accessToken?: string }) {
+    const res = await this.queryRefreshToken(opts);
+    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
    * @param refreshToken
    * @returns
    */
-  async queryRefreshToken(refreshToken?: string) {
-    const _refreshToken = refreshToken || this.cacheStore.getRefreshToken();
-    let data = { refreshToken: _refreshToken };
+  async queryRefreshToken(opts?: { refreshToken?: string, accessToken?: string }) {
+    const refreshToken = opts?.refreshToken;
+    let accessToken = opts?.accessToken;
+    const _refreshToken = refreshToken || (await this.cacheStore.getRefreshToken());
+    let data: any = {};
+    if (accessToken) {
+      data.accessToken = accessToken;
+    }
+    if (_refreshToken) {
+      data.refreshToken = _refreshToken;
+    }
     if (!_refreshToken) {
       await this.cacheStore.clearCurrentUser();
       return {
@@ -192,7 +234,7 @@ export class QueryLogin<T extends Cache = Cache> extends BaseQuery {
     if (response?.code === 401) {
       const hasRefreshToken = await that.cacheStore.getRefreshToken();
       if (hasRefreshToken) {
-        const res = await that.queryRefreshToken(hasRefreshToken);
+        const res = await that.queryRefreshToken({ refreshToken: hasRefreshToken });
         if (res.code === 200) {
           const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
           that.storage.setItem('token', accessToken || '');
@@ -311,8 +353,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;
   }
   /**
    * 检查本地用户列表