@versori/run 0.2.0-alpha.4 → 0.2.0-alpha.6

package/esm/src/dsl/http/versori/credentials/client.d.ts

@@ -1,10 +1,7 @@
-import { GetAccessTokenResponse } from './oauth2/v1/token_service_pb.js';
 import { GetTokenResponse } from './tokens/v1/token_service_pb.js';
 export declare class VersoriCredentialClient {
-    private oauth2Client;
     private TokenService;
     constructor(credsBaseUrl: string);
-    getToken(credId: string): Promise<GetTokenResponse>;
-    getOAuth2Token(credId: string): Promise<GetAccessTokenResponse>;
+    getToken(credId: string, forceRefresh?: boolean): Promise<GetTokenResponse>;
 }
 //# sourceMappingURL=client.d.ts.map

package/esm/src/dsl/http/versori/credentials/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../../../src/src/dsl/http/versori/credentials/client.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAGzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,qBAAa,uBAAuB;IAChC,OAAO,CAAC,YAAY,CAAoB;IAExC,OAAO,CAAC,YAAY,CAAc;gBAMtB,YAAY,EAAE,MAAM;IAMhC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAInD,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;CAGlE"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../../../src/src/dsl/http/versori/credentials/client.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAGnE,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,YAAY,CAAc;gBAEtB,YAAY,EAAE,MAAM;IAIhC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,GAAE,OAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAGrF"}

package/esm/src/dsl/http/versori/credentials/client.js

