@hahnpro/hpc-api 2025.4.0 → 2025.4.1-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hahnpro/hpc-api",
-  "version": "2025.4.0",
+  "version": "2025.4.1-beta.1",
   "description": "Module for easy access to the HahnPRO Cloud API",
   "license": "MIT",
   "author": {

package/src/lib/api.d.ts

@@ -27,5 +27,6 @@ export declare class API {
     notificationRules: NotificationRuleService;
     constructor(httpClient?: HttpClientService, context?: {
         tokenSubject?: string;
+        activeOrg?: string;
     });
 }

package/src/lib/api.js

@@ -23,7 +23,15 @@ class API {
             if (!secret) {
                 throw new Error('"API_BASE_URL", "API_USER", "AUTH_REALM" and "AUTH_SECRET" environment variables must be set');
             }
-            this.httpClient = new services_1.HttpClientService(apiUrl, authUrl, realm, client, secret, context?.tokenSubject);
+            this.httpClient = new services_1.HttpClientService({
+                baseURL: apiUrl,
+                authBaseURL: authUrl,
+                realm,
+                clientId: client,
+                clientSecret: secret,
+                tokenSubject: context?.tokenSubject,
+                activeOrg: context?.activeOrg,
+            });
         }
         this.ai = new services_1.AiService(this.httpClient);
         this.alerts = new services_1.AlertService(this.httpClient);

package/src/lib/services/http-client.service.d.ts

@@ -5,6 +5,15 @@ import { Observable, Subject } from 'rxjs';
 import { Config, Issuer, TokenOption } from '../interfaces';
 import { Queue } from '../queue';
 import { TokenSet } from '../token-set';
+export interface HttpClientConfig {
+    baseURL: string;
+    authBaseURL?: string;
+    realm: string;
+    clientId: string;
+    clientSecret: string;
+    tokenSubject?: string;
+    activeOrg?: string;
+}
 export declare class HttpClientService {
     protected readonly baseURL: string;
     protected readonly authBaseURL: string;
@@ -12,6 +21,7 @@ export declare class HttpClientService {
     protected readonly clientId: string;
     protected readonly clientSecret: string;
     protected readonly tokenSubject?: string;
+    protected readonly activeOrg?: string;
     protected readonly axiosInstance: AxiosInstance;
     protected readonly authAxiosInstance: AxiosInstance;
     protected readonly requestQueue: Queue;
@@ -23,7 +33,8 @@ export declare class HttpClientService {
         listener: (event: MessageEvent) => void;
         errListener: (event: MessageEvent) => void;
     }>;
-    constructor(baseURL: string, authBaseURL: string, realm: string, clientId: string, clientSecret: string, tokenSubject?: string);
+    constructor(config: HttpClientConfig);
+    constructor(baseURL: string, authBaseURL: string, realm: string, clientId: string, clientSecret: string, tokenSubject?: string, activeOrg?: string);
     getQueueStats: () => {
         peak: number;
         pending: number;

package/src/lib/services/http-client.service.js

@@ -10,13 +10,7 @@ const rxjs_1 = require("rxjs");
 const queue_1 = require("../queue");
 const token_set_1 = require("../token-set");
 class HttpClientService {
-    constructor(baseURL, authBaseURL, realm, clientId, clientSecret, tokenSubject) {
-        this.baseURL = baseURL;
-        this.authBaseURL = authBaseURL;
-        this.realm = realm;
-        this.clientId = clientId;
-        this.clientSecret = clientSecret;
-        this.tokenSubject = tokenSubject;
+    constructor(configOrBaseURL, authBaseURL, realm, clientId, clientSecret, tokenSubject, activeOrg) {
         this.discoveredIssuers = new Map();
         this.eventSourcesMap = new Map();
         this.getQueueStats = () => this.requestQueue?.getStats();
@@ -31,6 +25,9 @@ class HttpClientService {
                 tokenP
                     .then((token) => {
                     const headers = { Authorization: `Bearer ${token}`, ...config.headers };
+                    if (this.activeOrg) {
+                        headers['active-org-id'] = this.activeOrg;
+                    }
                     return this.axiosInstance.request({ ...config, headers, method, url, data });
                 })
                     .then((response) => resolve(response.data))
@@ -59,8 +56,32 @@ class HttpClientService {
                 return accessToken;
             }
         };
-        this.axiosInstance = axios_1.default.create({ baseURL, timeout: 60000 });
-        this.authAxiosInstance = axios_1.default.create({ baseURL: authBaseURL || baseURL, timeout: 10000 });
+        // Handle single config object overload
+        if (typeof configOrBaseURL === 'object') {
+            const config = configOrBaseURL;
+            this.baseURL = config.baseURL;
+            this.authBaseURL = config.authBaseURL || config.baseURL;
+            this.realm = config.realm;
+            this.clientId = config.clientId;
+            this.clientSecret = config.clientSecret;
+            this.tokenSubject = config.tokenSubject;
+            this.activeOrg = config.activeOrg;
+        }
+        else {
+            // Handle individual parameters overload
+            if (!authBaseURL || !realm || !clientId || !clientSecret) {
+                throw new Error('Missing required parameters for HttpClientService constructor');
+            }
+            this.baseURL = configOrBaseURL;
+            this.authBaseURL = authBaseURL;
+            this.realm = realm;
+            this.clientId = clientId;
+            this.clientSecret = clientSecret;
+            this.tokenSubject = tokenSubject;
+            this.activeOrg = activeOrg;
+        }
+        this.axiosInstance = axios_1.default.create({ baseURL: this.baseURL, timeout: 60000 });
+        this.authAxiosInstance = axios_1.default.create({ baseURL: this.authBaseURL, timeout: 10000 });
         this.requestQueue = new queue_1.Queue({ concurrency: 1, timeout: 70000, throwOnTimeout: true });
     }
     getSseObservable(path, onmessage) {
@@ -106,13 +127,19 @@ class HttpClientService {
             };
         const token = options.token ? options.token : await this.getAccessToken();
         const es = new eventsource_1.EventSource(`${this.baseURL}${url}`, {
-            fetch: (input, init) => fetch(input, {
-                ...init,
-                headers: {
+            fetch: (input, init) => {
+                const headers = {
                     ...init.headers,
                     Authorization: 'Bearer ' + token,
-                },
-            }),
+                };
+                if (this.activeOrg) {
+                    headers['active-org-id'] = this.activeOrg;
+                }
+                return fetch(input, {
+                    ...init,
+                    headers,
+                });
+            },
         });
         es.addEventListener('message', listener);
         es.addEventListener('error', errListener);