@versori/run 0.0.1-alpha.7 → 0.1.0-alpha.8

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

@@ -0,0 +1,14 @@
+import { Activation, Connection, ConnectionProvider } from '../types.js';
+export declare class PlatformAPIClient implements ConnectionProvider {
+    private baseUrl;
+    private orgId;
+    private envId;
+    private internalAuth;
+    private cache;
+    constructor(baseUrl: string, orgId: string, envId: string, cache?: Record<string, Connection>);
+    static fromEnv(): PlatformAPIClient;
+    getStaticConnection(cnxId: string): Promise<Connection | undefined>;
+    getEndUserConnection(templateId: string, userId: string): Promise<Connection | undefined>;
+    listActivations(): Promise<Activation[]>;
+}
+//# sourceMappingURL=platformapi.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"platformapi.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/platformapi.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAIzE,qBAAa,iBAAkB,YAAW,kBAAkB;IACxD,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO,CAAC,KAAK,CAAS;IAEtB,OAAO,CAAC,KAAK,CAAS;IAEtB,OAAO,CAAC,YAAY,CAAe;IAEnC,OAAO,CAAC,KAAK,CAA6B;gBAGtC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAM;IAS1C,MAAM,CAAC,OAAO,IAAI,iBAAiB;IAY7B,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IA2BnE,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAmBzF,eAAe,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;CAkBjD"}

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

