@kevisual/api 0.0.58 → 0.0.59

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

@@ -172,13 +172,19 @@ declare class QueryLogin<T extends Cache = Cache> extends BaseQuery {
      * @param refreshToken 刷新token，如果不传，则从缓存中获取
      * @returns
      */
-    refreshLoginUser(refreshToken?: string): Promise<any>;
+    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

package/dist/query-login-node.js

@@ -1011,18 +1011,26 @@ class QueryLogin extends BaseQuery {
       message: "登录失败"
     };
   }
-  async refreshLoginUser(refreshToken) {
-    const res = await this.queryRefreshToken(refreshToken);
+  async refreshLoginUser(opts) {
+    const res = await this.queryRefreshToken(opts);
     if (res.code === 200) {
-      const { accessToken, refreshToken: refreshToken2, accessTokenExpiresIn } = res?.data || {};
+      const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
       this.storage.setItem("token", accessToken || "");
-      await this.beforeSetLoginUser({ accessToken, refreshToken: refreshToken2, accessTokenExpiresIn, check401: false });
+      await this.beforeSetLoginUser({ accessToken, refreshToken, accessTokenExpiresIn, check401: false });
     }
     return res;
   }
-  async queryRefreshToken(refreshToken) {
+  async queryRefreshToken(opts) {
+    const refreshToken = opts?.refreshToken;
+    let accessToken = opts?.accessToken;
     const _refreshToken = refreshToken || await this.cacheStore.getRefreshToken();
-    let data = { refreshToken: _refreshToken };
+    let data = {};
+    if (accessToken) {
+      data.accessToken = accessToken;
+    }
+    if (_refreshToken) {
+      data.refreshToken = _refreshToken;
+    }
     if (!_refreshToken) {
       await this.cacheStore.clearCurrentUser();
       return {
@@ -1042,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 || "");

package/dist/query-login.d.ts

@@ -172,13 +172,19 @@ declare class QueryLogin<T extends Cache = Cache> extends BaseQuery {
      * @param refreshToken 刷新token，如果不传，则从缓存中获取
      * @returns
      */
-    refreshLoginUser(refreshToken?: string): Promise<any>;
+    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

package/dist/query-login.js

@@ -1011,18 +1011,26 @@ class QueryLogin extends BaseQuery {
       message: "登录失败"
     };
   }
-  async refreshLoginUser(refreshToken) {
-    const res = await this.queryRefreshToken(refreshToken);
+  async refreshLoginUser(opts) {
+    const res = await this.queryRefreshToken(opts);
     if (res.code === 200) {
-      const { accessToken, refreshToken: refreshToken2, accessTokenExpiresIn } = res?.data || {};
+      const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
       this.storage.setItem("token", accessToken || "");
-      await this.beforeSetLoginUser({ accessToken, refreshToken: refreshToken2, accessTokenExpiresIn, check401: false });
+      await this.beforeSetLoginUser({ accessToken, refreshToken, accessTokenExpiresIn, check401: false });
     }
     return res;
   }
-  async queryRefreshToken(refreshToken) {
+  async queryRefreshToken(opts) {
+    const refreshToken = opts?.refreshToken;
+    let accessToken = opts?.accessToken;
     const _refreshToken = refreshToken || await this.cacheStore.getRefreshToken();
-    let data = { refreshToken: _refreshToken };
+    let data = {};
+    if (accessToken) {
+      data.accessToken = accessToken;
+    }
+    if (_refreshToken) {
+      data.refreshToken = _refreshToken;
+    }
     if (!_refreshToken) {
       await this.cacheStore.clearCurrentUser();
       return {
@@ -1042,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 || "");

package/package.json

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

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

@@ -179,8 +179,8 @@ export class QueryLogin<T extends Cache = Cache> extends BaseQuery {
    * @param refreshToken 刷新token，如果不传，则从缓存中获取
    * @returns 
    */
-  async refreshLoginUser(refreshToken?: string) {
-    const res = await this.queryRefreshToken(refreshToken);
+  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 || '');
@@ -193,9 +193,17 @@ export class QueryLogin<T extends Cache = Cache> extends BaseQuery {
    * @param refreshToken
    * @returns
    */
-  async queryRefreshToken(refreshToken?: string) {
+  async queryRefreshToken(opts?: { refreshToken?: string, accessToken?: string }) {
+    const refreshToken = opts?.refreshToken;
+    let accessToken = opts?.accessToken;
     const _refreshToken = refreshToken || (await this.cacheStore.getRefreshToken());
-    let data = { refreshToken: _refreshToken };
+    let data: any = {};
+    if (accessToken) {
+      data.accessToken = accessToken;
+    }
+    if (_refreshToken) {
+      data.refreshToken = _refreshToken;
+    }
     if (!_refreshToken) {
       await this.cacheStore.clearCurrentUser();
       return {
@@ -226,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 || '');