@ogcio/building-blocks-sdk 0.2.11 → 0.2.12

package/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.2.11"
+  ".": "0.2.12"
 }

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.2.12](https://github.com/ogcio/building-blocks-sdk/compare/@ogcio/building-blocks-sdk@v0.2.11...@ogcio/building-blocks-sdk@v0.2.12) (2025-02-18)
+
+
+### Bug Fixes
+
+* check token expiration ([#148](https://github.com/ogcio/building-blocks-sdk/issues/148)) ([63b65fe](https://github.com/ogcio/building-blocks-sdk/commit/63b65fe06e3abac7ad826c8fa2d0dc3fb81798b7))
+
 ## [0.2.11](https://github.com/ogcio/building-blocks-sdk/compare/@ogcio/building-blocks-sdk@v0.2.10...@ogcio/building-blocks-sdk@v0.2.11) (2025-02-13)
 
 

package/dist/__tests__/client/clients/base-client.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=base-client.test.d.ts.map

package/dist/__tests__/client/clients/base-client.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"base-client.test.d.ts","sourceRoot":"","sources":["../../../../src/__tests__/client/clients/base-client.test.ts"],"names":[],"mappings":""}

package/dist/__tests__/client/clients/base-client.test.js

@@ -0,0 +1,53 @@
+import { describe, expect, it } from "vitest";
+import { Messaging } from "../../../client/clients/messaging/index.js";
+import { generateToken } from "../../utils.js";
+describe("Base Client - Get token", () => {
+    const baseUrl = "http://fakehost";
+    // messaging is not directly base client, but it inherits the get token logic
+    it("Will expire in a lot of time", async () => {
+        let getTokenFnInvokationNumber = 0;
+        const generatedToken = generateToken(10000000000000);
+        const getTokenFn = () => {
+            getTokenFnInvokationNumber++;
+            return Promise.resolve(generatedToken);
+        };
+        const client = new Messaging({ baseUrl, getTokenFn });
+        const token = await client.refreshToken();
+        expect(getTokenFnInvokationNumber).toBe(1);
+        expect(token).toBe(generatedToken);
+        const secondToken = await client.refreshToken();
+        expect(getTokenFnInvokationNumber, "It has been invoked even if it is not expired").toBe(1);
+        expect(secondToken).toBe(generatedToken);
+    });
+    it("Is already expired", async () => {
+        let getTokenFnInvokationNumber = 0;
+        const generatedToken = generateToken(-10000000000000);
+        const getTokenFn = () => {
+            getTokenFnInvokationNumber++;
+            return Promise.resolve(generatedToken);
+        };
+        const client = new Messaging({ baseUrl, getTokenFn });
+        const token = await client.refreshToken();
+        expect(getTokenFnInvokationNumber).toBe(1);
+        expect(token).toBe(generatedToken);
+        const secondToken = await client.refreshToken();
+        expect(getTokenFnInvokationNumber, "It has not been invoked even if it is expired").toBe(2);
+        expect(secondToken).toBe(generatedToken);
+    });
+    it("Will expire in few seconds", async () => {
+        let getTokenFnInvokationNumber = 0;
+        const generatedToken = generateToken(2);
+        const getTokenFn = () => {
+            getTokenFnInvokationNumber++;
+            return Promise.resolve(generatedToken);
+        };
+        const client = new Messaging({ baseUrl, getTokenFn });
+        const token = await client.refreshToken();
+        expect(getTokenFnInvokationNumber).toBe(1);
+        expect(token).toBe(generatedToken);
+        const secondToken = await client.refreshToken();
+        expect(getTokenFnInvokationNumber, "It has not been invoked even if it will expire in few seconds").toBe(2);
+        expect(secondToken).toBe(generatedToken);
+    });
+});
+//# sourceMappingURL=base-client.test.js.map

package/dist/__tests__/client/clients/base-client.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"base-client.test.js","sourceRoot":"","sources":["../../../../src/__tests__/client/clients/base-client.test.ts"],"names":[],"mappings":"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"}

package/dist/__tests__/client/clients/featureFlags/index.test.js

@@ -1,5 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import { FeatureFlags } from "../../../../client/clients/featureFlags/index.js";
+import { generateToken } from "../../../utils.js";
 const enabledOrNot = {
     "not-enabled": false,
     enabled: true,
@@ -21,7 +22,7 @@ global.fetch = async () => ({
 });
 describe("FeatureFlags", () => {
     const baseUrl = "http://fakehost";
-    const getTokenFn = () => Promise.resolve("test-token");
+    const getTokenFn = () => Promise.resolve(generateToken(10000));
     let featureFlags;
     beforeEach(async () => {
         featureFlags = new FeatureFlags({ baseUrl, getTokenFn });

package/dist/__tests__/client/clients/featureFlags/index.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../../../src/__tests__/client/clients/featureFlags/index.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,kDAAkD,CAAC;AAEhF,MAAM,YAAY,GAAG;IACnB,aAAa,EAAE,KAAK;IACpB,OAAO,EAAE,IAAI;CACd,CAAC;AAEF,EAAE,CAAC,IAAI,CAAC,gBAAgB,EAAE,GAAG,EAAE,CAAC,CAAC;IAC/B,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE;IACnB,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC;QACnB,SAAS,EAAE,EAAE,CAAC,EAAE,CACd,CACE,IAA+B,EAC/B,QAAiB,EACjB,cAA6B,EAC7B,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CACxB;KACF,CAAC;IACF,oBAAoB,EAAE,EAAE,CAAC,EAAE,EAAE;CAC9B,CAAC,CAAC,CAAC;AAEJ,IAAI,aAAa,GAAG,EAAE,CAAC;AAEvB,oBAAoB;AACpB,MAAM,CAAC,KAAK,GAAG,KAAK,IAAI,EAAE,CACxB,CAAC;IACC,EAAE,EAAE,IAAI;IACR,MAAM,EAAE,GAAG;IACX,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,aAAa;IAC/B,OAAO,EAAE,IAAI,OAAO,EAAE;CACvB,CAAa,CAAC;AAEjB,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,MAAM,OAAO,GAAG,iBAAiB,CAAC;IAClC,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACvD,IAAI,YAA0B,CAAC;IAE/B,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,YAAY,GAAG,IAAI,YAAY,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QAC1D,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;QAC/D,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;QACrD,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAC3D,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iEAAiE,EAAE,KAAK,IAAI,EAAE;QAC/E,aAAa,GAAG,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;QACzD,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAC;QACpD,MAAM,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,CAAC;QAC5B,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACrB,IAAI,EAAE,EAAE;YACR,QAAQ,EAAE,EAAE;YACZ,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../../../src/__tests__/client/clients/featureFlags/index.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,kDAAkD,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,MAAM,YAAY,GAAG;IACnB,aAAa,EAAE,KAAK;IACpB,OAAO,EAAE,IAAI;CACd,CAAC;AAEF,EAAE,CAAC,IAAI,CAAC,gBAAgB,EAAE,GAAG,EAAE,CAAC,CAAC;IAC/B,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE;IACnB,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC;QACnB,SAAS,EAAE,EAAE,CAAC,EAAE,CACd,CACE,IAA+B,EAC/B,QAAiB,EACjB,cAA6B,EAC7B,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CACxB;KACF,CAAC;IACF,oBAAoB,EAAE,EAAE,CAAC,EAAE,EAAE;CAC9B,CAAC,CAAC,CAAC;AAEJ,IAAI,aAAa,GAAG,EAAE,CAAC;AAEvB,oBAAoB;AACpB,MAAM,CAAC,KAAK,GAAG,KAAK,IAAI,EAAE,CACxB,CAAC;IACC,EAAE,EAAE,IAAI;IACR,MAAM,EAAE,GAAG;IACX,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,aAAa;IAC/B,OAAO,EAAE,IAAI,OAAO,EAAE;CACvB,CAAa,CAAC;AAEjB,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,MAAM,OAAO,GAAG,iBAAiB,CAAC;IAClC,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IAC/D,IAAI,YAA0B,CAAC;IAE/B,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,YAAY,GAAG,IAAI,YAAY,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QAC1D,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;QAC/D,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;QACrD,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAC3D,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iEAAiE,EAAE,KAAK,IAAI,EAAE;QAC/E,aAAa,GAAG,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;QACzD,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAC;QACpD,MAAM,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,CAAC;QAC5B,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACrB,IAAI,EAAE,EAAE;YACR,QAAQ,EAAE,EAAE;YACZ,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/__tests__/utils.d.ts

@@ -0,0 +1,2 @@
+export declare function generateToken(expiresInSeconds: number): string;
+//# sourceMappingURL=utils.d.ts.map

package/dist/__tests__/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/__tests__/utils.ts"],"names":[],"mappings":"AAAA,wBAAgB,aAAa,CAAC,gBAAgB,EAAE,MAAM,GAAG,MAAM,CAyB9D"}

package/dist/__tests__/utils.js

@@ -0,0 +1,20 @@
+export function generateToken(expiresInSeconds) {
+    // Create JWT header
+    const header = {
+        alg: "none",
+        typ: "JWT",
+    };
+    // Create JWT payload with mock data
+    const payload = {
+        sub: "1234567890",
+        name: "John Doe",
+        email: "john@example.com",
+        role: "user",
+        exp: Math.floor(Date.now() / 1000) + expiresInSeconds,
+    };
+    // Encode header and payload
+    const encodedHeader = Buffer.from(JSON.stringify(header)).toString("base64url");
+    const encodedPayload = Buffer.from(JSON.stringify(payload)).toString("base64url");
+    return `${encodedHeader}.${encodedPayload}.`;
+}
+//# sourceMappingURL=utils.js.map

package/dist/__tests__/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/__tests__/utils.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,aAAa,CAAC,gBAAwB;IACpD,oBAAoB;IACpB,MAAM,MAAM,GAAG;QACb,GAAG,EAAE,MAAM;QACX,GAAG,EAAE,KAAK;KACX,CAAC;IAEF,oCAAoC;IACpC,MAAM,OAAO,GAAG;QACd,GAAG,EAAE,YAAY;QACjB,IAAI,EAAE,UAAU;QAChB,KAAK,EAAE,kBAAkB;QACzB,IAAI,EAAE,MAAM;QACZ,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,gBAAgB;KACtD,CAAC;IAEF,4BAA4B;IAC5B,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAChE,WAAW,CACZ,CAAC;IACF,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAClE,WAAW,CACZ,CAAC;IAEF,OAAO,GAAG,aAAa,IAAI,cAAc,GAAG,CAAC;AAC/C,CAAC"}

package/dist/client/base-client.d.ts

@@ -6,6 +6,7 @@ export declare abstract class BaseClient<T extends {}> {
     private tokenExpiryThresholdMs;
     protected token?: string;
     protected tokenExpiryCheckTime: number;
+    private refreshLock;
     protected getTokenFn?: TokenFunction;
     protected serviceName: SERVICE_NAME | undefined;
     protected logger?: Logger;
@@ -19,5 +20,9 @@ export declare abstract class BaseClient<T extends {}> {
     protected getToken(): Promise<string | undefined>;
     isInitialized(): boolean;
     hasValidToken(): boolean;
+    private toMilliseconds;
+    private isTokenExpired;
+    private performRefreshToken;
+    refreshToken(): Promise<string | undefined>;
 }
 //# sourceMappingURL=base-client.d.ts.map

package/dist/client/base-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-client.d.ts","sourceRoot":"","sources":["../../src/client/base-client.ts"],"names":[],"mappings":"AAAA,OAAO,YAAiC,MAAM,eAAe,CAAC;AAC9D,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAM7E,8BAAsB,UAAU,CAAC,CAAC,SAAS,EAAE;IAC3C,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB,OAAO,CAAC,WAAW,CAAC;IACpB,OAAO,CAAC,sBAAsB,CAAQ;IACtC,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,oBAAoB,SAA4B;IAE1D,SAAS,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC;IACrC,SAAS,CAAC,WAAW,EAAE,YAAY,GAAG,SAAS,CAAC;IAChD,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAE1B,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;gBAEzC,EACV,OAAO,EACP,UAAU,EACV,MAAM,GACP,EAAE;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,aAAa,CAAC;QAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB;IAyDM,WAAW;cAKF,QAAQ;IASjB,aAAa;IAIb,aAAa;CAGrB"}
+{"version":3,"file":"base-client.d.ts","sourceRoot":"","sources":["../../src/client/base-client.ts"],"names":[],"mappings":"AAAA,OAAO,YAAiC,MAAM,eAAe,CAAC;AAC9D,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAM7E,8BAAsB,UAAU,CAAC,CAAC,SAAS,EAAE;IAC3C,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB,OAAO,CAAC,WAAW,CAAC;IACpB,OAAO,CAAC,sBAAsB,CAAQ;IACtC,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,oBAAoB,SAA4B;IAC1D,OAAO,CAAC,WAAW,CAA0C;IAC7D,SAAS,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC;IACrC,SAAS,CAAC,WAAW,EAAE,YAAY,GAAG,SAAS,CAAC;IAChD,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAE1B,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;gBAEzC,EACV,OAAO,EACP,UAAU,EACV,MAAM,GACP,EAAE;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,aAAa,CAAC;QAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB;IA0CM,WAAW;cAKF,QAAQ;IAmBjB,aAAa;IAIb,aAAa;IAIpB,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,cAAc;YAIR,mBAAmB;IAQpB,YAAY,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAazD"}

package/dist/client/base-client.js

@@ -5,7 +5,8 @@ export class BaseClient {
     initialized;
     tokenExpiryThresholdMs = 5000;
     token;
-    tokenExpiryCheckTime = Number.POSITIVE_INFINITY;
+    tokenExpiryCheckTime = Number.NEGATIVE_INFINITY;
+    refreshLock;
     getTokenFn;
     serviceName;
     logger;
@@ -24,20 +25,7 @@ export class BaseClient {
         this.client = createClient({ baseUrl: this.baseUrl });
         const authMiddleware = {
             onRequest: async ({ request }) => {
-                if ((!this.token || Date.now() >= this.tokenExpiryCheckTime) &&
-                    this.getTokenFn) {
-                    this.token = await this.getTokenFn(this.serviceName);
-                    try {
-                        const { payload } = parseJwtToken(this.token);
-                        const expires = getNumberValueFromObject(payload, "exp");
-                        this.tokenExpiryCheckTime = expires - this.tokenExpiryThresholdMs;
-                    }
-                    catch (err) {
-                        if (this.logger) {
-                            this.logger.warn(err, "failed to set tokenExpiryCheckTime");
-                        }
-                    }
-                }
+                await this.refreshToken();
                 if (this.logger) {
                     const clonedRequest = request.clone();
                     let requestBody = null;
@@ -59,12 +47,22 @@ export class BaseClient {
     }
     deleteToken() {
         this.token = undefined;
-        this.tokenExpiryCheckTime = Number.POSITIVE_INFINITY;
+        this.tokenExpiryCheckTime = Number.NEGATIVE_INFINITY;
     }
     async getToken() {
-        if (this.getTokenFn) {
-            const token = await this.getTokenFn(this.serviceName);
-            this.token = token;
+        if (!this.getTokenFn) {
+            return this.token;
+        }
+        this.token = await this.getTokenFn(this.serviceName);
+        try {
+            const { payload } = parseJwtToken(this.token);
+            const expires = getNumberValueFromObject(payload, "exp");
+            this.tokenExpiryCheckTime =
+                this.toMilliseconds(expires) - this.tokenExpiryThresholdMs;
+        }
+        catch (err) {
+            this.deleteToken();
+            throw err;
         }
         return this.token;
     }
@@ -72,7 +70,34 @@ export class BaseClient {
         return this.initialized;
     }
     hasValidToken() {
-        return this.token !== undefined;
+        return this.token !== undefined && !this.isTokenExpired();
+    }
+    toMilliseconds(timestamp) {
+        // If timestamp is in seconds (length is 10), convert to milliseconds
+        // If already in milliseconds (length is 13), return as is
+        return timestamp.toString().length === 10 ? timestamp * 1000 : timestamp;
+    }
+    isTokenExpired() {
+        return this.toMilliseconds(Date.now()) >= this.tokenExpiryCheckTime;
+    }
+    async performRefreshToken() {
+        if (this.hasValidToken()) {
+            return this.token;
+        }
+        return this.getToken();
+    }
+    async refreshToken() {
+        if (this.refreshLock)
+            return this.refreshLock;
+        let token;
+        try {
+            this.refreshLock = this.performRefreshToken();
+            token = await this.refreshLock;
+        }
+        finally {
+            this.refreshLock = undefined;
+        }
+        return token;
     }
 }
 //# sourceMappingURL=base-client.js.map

package/dist/client/base-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-client.js","sourceRoot":"","sources":["../../src/client/base-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base-client.js","sourceRoot":"","sources":["../../src/client/base-client.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ogcio/building-blocks-sdk",
-  "version": "0.2.11",
+  "version": "0.2.12",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/src/__tests__/client/clients/base-client.test.ts

@@ -0,0 +1,68 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { Messaging } from "../../../client/clients/messaging/index.js";
+import { generateToken } from "../../utils.js";
+
+describe("Base Client - Get token", () => {
+  const baseUrl = "http://fakehost";
+  // messaging is not directly base client, but it inherits the get token logic
+
+  it("Will expire in a lot of time", async () => {
+    let getTokenFnInvokationNumber = 0;
+    const generatedToken = generateToken(10000000000000);
+    const getTokenFn = () => {
+      getTokenFnInvokationNumber++;
+      return Promise.resolve(generatedToken);
+    };
+    const client = new Messaging({ baseUrl, getTokenFn });
+    const token = await client.refreshToken();
+    expect(getTokenFnInvokationNumber).toBe(1);
+    expect(token).toBe(generatedToken);
+
+    const secondToken = await client.refreshToken();
+    expect(
+      getTokenFnInvokationNumber,
+      "It has been invoked even if it is not expired",
+    ).toBe(1);
+    expect(secondToken).toBe(generatedToken);
+  });
+
+  it("Is already expired", async () => {
+    let getTokenFnInvokationNumber = 0;
+    const generatedToken = generateToken(-10000000000000);
+    const getTokenFn = () => {
+      getTokenFnInvokationNumber++;
+      return Promise.resolve(generatedToken);
+    };
+    const client = new Messaging({ baseUrl, getTokenFn });
+    const token = await client.refreshToken();
+    expect(getTokenFnInvokationNumber).toBe(1);
+    expect(token).toBe(generatedToken);
+
+    const secondToken = await client.refreshToken();
+    expect(
+      getTokenFnInvokationNumber,
+      "It has not been invoked even if it is expired",
+    ).toBe(2);
+    expect(secondToken).toBe(generatedToken);
+  });
+
+  it("Will expire in few seconds", async () => {
+    let getTokenFnInvokationNumber = 0;
+    const generatedToken = generateToken(2);
+    const getTokenFn = () => {
+      getTokenFnInvokationNumber++;
+      return Promise.resolve(generatedToken);
+    };
+    const client = new Messaging({ baseUrl, getTokenFn });
+    const token = await client.refreshToken();
+    expect(getTokenFnInvokationNumber).toBe(1);
+    expect(token).toBe(generatedToken);
+
+    const secondToken = await client.refreshToken();
+    expect(
+      getTokenFnInvokationNumber,
+      "It has not been invoked even if it will expire in few seconds",
+    ).toBe(2);
+    expect(secondToken).toBe(generatedToken);
+  });
+});

package/src/__tests__/client/clients/featureFlags/index.test.ts

@@ -1,5 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import { FeatureFlags } from "../../../../client/clients/featureFlags/index.js";
+import { generateToken } from "../../../utils.js";
 
 const enabledOrNot = {
   "not-enabled": false,
@@ -33,7 +34,7 @@ global.fetch = async () =>
 
 describe("FeatureFlags", () => {
   const baseUrl = "http://fakehost";
-  const getTokenFn = () => Promise.resolve("test-token");
+  const getTokenFn = () => Promise.resolve(generateToken(10000));
   let featureFlags: FeatureFlags;
 
   beforeEach(async () => {

package/src/__tests__/utils.ts

@@ -0,0 +1,26 @@
+export function generateToken(expiresInSeconds: number): string {
+  // Create JWT header
+  const header = {
+    alg: "none",
+    typ: "JWT",
+  };
+
+  // Create JWT payload with mock data
+  const payload = {
+    sub: "1234567890",
+    name: "John Doe",
+    email: "john@example.com",
+    role: "user",
+    exp: Math.floor(Date.now() / 1000) + expiresInSeconds,
+  };
+
+  // Encode header and payload
+  const encodedHeader = Buffer.from(JSON.stringify(header)).toString(
+    "base64url",
+  );
+  const encodedPayload = Buffer.from(JSON.stringify(payload)).toString(
+    "base64url",
+  );
+
+  return `${encodedHeader}.${encodedPayload}.`;
+}

package/src/client/base-client.ts

@@ -10,8 +10,8 @@ export abstract class BaseClient<T extends {}> {
   private initialized;
   private tokenExpiryThresholdMs = 5000;
   protected token?: string;
-  protected tokenExpiryCheckTime = Number.POSITIVE_INFINITY;
-
+  protected tokenExpiryCheckTime = Number.NEGATIVE_INFINITY;
+  private refreshLock: Promise<string | undefined> | undefined;
   protected getTokenFn?: TokenFunction;
   protected serviceName: SERVICE_NAME | undefined;
   protected logger?: Logger;
@@ -41,22 +41,7 @@ export abstract class BaseClient<T extends {}> {
     this.client = createClient<T>({ baseUrl: this.baseUrl });
     const authMiddleware: Middleware = {
       onRequest: async ({ request }) => {
-        if (
-          (!this.token || Date.now() >= this.tokenExpiryCheckTime) &&
-          this.getTokenFn
-        ) {
-          this.token = await this.getTokenFn(this.serviceName as SERVICE_NAME);
-
-          try {
-            const { payload } = parseJwtToken(this.token);
-            const expires = getNumberValueFromObject(payload, "exp");
-            this.tokenExpiryCheckTime = expires - this.tokenExpiryThresholdMs;
-          } catch (err) {
-            if (this.logger) {
-              this.logger.warn(err, "failed to set tokenExpiryCheckTime");
-            }
-          }
-        }
+        await this.refreshToken();
 
         if (this.logger) {
           const clonedRequest = request.clone();
@@ -85,13 +70,23 @@ export abstract class BaseClient<T extends {}> {
 
   public deleteToken() {
     this.token = undefined;
-    this.tokenExpiryCheckTime = Number.POSITIVE_INFINITY;
+    this.tokenExpiryCheckTime = Number.NEGATIVE_INFINITY;
   }
 
   protected async getToken() {
-    if (this.getTokenFn) {
-      const token = await this.getTokenFn(this.serviceName as SERVICE_NAME);
-      this.token = token;
+    if (!this.getTokenFn) {
+      return this.token;
+    }
+
+    this.token = await this.getTokenFn(this.serviceName as SERVICE_NAME);
+    try {
+      const { payload } = parseJwtToken(this.token);
+      const expires = getNumberValueFromObject(payload, "exp");
+      this.tokenExpiryCheckTime =
+        this.toMilliseconds(expires) - this.tokenExpiryThresholdMs;
+    } catch (err) {
+      this.deleteToken();
+      throw err;
     }
 
     return this.token;
@@ -102,6 +97,38 @@ export abstract class BaseClient<T extends {}> {
   }
 
   public hasValidToken() {
-    return this.token !== undefined;
+    return this.token !== undefined && !this.isTokenExpired();
+  }
+
+  private toMilliseconds(timestamp: number) {
+    // If timestamp is in seconds (length is 10), convert to milliseconds
+    // If already in milliseconds (length is 13), return as is
+    return timestamp.toString().length === 10 ? timestamp * 1000 : timestamp;
+  }
+
+  private isTokenExpired() {
+    return this.toMilliseconds(Date.now()) >= this.tokenExpiryCheckTime;
+  }
+
+  private async performRefreshToken(): Promise<string | undefined> {
+    if (this.hasValidToken()) {
+      return this.token;
+    }
+
+    return this.getToken();
+  }
+
+  public async refreshToken(): Promise<string | undefined> {
+    if (this.refreshLock) return this.refreshLock;
+
+    let token: string | undefined;
+    try {
+      this.refreshLock = this.performRefreshToken();
+      token = await this.refreshLock;
+    } finally {
+      this.refreshLock = undefined;
+    }
+
+    return token;
   }
 }

package/vitest.config.mts

@@ -11,7 +11,6 @@ export default defineConfig({
     include: [
       "**/@(test?(s)|__test?(s)__)/**/*.test.@(js|cjs|mjs|tap|cts|jsx|mts|ts|tsx)",
       "**/*.@(test?(s)|spec).@(js|cjs|mjs|tap|cts|jsx|mts|ts|tsx)",
-      "**/test?(s).@(js|cjs|mjs|tap|cts|jsx|mts|ts|tsx)",
     ],
     exclude: ["**/@(fixture*(s)|dist|node_modules)/**"],
     maxConcurrency: 1,