@versori/run 0.2.25 → 0.2.26

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

@@ -25,12 +25,20 @@ export declare class VersoriCredentialsFactory implements RoundTripperFactory {
     private cfgReader;
     private log;
     private tracer;
+    private oauth2Cache;
     private readonly defaultDynamic;
     constructor(credsClient: VersoriCredentialClient, credsBaseURL: string, platformAPIClient: PlatformAPIClient, logger: Logger, tracer: Tracer, cfgReader: ConfigReader);
     static fromEnv(logger: Logger, tracer: Tracer): VersoriCredentialsFactory;
     private changeRequestInit;
     private changeBaseUrl;
     create(connName: string): Promise<denoFetch | undefined>;
+    private apiKeyFetcherStatic;
+    private basicAuthFetcherStatic;
+    private bearerTokenFetcherStatic;
+    private getOAuth2Token;
+    private oauth2FetcherStatic;
+    private oauth1FetcherStatic;
+    private mtlsFetcherStatic;
     createDynamic(templateName: string): Promise<DynamicFetcher | undefined>;
     private traceFetch;
     credentials(): CredentialsProvider;

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":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AAElE,OAAO,EAEH,cAAc,EACd,YAAY,EAGZ,cAAc,EACd,mBAAmB,EACtB,MAAM,aAAa,CAAC;AAQrB,OAAO,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAQ9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAOrD,KAAK,SAAS,GAAG,CACb,KAAK,EAAE,WAAW,GAAG,GAAG,EACxB,IAAI,CAAC,EAAE,WAAW,GAAG;IAAE,MAAM,CAAC,EAAE,IAAI,CAAC,UAAU,CAAA;CAAE,KAChD,OAAO,CAAC,QAAQ,CAAC,CAAC;AAEvB;;;;;;;;;;GAUG;AACH,qBAAa,yBAA0B,YAAW,mBAAmB;IACjE,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,YAAY,CAAS;IAE7B,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,OAAO,CAAC,SAAS,CAAe;IAEhC,OAAO,CAAC,GAAG,CAAS;IAEpB,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAK7B;gBAGE,WAAW,EAAE,uBAAuB,EACpC,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,YAAY;IAe3B,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,yBAAyB;IAoCzE,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,aAAa;IAwBrB,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAqDxD,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IA6DxE,OAAO,CAAC,UAAU;IAqClB,WAAW,IAAI,mBAAmB;IAQlC,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,cAAc;IAyC9C,cAAc,CAChB,IAAI,EAAE,MAAM,EACZ,YAAY,UAAQ,EACpB,YAAY,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,KAAK,CAAC;IAiBX,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;YAqB9D,uBAAuB;IAoDrC,OAAO,CAAC,aAAa;IAoDrB,OAAO,CAAC,gBAAgB;IAmCxB,OAAO,CAAC,kBAAkB;IAiC1B,OAAO,CAAC,aAAa;IAqErB,OAAO,CAAC,aAAa;IAyErB,OAAO,CAAC,WAAW;YA6BL,QAAQ;YA2BR,MAAM;YA2BN,iBAAiB;CA0BlC"}
+{"version":3,"file":"roundtripper.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/roundtripper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AAElE,OAAO,EAIH,cAAc,EACd,YAAY,EAGZ,cAAc,EACd,mBAAmB,EACtB,MAAM,aAAa,CAAC;AAQrB,OAAO,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAQ9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAOrD,KAAK,SAAS,GAAG,CACb,KAAK,EAAE,WAAW,GAAG,GAAG,EACxB,IAAI,CAAC,EAAE,WAAW,GAAG;IAAE,MAAM,CAAC,EAAE,IAAI,CAAC,UAAU,CAAA;CAAE,KAChD,OAAO,CAAC,QAAQ,CAAC,CAAC;AAavB;;;;;;;;;;GAUG;AACH,qBAAa,yBAA0B,YAAW,mBAAmB;IACjE,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,YAAY,CAAS;IAE7B,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,OAAO,CAAC,SAAS,CAAe;IAEhC,OAAO,CAAC,GAAG,CAAS;IAEpB,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,WAAW,CAAuC;IAE1D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAK7B;gBAGE,WAAW,EAAE,uBAAuB,EACpC,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,YAAY;IAe3B,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,yBAAyB;IAoCzE,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,aAAa;IAwBf,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAuG9D,OAAO,CAAC,mBAAmB;IAoD3B,OAAO,CAAC,sBAAsB;IA2B9B,OAAO,CAAC,wBAAwB;YA6BlB,cAAc;IAiB5B,OAAO,CAAC,mBAAmB;IA2D3B,OAAO,CAAC,mBAAmB;IAuE3B,OAAO,CAAC,iBAAiB;IAqBzB,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAyDxE,OAAO,CAAC,UAAU;IAqClB,WAAW,IAAI,mBAAmB;IAQlC,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,cAAc;IAyC9C,cAAc,CAChB,IAAI,EAAE,MAAM,EACZ,YAAY,UAAQ,EACpB,YAAY,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,KAAK,CAAC;IAiBX,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;YAqB9D,uBAAuB;IAoDrC,OAAO,CAAC,aAAa;IAoDrB,OAAO,CAAC,gBAAgB;IAmCxB,OAAO,CAAC,kBAAkB;IAiC1B,OAAO,CAAC,aAAa;IAqErB,OAAO,CAAC,aAAa;IAyErB,OAAO,CAAC,WAAW;YA6BL,QAAQ;YA2BR,MAAM;YA2BN,iBAAiB;CA0BlC"}

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