@@ -1,30 +1,17 @@
-import { createOAuth2TokenService, createTokenClient,
+import { createTokenClient,
 // createCredentialService,
  } from './credentials.js';
 export class VersoriCredentialClient {
-    // private CredentialService: CredentialService;
-    // need to add custom function service
     constructor(credsBaseUrl) {
-        Object.defineProperty(this, "oauth2Client", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         Object.defineProperty(this, "TokenService", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        this.oauth2Client = createOAuth2TokenService(credsBaseUrl);
         this.TokenService = createTokenClient(credsBaseUrl);
-        // this.CredentialService = createCredentialService(credsBaseUrl);
-    }
-    getToken(credId) {
-        return this.TokenService.getToken({ credentialId: credId });
     }
-    getOAuth2Token(credId) {
-        return this.oauth2Client.getAccessToken({ credentialId: credId });
+    getToken(credId, forceRefresh = false) {
+        return this.TokenService.getToken({ credentialId: credId, forceRefresh });
     }
 }

package/esm/src/dsl/http/versori/roundtripper.d.ts

@@ -2,7 +2,6 @@ import { DynamicFetcher, RoundTripperFactory } from '../types.js';
 import { VersoriCredentialClient } from './credentials/mod.js';
 import { PlatformAPIClient } from './platformapi.js';
 import { Logger } from '../../../observability/logging/Logger.js';
-export type RunningEnvironment = 'local' | 'versori' | 'staging';
 /**
  * VersoriRoundTripper is an implementation of the RoundTripperFactory interface for Versori connections.
  * This is the intended implementation for when projects/services are hosted on Versori infrastructure.

package/esm/src/dsl/http/versori/roundtripper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"roundtripper.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/roundtripper.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,cAAc,EACd,mBAAmB,EAEtB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AASlE,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC;AAEjE;;;;;;;;;;;GAWG;AACH,qBAAa,0BAA2B,YAAW,mBAAmB;IAClE,OAAO,CAAC,WAAW,CAA0B;IAE7C,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,OAAO,CAAC,UAAU,CAAmB;IAErC,OAAO,CAAC,GAAG,CAAS;IAEpB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAK7B;gBAGE,WAAW,EAAE,uBAAuB,EACpC,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM;IAQlB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,0BAA0B;IA0B3D,OAAO,CAAC,iBAAiB;IAczB,OAAO,CAAC,aAAa;IAsBf,MAAM,CACR,QAAQ,EAAE,MAAM,EAChB,EAAE,GAAE,OAAO,KAAwB,GACpC,OAAO,CAAC,OAAO,KAAK,GAAG,SAAS,CAAC;IA4B9B,aAAa,CACf,YAAY,EAAE,MAAM,EACpB,EAAE,GAAE,OAAO,KAAwB,GACpC,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IA4CtC,OAAO,CAAC,eAAe;IAYvB,OAAO,CAAC,aAAa;YAUP,aAAa;YAoDb,gBAAgB;YAmChB,kBAAkB;YAiClB,aAAa;CAkD9B"}
+{"version":3,"file":"roundtripper.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/roundtripper.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,cAAc,EACd,mBAAmB,EAEtB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AAUlE;;;;;;;;;;;GAWG;AACH,qBAAa,0BAA2B,YAAW,mBAAmB;IAClE,OAAO,CAAC,WAAW,CAA0B;IAE7C,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,OAAO,CAAC,UAAU,CAAmB;IAErC,OAAO,CAAC,GAAG,CAAS;IAEpB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAK7B;gBAGE,WAAW,EAAE,uBAAuB,EACpC,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM;IAQlB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,0BAA0B;IA0B3D,OAAO,CAAC,iBAAiB;IAczB,OAAO,CAAC,aAAa;IAwBf,MAAM,CACR,QAAQ,EAAE,MAAM,EAChB,EAAE,GAAE,OAAO,KAAwB,GACpC,OAAO,CAAC,OAAO,KAAK,GAAG,SAAS,CAAC;IAqC9B,aAAa,CACf,YAAY,EAAE,MAAM,EACpB,EAAE,GAAE,OAAO,KAAwB,GACpC,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IA+CtC,OAAO,CAAC,eAAe;IAcvB,OAAO,CAAC,aAAa;YAYP,aAAa;YAyDb,gBAAgB;YAqChB,kBAAkB;YAmClB,aAAa;CAuE9B"}

package/esm/src/dsl/http/versori/roundtripper.js

@@ -99,6 +99,7 @@ export class VersoriRoundTripperFactory {
         const connBaseURL = conn.baseUrl;
         // if the connection has no baseUrl set, but the pathname is a valid URL, return it as is
         if (!connBaseURL && isValidURL(pathname)) {
+            this.log.debug('Using given URL as is', { url: pathname });
             return pathname;
         }
         const connBaseURLObj = new URL(connBaseURL);
@@ -108,36 +109,45 @@ export class VersoriRoundTripperFactory {
             _pathname = pathnameObj.pathname;
         }
         const newURL = new URL(_pathname, connBaseURLObj.origin);
+        this.log.debug('Using baseURL from connection', { url: newURL.toString() });
         return newURL.toString();
     }
-    // TODO: Currently if the connection is edited, then the fetcher will not be updated.
     async create(connName, fn = globalThis.fetch) {
         const cnxId = this.getConnectionID(connName);
-        const conn = await this.platformAPIClient.getStaticConnection(cnxId);
-        if (!conn) {
+        if (!cnxId) {
+            this.log.debug('Connection not found in config, could be a dynamic connection', {
+                connectionName: connName,
+            });
             return undefined;
         }
-        const _fn = (input, init) => {
+        const _fn = async (input, init) => {
+            const conn = await this.platformAPIClient.getStaticConnection(cnxId);
+            if (!conn) {
+                this.log.error('Connection not found for user, using default fetch', {
+                    connectionName: connName,
+                });
+                return globalThis.fetch(input, init);
+            }
             const _input = this.changeRequestInit(input, conn);
-            return fn(_input, init);
+            switch (conn.credentials[0].authSchemeConfig.type) {
+                case 'api-key':
+                    return (await this.apiKeyFetcher(conn, _fn))(_input, init);
+                case 'basic-auth':
+                    return (await this.basicAuthFetcher(conn, _fn))(_input, init);
+                case 'jwt-bearer':
+                    return (await this.bearerTokenFetcher(conn, _fn))(_input, init);
+                case 'oauth2':
+                    return (await this.oauth2Fetcher(conn, _fn))(_input, init);
+                default:
+                    return fn(_input, init);
+            }
         };
-        switch (conn.credentials[0].authSchemeConfig.type) {
-            case 'api-key':
-                return this.apiKeyFetcher(conn, _fn);
-            case 'basic-auth':
-                return this.basicAuthFetcher(conn, _fn);
-            case 'jwt-bearer':
-                return this.bearerTokenFetcher(conn, _fn);
-            case 'oauth2':
-                return this.oauth2Fetcher(conn, _fn);
-            default:
-                return fn;
-        }
+        return _fn;
     }
     async createDynamic(templateName, fn = globalThis.fetch) {
         const template = this.getTemplateID(templateName);
         if (!template) {
-            this.log.info('Template not found in config, could be a static connection', {
+            this.log.debug('Template not found in config, could be a static connection', {
                 templateName: templateName,
             });
             return undefined;
@@ -168,7 +178,8 @@ export class VersoriRoundTripperFactory {
         return _fn;
     }
     getConnectionID(connName) {
-        const conn = this.versoriCfg.mappings.find((c) => (c.dynamic === undefined || c.dynamic === false) && c.name.toLowerCase() === connName.toLowerCase());
+        const conn = this.versoriCfg.mappings.find((c) => (c.dynamic === undefined || c.dynamic === false) &&
+            c.name.toLowerCase() === connName.toLowerCase());
         if (!conn || !conn.connId) {
             return '';
         }
@@ -182,16 +193,16 @@ export class VersoriRoundTripperFactory {
         return template.templateId;
     }
     async apiKeyFetcher(conn, fn) {
-        const tokenResponse = await this.tokenClient.getToken(conn.credentials[0].credential.id);
-        const token = tokenResponse.token?.accessToken;
-        const asc = conn.credentials[0].authSchemeConfig.apiKey;
-        if (!token) {
-            throw new Error('Token not found');
-        }
-        if (!asc) {
-            throw new Error('API Key configuration not found');
-        }
-        const _fn = (input, init) => {
+        const _fn = async (input, init) => {
+            const tokenResponse = await this.tokenClient.getToken(conn.credentials[0].credential.id);
+            const token = tokenResponse.token?.accessToken;
+            const asc = conn.credentials[0].authSchemeConfig.apiKey;
+            if (!token) {
+                throw new Error('Token not found');
+            }
+            if (!asc) {
+                throw new Error('API Key configuration not found');
+            }
             if (!init) {
                 init = {};
             }
@@ -230,12 +241,12 @@ export class VersoriRoundTripperFactory {
         return _fn;
     }
     async basicAuthFetcher(conn, fn) {
-        const tokenResponse = await this.tokenClient.getToken(conn.credentials[0].credential.id);
-        const token = tokenResponse.token?.accessToken;
-        if (!token) {
-            throw new Error('Token not found');
-        }
-        const _fn = (input, init) => {
+        const _fn = async (input, init) => {
+            const tokenResponse = await this.tokenClient.getToken(conn.credentials[0].credential.id);
+            const token = tokenResponse.token?.accessToken;
+            if (!token) {
+                throw new Error('Token not found');
+            }
             if (!init) {
                 init = {};
             }
@@ -260,12 +271,12 @@ export class VersoriRoundTripperFactory {
     }
     // TODO: need to make the prefix and header name configurable from authschemeconfig
     async bearerTokenFetcher(conn, fn) {
-        const tokenResponse = await this.tokenClient.getToken(conn.credentials[0].credential.id);
-        const token = tokenResponse.token?.accessToken;
-        if (!token) {
-            throw new Error('Token not found');
-        }
-        const _fn = (input, init) => {
+        const _fn = async (input, init) => {
+            const tokenResponse = await this.tokenClient.getToken(conn.credentials[0].credential.id);
+            const token = tokenResponse.token?.accessToken;
+            if (!token) {
+                throw new Error('Token not found');
+            }
             if (!init) {
                 init = {};
             }
@@ -289,26 +300,26 @@ export class VersoriRoundTripperFactory {
         return _fn;
     }
     async oauth2Fetcher(conn, fn) {
-        const tokenResponse = await this.tokenClient.getOAuth2Token(conn.credentials[0].credential.id);
-        const token = tokenResponse.token?.accessToken;
-        const tokenType = tokenResponse.token?.tokenType;
-        if (!token) {
-            throw new Error('Token not found');
-        }
-        const _tokenType = () => {
-            const _tt = tokenType?.toLowerCase();
-            switch (_tt) {
-                case 'bearer':
-                    return 'Bearer';
-                case 'mac':
-                    return 'MAC';
-                case 'basic':
-                    return 'Basic';
-                default:
-                    return 'Bearer';
+        const refreshFn = async (input, init, forceRefresh = false) => {
+            const tokenResponse = await this.tokenClient.getToken(conn.credentials[0].credential.id, forceRefresh);
+            const token = tokenResponse.token?.accessToken;
+            const tokenType = tokenResponse.token?.tokenType;
+            if (!token) {
+                throw new Error('Token not found');
             }
-        };
-        const _fn = (input, init) => {
+            const _tokenType = () => {
+                const _tt = tokenType?.toLowerCase();
+                switch (_tt) {
+                    case 'bearer':
+                        return 'Bearer';
+                    case 'mac':
+                        return 'MAC';
+                    case 'basic':
+                        return 'Basic';
+                    default:
+                        return 'Bearer';
+                }
+            };
             if (!init) {
                 init = {};
             }
@@ -329,6 +340,18 @@ export class VersoriRoundTripperFactory {
             }
             return fn(input, init);
         };
+        const _fn = async (input, init) => {
+            const resp = await refreshFn(input, init, false);
+            if (resp.status === 401) {
+                this.log.debug('Received 401 Unauthorized response, attempting refresh', {
+                    url: input,
+                    status: resp.status,
+                });
+                // TODO: attempt refresh until precondition failed??
+                return refreshFn(input, init, true);
+            }
+            return Promise.resolve(resp);
+        };
         return _fn;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@versori/run",
-  "version": "v0.2.0-alpha.4",
+  "version": "v0.2.0-alpha.6",
   "description": "Versori Run",
   "homepage": "https://github.com/versori/versori-run#readme",
   "repository": {

package/script/src/dsl/http/versori/credentials/client.d.ts

@@ -1,10 +1,7 @@
-import { GetAccessTokenResponse } from './oauth2/v1/token_service_pb.js';
 import { GetTokenResponse } from './tokens/v1/token_service_pb.js';
 export declare class VersoriCredentialClient {
-    private oauth2Client;
     private TokenService;
     constructor(credsBaseUrl: string);
-    getToken(credId: string): Promise<GetTokenResponse>;
-    getOAuth2Token(credId: string): Promise<GetAccessTokenResponse>;
+    getToken(credId: string, forceRefresh?: boolean): Promise<GetTokenResponse>;
 }
 //# sourceMappingURL=client.d.ts.map

package/script/src/dsl/http/versori/credentials/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../../../src/src/dsl/http/versori/credentials/client.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAGzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,qBAAa,uBAAuB;IAChC,OAAO,CAAC,YAAY,CAAoB;IAExC,OAAO,CAAC,YAAY,CAAc;gBAMtB,YAAY,EAAE,MAAM;IAMhC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAInD,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;CAGlE"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../../../src/src/dsl/http/versori/credentials/client.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAGnE,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,YAAY,CAAc;gBAEtB,YAAY,EAAE,MAAM;IAIhC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,GAAE,OAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAGrF"}

package/script/src/dsl/http/versori/credentials/client.js

@@ -3,30 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VersoriCredentialClient = void 0;
 const credentials_js_1 = require("./credentials.js");
 class VersoriCredentialClient {
-    // private CredentialService: CredentialService;
-    // need to add custom function service
     constructor(credsBaseUrl) {
-        Object.defineProperty(this, "oauth2Client", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         Object.defineProperty(this, "TokenService", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        this.oauth2Client = (0, credentials_js_1.createOAuth2TokenService)(credsBaseUrl);
         this.TokenService = (0, credentials_js_1.createTokenClient)(credsBaseUrl);
-        // this.CredentialService = createCredentialService(credsBaseUrl);
-    }
-    getToken(credId) {
-        return this.TokenService.getToken({ credentialId: credId });
     }
-    getOAuth2Token(credId) {
-        return this.oauth2Client.getAccessToken({ credentialId: credId });
+    getToken(credId, forceRefresh = false) {
+        return this.TokenService.getToken({ credentialId: credId, forceRefresh });
     }
 }
 exports.VersoriCredentialClient = VersoriCredentialClient;

package/script/src/dsl/http/versori/roundtripper.d.ts

@@ -2,7 +2,6 @@ import { DynamicFetcher, RoundTripperFactory } from '../types.js';
 import { VersoriCredentialClient } from './credentials/mod.js';
 import { PlatformAPIClient } from './platformapi.js';
 import { Logger } from '../../../observability/logging/Logger.js';
-export type RunningEnvironment = 'local' | 'versori' | 'staging';
 /**
  * VersoriRoundTripper is an implementation of the RoundTripperFactory interface for Versori connections.
  * This is the intended implementation for when projects/services are hosted on Versori infrastructure.

package/script/src/dsl/http/versori/roundtripper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"roundtripper.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/roundtripper.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,cAAc,EACd,mBAAmB,EAEtB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AASlE,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC;AAEjE;;;;;;;;;;;GAWG;AACH,qBAAa,0BAA2B,YAAW,mBAAmB;IAClE,OAAO,CAAC,WAAW,CAA0B;IAE7C,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,OAAO,CAAC,UAAU,CAAmB;IAErC,OAAO,CAAC,GAAG,CAAS;IAEpB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAK7B;gBAGE,WAAW,EAAE,uBAAuB,EACpC,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM;IAQlB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,0BAA0B;IA0B3D,OAAO,CAAC,iBAAiB;IAczB,OAAO,CAAC,aAAa;IAsBf,MAAM,CACR,QAAQ,EAAE,MAAM,EAChB,EAAE,GAAE,OAAO,KAAwB,GACpC,OAAO,CAAC,OAAO,KAAK,GAAG,SAAS,CAAC;IA4B9B,aAAa,CACf,YAAY,EAAE,MAAM,EACpB,EAAE,GAAE,OAAO,KAAwB,GACpC,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IA4CtC,OAAO,CAAC,eAAe;IAYvB,OAAO,CAAC,aAAa;YAUP,aAAa;YAoDb,gBAAgB;YAmChB,kBAAkB;YAiClB,aAAa;CAkD9B"}
+{"version":3,"file":"roundtripper.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/roundtripper.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,cAAc,EACd,mBAAmB,EAEtB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AAUlE;;;;;;;;;;;GAWG;AACH,qBAAa,0BAA2B,YAAW,mBAAmB;IAClE,OAAO,CAAC,WAAW,CAA0B;IAE7C,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,OAAO,CAAC,UAAU,CAAmB;IAErC,OAAO,CAAC,GAAG,CAAS;IAEpB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAK7B;gBAGE,WAAW,EAAE,uBAAuB,EACpC,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM;IAQlB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,0BAA0B;IA0B3D,OAAO,CAAC,iBAAiB;IAczB,OAAO,CAAC,aAAa;IAwBf,MAAM,CACR,QAAQ,EAAE,MAAM,EAChB,EAAE,GAAE,OAAO,KAAwB,GACpC,OAAO,CAAC,OAAO,KAAK,GAAG,SAAS,CAAC;IAqC9B,aAAa,CACf,YAAY,EAAE,MAAM,EACpB,EAAE,GAAE,OAAO,KAAwB,GACpC,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IA+CtC,OAAO,CAAC,eAAe;IAcvB,OAAO,CAAC,aAAa;YAYP,aAAa;YAyDb,gBAAgB;YAqChB,kBAAkB;YAmClB,aAAa;CAuE9B"}

package/script/src/dsl/http/versori/roundtripper.js

@@ -102,6 +102,7 @@ class VersoriRoundTripperFactory {
         const connBaseURL = conn.baseUrl;
         // if the connection has no baseUrl set, but the pathname is a valid URL, return it as is
         if (!connBaseURL && isValidURL(pathname)) {
+            this.log.debug('Using given URL as is', { url: pathname });
             return pathname;
         }
         const connBaseURLObj = new URL(connBaseURL);
@@ -111,36 +112,45 @@ class VersoriRoundTripperFactory {
             _pathname = pathnameObj.pathname;
         }
         const newURL = new URL(_pathname, connBaseURLObj.origin);
+        this.log.debug('Using baseURL from connection', { url: newURL.toString() });
         return newURL.toString();
     }
-    // TODO: Currently if the connection is edited, then the fetcher will not be updated.
     async create(connName, fn = globalThis.fetch) {
         const cnxId = this.getConnectionID(connName);
-        const conn = await this.platformAPIClient.getStaticConnection(cnxId);
-        if (!conn) {
+        if (!cnxId) {
+            this.log.debug('Connection not found in config, could be a dynamic connection', {
+                connectionName: connName,
+            });
             return undefined;
         }
-        const _fn = (input, init) => {
+        const _fn = async (input, init) => {
+            const conn = await this.platformAPIClient.getStaticConnection(cnxId);
+            if (!conn) {
+                this.log.error('Connection not found for user, using default fetch', {
+                    connectionName: connName,
+                });
+                return globalThis.fetch(input, init);
+            }
             const _input = this.changeRequestInit(input, conn);
-            return fn(_input, init);
+            switch (conn.credentials[0].authSchemeConfig.type) {
+                case 'api-key':
+                    return (await this.apiKeyFetcher(conn, _fn))(_input, init);
+                case 'basic-auth':
+                    return (await this.basicAuthFetcher(conn, _fn))(_input, init);
+                case 'jwt-bearer':
+                    return (await this.bearerTokenFetcher(conn, _fn))(_input, init);
+                case 'oauth2':
+                    return (await this.oauth2Fetcher(conn, _fn))(_input, init);
+                default:
+                    return fn(_input, init);
+            }
         };
-        switch (conn.credentials[0].authSchemeConfig.type) {
-            case 'api-key':
-                return this.apiKeyFetcher(conn, _fn);
-            case 'basic-auth':
-                return this.basicAuthFetcher(conn, _fn);
-            case 'jwt-bearer':
-                return this.bearerTokenFetcher(conn, _fn);
-            case 'oauth2':
-                return this.oauth2Fetcher(conn, _fn);
-            default:
-                return fn;
-        }
+        return _fn;
     }
     async createDynamic(templateName, fn = globalThis.fetch) {
         const template = this.getTemplateID(templateName);
         if (!template) {
-            this.log.info('Template not found in config, could be a static connection', {
+            this.log.debug('Template not found in config, could be a static connection', {
                 templateName: templateName,
             });
             return undefined;
@@ -171,7 +181,8 @@ class VersoriRoundTripperFactory {
         return _fn;
     }
     getConnectionID(connName) {
-        const conn = this.versoriCfg.mappings.find((c) => (c.dynamic === undefined || c.dynamic === false) && c.name.toLowerCase() === connName.toLowerCase());
+        const conn = this.versoriCfg.mappings.find((c) => (c.dynamic === undefined || c.dynamic === false) &&
+            c.name.toLowerCase() === connName.toLowerCase());
         if (!conn || !conn.connId) {
             return '';
         }
@@ -185,16 +196,16 @@ class VersoriRoundTripperFactory {
         return template.templateId;
     }
     async apiKeyFetcher(conn, fn) {
-        const tokenResponse = await this.tokenClient.getToken(conn.credentials[0].credential.id);
-        const token = tokenResponse.token?.accessToken;
-        const asc = conn.credentials[0].authSchemeConfig.apiKey;
-        if (!token) {
-            throw new Error('Token not found');
-        }
-        if (!asc) {
-            throw new Error('API Key configuration not found');
-        }
-        const _fn = (input, init) => {
+        const _fn = async (input, init) => {
+            const tokenResponse = await this.tokenClient.getToken(conn.credentials[0].credential.id);
+            const token = tokenResponse.token?.accessToken;
+            const asc = conn.credentials[0].authSchemeConfig.apiKey;
+            if (!token) {
+                throw new Error('Token not found');
+            }
+            if (!asc) {
+                throw new Error('API Key configuration not found');
+            }
             if (!init) {
                 init = {};
             }
@@ -233,12 +244,12 @@ class VersoriRoundTripperFactory {
         return _fn;
     }
     async basicAuthFetcher(conn, fn) {
-        const tokenResponse = await this.tokenClient.getToken(conn.credentials[0].credential.id);
-        const token = tokenResponse.token?.accessToken;
-        if (!token) {
-            throw new Error('Token not found');
-        }
-        const _fn = (input, init) => {
+        const _fn = async (input, init) => {
+            const tokenResponse = await this.tokenClient.getToken(conn.credentials[0].credential.id);
+            const token = tokenResponse.token?.accessToken;
+            if (!token) {
+                throw new Error('Token not found');
+            }
             if (!init) {
                 init = {};
             }
@@ -263,12 +274,12 @@ class VersoriRoundTripperFactory {
     }
     // TODO: need to make the prefix and header name configurable from authschemeconfig
     async bearerTokenFetcher(conn, fn) {
-        const tokenResponse = await this.tokenClient.getToken(conn.credentials[0].credential.id);
-        const token = tokenResponse.token?.accessToken;
-        if (!token) {
-            throw new Error('Token not found');
-        }
-        const _fn = (input, init) => {
+        const _fn = async (input, init) => {
+            const tokenResponse = await this.tokenClient.getToken(conn.credentials[0].credential.id);
+            const token = tokenResponse.token?.accessToken;
+            if (!token) {
+                throw new Error('Token not found');
+            }
             if (!init) {
                 init = {};
             }
@@ -292,26 +303,26 @@ class VersoriRoundTripperFactory {
         return _fn;
     }
     async oauth2Fetcher(conn, fn) {
-        const tokenResponse = await this.tokenClient.getOAuth2Token(conn.credentials[0].credential.id);
-        const token = tokenResponse.token?.accessToken;
-        const tokenType = tokenResponse.token?.tokenType;
-        if (!token) {
-            throw new Error('Token not found');
-        }
-        const _tokenType = () => {
-            const _tt = tokenType?.toLowerCase();
-            switch (_tt) {
-                case 'bearer':
-                    return 'Bearer';
-                case 'mac':
-                    return 'MAC';
-                case 'basic':
-                    return 'Basic';
-                default:
-                    return 'Bearer';
+        const refreshFn = async (input, init, forceRefresh = false) => {
+            const tokenResponse = await this.tokenClient.getToken(conn.credentials[0].credential.id, forceRefresh);
+            const token = tokenResponse.token?.accessToken;
+            const tokenType = tokenResponse.token?.tokenType;
+            if (!token) {
+                throw new Error('Token not found');
             }
-        };
-        const _fn = (input, init) => {
+            const _tokenType = () => {
+                const _tt = tokenType?.toLowerCase();
+                switch (_tt) {
+                    case 'bearer':
+                        return 'Bearer';
+                    case 'mac':
+                        return 'MAC';
+                    case 'basic':
+                        return 'Basic';
+                    default:
+                        return 'Bearer';
+                }
+            };
             if (!init) {
                 init = {};
             }
@@ -332,6 +343,18 @@ class VersoriRoundTripperFactory {
             }
             return fn(input, init);
         };
+        const _fn = async (input, init) => {
+            const resp = await refreshFn(input, init, false);
+            if (resp.status === 401) {
+                this.log.debug('Received 401 Unauthorized response, attempting refresh', {
+                    url: input,
+                    status: resp.status,
+                });
+                // TODO: attempt refresh until precondition failed??
+                return refreshFn(input, init, true);
+            }
+            return Promise.resolve(resp);
+        };
         return _fn;
     }
 }