@flowcore/sdk 1.11.9 → 1.11.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/CHANGELOG.md +9 -0
  2. package/esm/common/notification-client.d.ts +12 -3
  3. package/esm/common/notification-client.d.ts.map +1 -1
  4. package/esm/common/notification-client.js +22 -9
  5. package/package.json +1 -1
  6. package/script/common/notification-client.d.ts +12 -3
  7. package/script/common/notification-client.d.ts.map +1 -1
  8. package/script/common/notification-client.js +22 -9
package/CHANGELOG.md CHANGED
@@ -1,5 +1,14 @@
1
1
  # Changelog
2
2
 
3
+ ## [1.11.10](https://github.com/flowcore-io/flowcore-sdk/compare/v1.11.9...v1.11.10) (2025-02-14)
4
+
5
+
6
+ ### Bug Fixes
7
+
8
+ * allow api key in notification client ([62269e9](https://github.com/flowcore-io/flowcore-sdk/commit/62269e94e3fee0fcb7a38c30cd8a595982ea1af9))
9
+ * fix auth interface ([077b727](https://github.com/flowcore-io/flowcore-sdk/commit/077b727bb24234b58036cca6aba5aad5f7b310d0))
10
+ * rename url params ([395b47d](https://github.com/flowcore-io/flowcore-sdk/commit/395b47ddd57f2f79693eacb91fa14aeb5ba43332))
11
+
3
12
  ## [1.11.9](https://github.com/flowcore-io/flowcore-sdk/compare/v1.11.8...v1.11.9) (2025-02-14)
4
13
 
5
14
 
package/esm/common/notification-client.d.ts CHANGED
@@ -31,13 +31,21 @@ export type NotificationClientOptions = {
31
31
  maxEvents?: number;
32
32
  logger?: Logger;
33
33
  };
34
+ interface NotificationClientAuthOptionsBearer {
35
+ oidcClient: OidcClient;
36
+ }
37
+ interface NotificationClientAuthOptionsApiKey {
38
+ apiKey: string;
39
+ apiKeyId: string;
40
+ }
41
+ type NotificationClientAuthOptions = NotificationClientAuthOptionsBearer | NotificationClientAuthOptionsApiKey;
34
42
  /**
35
43
  * Client for handling WebSocket connections to the Flowcore notification system.
36
44
  * Manages connection lifecycle, authentication, and event handling.
37
45
  */
38
46
  export declare class NotificationClient {
39
47
  private readonly observer;
40
- private readonly oidcClient;
48
+ private readonly authOptions;
41
49
  private readonly subscriptionSpec;
42
50
  private url;
43
51
  private webSocket;
@@ -51,11 +59,11 @@ export declare class NotificationClient {
51
59
  /**
52
60
  * Creates a new NotificationClient instance
53
61
  * @param observer - RxJS Subject for emitting notification events
54
- * @param oidcClient - Client for handling OIDC authentication
62
+ * @param authOptions - Auth options for the client
55
63
  * @param subscriptionSpec - Specification for what notifications to subscribe to
56
64
  * @param options - Configuration options for the client
57
65
  */
58
- constructor(observer: Subject<NotificationEvent>, oidcClient: OidcClient, subscriptionSpec: {
66
+ constructor(observer: Subject<NotificationEvent>, authOptions: NotificationClientAuthOptions, subscriptionSpec: {
59
67
  tenant: string;
60
68
  dataCore: string;
61
69
  flowType?: string;
@@ -87,4 +95,5 @@ export declare class NotificationClient {
87
95
  */
88
96
  overrideBaseUrl(url: string): void;
89
97
  }
98
+ export {};
90
99
  //# sourceMappingURL=notification-client.d.ts.map
package/esm/common/notification-client.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"notification-client.d.ts","sourceRoot":"","sources":["../../src/common/notification-client.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AASnC,OAAO,EAAiB,KAAK,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAM/D;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE;QACJ,MAAM,EAAE,MAAM,CAAA;QACd,OAAO,EAAE,MAAM,CAAA;QACf,UAAU,EAAE,MAAM,CAAA;QAClB,QAAQ,EAAE,MAAM,CAAA;QAChB,SAAS,EAAE,MAAM,CAAA;QACjB,SAAS,EAAE,MAAM,CAAA;KAClB,CAAA;CACF,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,MAAM,OAAO,CAAC;QACtB,WAAW,EAAE,MAAM,CAAA;KACpB,CAAC,CAAA;CACH,CAAA;AAcD;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG;IACtC,iBAAiB,EAAE,MAAM,CAAA;IACzB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAKD;;;GAGG;AACH,qBAAa,kBAAkB;IAmB3B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IApBnC,OAAO,CAAC,GAAG,CAA+C;IAC1D,OAAO,CAAC,SAAS,CAAoB;IACrC,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,UAAU,CAAI;IACtB,OAAO,CAAC,iBAAiB,CAAQ;IACjC,OAAO,CAAC,iBAAiB,CAAI;IAC7B,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,aAAa,CAAiB;IAEtC;;;;;;OAMG;gBAEgB,QAAQ,EAAE,OAAO,CAAC,iBAAiB,CAAC,EACpC,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE;QACjC,MAAM,EAAE,MAAM,CAAA;QACd,QAAQ,EAAE,MAAM,CAAA;QAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,SAAS,CAAC,EAAE,MAAM,CAAA;KACnB,EACD,OAAO,CAAC,EAAE,OAAO,CAAC,yBAAyB,CAAC;IAU9C;;OAEG;IACH,IAAW,MAAM,IAAI,OAAO,CAE3B;IAED;;OAEG;IACH,IAAW,YAAY,IAAI,OAAO,CAEjC;IAED;;OAEG;IACG,OAAO;IAmIb;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAqBxB;;OAEG;IACH,UAAU;IAMV;;;OAGG;IACI,eAAe,CAAC,GAAG,EAAE,MAAM;CAGnC"}
1
+ {"version":3,"file":"notification-client.d.ts","sourceRoot":"","sources":["../../src/common/notification-client.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AASnC,OAAO,EAAiB,KAAK,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAM/D;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE;QACJ,MAAM,EAAE,MAAM,CAAA;QACd,OAAO,EAAE,MAAM,CAAA;QACf,UAAU,EAAE,MAAM,CAAA;QAClB,QAAQ,EAAE,MAAM,CAAA;QAChB,SAAS,EAAE,MAAM,CAAA;QACjB,SAAS,EAAE,MAAM,CAAA;KAClB,CAAA;CACF,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,MAAM,OAAO,CAAC;QACtB,WAAW,EAAE,MAAM,CAAA;KACpB,CAAC,CAAA;CACH,CAAA;AAcD;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG;IACtC,iBAAiB,EAAE,MAAM,CAAA;IACzB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAKD,UAAU,mCAAmC;IAC3C,UAAU,EAAE,UAAU,CAAA;CACvB;AAED,UAAU,mCAAmC;IAC3C,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,KAAK,6BAA6B,GAC9B,mCAAmC,GACnC,mCAAmC,CAAA;AAEvC;;;GAGG;AACH,qBAAa,kBAAkB;IAmB3B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IApBnC,OAAO,CAAC,GAAG,CAA+C;IAC1D,OAAO,CAAC,SAAS,CAAoB;IACrC,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,UAAU,CAAI;IACtB,OAAO,CAAC,iBAAiB,CAAQ;IACjC,OAAO,CAAC,iBAAiB,CAAI;IAC7B,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,aAAa,CAAiB;IAEtC;;;;;;OAMG;gBAEgB,QAAQ,EAAE,OAAO,CAAC,iBAAiB,CAAC,EACpC,WAAW,EAAE,6BAA6B,EAC1C,gBAAgB,EAAE;QACjC,MAAM,EAAE,MAAM,CAAA;QACd,QAAQ,EAAE,MAAM,CAAA;QAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,SAAS,CAAC,EAAE,MAAM,CAAA;KACnB,EACD,OAAO,CAAC,EAAE,OAAO,CAAC,yBAAyB,CAAC;IAU9C;;OAEG;IACH,IAAW,MAAM,IAAI,OAAO,CAE3B;IAED;;OAEG;IACH,IAAW,YAAY,IAAI,OAAO,CAEjC;IAED;;OAEG;IACG,OAAO;IA+Ib;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAqBxB;;OAEG;IACH,UAAU;IAMV;;;OAGG;IACI,eAAe,CAAC,GAAG,EAAE,MAAM;CAGnC"}
package/esm/common/notification-client.js CHANGED
@@ -13,22 +13,22 @@ export class NotificationClient {
13
13
  /**
14
14
  * Creates a new NotificationClient instance
15
15
  * @param observer - RxJS Subject for emitting notification events
16
- * @param oidcClient - Client for handling OIDC authentication
16
+ * @param authOptions - Auth options for the client
17
17
  * @param subscriptionSpec - Specification for what notifications to subscribe to
18
18
  * @param options - Configuration options for the client
19
19
  */
20
- constructor(observer, oidcClient, subscriptionSpec, options) {
20
+ constructor(observer, authOptions, subscriptionSpec, options) {
21
21
  Object.defineProperty(this, "observer", {
22
22
  enumerable: true,
23
23
  configurable: true,
24
24
  writable: true,
25
25
  value: observer
26
26
  });
27
- Object.defineProperty(this, "oidcClient", {
27
+ Object.defineProperty(this, "authOptions", {
28
28
  enumerable: true,
29
29
  configurable: true,
30
30
  writable: true,
31
- value: oidcClient
31
+ value: authOptions
32
32
  });
33
33
  Object.defineProperty(this, "subscriptionSpec", {
34
34
  enumerable: true,
@@ -118,10 +118,23 @@ export class NotificationClient {
118
118
  return;
119
119
  }
120
120
  this._isConnecting = true;
121
- const token = await this.oidcClient.getToken();
122
- const flowcoreClient = new FlowcoreClient({
123
- getBearerToken: () => Promise.resolve(token.accessToken),
124
- });
121
+ let flowcoreClient = null;
122
+ const urlParams = new URLSearchParams();
123
+ if ("oidcClient" in this.authOptions) {
124
+ const oidcClient = this.authOptions.oidcClient;
125
+ flowcoreClient = new FlowcoreClient({
126
+ getBearerToken: async () => (await oidcClient.getToken()).accessToken,
127
+ });
128
+ urlParams.set("token", (await oidcClient.getToken()).accessToken);
129
+ }
130
+ else {
131
+ flowcoreClient = new FlowcoreClient({
132
+ apiKey: this.authOptions.apiKey,
133
+ apiKeyId: this.authOptions.apiKeyId,
134
+ });
135
+ urlParams.set("api_key", this.authOptions.apiKey);
136
+ urlParams.set("api_key_id", this.authOptions.apiKeyId);
137
+ }
125
138
  const tenant = await flowcoreClient.execute(new TenantFetchCommand({
126
139
  tenant: this.subscriptionSpec.tenant,
127
140
  }));
@@ -143,7 +156,7 @@ export class NotificationClient {
143
156
  }));
144
157
  }
145
158
  }
146
- this.webSocket = new dntShim.WebSocket(`${this.url}?token=${encodeURIComponent(token.accessToken)}`);
159
+ this.webSocket = new dntShim.WebSocket(`${this.url}?${urlParams.toString()}`);
147
160
  this.webSocket.onopen = () => {
148
161
  this._isOpen = true;
149
162
  this._isConnecting = false;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@flowcore/sdk",
3
- "version": "1.11.9",
3
+ "version": "1.11.10",
4
4
  "description": "Flowcore SDK",
5
5
  "homepage": "https://github.com/flowcore-io/flowcore-sdk#readme",
6
6
  "repository": {
package/script/common/notification-client.d.ts CHANGED
@@ -31,13 +31,21 @@ export type NotificationClientOptions = {
31
31
  maxEvents?: number;
32
32
  logger?: Logger;
33
33
  };
34
+ interface NotificationClientAuthOptionsBearer {
35
+ oidcClient: OidcClient;
36
+ }
37
+ interface NotificationClientAuthOptionsApiKey {
38
+ apiKey: string;
39
+ apiKeyId: string;
40
+ }
41
+ type NotificationClientAuthOptions = NotificationClientAuthOptionsBearer | NotificationClientAuthOptionsApiKey;
34
42
  /**
35
43
  * Client for handling WebSocket connections to the Flowcore notification system.
36
44
  * Manages connection lifecycle, authentication, and event handling.
37
45
  */
38
46
  export declare class NotificationClient {
39
47
  private readonly observer;
40
- private readonly oidcClient;
48
+ private readonly authOptions;
41
49
  private readonly subscriptionSpec;
42
50
  private url;
43
51
  private webSocket;
@@ -51,11 +59,11 @@ export declare class NotificationClient {
51
59
  /**
52
60
  * Creates a new NotificationClient instance
53
61
  * @param observer - RxJS Subject for emitting notification events
54
- * @param oidcClient - Client for handling OIDC authentication
62
+ * @param authOptions - Auth options for the client
55
63
  * @param subscriptionSpec - Specification for what notifications to subscribe to
56
64
  * @param options - Configuration options for the client
57
65
  */
58
- constructor(observer: Subject<NotificationEvent>, oidcClient: OidcClient, subscriptionSpec: {
66
+ constructor(observer: Subject<NotificationEvent>, authOptions: NotificationClientAuthOptions, subscriptionSpec: {
59
67
  tenant: string;
60
68
  dataCore: string;
61
69
  flowType?: string;
@@ -87,4 +95,5 @@ export declare class NotificationClient {
87
95
  */
88
96
  overrideBaseUrl(url: string): void;
89
97
  }
98
+ export {};
90
99
  //# sourceMappingURL=notification-client.d.ts.map
package/script/common/notification-client.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"notification-client.d.ts","sourceRoot":"","sources":["../../src/common/notification-client.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AASnC,OAAO,EAAiB,KAAK,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAM/D;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE;QACJ,MAAM,EAAE,MAAM,CAAA;QACd,OAAO,EAAE,MAAM,CAAA;QACf,UAAU,EAAE,MAAM,CAAA;QAClB,QAAQ,EAAE,MAAM,CAAA;QAChB,SAAS,EAAE,MAAM,CAAA;QACjB,SAAS,EAAE,MAAM,CAAA;KAClB,CAAA;CACF,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,MAAM,OAAO,CAAC;QACtB,WAAW,EAAE,MAAM,CAAA;KACpB,CAAC,CAAA;CACH,CAAA;AAcD;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG;IACtC,iBAAiB,EAAE,MAAM,CAAA;IACzB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAKD;;;GAGG;AACH,qBAAa,kBAAkB;IAmB3B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IApBnC,OAAO,CAAC,GAAG,CAA+C;IAC1D,OAAO,CAAC,SAAS,CAAoB;IACrC,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,UAAU,CAAI;IACtB,OAAO,CAAC,iBAAiB,CAAQ;IACjC,OAAO,CAAC,iBAAiB,CAAI;IAC7B,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,aAAa,CAAiB;IAEtC;;;;;;OAMG;gBAEgB,QAAQ,EAAE,OAAO,CAAC,iBAAiB,CAAC,EACpC,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE;QACjC,MAAM,EAAE,MAAM,CAAA;QACd,QAAQ,EAAE,MAAM,CAAA;QAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,SAAS,CAAC,EAAE,MAAM,CAAA;KACnB,EACD,OAAO,CAAC,EAAE,OAAO,CAAC,yBAAyB,CAAC;IAU9C;;OAEG;IACH,IAAW,MAAM,IAAI,OAAO,CAE3B;IAED;;OAEG;IACH,IAAW,YAAY,IAAI,OAAO,CAEjC;IAED;;OAEG;IACG,OAAO;IAmIb;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAqBxB;;OAEG;IACH,UAAU;IAMV;;;OAGG;IACI,eAAe,CAAC,GAAG,EAAE,MAAM;CAGnC"}
1
+ {"version":3,"file":"notification-client.d.ts","sourceRoot":"","sources":["../../src/common/notification-client.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AASnC,OAAO,EAAiB,KAAK,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAM/D;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE;QACJ,MAAM,EAAE,MAAM,CAAA;QACd,OAAO,EAAE,MAAM,CAAA;QACf,UAAU,EAAE,MAAM,CAAA;QAClB,QAAQ,EAAE,MAAM,CAAA;QAChB,SAAS,EAAE,MAAM,CAAA;QACjB,SAAS,EAAE,MAAM,CAAA;KAClB,CAAA;CACF,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,MAAM,OAAO,CAAC;QACtB,WAAW,EAAE,MAAM,CAAA;KACpB,CAAC,CAAA;CACH,CAAA;AAcD;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG;IACtC,iBAAiB,EAAE,MAAM,CAAA;IACzB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAKD,UAAU,mCAAmC;IAC3C,UAAU,EAAE,UAAU,CAAA;CACvB;AAED,UAAU,mCAAmC;IAC3C,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,KAAK,6BAA6B,GAC9B,mCAAmC,GACnC,mCAAmC,CAAA;AAEvC;;;GAGG;AACH,qBAAa,kBAAkB;IAmB3B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IApBnC,OAAO,CAAC,GAAG,CAA+C;IAC1D,OAAO,CAAC,SAAS,CAAoB;IACrC,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,UAAU,CAAI;IACtB,OAAO,CAAC,iBAAiB,CAAQ;IACjC,OAAO,CAAC,iBAAiB,CAAI;IAC7B,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,aAAa,CAAiB;IAEtC;;;;;;OAMG;gBAEgB,QAAQ,EAAE,OAAO,CAAC,iBAAiB,CAAC,EACpC,WAAW,EAAE,6BAA6B,EAC1C,gBAAgB,EAAE;QACjC,MAAM,EAAE,MAAM,CAAA;QACd,QAAQ,EAAE,MAAM,CAAA;QAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,SAAS,CAAC,EAAE,MAAM,CAAA;KACnB,EACD,OAAO,CAAC,EAAE,OAAO,CAAC,yBAAyB,CAAC;IAU9C;;OAEG;IACH,IAAW,MAAM,IAAI,OAAO,CAE3B;IAED;;OAEG;IACH,IAAW,YAAY,IAAI,OAAO,CAEjC;IAED;;OAEG;IACG,OAAO;IA+Ib;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAqBxB;;OAEG;IACH,UAAU;IAMV;;;OAGG;IACI,eAAe,CAAC,GAAG,EAAE,MAAM;CAGnC"}
package/script/common/notification-client.js CHANGED
@@ -39,22 +39,22 @@ class NotificationClient {
39
39
  /**
40
40
  * Creates a new NotificationClient instance
41
41
  * @param observer - RxJS Subject for emitting notification events
42
- * @param oidcClient - Client for handling OIDC authentication
42
+ * @param authOptions - Auth options for the client
43
43
  * @param subscriptionSpec - Specification for what notifications to subscribe to
44
44
  * @param options - Configuration options for the client
45
45
  */
46
- constructor(observer, oidcClient, subscriptionSpec, options) {
46
+ constructor(observer, authOptions, subscriptionSpec, options) {
47
47
  Object.defineProperty(this, "observer", {
48
48
  enumerable: true,
49
49
  configurable: true,
50
50
  writable: true,
51
51
  value: observer
52
52
  });
53
- Object.defineProperty(this, "oidcClient", {
53
+ Object.defineProperty(this, "authOptions", {
54
54
  enumerable: true,
55
55
  configurable: true,
56
56
  writable: true,
57
- value: oidcClient
57
+ value: authOptions
58
58
  });
59
59
  Object.defineProperty(this, "subscriptionSpec", {
60
60
  enumerable: true,
@@ -144,10 +144,23 @@ class NotificationClient {
144
144
  return;
145
145
  }
146
146
  this._isConnecting = true;
147
- const token = await this.oidcClient.getToken();
148
- const flowcoreClient = new flowcore_client_js_1.FlowcoreClient({
149
- getBearerToken: () => Promise.resolve(token.accessToken),
150
- });
147
+ let flowcoreClient = null;
148
+ const urlParams = new URLSearchParams();
149
+ if ("oidcClient" in this.authOptions) {
150
+ const oidcClient = this.authOptions.oidcClient;
151
+ flowcoreClient = new flowcore_client_js_1.FlowcoreClient({
152
+ getBearerToken: async () => (await oidcClient.getToken()).accessToken,
153
+ });
154
+ urlParams.set("token", (await oidcClient.getToken()).accessToken);
155
+ }
156
+ else {
157
+ flowcoreClient = new flowcore_client_js_1.FlowcoreClient({
158
+ apiKey: this.authOptions.apiKey,
159
+ apiKeyId: this.authOptions.apiKeyId,
160
+ });
161
+ urlParams.set("api_key", this.authOptions.apiKey);
162
+ urlParams.set("api_key_id", this.authOptions.apiKeyId);
163
+ }
151
164
  const tenant = await flowcoreClient.execute(new mod_js_1.TenantFetchCommand({
152
165
  tenant: this.subscriptionSpec.tenant,
153
166
  }));
@@ -169,7 +182,7 @@ class NotificationClient {
169
182
  }));
170
183
  }
171
184
  }
172
- this.webSocket = new dntShim.WebSocket(`${this.url}?token=${encodeURIComponent(token.accessToken)}`);
185
+ this.webSocket = new dntShim.WebSocket(`${this.url}?${urlParams.toString()}`);
173
186
  this.webSocket.onopen = () => {
174
187
  this._isOpen = true;
175
188
  this._isConnecting = false;