@@ -57,6 +57,12 @@ export class VersoriCredentialsFactory {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "oauth2Cache", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {}
+        });
         Object.defineProperty(this, "defaultDynamic", {
             enumerable: true,
             configurable: true,
@@ -137,58 +143,341 @@ export class VersoriCredentialsFactory {
         this.log.debug('Using baseURL from connection', { url: newURL.toString() });
         return newURL.toString();
     }
-    create(connName) {
+    async create(connName) {
         const cnxId = this.cfgReader.getConnectionID(connName);
         if (!cnxId) {
-            this.log.debug('Connection not found in config, could be a dynamic connection', {
-                connectionName: connName,
-            });
             return Promise.resolve(undefined);
         }
-        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 this.traceFetch(input, init);
+        const conn = await this.platformAPIClient.getStaticConnection(cnxId);
+        let _fetch = this.traceFetch;
+        if (!conn) {
+            this.log.error('Connection not found - using default fetch', { 'connectionName': connName, 'connectionID': cnxId });
+            return _fetch;
+        }
+        for (const cred of conn?.credentials ?? []) {
+            switch (cred.authSchemeConfig.type) {
+                case 'api-key': {
+                    const apiTokenResponse = await this.getToken(cred.credential.id);
+                    if (!apiTokenResponse?.token?.accessToken || !cred.authSchemeConfig.apiKey) {
+                        this.log.error('API Key credential is missing token or configuration', {
+                            connectionName: connName,
+                            credentialId: cred.credential.id,
+                        });
+                        continue;
+                    }
+                    _fetch = this.apiKeyFetcherStatic(apiTokenResponse.token.accessToken, cred.authSchemeConfig.apiKey, _fetch);
+                    break;
+                }
+                case 'basic-auth': {
+                    const basicTokenResponse = await this.getToken(cred.credential.id);
+                    if (!basicTokenResponse?.token?.accessToken) {
+                        this.log.error('Basic Auth credential is missing token', {
+                            connectionName: connName,
+                            credentialId: cred.credential.id,
+                        });
+                        continue;
+                    }
+                    _fetch = this.basicAuthFetcherStatic(basicTokenResponse.token.accessToken, _fetch);
+                    break;
+                }
+                case 'jwt-bearer': {
+                    const bearerTokenResponse = await this.getToken(cred.credential.id);
+                    if (!bearerTokenResponse?.token?.accessToken) {
+                        this.log.error('Bearer Token credential is missing token', {
+                            connectionName: connName,
+                            credentialId: cred.credential.id,
+                        });
+                        continue;
+                    }
+                    _fetch = this.bearerTokenFetcherStatic(bearerTokenResponse.token.accessToken, _fetch);
+                    break;
+                }
+                case 'oauth2': {
+                    if (!cred.credential?.id) {
+                        this.log.error('OAuth2 credential is missing credential ID', {
+                            connectionName: connName,
+                            credentialId: cred.credential.id,
+                        });
+                        continue;
+                    }
+                    _fetch = this.oauth2FetcherStatic(cred.credential.id, _fetch);
+                    break;
+                }
+                case 'oauth1': {
+                    const oauth1Metadata = await this.getOAuth1Metadata(cred.credential.id);
+                    if (!oauth1Metadata?.authorizationMetadata) {
+                        this.log.error('OAuth1 credential is missing metadata', {
+                            connectionName: connName,
+                            credentialId: cred.credential.id,
+                        });
+                        continue;
+                    }
+                    _fetch = this.oauth1FetcherStatic(oauth1Metadata, _fetch);
+                    break;
+                }
+                case 'certificate': {
+                    const mtlsData = await this.getRaw(cred.credential.id);
+                    if (!mtlsData?.credential?.data['cert'] || !mtlsData?.credential?.data['key']) {
+                        this.log.error('mTLS credential is missing cert or key data', {
+                            connectionName: connName,
+                            credentialId: cred.credential.id,
+                        });
+                        continue;
+                    }
+                    _fetch = this.mtlsFetcherStatic({
+                        cert: mtlsData.credential.data['cert'],
+                        key: mtlsData.credential.data['key'],
+                        ca: mtlsData.credential.data['ca'],
+                    }, _fetch);
+                    break;
+                }
             }
+        }
+        const _fn = async (input, init) => {
             const _input = this.changeRequestInit(input, conn);
-            let _fetch = this.traceFetch;
-            conn.credentials.forEach((cred) => {
-                switch (cred.authSchemeConfig.type) {
-                    case 'api-key':
-                        _fetch = this.apiKeyFetcher(cred, _fetch);
-                        break;
-                    case 'basic-auth':
-                        _fetch = this.basicAuthFetcher(cred, _fetch);
-                        break;
-                    case 'jwt-bearer':
-                        _fetch = this.bearerTokenFetcher(cred, _fetch);
-                        break;
-                    case 'oauth2':
-                        _fetch = this.oauth2Fetcher(cred, _fetch);
-                        break;
-                    case 'certificate':
-                        _fetch = this.mtlsFetcher(cred, _fetch);
-                        break;
-                    case 'oauth1':
-                        _fetch = this.oauth1Fetcher(cred, _fetch);
-                        break;
+            return _fetch(_input, init);
+        };
+        return _fn;
+    }
+    apiKeyFetcherStatic(token, asc, fn) {
+        const _fn = async (input, init) => {
+            if (!token) {
+                throw new Error('Token not found');
+            }
+            if (!asc) {
+                throw new Error('API Key configuration not found');
+            }
+            if (!init) {
+                init = {};
+            }
+            switch (asc.in) {
+                case 'header':
+                    if (!init.headers) {
+                        init.headers = new Headers();
+                    }
+                    if (init.headers instanceof Headers) {
+                        init.headers.set(asc.name, token);
+                    }
+                    else if (init.headers instanceof Array) {
+                        init.headers.push([asc.name, token]);
+                    }
+                    else {
+                        init.headers = {
+                            ...init.headers,
+                            [asc.name]: token,
+                        };
+                    }
+                    break;
+                case 'query':
+                    if (typeof input === 'string') {
+                        const _input = new URL(input);
+                        _input.searchParams.append(asc.name, token);
+                        input = _input.toString();
+                    }
+                    else if (input instanceof Request) {
+                        const _input = new URL(input.url);
+                        _input.searchParams.append(asc.name, token);
+                        input = new Request(_input.toString(), init);
+                    }
+                    else if (input instanceof URL) {
+                        input.searchParams.append(asc.name, token);
+                    }
+                    break;
+            }
+            return fn(input, init);
+        };
+        return _fn;
+    }
+    basicAuthFetcherStatic(token, fn) {
+        const _fn = async (input, init) => {
+            if (!init) {
+                init = {};
+            }
+            if (!init.headers) {
+                init.headers = new Headers();
+            }
+            if (init.headers instanceof Headers) {
+                init.headers.set('Authorization', `Basic ${token}`);
+            }
+            else if (init.headers instanceof Array) {
+                init.headers.push(['Authorization', `Basic ${token}`]);
+            }
+            else {
+                init.headers = {
+                    ...init.headers,
+                    ['Authorization']: `Basic ${token}`,
+                };
+            }
+            return fn(input, init);
+        };
+        return _fn;
+    }
+    bearerTokenFetcherStatic(token, fn) {
+        const _fn = async (input, init) => {
+            if (!init) {
+                init = {};
+            }
+            if (!init.headers) {
+                init.headers = new Headers();
+            }
+            if (init.headers instanceof Headers) {
+                init.headers.set('Authorization', `Bearer ${token}`);
+            }
+            else if (init.headers instanceof Array) {
+                init.headers.push(['Authorization', `Bearer ${token}`]);
+            }
+            else {
+                init.headers = {
+                    ...init.headers,
+                    ['Authorization']: `Bearer ${token}`,
+                };
+            }
+            return fn(input, init);
+        };
+        return _fn;
+    }
+    // getOauth2Token fetches an OAuth2 token, stores the result in a cache, and returns the token.
+    // If forceRefresh is true, it will bypass the cache and fetch a new token then update the cache.
+    async getOAuth2Token(credId, forceRefresh = false) {
+        if (credId in this.oauth2Cache && !forceRefresh) {
+            return Promise.resolve(this.oauth2Cache[credId]);
+        }
+        const tokenResponse = await this.getToken(credId, forceRefresh);
+        this.oauth2Cache[credId] = {
+            token: tokenResponse.token?.accessToken || '',
+            tokenType: tokenResponse.token?.tokenType,
+        };
+        this.log.debug('Refreshed OAuth2 token and updating cache');
+        return this.oauth2Cache[credId];
+    }
+    oauth2FetcherStatic(credId, fn) {
+        const refreshFn = async (input, init, forceRefresh = false) => {
+            const tokenResponse = await this.getOAuth2Token(credId, forceRefresh);
+            const token = tokenResponse.token;
+            const _tokenType = () => {
+                const _tt = tokenResponse.tokenType?.toLowerCase();
+                switch (_tt) {
+                    case 'bearer':
+                        return 'Bearer';
+                    case 'mac':
+                        return 'MAC';
+                    case 'basic':
+                        return 'Basic';
                     default:
-                        break;
+                        return 'Bearer';
                 }
+            };
+            if (!init) {
+                init = {};
+            }
+            if (!init.headers) {
+                init.headers = new Headers();
+            }
+            if (init.headers instanceof Headers) {
+                init.headers.set('Authorization', `${_tokenType()} ${token}`);
+            }
+            else if (init.headers instanceof Array) {
+                init.headers.push(['Authorization', `${_tokenType()} ${token}`]);
+            }
+            else {
+                init.headers = {
+                    ...init.headers,
+                    ['Authorization']: `${_tokenType()} ${token}`,
+                };
+            }
+            return fn(input, init);
+        };
+        const _fn = async (input, init) => {
+            const resp = await refreshFn(input, init);
+            if (resp.status === 401) {
+                this.log.debug('Received 401 Unauthorized response, attempting refresh', {
+                    url: input,
+                    status: resp.status,
+                });
+                return refreshFn(input, init, true);
+            }
+            return resp;
+        };
+        return _fn;
+    }
+    oauth1FetcherStatic(metadata, fn) {
+        const _fn = async (input, init) => {
+            const authParams = new URLSearchParams(metadata.authorizationMetadata?.authorizationParams);
+            if (!metadata.authorizationMetadata) {
+                throw new Error('OAuth1 metadata not found');
+            }
+            const oauth = new OAuth({
+                consumer: {
+                    key: metadata.authorizationMetadata.consumerKey,
+                    secret: metadata.authorizationMetadata.consumerSecret,
+                },
+                signature_method: 'HMAC-SHA256',
+                hash_function: (baseString, key) => createHmac('sha256', key).update(baseString).digest('base64'),
+                realm: authParams.get('realm') || undefined,
             });
-            return _fetch(_input, init);
+            let url;
+            if (input instanceof Request) {
+                url = input.url;
+            }
+            else if (input instanceof URL) {
+                url = input.toString();
+            }
+            else if (typeof input === 'string') {
+                url = input;
+            }
+            else {
+                throw new Error('Invalid input type for OAuth1 fetcher');
+            }
+            const header = oauth.toHeader(oauth.authorize({
+                url: url,
+                method: init?.method || 'GET',
+            }, {
+                key: metadata.authorizationMetadata?.oauthToken,
+                secret: metadata.authorizationMetadata?.oauthTokenSecret,
+            }));
+            const authHeader = header.Authorization;
+            if (!init) {
+                init = {};
+            }
+            if (!init.headers) {
+                init.headers = new Headers();
+            }
+            if (init.headers instanceof Headers) {
+                init.headers.set('Authorization', authHeader);
+            }
+            else if (init.headers instanceof Array) {
+                init.headers.push(['Authorization', authHeader]);
+            }
+            else {
+                init.headers = {
+                    ...init.headers,
+                    ['Authorization']: authHeader,
+                };
+            }
+            return fn(input, init);
         };
-        return Promise.resolve(_fn);
+        return _fn;
+    }
+    mtlsFetcherStatic(mtlsdata, fn) {
+        const _fn = async (input, init) => {
+            const cert = new TextDecoder().decode(mtlsdata.cert);
+            const key = new TextDecoder().decode(mtlsdata.key);
+            const caCerts = new TextDecoder().decode(mtlsdata.ca ?? new Uint8Array());
+            const httpClient = Deno.createHttpClient({
+                cert,
+                key,
+                caCerts: caCerts ? [caCerts] : [],
+            });
+            return fn(input, {
+                ...init,
+                client: httpClient,
+            });
+        };
+        return _fn;
     }
     createDynamic(templateName) {
         const template = this.cfgReader.getTemplateID(templateName);
         if (!template) {
-            this.log.debug('Template not found in config, could be a static connection', {
-                templateName: templateName,
-            });
             return Promise.resolve(undefined);
         }
         const _fn = async (activation, input, init) => {

package/package.json

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

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

@@ -25,12 +25,20 @@ export declare class VersoriCredentialsFactory implements RoundTripperFactory {
     private cfgReader;
     private log;
     private tracer;
+    private oauth2Cache;
     private readonly defaultDynamic;
     constructor(credsClient: VersoriCredentialClient, credsBaseURL: string, platformAPIClient: PlatformAPIClient, logger: Logger, tracer: Tracer, cfgReader: ConfigReader);
     static fromEnv(logger: Logger, tracer: Tracer): VersoriCredentialsFactory;
     private changeRequestInit;
     private changeBaseUrl;
     create(connName: string): Promise<denoFetch | undefined>;
+    private apiKeyFetcherStatic;
+    private basicAuthFetcherStatic;
+    private bearerTokenFetcherStatic;
+    private getOAuth2Token;
+    private oauth2FetcherStatic;
+    private oauth1FetcherStatic;
+    private mtlsFetcherStatic;
     createDynamic(templateName: string): Promise<DynamicFetcher | undefined>;
     private traceFetch;
     credentials(): CredentialsProvider;

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":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AAElE,OAAO,EAEH,cAAc,EACd,YAAY,EAGZ,cAAc,EACd,mBAAmB,EACtB,MAAM,aAAa,CAAC;AAQrB,OAAO,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAQ9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAOrD,KAAK,SAAS,GAAG,CACb,KAAK,EAAE,WAAW,GAAG,GAAG,EACxB,IAAI,CAAC,EAAE,WAAW,GAAG;IAAE,MAAM,CAAC,EAAE,IAAI,CAAC,UAAU,CAAA;CAAE,KAChD,OAAO,CAAC,QAAQ,CAAC,CAAC;AAEvB;;;;;;;;;;GAUG;AACH,qBAAa,yBAA0B,YAAW,mBAAmB;IACjE,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,YAAY,CAAS;IAE7B,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,OAAO,CAAC,SAAS,CAAe;IAEhC,OAAO,CAAC,GAAG,CAAS;IAEpB,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAK7B;gBAGE,WAAW,EAAE,uBAAuB,EACpC,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,YAAY;IAe3B,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,yBAAyB;IAoCzE,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,aAAa;IAwBrB,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAqDxD,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IA6DxE,OAAO,CAAC,UAAU;IAqClB,WAAW,IAAI,mBAAmB;IAQlC,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,cAAc;IAyC9C,cAAc,CAChB,IAAI,EAAE,MAAM,EACZ,YAAY,UAAQ,EACpB,YAAY,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,KAAK,CAAC;IAiBX,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;YAqB9D,uBAAuB;IAoDrC,OAAO,CAAC,aAAa;IAoDrB,OAAO,CAAC,gBAAgB;IAmCxB,OAAO,CAAC,kBAAkB;IAiC1B,OAAO,CAAC,aAAa;IAqErB,OAAO,CAAC,aAAa;IAyErB,OAAO,CAAC,WAAW;YA6BL,QAAQ;YA2BR,MAAM;YA2BN,iBAAiB;CA0BlC"}
+{"version":3,"file":"roundtripper.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/roundtripper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AAElE,OAAO,EAIH,cAAc,EACd,YAAY,EAGZ,cAAc,EACd,mBAAmB,EACtB,MAAM,aAAa,CAAC;AAQrB,OAAO,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAQ9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAOrD,KAAK,SAAS,GAAG,CACb,KAAK,EAAE,WAAW,GAAG,GAAG,EACxB,IAAI,CAAC,EAAE,WAAW,GAAG;IAAE,MAAM,CAAC,EAAE,IAAI,CAAC,UAAU,CAAA;CAAE,KAChD,OAAO,CAAC,QAAQ,CAAC,CAAC;AAavB;;;;;;;;;;GAUG;AACH,qBAAa,yBAA0B,YAAW,mBAAmB;IACjE,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,YAAY,CAAS;IAE7B,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,OAAO,CAAC,SAAS,CAAe;IAEhC,OAAO,CAAC,GAAG,CAAS;IAEpB,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,WAAW,CAAuC;IAE1D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAK7B;gBAGE,WAAW,EAAE,uBAAuB,EACpC,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,YAAY;IAe3B,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,yBAAyB;IAoCzE,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,aAAa;IAwBf,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAuG9D,OAAO,CAAC,mBAAmB;IAoD3B,OAAO,CAAC,sBAAsB;IA2B9B,OAAO,CAAC,wBAAwB;YA6BlB,cAAc;IAiB5B,OAAO,CAAC,mBAAmB;IA2D3B,OAAO,CAAC,mBAAmB;IAuE3B,OAAO,CAAC,iBAAiB;IAqBzB,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAyDxE,OAAO,CAAC,UAAU;IAqClB,WAAW,IAAI,mBAAmB;IAQlC,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,cAAc;IAyC9C,cAAc,CAChB,IAAI,EAAE,MAAM,EACZ,YAAY,UAAQ,EACpB,YAAY,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,KAAK,CAAC;IAiBX,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;YAqB9D,uBAAuB;IAoDrC,OAAO,CAAC,aAAa;IAoDrB,OAAO,CAAC,gBAAgB;IAmCxB,OAAO,CAAC,kBAAkB;IAiC1B,OAAO,CAAC,aAAa;IAqErB,OAAO,CAAC,aAAa;IAyErB,OAAO,CAAC,WAAW;YA6BL,QAAQ;YA2BR,MAAM;YA2BN,iBAAiB;CA0BlC"}

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

@@ -63,6 +63,12 @@ class VersoriCredentialsFactory {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "oauth2Cache", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {}
+        });
         Object.defineProperty(this, "defaultDynamic", {
             enumerable: true,
             configurable: true,
@@ -143,58 +149,341 @@ class VersoriCredentialsFactory {
         this.log.debug('Using baseURL from connection', { url: newURL.toString() });
         return newURL.toString();
     }
-    create(connName) {
+    async create(connName) {
         const cnxId = this.cfgReader.getConnectionID(connName);
         if (!cnxId) {
-            this.log.debug('Connection not found in config, could be a dynamic connection', {
-                connectionName: connName,
-            });
             return Promise.resolve(undefined);
         }
-        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 this.traceFetch(input, init);
+        const conn = await this.platformAPIClient.getStaticConnection(cnxId);
+        let _fetch = this.traceFetch;
+        if (!conn) {
+            this.log.error('Connection not found - using default fetch', { 'connectionName': connName, 'connectionID': cnxId });
+            return _fetch;
+        }
+        for (const cred of conn?.credentials ?? []) {
+            switch (cred.authSchemeConfig.type) {
+                case 'api-key': {
+                    const apiTokenResponse = await this.getToken(cred.credential.id);
+                    if (!apiTokenResponse?.token?.accessToken || !cred.authSchemeConfig.apiKey) {
+                        this.log.error('API Key credential is missing token or configuration', {
+                            connectionName: connName,
+                            credentialId: cred.credential.id,
+                        });
+                        continue;
+                    }
+                    _fetch = this.apiKeyFetcherStatic(apiTokenResponse.token.accessToken, cred.authSchemeConfig.apiKey, _fetch);
+                    break;
+                }
+                case 'basic-auth': {
+                    const basicTokenResponse = await this.getToken(cred.credential.id);
+                    if (!basicTokenResponse?.token?.accessToken) {
+                        this.log.error('Basic Auth credential is missing token', {
+                            connectionName: connName,
+                            credentialId: cred.credential.id,
+                        });
+                        continue;
+                    }
+                    _fetch = this.basicAuthFetcherStatic(basicTokenResponse.token.accessToken, _fetch);
+                    break;
+                }
+                case 'jwt-bearer': {
+                    const bearerTokenResponse = await this.getToken(cred.credential.id);
+                    if (!bearerTokenResponse?.token?.accessToken) {
+                        this.log.error('Bearer Token credential is missing token', {
+                            connectionName: connName,
+                            credentialId: cred.credential.id,
+                        });
+                        continue;
+                    }
+                    _fetch = this.bearerTokenFetcherStatic(bearerTokenResponse.token.accessToken, _fetch);
+                    break;
+                }
+                case 'oauth2': {
+                    if (!cred.credential?.id) {
+                        this.log.error('OAuth2 credential is missing credential ID', {
+                            connectionName: connName,
+                            credentialId: cred.credential.id,
+                        });
+                        continue;
+                    }
+                    _fetch = this.oauth2FetcherStatic(cred.credential.id, _fetch);
+                    break;
+                }
+                case 'oauth1': {
+                    const oauth1Metadata = await this.getOAuth1Metadata(cred.credential.id);
+                    if (!oauth1Metadata?.authorizationMetadata) {
+                        this.log.error('OAuth1 credential is missing metadata', {
+                            connectionName: connName,
+                            credentialId: cred.credential.id,
+                        });
+                        continue;
+                    }
+                    _fetch = this.oauth1FetcherStatic(oauth1Metadata, _fetch);
+                    break;
+                }
+                case 'certificate': {
+                    const mtlsData = await this.getRaw(cred.credential.id);
+                    if (!mtlsData?.credential?.data['cert'] || !mtlsData?.credential?.data['key']) {
+                        this.log.error('mTLS credential is missing cert or key data', {
+                            connectionName: connName,
+                            credentialId: cred.credential.id,
+                        });
+                        continue;
+                    }
+                    _fetch = this.mtlsFetcherStatic({
+                        cert: mtlsData.credential.data['cert'],
+                        key: mtlsData.credential.data['key'],
+                        ca: mtlsData.credential.data['ca'],
+                    }, _fetch);
+                    break;
+                }
             }
+        }
+        const _fn = async (input, init) => {
             const _input = this.changeRequestInit(input, conn);
-            let _fetch = this.traceFetch;
-            conn.credentials.forEach((cred) => {
-                switch (cred.authSchemeConfig.type) {
-                    case 'api-key':
-                        _fetch = this.apiKeyFetcher(cred, _fetch);
-                        break;
-                    case 'basic-auth':
-                        _fetch = this.basicAuthFetcher(cred, _fetch);
-                        break;
-                    case 'jwt-bearer':
-                        _fetch = this.bearerTokenFetcher(cred, _fetch);
-                        break;
-                    case 'oauth2':
-                        _fetch = this.oauth2Fetcher(cred, _fetch);
-                        break;
-                    case 'certificate':
-                        _fetch = this.mtlsFetcher(cred, _fetch);
-                        break;
-                    case 'oauth1':
-                        _fetch = this.oauth1Fetcher(cred, _fetch);
-                        break;
+            return _fetch(_input, init);
+        };
+        return _fn;
+    }
+    apiKeyFetcherStatic(token, asc, fn) {
+        const _fn = async (input, init) => {
+            if (!token) {
+                throw new Error('Token not found');
+            }
+            if (!asc) {
+                throw new Error('API Key configuration not found');
+            }
+            if (!init) {
+                init = {};
+            }
+            switch (asc.in) {
+                case 'header':
+                    if (!init.headers) {
+                        init.headers = new Headers();
+                    }
+                    if (init.headers instanceof Headers) {
+                        init.headers.set(asc.name, token);
+                    }
+                    else if (init.headers instanceof Array) {
+                        init.headers.push([asc.name, token]);
+                    }
+                    else {
+                        init.headers = {
+                            ...init.headers,
+                            [asc.name]: token,
+                        };
+                    }
+                    break;
+                case 'query':
+                    if (typeof input === 'string') {
+                        const _input = new URL(input);
+                        _input.searchParams.append(asc.name, token);
+                        input = _input.toString();
+                    }
+                    else if (input instanceof Request) {
+                        const _input = new URL(input.url);
+                        _input.searchParams.append(asc.name, token);
+                        input = new Request(_input.toString(), init);
+                    }
+                    else if (input instanceof URL) {
+                        input.searchParams.append(asc.name, token);
+                    }
+                    break;
+            }
+            return fn(input, init);
+        };
+        return _fn;
+    }
+    basicAuthFetcherStatic(token, fn) {
+        const _fn = async (input, init) => {
+            if (!init) {
+                init = {};
+            }
+            if (!init.headers) {
+                init.headers = new Headers();
+            }
+            if (init.headers instanceof Headers) {
+                init.headers.set('Authorization', `Basic ${token}`);
+            }
+            else if (init.headers instanceof Array) {
+                init.headers.push(['Authorization', `Basic ${token}`]);
+            }
+            else {
+                init.headers = {
+                    ...init.headers,
+                    ['Authorization']: `Basic ${token}`,
+                };
+            }
+            return fn(input, init);
+        };
+        return _fn;
+    }
+    bearerTokenFetcherStatic(token, fn) {
+        const _fn = async (input, init) => {
+            if (!init) {
+                init = {};
+            }
+            if (!init.headers) {
+                init.headers = new Headers();
+            }
+            if (init.headers instanceof Headers) {
+                init.headers.set('Authorization', `Bearer ${token}`);
+            }
+            else if (init.headers instanceof Array) {
+                init.headers.push(['Authorization', `Bearer ${token}`]);
+            }
+            else {
+                init.headers = {
+                    ...init.headers,
+                    ['Authorization']: `Bearer ${token}`,
+                };
+            }
+            return fn(input, init);
+        };
+        return _fn;
+    }
+    // getOauth2Token fetches an OAuth2 token, stores the result in a cache, and returns the token.
+    // If forceRefresh is true, it will bypass the cache and fetch a new token then update the cache.
+    async getOAuth2Token(credId, forceRefresh = false) {
+        if (credId in this.oauth2Cache && !forceRefresh) {
+            return Promise.resolve(this.oauth2Cache[credId]);
+        }
+        const tokenResponse = await this.getToken(credId, forceRefresh);
+        this.oauth2Cache[credId] = {
+            token: tokenResponse.token?.accessToken || '',
+            tokenType: tokenResponse.token?.tokenType,
+        };
+        this.log.debug('Refreshed OAuth2 token and updating cache');
+        return this.oauth2Cache[credId];
+    }
+    oauth2FetcherStatic(credId, fn) {
+        const refreshFn = async (input, init, forceRefresh = false) => {
+            const tokenResponse = await this.getOAuth2Token(credId, forceRefresh);
+            const token = tokenResponse.token;
+            const _tokenType = () => {
+                const _tt = tokenResponse.tokenType?.toLowerCase();
+                switch (_tt) {
+                    case 'bearer':
+                        return 'Bearer';
+                    case 'mac':
+                        return 'MAC';
+                    case 'basic':
+                        return 'Basic';
                     default:
-                        break;
+                        return 'Bearer';
                 }
+            };
+            if (!init) {
+                init = {};
+            }
+            if (!init.headers) {
+                init.headers = new Headers();
+            }
+            if (init.headers instanceof Headers) {
+                init.headers.set('Authorization', `${_tokenType()} ${token}`);
+            }
+            else if (init.headers instanceof Array) {
+                init.headers.push(['Authorization', `${_tokenType()} ${token}`]);
+            }
+            else {
+                init.headers = {
+                    ...init.headers,
+                    ['Authorization']: `${_tokenType()} ${token}`,
+                };
+            }
+            return fn(input, init);
+        };
+        const _fn = async (input, init) => {
+            const resp = await refreshFn(input, init);
+            if (resp.status === 401) {
+                this.log.debug('Received 401 Unauthorized response, attempting refresh', {
+                    url: input,
+                    status: resp.status,
+                });
+                return refreshFn(input, init, true);
+            }
+            return resp;
+        };
+        return _fn;
+    }
+    oauth1FetcherStatic(metadata, fn) {
+        const _fn = async (input, init) => {
+            const authParams = new node_url_1.URLSearchParams(metadata.authorizationMetadata?.authorizationParams);
+            if (!metadata.authorizationMetadata) {
+                throw new Error('OAuth1 metadata not found');
+            }
+            const oauth = new oauth_1_0a_1.default({
+                consumer: {
+                    key: metadata.authorizationMetadata.consumerKey,
+                    secret: metadata.authorizationMetadata.consumerSecret,
+                },
+                signature_method: 'HMAC-SHA256',
+                hash_function: (baseString, key) => (0, node_crypto_1.createHmac)('sha256', key).update(baseString).digest('base64'),
+                realm: authParams.get('realm') || undefined,
             });
-            return _fetch(_input, init);
+            let url;
+            if (input instanceof Request) {
+                url = input.url;
+            }
+            else if (input instanceof URL) {
+                url = input.toString();
+            }
+            else if (typeof input === 'string') {
+                url = input;
+            }
+            else {
+                throw new Error('Invalid input type for OAuth1 fetcher');
+            }
+            const header = oauth.toHeader(oauth.authorize({
+                url: url,
+                method: init?.method || 'GET',
+            }, {
+                key: metadata.authorizationMetadata?.oauthToken,
+                secret: metadata.authorizationMetadata?.oauthTokenSecret,
+            }));
+            const authHeader = header.Authorization;
+            if (!init) {
+                init = {};
+            }
+            if (!init.headers) {
+                init.headers = new Headers();
+            }
+            if (init.headers instanceof Headers) {
+                init.headers.set('Authorization', authHeader);
+            }
+            else if (init.headers instanceof Array) {
+                init.headers.push(['Authorization', authHeader]);
+            }
+            else {
+                init.headers = {
+                    ...init.headers,
+                    ['Authorization']: authHeader,
+                };
+            }
+            return fn(input, init);
         };
-        return Promise.resolve(_fn);
+        return _fn;
+    }
+    mtlsFetcherStatic(mtlsdata, fn) {
+        const _fn = async (input, init) => {
+            const cert = new TextDecoder().decode(mtlsdata.cert);
+            const key = new TextDecoder().decode(mtlsdata.key);
+            const caCerts = new TextDecoder().decode(mtlsdata.ca ?? new Uint8Array());
+            const httpClient = Deno.createHttpClient({
+                cert,
+                key,
+                caCerts: caCerts ? [caCerts] : [],
+            });
+            return fn(input, {
+                ...init,
+                client: httpClient,
+            });
+        };
+        return _fn;
     }
     createDynamic(templateName) {
         const template = this.cfgReader.getTemplateID(templateName);
         if (!template) {
-            this.log.debug('Template not found in config, could be a static connection', {
-                templateName: templateName,
-            });
             return Promise.resolve(undefined);
         }
         const _fn = async (activation, input, init) => {