@faable/sdk-base 1.0.14 → 1.0.15

package/dist/auth/client_credentials/client_credentials.d.ts

@@ -6,9 +6,6 @@ type Params = {
     debug?: boolean;
 };
 export type ClientCredentialsAuthParams = Partial<[Partial<Params>]>;
-export interface ClientCredentialsResponse {
-    access_token: string;
-}
 export declare const createClientCredentials: StrategyInterface<ClientCredentialsAuthParams>;
 export {};
 //# sourceMappingURL=client_credentials.d.ts.map

package/dist/auth/client_credentials/client_credentials.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client_credentials.d.ts","sourceRoot":"","sources":["../../../src/auth/client_credentials/client_credentials.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAKrE,KAAK,MAAM,GAAG;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG,OAAO,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAMrE,MAAM,WAAW,yBAAyB;IACxC,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,uBAAuB,EAAE,iBAAiB,CACrD,2BAA2B,CAyF5B,CAAC"}
+{"version":3,"file":"client_credentials.d.ts","sourceRoot":"","sources":["../../../src/auth/client_credentials/client_credentials.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAKrE,KAAK,MAAM,GAAG;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG,OAAO,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAMrE,eAAO,MAAM,uBAAuB,EAAE,iBAAiB,CACrD,2BAA2B,CAwF5B,CAAC"}

package/dist/auth/client_credentials/client_credentials.js

@@ -1,5 +1,4 @@
 import { fetcher_axios } from "../../fetcher/fetcher_axios.js";
-import { jwtDecode } from "jwt-decode";
 import { createTokenStore } from "./store.js";
 import PQueue from "p-queue";
 const CLIENT_ID_ENV = "FAABLEAUTH_CLIENT_ID";
@@ -21,14 +20,9 @@ export const createClientCredentials = (params) => {
     }
     const store = createTokenStore({ debug });
     const queue = new PQueue({ concurrency: 1, timeout: 20 * 1000 });
-    const isTokenExpired = (token) => {
-        const { access_token } = token;
-        let { exp } = jwtDecode(access_token);
-        if (!exp) {
-            throw new Error("Missing expire date");
-        }
-        const currentSeconds = new Date().getTime() / 1000;
-        return currentSeconds > exp;
+    const isTokenExpired = (token, issued_at) => {
+        const { expires_in } = token;
+        return issued_at + expires_in < Date.now();
     };
     const fetcher = fetcher_axios({
         baseURL: auth_domain,
@@ -40,16 +34,16 @@ export const createClientCredentials = (params) => {
         params.append("client_secret", client_secret);
         const token_response = await fetcher.post("/oauth/token", params);
         // Save token in store
-        store.saveToken(token_response);
+        store.saveTokenResponse(token_response);
         return token_response;
     };
     const getToken = async () => {
-        let token = store.getToken();
+        let res = store.getTokenResponse();
         // We don't have a token or it's expired
-        if (!token || isTokenExpired(token)) {
-            token = await requestToken();
+        if (!res || isTokenExpired(res.response, res.iat)) {
+            return requestToken();
         }
-        return token;
+        return res.response;
     };
     const getTokenWithLimits = async () => {
         const token = await queue.add(() => getToken());

package/dist/auth/client_credentials/store.d.ts

@@ -1,12 +1,16 @@
-export interface ClientCredentialsResponse {
-    access_token: string;
-}
+import { ClientCredentialsResponse } from "./types.js";
 type TokenStoreOptions = {
     debug?: boolean;
 };
 export declare const createTokenStore: ({ debug }?: TokenStoreOptions) => {
-    saveToken: (token: ClientCredentialsResponse) => ClientCredentialsResponse;
-    getToken: () => ClientCredentialsResponse | null;
+    saveTokenResponse: (response: ClientCredentialsResponse) => {
+        response: ClientCredentialsResponse;
+        iat: number;
+    };
+    getTokenResponse: () => {
+        response: ClientCredentialsResponse;
+        iat: number;
+    } | null;
 };
 export {};
 //# sourceMappingURL=store.d.ts.map

package/dist/auth/client_credentials/store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../../src/auth/client_credentials/store.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,yBAAyB;IACxC,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,KAAK,iBAAiB,GAAG;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,gBAAgB,eAAe,iBAAiB;uBAMjC,yBAAyB;;CASpD,CAAC"}
+{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../../src/auth/client_credentials/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAEvD,KAAK,iBAAiB,GAAG;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,gBAAgB,eAAe,iBAAiB;kCAStB,yBAAyB;kBAPlD,yBAAyB;aAC9B,MAAM;;;kBADD,yBAAyB;aAC9B,MAAM;;CAkBd,CAAC"}

package/dist/auth/client_credentials/store.js

@@ -1,15 +1,18 @@
 export const createTokenStore = ({ debug } = {}) => {
     let _stored_token;
-    const getToken = () => {
+    const getTokenResponse = () => {
         return _stored_token;
     };
-    const saveToken = (token) => {
-        _stored_token = token;
+    const saveTokenResponse = (response) => {
+        _stored_token = {
+            response,
+            iat: Date.now(),
+        };
         debug && console.log(`[SDK] Token stored successfully`);
         return _stored_token;
     };
     return {
-        saveToken,
-        getToken,
+        saveTokenResponse,
+        getTokenResponse,
     };
 };

package/dist/auth/client_credentials/types.d.ts

@@ -0,0 +1,6 @@
+export interface ClientCredentialsResponse {
+    access_token: string;
+    expires_in: number;
+    token_type: string;
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/auth/client_credentials/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/auth/client_credentials/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,yBAAyB;IACxC,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB"}

package/dist/auth/client_credentials/types.js

@@ -0,0 +1 @@
+export {};

package/dist/fetcher/Fetcher.d.ts

@@ -20,10 +20,10 @@ export type FetcherConfig = {
     params?: Partial<Params>;
 };
 export type Fetcher = {
-    get: <T>(url: string, config?: FetcherConfig) => Promise<T>;
-    post: <T>(url: string, data: any, config?: FetcherConfig) => Promise<T>;
-    request: <T>(params: FetcherRequestParams) => Promise<T>;
-    check: <T>(url: string, status?: number, config?: FetcherConfig) => Promise<boolean>;
+    get: <T = any>(url: string, config?: FetcherConfig) => Promise<T>;
+    post: <T = any>(url: string, data: any, config?: FetcherConfig) => Promise<T>;
+    request: <T = any>(params: FetcherRequestParams) => Promise<T>;
+    check: (url: string, status?: number, config?: FetcherConfig) => Promise<boolean>;
 };
 export type FetcherResponse = {
     status?: number;

package/dist/fetcher/Fetcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Fetcher.d.ts","sourceRoot":"","sources":["../../src/fetcher/Fetcher.ts"],"names":[],"mappings":"AAAA,KAAK,MAAM,GACP,KAAK,GACL,KAAK,GACL,QAAQ,GACR,QAAQ,GACR,MAAM,GACN,MAAM,GACN,SAAS,GACT,SAAS,GACT,MAAM,GACN,MAAM,GACN,KAAK,GACL,KAAK,GACL,OAAO,GACP,OAAO,GACP,OAAO,GACP,OAAO,GACP,MAAM,GACN,MAAM,GACN,QAAQ,GACR,QAAQ,CAAC;AACb,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,GAAG,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,aAAa,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IAC5D,IAAI,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,aAAa,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IACxE,OAAO,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,oBAAoB,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IACzD,KAAK,EAAE,CAAC,CAAC,EACP,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,aAAa,KACnB,OAAO,CAAC,OAAO,CAAC,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,MAAM,CAAC,EAAE;QACP,GAAG,CAAC,EAAE,MAAM,CAAC;KACd,CAAC;CACH,CAAC"}
+{"version":3,"file":"Fetcher.d.ts","sourceRoot":"","sources":["../../src/fetcher/Fetcher.ts"],"names":[],"mappings":"AAAA,KAAK,MAAM,GACP,KAAK,GACL,KAAK,GACL,QAAQ,GACR,QAAQ,GACR,MAAM,GACN,MAAM,GACN,SAAS,GACT,SAAS,GACT,MAAM,GACN,MAAM,GACN,KAAK,GACL,KAAK,GACL,OAAO,GACP,OAAO,GACP,OAAO,GACP,OAAO,GACP,MAAM,GACN,MAAM,GACN,QAAQ,GACR,QAAQ,CAAC;AACb,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,GAAG,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,aAAa,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IAClE,IAAI,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,aAAa,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IAC9E,OAAO,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,MAAM,EAAE,oBAAoB,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IAC/D,KAAK,EAAE,CACL,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,aAAa,KACnB,OAAO,CAAC,OAAO,CAAC,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,MAAM,CAAC,EAAE;QACP,GAAG,CAAC,EAAE,MAAM,CAAC;KACd,CAAC;CACH,CAAC"}

package/dist/fetcher/fetcher_axios.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetcher_axios.d.ts","sourceRoot":"","sources":["../../src/fetcher/fetcher_axios.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAiB,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAY5C,eAAO,MAAM,aAAa,YAAY,SAAS,KAAQ,OA6DtD,CAAC"}
+{"version":3,"file":"fetcher_axios.d.ts","sourceRoot":"","sources":["../../src/fetcher/fetcher_axios.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAiB,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAY5C,eAAO,MAAM,aAAa,YAAY,SAAS,KAAQ,OAgEtD,CAAC"}

package/dist/fetcher/fetcher_axios.js

@@ -20,7 +20,7 @@ export const fetcher_axios = (params = {}) => {
     });
     // Add base interceptor
     instance.interceptors.response.use((res) => {
-        if (params.debug) {
+        if (params.debug && res.config.params) {
             const queryparams = new URLSearchParams(res.config.params);
             console.log(`[${res.status}] ${res.config.url}${queryparams.size > 0 ? `?${queryparams.toString()}` : ""}`);
         }
@@ -36,6 +36,9 @@ export const fetcher_axios = (params = {}) => {
             return res.data;
         },
         post: async (url, data, config) => {
+            if (!data) {
+                throw new FaableApiError("empty body");
+            }
             const res = await instance.request({
                 method: "POST",
                 url,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faable/sdk-base",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "author": "Marc Pomar <marc@faable.com>",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -11,7 +11,6 @@
   },
   "dependencies": {
     "axios": "^1.7.7",
-    "jwt-decode": "^4.0.0",
     "p-queue": "^8.0.1",
     "ramda": "^0.30.1"
   },
@@ -21,13 +20,15 @@
     "@types/ramda": "^0.30.2",
     "ava": "^6.1.3",
     "dotenv": "^16.4.5",
+    "json-server": "^1.0.0-beta.3",
     "nock": "^13.5.5",
     "openapi-typescript": "^7.4.0",
     "rimraf": "^6.0.1",
     "semantic-release": "^24.1.1",
     "tsimp": "^2.0.11",
     "tsx": "^4.19.1",
-    "typescript": "^5.6.2"
+    "typescript": "^5.6.2",
+    "wait-on": "^8.0.1"
   },
   "scripts": {
     "generate-types": "openapi-typescript https://api.faable.com/docs/json -o src/api/types.ts",