@@ -0,0 +1,118 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PlatformAPIClient = void 0;
+const dntShim = __importStar(require("../../../../_dnt.shims.js"));
+const constants_js_1 = require("./constants.js");
+const internalauth_js_1 = require("./internalauth.js");
+class PlatformAPIClient {
+    constructor(baseUrl, orgId, envId, cache = {}) {
+        Object.defineProperty(this, "baseUrl", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "orgId", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "envId", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "internalAuth", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "cache", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.baseUrl = baseUrl;
+        this.orgId = orgId;
+        this.cache = cache;
+        this.envId = envId;
+        this.internalAuth = new internalauth_js_1.InternalAuth();
+    }
+    static fromEnv() {
+        const baseUrl = dntShim.Deno.env.get(constants_js_1.envVarPlatformApiBaseURL);
+        const orgId = dntShim.Deno.env.get(constants_js_1.envVarOrgId);
+        const envId = dntShim.Deno.env.get(constants_js_1.envVarEnvId);
+        if (!baseUrl || !orgId || !envId) {
+            throw new Error('Missing required environment variables');
+        }
+        return new PlatformAPIClient(baseUrl, orgId, envId);
+    }
+    async getStaticConnection(cnxId) {
+        if (this.cache[cnxId]) {
+            return this.cache[cnxId];
+        }
+        const resp = await fetch(`${this.baseUrl}/o/${this.orgId}/connections/${cnxId}`, {
+            headers: {
+                'x-versori-internal-token': await this.internalAuth.getToken(),
+            },
+        });
+        if (!resp.ok) {
+            return undefined;
+        }
+        const result = (await resp.json());
+        this.cache[cnxId] = result;
+        return result;
+    }
+    async getEndUserConnection(templateId, userId) {
+        const resp = await fetch(`${this.baseUrl}/o/${this.orgId}/environment-systems/${templateId}/users/${userId}`, {
+            headers: {
+                'x-versori-internal-token': await this.internalAuth.getToken(),
+            },
+        });
+        if (!resp.ok) {
+            return undefined;
+        }
+        const result = (await resp.json());
+        return result;
+    }
+    async listActivations() {
+        const resp = await fetch(`${this.baseUrl}/o/${this.orgId}/environments/${this.envId}/activations`, {
+            headers: {
+                'x-versori-internal-token': await this.internalAuth.getToken(),
+            },
+        });
+        if (!resp.ok) {
+            return [];
+        }
+        const result = (await resp.json());
+        return result;
+    }
+}
+exports.PlatformAPIClient = PlatformAPIClient;

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

@@ -1,8 +1,8 @@
-import { ConnectAPIClient } from './connectapi.js';
-import { DynamicFetcher, RoundTripperFactory } from "../types.js";
+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';
-export declare function CreateFromEnv(): VersoriRoundTripperFactory;
 /**
  * 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.
@@ -16,13 +16,20 @@ export declare function CreateFromEnv(): VersoriRoundTripperFactory;
  * ```
  */
 export declare class VersoriRoundTripperFactory implements RoundTripperFactory {
-    private cAPIClient;
     private tokenClient;
+    private platformAPIClient;
     private versoriCfg;
-    constructor(cAPIClient: ConnectAPIClient, credsClient: VersoriCredentialClient);
+    private log;
+    private readonly defaultStatic;
+    private readonly defaultDynamic;
+    constructor(credsClient: VersoriCredentialClient, platformAPIClient: PlatformAPIClient, logger: Logger);
+    static fromEnv(logger?: Logger): VersoriRoundTripperFactory;
+    private changeRequestInit;
+    private changeBaseUrl;
     create(connName: string, fn?: typeof fetch): Promise<typeof fetch>;
-    createDynamic(templateName: string, fn: typeof fetch): Promise<DynamicFetcher>;
+    createDynamic(templateName: string, fn?: typeof fetch): Promise<DynamicFetcher>;
     private getConnectionID;
+    private getTemplateID;
     private apiKeyFetcher;
     private basicAuthFetcher;
     private bearerTokenFetcher;

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,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAc,cAAc,EAAE,mBAAmB,EAAoB,MAAM,aAAa,CAAC;AAEhG,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC;AAEjE,wBAAgB,aAAa,IAAI,0BAA0B,CAuB1D;AAED;;;;;;;;;;;GAWG;AACH,qBAAa,0BAA2B,YAAW,mBAAmB;IAClE,OAAO,CAAC,UAAU,CAAmB;IAErC,OAAO,CAAC,WAAW,CAA0B;IAE7C,OAAO,CAAC,UAAU,CAAmB;gBAEzB,UAAU,EAAE,gBAAgB,EAAE,WAAW,EAAE,uBAAuB;IAMxE,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,GAAE,OAAO,KAAa,GAAG,OAAO,CAAC,OAAO,KAAK,CAAC;IAsBzE,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,KAAK,GAAG,OAAO,CAAC,cAAc,CAAC;IAIpF,OAAO,CAAC,eAAe;YAWT,aAAa;YAiDb,gBAAgB;YA0BhB,kBAAkB;YAkClB,aAAa;CAgD9B"}
+{"version":3,"file":"roundtripper.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/roundtripper.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,cAAc,EAAE,mBAAmB,EAAoB,MAAM,aAAa,CAAC;AAEhG,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/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,aAAa,CAK5B;IAEF,OAAO,CAAC,QAAQ,CAAC,cAAc,CAM7B;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;IAYzB,OAAO,CAAC,aAAa;IAmBf,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,GAAE,OAAO,KAAwB,GAAG,OAAO,CAAC,OAAO,KAAK,CAAC;IAyBpF,aAAa,CACf,YAAY,EAAE,MAAM,EACpB,EAAE,GAAE,OAAO,KAAwB,GACpC,OAAO,CAAC,cAAc,CAAC;IA0D1B,OAAO,CAAC,eAAe;IAavB,OAAO,CAAC,aAAa;YAYP,aAAa;YAoDb,gBAAgB;YA0BhB,kBAAkB;YAiClB,aAAa;CAkD9B"}

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

@@ -24,32 +24,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VersoriRoundTripperFactory = void 0;
-exports.CreateFromEnv = CreateFromEnv;
 const dntShim = __importStar(require("../../../../_dnt.shims.js"));
-const connectapi_js_1 = require("./connectapi.js");
 const configloader_js_1 = require("./configloader.js");
 const mod_js_1 = require("./credentials/mod.js");
-function CreateFromEnv() {
-    const connAPIBaseURL = dntShim.Deno.env.get('RUN_CONNECT_API_INTERNAL_URL');
-    const credsBaseURL = dntShim.Deno.env.get('RUN_CREDENTIALS_SERVICE_INTERNAL_URL');
-    const orgId = dntShim.Deno.env.get('RUN_ORGANISATION_ID');
-    const serviceConnId = dntShim.Deno.env.get('RUN_CONNECTOR_ID');
-    if (!orgId || !serviceConnId || !connAPIBaseURL || !credsBaseURL) {
-        const missingVars = [];
-        if (!orgId)
-            missingVars.push('RUN_ORGANISATION_ID');
-        if (!serviceConnId)
-            missingVars.push('RUN_CONNECTOR_ID');
-        if (!connAPIBaseURL)
-            missingVars.push('RUN_CONNECT_API_INTERNAL_URL');
-        if (!credsBaseURL)
-            missingVars.push('RUN_CREDENTIALS_SERVICE_INTERNAL_URL');
-        throw new Error(`Missing environment variables: ${missingVars.join(', ')}`);
-    }
-    const cAPIClient = new connectapi_js_1.ConnectAPIClient(connAPIBaseURL, orgId, serviceConnId, {});
-    const tokenClient = new mod_js_1.VersoriCredentialClient(credsBaseURL);
-    return new VersoriRoundTripperFactory(cAPIClient, tokenClient);
-}
+const lru_cache_1 = require("lru-cache");
+const platformapi_js_1 = require("./platformapi.js");
+const mod_js_2 = require("../../../observability/mod.js");
+const constants_js_1 = require("./constants.js");
 /**
  * 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.
@@ -63,14 +44,14 @@ function CreateFromEnv() {
  * ```
  */
 class VersoriRoundTripperFactory {
-    constructor(cAPIClient, credsClient) {
-        Object.defineProperty(this, "cAPIClient", {
+    constructor(credsClient, platformAPIClient, logger) {
+        Object.defineProperty(this, "tokenClient", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "tokenClient", {
+        Object.defineProperty(this, "platformAPIClient", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -82,17 +63,99 @@ class VersoriRoundTripperFactory {
             writable: true,
             value: void 0
         });
-        this.cAPIClient = cAPIClient;
+        Object.defineProperty(this, "log", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "defaultStatic", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (msg, values) => {
+                return (input, init) => {
+                    this.log.error(msg, values);
+                    return globalThis.fetch(input, init);
+                };
+            }
+        });
+        Object.defineProperty(this, "defaultDynamic", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (msg, values) => {
+                return (userId, input, init) => {
+                    values['userId'] = userId;
+                    this.log.error(msg, values);
+                    return globalThis.fetch(input, init);
+                };
+            }
+        });
         this.tokenClient = credsClient;
-        this.versoriCfg = (0, configloader_js_1.LoadConfigFromJSON)(); // for now?
+        this.platformAPIClient = platformAPIClient;
+        this.versoriCfg = (0, configloader_js_1.LoadConfigFromFile)();
+        this.log = logger;
+    }
+    static fromEnv(logger) {
+        const credsBaseURL = dntShim.Deno.env.get(constants_js_1.envVarCredsBaseURL);
+        const platformApiBaseURL = dntShim.Deno.env.get(constants_js_1.envVarPlatformApiBaseURL);
+        const orgId = dntShim.Deno.env.get(constants_js_1.envVarOrgId);
+        const envId = dntShim.Deno.env.get(constants_js_1.envVarEnvId);
+        if (!orgId || !envId || !platformApiBaseURL || !credsBaseURL) {
+            const missingVars = [];
+            if (!orgId)
+                missingVars.push(constants_js_1.envVarOrgId);
+            if (!envId)
+                missingVars.push(constants_js_1.envVarEnvId);
+            if (!platformApiBaseURL)
+                missingVars.push(constants_js_1.envVarPlatformApiBaseURL);
+            if (!credsBaseURL)
+                missingVars.push(constants_js_1.envVarCredsBaseURL);
+            throw new Error(`Missing environment variables: ${missingVars.join(', ')}`);
+        }
+        const pAPIClient = new platformapi_js_1.PlatformAPIClient(platformApiBaseURL, orgId, envId, {});
+        const tokenClient = new mod_js_1.VersoriCredentialClient(credsBaseURL);
+        const log = logger || new mod_js_2.ConsoleLogger('debug');
+        return new VersoriRoundTripperFactory(tokenClient, pAPIClient, log);
+    }
+    // takes the info and modifies the url using changeBaseUrl if necessary
+    changeRequestInit(info, conn) {
+        if (typeof info === 'string') {
+            return this.changeBaseUrl(info, conn);
+        }
+        else if (info instanceof URL) {
+            return this.changeBaseUrl(info.toString(), conn);
+        }
+        else if (info instanceof Request) {
+            const url = this.changeBaseUrl(info.url, conn);
+            return new Request(url, info);
+        }
+        return info;
     }
-    async create(connName, fn = fetch) {
+    changeBaseUrl(url, conn) {
+        const baseUrl = conn.baseUrl;
+        if (!baseUrl) {
+            return url;
+        }
+        const urlObj = new URL(url);
+        const baseUrlObj = new URL(baseUrl);
+        urlObj.hostname = baseUrlObj.hostname;
+        this.log.debug('Changing base URL', {
+            originalUrl: url,
+            newUrl: urlObj.toString(),
+        });
+        return url.toString();
+    }
+    async create(connName, fn = globalThis.fetch) {
         const cnxId = this.getConnectionID(connName);
-        const conn = await this.cAPIClient.getConnection(cnxId);
+        const conn = await this.platformAPIClient.getStaticConnection(cnxId);
         if (!conn) {
-            throw new Error(`Connection ${connName} not found`);
+            return this.defaultStatic('Connection not found for static, using default fetch', {
+                connName: connName,
+            });
         }
-        switch (conn.credentials.action[0].authSchemeConfig.schemeType) {
+        switch (conn.credentials[0].authSchemeConfig.type) {
             case 'api-key':
                 return this.apiKeyFetcher(conn, fn);
             case 'basic-auth':
@@ -105,55 +168,108 @@ class VersoriRoundTripperFactory {
                 return fn;
         }
     }
-    async createDynamic(templateName, fn) {
-        throw new Error('Method not implemented.');
+    async createDynamic(templateName, fn = globalThis.fetch) {
+        const lruCacheOptions = {
+            max: 100,
+        };
+        const cache = new lru_cache_1.LRUCache(lruCacheOptions);
+        const template = this.getTemplateID(templateName);
+        if (!template) {
+            return this.defaultDynamic('Template not found for dynamic, using default fetch', {
+                templateName: templateName,
+            });
+        }
+        const _fn = async (userId, input, init) => {
+            let conn = undefined;
+            if (cache.has(userId)) {
+                conn = cache.get(userId);
+            }
+            else {
+                conn = await this.platformAPIClient.getEndUserConnection(template, userId);
+                if (conn) {
+                    cache.set(userId, conn);
+                }
+            }
+            if (!conn) {
+                return this.defaultDynamic('Connection not found for user, using default fetch', {
+                    templateName: templateName,
+                    userId: userId,
+                })(userId, input, init);
+            }
+            const _input = this.changeRequestInit(input, conn);
+            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);
+            }
+        };
+        return _fn;
     }
     getConnectionID(connName) {
         // Note that this is till very up in the air whether we are going to store the connection ID in the config
-        const conn = this.versoriCfg.connections.find(c => c.name === connName);
-        if (!conn) {
-            throw new Error(`Connection ${connName} not found`);
+        const conn = this.versoriCfg.mappings.find((c) => (c.dynamic === undefined || c.dynamic === false) && c.name === connName);
+        if (!conn || !conn.connId) {
+            return '';
         }
-        return conn.id;
+        return conn.connId;
+    }
+    getTemplateID(templateName) {
+        // see above, also I'm assuming for now that the template id is simply the same as the connection id
+        // but there is another flag that denotes it as dynamic??
+        const template = this.versoriCfg.mappings.find((c) => c.dynamic && c.name === templateName);
+        if (!template || !template.templateId) {
+            return '';
+        }
+        return template.templateId;
     }
     async apiKeyFetcher(conn, fn) {
-        const tokenResponse = await this.tokenClient.getToken(conn.credentials.action[0].credential.id);
+        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) => {
             if (!init) {
                 init = {};
             }
-            const apiKeyName = conn.credentials.action[0].authSchemeConfig?.name || 'Authorization';
-            switch (conn.credentials.action[0].authSchemeConfig.in) {
+            switch (asc.in) {
                 case 'header':
                     if (!init.headers) {
                         init.headers = new Headers();
                     }
                     if (init.headers instanceof Headers) {
-                        init.headers.set(apiKeyName, token);
+                        init.headers.set(asc.name, token);
                     }
                     else if (init.headers instanceof Array) {
-                        init.headers.push([apiKeyName, token]);
+                        init.headers.push([asc.name, token]);
                     }
                     else {
                         init.headers = {
                             ...init.headers,
-                            [apiKeyName]: token
+                            [asc.name]: token,
                         };
                     }
                     break;
                 case 'query':
                     if (typeof input === 'string') {
-                        input += `?${apiKeyName}=${token}`;
+                        input += `?${asc.name}=${token}`;
                     }
                     else if (input instanceof Request) {
-                        input = new Request(input.url + `?${apiKeyName}=${token}`, init);
+                        input = new Request(input.url + `?${asc.name}=${token}`, init);
                     }
                     else if (input instanceof URL) {
-                        input.searchParams.append(apiKeyName, token);
+                        input.searchParams.append(asc.name, token);
                     }
                     break;
             }
@@ -162,7 +278,7 @@ class VersoriRoundTripperFactory {
         return _fn;
     }
     async basicAuthFetcher(conn, fn) {
-        const tokenResponse = await this.tokenClient.getToken(conn.credentials.action[0].credential.id);
+        const tokenResponse = await this.tokenClient.getToken(conn.credentials[0].credential.id);
         const token = tokenResponse.token?.accessToken;
         if (!token) {
             throw new Error('Token not found');
@@ -174,14 +290,14 @@ class VersoriRoundTripperFactory {
             if (!init.headers) {
                 init.headers = new Headers();
             }
-            init.headers.set('Authorization', token);
+            init.headers.set('Authorization', `Basic ${token}`);
             return fn(input, init);
         };
         return _fn;
     }
-    // TODO: need to make the prefix and header name configuratble from authschemeconfig
+    // TODO: need to make the prefix and header name configurable from authschemeconfig
     async bearerTokenFetcher(conn, fn) {
-        const tokenResponse = await this.tokenClient.getToken(conn.credentials.action[0].credential.id);
+        const tokenResponse = await this.tokenClient.getToken(conn.credentials[0].credential.id);
         const token = tokenResponse.token?.accessToken;
         if (!token) {
             throw new Error('Token not found');
@@ -202,7 +318,7 @@ class VersoriRoundTripperFactory {
             else {
                 init.headers = {
                     ...init.headers,
-                    ['Authorization']: `Bearer ${token}`
+                    ['Authorization']: `Bearer ${token}`,
                 };
             }
             return fn(input, init);
@@ -210,7 +326,7 @@ class VersoriRoundTripperFactory {
         return _fn;
     }
     async oauth2Fetcher(conn, fn) {
-        const tokenResponse = await this.tokenClient.getOAuth2Token(conn.credentials.action[0].credential.id);
+        const tokenResponse = await this.tokenClient.getOAuth2Token(conn.credentials[0].credential.id);
         const token = tokenResponse.token?.accessToken;
         const tokenType = tokenResponse.token?.tokenType;
         if (!token) {
@@ -245,7 +361,7 @@ class VersoriRoundTripperFactory {
             else {
                 init.headers = {
                     ...init.headers,
-                    ['Authorization']: `${_tokenType()} ${token}`
+                    ['Authorization']: `${_tokenType()} ${token}`,
                 };
             }
             return fn(input, init);

package/script/src/dsl/tasks/HttpTask.d.ts

@@ -1,11 +1,13 @@
 import { Context } from '../../context/Context.js';
+import { Logger } from '../../mod.js';
+import { Activation, DynamicFetcher } from '../http/types.js';
 import { ArrayTask, Task, Taskable, TaskType } from '../Task.js';
-export type HttpContext<Data, PageParams> = Context<Data> & {
+export interface HttpContext<Data, PageParams = undefined> extends Context<Data> {
     fetch: typeof fetch;
     connectionVariables: Record<string, any>;
     pageParams?: PageParams;
     nextPage: (nextParams: PageParams) => Promise<void>;
-};
+}
 export type HttpContextFunc<In, Out, PageParams> = (ctx: HttpContext<In, PageParams>) => Promise<Out>;
 export type PaginateOptions<P> = {
     initialParams: P;
@@ -27,5 +29,19 @@ export declare class HttpTaskImpl<In, Out, PageParams> implements Task<In, Out>
     unpack<NextOut>(mapper: (data: Out) => NextOut[]): ArrayTask<In, NextOut>;
     clone(): Task<In, Out>;
 }
+export declare class HttpContextImpl<D, PageParams> implements HttpContext<D, PageParams> {
+    log: Logger;
+    startTime: Date;
+    executionId: string;
+    activation?: Activation;
+    data: D;
+    connectionVariables: Record<string, any>;
+    pageParams?: PageParams;
+    private dynamicFetcher?;
+    private staticFetcher;
+    constructor(ctx: Context<D>, connectionVars: Record<string, any>, staticFetcher: typeof fetch, dynamicFetcher?: DynamicFetcher, pageParams?: PageParams);
+    get fetch(): typeof globalThis.fetch;
+    nextPage(nextParams: PageParams): Promise<void>;
+}
 export declare function http<In = any, Out = any, PageParams = unknown>(taskId: string, opts: HttpOptions<In, Out, PageParams>, fn: HttpContextFunc<In, Out, PageParams>): Task<In, Out>;
 //# sourceMappingURL=HttpTask.d.ts.map

package/script/src/dsl/tasks/HttpTask.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HttpTask.d.ts","sourceRoot":"","sources":["../../../../src/src/dsl/tasks/HttpTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAMjE,MAAM,MAAM,WAAW,CAAC,IAAI,EAAE,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG;IACxD,KAAK,EAAE,OAAO,KAAK,CAAC;IACpB,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACzC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,QAAQ,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACvD,CAAC;AAEF,MAAM,MAAM,eAAe,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,IAAI,CAC/C,GAAG,EAAE,WAAW,CAAC,EAAE,EAAE,UAAU,CAAC,KAC/B,OAAO,CAAC,GAAG,CAAC,CAAC;AAElB,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI;IAC7B,aAAa,EAAE,CAAC,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,IAAI;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;CAC5C,CAAC;AAEF,qBAAa,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAE,YAAW,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC;IACnE,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAU;IAE5B,EAAE,EAAE,MAAM,CAAC;IAEX,EAAE,EAAE,eAAe,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;IAEzC,IAAI,EAAE,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;gBAGnC,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,EACtC,EAAE,EAAE,eAAe,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC;IAO5C,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC;IAI9D,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC;IAIjE,UAAU,IAAI,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC;IAI5B,MAAM,CAAC,OAAO,GAAG,GAAG,SAAS,KAAK,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,GAAG,GAAG,KAAK,SAAS,CAAC,EAAE,EAAE,OAAO,CAAC;IACtF,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,EAAE,GAAG,SAAS,CAAC,EAAE,EAAE,OAAO,CAAC;IASzE,KAAK,IAAI,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC;CAGzB;AAED,wBAAgB,IAAI,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,UAAU,GAAG,OAAO,EAC1D,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,EACtC,EAAE,EAAE,eAAe,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,GACzC,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,CAEf"}
+{"version":3,"file":"HttpTask.d.ts","sourceRoot":"","sources":["../../../../src/src/dsl/tasks/HttpTask.ts"],"names":[],"mappings":"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"}

package/script/src/dsl/tasks/HttpTask.js

@@ -1,9 +1,10 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpTaskImpl = void 0;
+exports.HttpContextImpl = exports.HttpTaskImpl = void 0;
 exports.http = http;
 const ensureTask_js_1 = require("../ensureTask.js");
+const types_js_1 = require("../http/types.js");
 const Task_js_1 = require("../Task.js");
 const BackgroundTask_js_1 = require("./BackgroundTask.js");
 const CatchTask_js_1 = require("./CatchTask.js");
@@ -60,6 +61,88 @@ class HttpTaskImpl {
 }
 exports.HttpTaskImpl = HttpTaskImpl;
 _a = Task_js_1.TaskType;
+class HttpContextImpl {
+    constructor(ctx, connectionVars, staticFetcher, dynamicFetcher, pageParams) {
+        Object.defineProperty(this, "log", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "startTime", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "executionId", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "activation", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "data", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "connectionVariables", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {}
+        });
+        Object.defineProperty(this, "pageParams", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        }); // TODO: Implement page params
+        Object.defineProperty(this, "dynamicFetcher", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "staticFetcher", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.log = ctx.log;
+        this.executionId = ctx.executionId;
+        this.startTime = ctx.startTime;
+        this.activation = ctx.activation;
+        this.data = ctx.data;
+        this.pageParams = pageParams;
+        this.connectionVariables = connectionVars;
+        this.dynamicFetcher = dynamicFetcher;
+        this.staticFetcher = staticFetcher;
+    }
+    get fetch() {
+        // TODO: this will need some work to make dynamic and static connections work in tandem.
+        let fetch;
+        if (this.dynamicFetcher && this.activation) {
+            fetch = (0, types_js_1.wrapDynamicFetcher)(this.dynamicFetcher, this.activation.id);
+        }
+        else {
+            fetch = this.staticFetcher;
+        }
+        return fetch;
+    }
+    async nextPage(nextParams) {
+        throw new Error("Method not implemented.");
+    }
+}
+exports.HttpContextImpl = HttpContextImpl;
 function http(taskId, opts, fn) {
     return new HttpTaskImpl(taskId, opts, fn);
 }