@clairejs/client 3.4.6 → 3.4.9

package/README.md

@@ -1,5 +1,9 @@
 ## Change Log
 
+#### 3.4.9:
+
+-   refactor http client
+
 #### 3.4.6:
 
 -   update RouterConfig to allow arbitrary field

package/dist/api/DefaultHttpClient.d.ts

@@ -9,7 +9,7 @@ export interface RequestData {
     headers?: object;
     options?: RequestOptions;
 }
-export declare class DefaultHttpClient extends AbstractHttpClient {
+export declare abstract class DefaultHttpClient extends AbstractHttpClient {
     protected readonly apiServerUrl: string;
     protected readonly logger?: LogHandler | undefined;
     protected readonly maxRetryCount: number;
@@ -18,8 +18,8 @@ export declare class DefaultHttpClient extends AbstractHttpClient {
     private readonly api;
     constructor(apiServerUrl: string, logger?: LogHandler | undefined, maxRetryCount?: number, delayMsBetweenRetry?: number, storage?: AbstractStorage | undefined);
     protected resolveUrl(url: string): Promise<string>;
-    protected getAuthorization(): Promise<string>;
-    protected errorHandler<T = any>(_operation: () => Promise<T>, err: any): Promise<T | undefined>;
+    protected abstract getAuthorizationHeader(): Promise<Record<string, string>>;
+    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,12 +53,6 @@ export class DefaultHttpClient extends AbstractHttpClient {
     async resolveUrl(url) {
         return this.apiServerUrl + url;
     }
-    async getAuthorization() {
-        return "";
-    }
-    async errorHandler(_operation, err) {
-        throw err;
-    }
     async retry(apiCall, retryCount = 0) {
         try {
             return await apiCall();
@@ -79,7 +73,7 @@ export class DefaultHttpClient extends AbstractHttpClient {
     async performRequest(data) {
         const finalUrl = await this.resolveUrl(data.url);
         const operation = async () => {
-            const authHeader = !data.options?.noAuthorization ? { authorization: await this.getAuthorization() } : {};
+            const authHeader = !data.options?.noAuthorization ? await this.getAuthorizationHeader() : {};
             const result = await this.api({
                 method: data.method,
                 url: finalUrl,

package/dist/api/RefreshHttpClient.d.ts

@@ -2,7 +2,7 @@ import { AccessToken, LogHandler } from "@clairejs/core";
 import { AbstractStorage } from "../system/AbstractStorage";
 import { AbstractTokenManager } from "./AbstractTokenManager";
 import { DefaultHttpClient } from "./DefaultHttpClient";
-export declare class RefreshHttpClient extends DefaultHttpClient {
+export declare abstract class RefreshHttpClient extends DefaultHttpClient {
     protected readonly apiServerUrl: string;
     protected readonly tokenManager: AbstractTokenManager;
     protected readonly logger?: LogHandler | undefined;
@@ -13,9 +13,9 @@ export declare class RefreshHttpClient extends DefaultHttpClient {
     private refreshQueue;
     private tokenQueue;
     constructor(apiServerUrl: string, tokenManager: AbstractTokenManager, logger?: LogHandler | undefined, maxRetryCount?: number, delayMsBetweenRetry?: number, storage?: AbstractStorage | undefined);
-    protected getRefreshedAccessToken(): Promise<AccessToken>;
-    protected reauthenticate(): Promise<void>;
     protected getAuthorization(): Promise<string>;
-    protected refreshToken(token?: AccessToken): Promise<void>;
+    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

@@ -1,7 +1,5 @@
 import { Errors, LogLevel } from "@clairejs/core";
 import { DefaultHttpClient } from "./DefaultHttpClient";
-const tokenExpiredError = Errors.TOKEN_EXPIRED().name;
-const invalidTokenError = Errors.INVALID_TOKEN().name;
 export class RefreshHttpClient extends DefaultHttpClient {
     apiServerUrl;
     tokenManager;
@@ -21,12 +19,6 @@ export class RefreshHttpClient extends DefaultHttpClient {
         this.delayMsBetweenRetry = delayMsBetweenRetry;
         this.storage = storage;
     }
-    async getRefreshedAccessToken() {
-        throw Errors.INVALID_TOKEN();
-    }
-    async reauthenticate() {
-        throw Errors.INVALID_CREDENTIALS();
-    }
     async getAuthorization() {
         if (this.refreshing) {
             const promise = new Promise((resolver) => {
@@ -39,6 +31,19 @@ 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() };
+    }
     async refreshToken(token) {
         if (this.refreshing) {
             this.logger?.log(LogLevel.DEBUG, "Awaiting refresh token, queued");
@@ -47,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
-            return await this.reauthenticate();
+            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");
         }
@@ -64,36 +71,11 @@ export class RefreshHttpClient extends DefaultHttpClient {
                 resolver();
             }
             for (const resolver of this.tokenQueue) {
-                resolver(token.token);
+                resolver(token?.token || "");
             }
             //-- clear queue
             this.refreshQueue = [];
             this.tokenQueue = [];
         }
     }
-    async errorHandler(operation, err) {
-        const errorName = err.name;
-        if (errorName === tokenExpiredError) {
-            return await this.refreshToken()
-                .catch(() => this.reauthenticate())
-                .catch(() => {
-                throw Errors.SESSION_EXPIRED();
-            })
-                .then(() => operation())
-                .catch((err) => {
-                throw err.response?.data || Errors.HTTP_REQUEST_ERROR();
-            });
-        }
-        else if (errorName === invalidTokenError) {
-            return await this.reauthenticate()
-                .catch(() => {
-                throw Errors.SESSION_EXPIRED();
-            })
-                .then(() => operation())
-                .catch((err) => {
-                throw err.response?.data || Errors.HTTP_REQUEST_ERROR();
-            });
-        }
-        throw err;
-    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clairejs/client",
-    "version": "3.4.6",
+    "version": "3.4.9",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "type": "module",
@@ -13,7 +13,7 @@
         "axios": "^1.3.4"
     },
     "peerDependencies": {
-        "@clairejs/core": "^3.8.4"
+        "@clairejs/core": "^3.8.10"
     },
     "devDependencies": {
         "@types/mocha": "^10.0.1",