@clairejs/client 3.4.8 → 3.4.9

package/README.md

@@ -1,6 +1,6 @@
 ## Change Log
 
-#### 3.4.8:
+#### 3.4.9:
 
 -   refactor http client
 

package/dist/api/DefaultHttpClient.d.ts

@@ -19,7 +19,7 @@ export declare abstract class DefaultHttpClient extends AbstractHttpClient {
     constructor(apiServerUrl: string, logger?: LogHandler | undefined, maxRetryCount?: number, delayMsBetweenRetry?: number, storage?: AbstractStorage | undefined);
     protected resolveUrl(url: string): Promise<string>;
     protected abstract getAuthorizationHeader(): Promise<Record<string, string>>;
-    protected errorHandler<T = any>(_operation: () => Promise<T>, err: any): Promise<T | undefined>;
+    protected abstract errorHandler<T = any>(_operation: () => Promise<T>, err: any): Promise<T | undefined>;
     protected retry<T = any>(apiCall: () => Promise<T>, retryCount?: number): Promise<T | undefined>;
     protected performRequest<T = any>(data: RequestData): Promise<T | undefined>;
     protected doGet<T = any>(url: string, headers?: object, options?: RequestOptions): Promise<T | undefined>;

package/dist/api/DefaultHttpClient.js

@@ -53,9 +53,6 @@ export class DefaultHttpClient extends AbstractHttpClient {
     async resolveUrl(url) {
         return this.apiServerUrl + url;
     }
-    async errorHandler(_operation, err) {
-        throw err;
-    }
     async retry(apiCall, retryCount = 0) {
         try {
             return await apiCall();

package/dist/api/RefreshHttpClient.d.ts

@@ -14,7 +14,8 @@ export declare abstract class RefreshHttpClient extends DefaultHttpClient {
     private tokenQueue;
     constructor(apiServerUrl: string, tokenManager: AbstractTokenManager, logger?: LogHandler | undefined, maxRetryCount?: number, delayMsBetweenRetry?: number, storage?: AbstractStorage | undefined);
     protected getAuthorization(): Promise<string>;
-    protected abstract getRefreshedAccessToken(): Promise<AccessToken>;
+    protected abstract refreshSession(refreshToken: string): Promise<AccessToken | undefined>;
+    protected errorHandler<T = any>(operation: () => Promise<T>, err: any): Promise<T | undefined>;
     protected getAuthorizationHeader(): Promise<Record<string, string>>;
     protected refreshToken(token?: AccessToken): Promise<void>;
 }

package/dist/api/RefreshHttpClient.js

@@ -31,6 +31,16 @@ export class RefreshHttpClient extends DefaultHttpClient {
             return accessToken?.token || "";
         }
     }
+    async errorHandler(operation, err) {
+        if (err.name === Errors.TOKEN_EXPIRED().name) {
+            return await this.refreshToken()
+                .then(operation)
+                .catch((err) => {
+                throw err.response.data || err;
+            });
+        }
+        throw err;
+    }
     async getAuthorizationHeader() {
         return { authorization: await this.getAuthorization() };
     }
@@ -42,14 +52,16 @@ export class RefreshHttpClient extends DefaultHttpClient {
             });
         }
         token = token || (await this.tokenManager.getAccessToken());
-        //-- call to api server to refresh token
         if (!token || !token.refreshToken) {
             //-- there is no refresh token to refresh
             throw Errors.SESSION_EXPIRED();
         }
         try {
             this.refreshing = true;
-            token = await this.getRefreshedAccessToken();
+            token = await this.refreshSession(token.refreshToken);
+            if (!token) {
+                throw Errors.SESSION_EXPIRED();
+            }
             await this.tokenManager.setAccessToken(token);
             this.logger?.log(LogLevel.DEBUG, "Access token was refreshed");
         }
@@ -59,7 +71,7 @@ export class RefreshHttpClient extends DefaultHttpClient {
                 resolver();
             }
             for (const resolver of this.tokenQueue) {
-                resolver(token.token);
+                resolver(token?.token || "");
             }
             //-- clear queue
             this.refreshQueue = [];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clairejs/client",
-    "version": "3.4.8",
+    "version": "3.4.9",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "type": "module",