@equinor/fusion-framework-app 10.3.2 → 10.4.0
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.
- package/CHANGELOG.md +23 -0
- package/dist/esm/AppConfigurator.js +19 -2
- package/dist/esm/AppConfigurator.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/types/AppConfigurator.d.ts +14 -0
- package/dist/types/version.d.ts +1 -1
- package/package.json +6 -6
- package/src/AppConfigurator.ts +19 -2
- package/src/version.ts +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,28 @@
|
|
|
1
1
|
# Change Log
|
|
2
2
|
|
|
3
|
+
## 10.4.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#3995](https://github.com/equinor/fusion-framework/pull/3995) [`434ce70`](https://github.com/equinor/fusion-framework/commit/434ce707d237b399f8438eebe742641b2a81b11f) Thanks [@asbjornhaland](https://github.com/asbjornhaland)! - Add support for session overridden service discovery endpoints
|
|
8
|
+
|
|
9
|
+
Checks `overriddenServiceDiscoveryUrls` in session storage.
|
|
10
|
+
|
|
11
|
+
The serviceName is looked up in ServiceDiscovery.
|
|
12
|
+
User can override url and scopes with session values.
|
|
13
|
+
App can override url and scopes with app config.
|
|
14
|
+
|
|
15
|
+
Priority:
|
|
16
|
+
|
|
17
|
+
1. Session overrides
|
|
18
|
+
2. AppConfig
|
|
19
|
+
3. ServiceDiscovery
|
|
20
|
+
|
|
21
|
+
### Patch Changes
|
|
22
|
+
|
|
23
|
+
- Updated dependencies []:
|
|
24
|
+
- @equinor/fusion-framework@7.4.5
|
|
25
|
+
|
|
3
26
|
## 10.3.2
|
|
4
27
|
|
|
5
28
|
### Patch Changes
|
|
@@ -32,18 +32,35 @@ export class AppConfigurator extends ModulesConfigurator {
|
|
|
32
32
|
configureHttpClient(...args) {
|
|
33
33
|
this.addConfig(configureHttpClient(...args));
|
|
34
34
|
}
|
|
35
|
+
/**
|
|
36
|
+
* Configures a http client for the service `serviceName`.
|
|
37
|
+
* The serviceName is looked up in ServiceDiscovery.
|
|
38
|
+
* User can override url and scopes with session values.
|
|
39
|
+
* App can override url and scopes with app config.
|
|
40
|
+
*
|
|
41
|
+
* Priority:
|
|
42
|
+
* 1. Session overrides
|
|
43
|
+
* 2. AppConfig
|
|
44
|
+
* 3. ServiceDiscovery
|
|
45
|
+
*
|
|
46
|
+
* @see modules/service-discovery/src/client.ts
|
|
47
|
+
* @see configureHttpClientsFromAppConfig()
|
|
48
|
+
*/
|
|
35
49
|
useFrameworkServiceClient(serviceName,
|
|
36
50
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
37
51
|
options) {
|
|
38
52
|
this.addConfig({
|
|
39
53
|
module: http,
|
|
40
54
|
configure: async (config, ref) => {
|
|
55
|
+
// Service from serviceDiscovery with potential session override.
|
|
41
56
|
const service = await ref?.serviceDiscovery.resolveService(serviceName);
|
|
42
57
|
if (!service) {
|
|
43
58
|
throw Error(`failed to configure service [${serviceName}]`);
|
|
44
59
|
}
|
|
45
|
-
// Check if serviceName is already configured
|
|
46
|
-
|
|
60
|
+
// Check if serviceName is already configured (potentially with app-config)
|
|
61
|
+
// If the service is session overridden - we need the configuration to run
|
|
62
|
+
// as normal (the uri already updated).
|
|
63
|
+
if (config.hasClient(serviceName) && !service.overridden) {
|
|
47
64
|
console.warn(`${serviceName} is already configured, possibly by app.config.[ENV].ts.
|
|
48
65
|
Overriding configurations may lead to unintended behaviour and should
|
|
49
66
|
be reviewed carefully.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppConfigurator.js","sourceRoot":"","sources":["../../src/AppConfigurator.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,mBAAmB,GACpB,MAAM,kCAAkC,CAAC;AAE1C,OAAO,KAAK,MAAM,wCAAwC,CAAC;AAE3D,OAAO,IAAI,EAAE,EACX,mBAAmB,EACnB,aAAa,GAEd,MAAM,uCAAuC,CAAC;AAE/C,OAAO,IAAI,MAAM,uCAAuC,CAAC;AAmDzD,MAAM,OAAO,eAKX,SAAQ,mBAA+C;IAS3B;IAN5B;;;OAGG;IACH,MAAM,CAAU,SAAS,GAAW,iBAAiB,CAAC;IAEtD,YAA4B,GAAS;QACnC,KAAK,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QADD,QAAG,GAAH,GAAG,CAAM;QAGnC,IAAI,CAAC,iCAAiC,EAAE,CAAC;IAC3C,CAAC;IAED;;OAEG;IACO,iCAAiC;QACzC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxE,KAAK,MAAM,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAC/D,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE;gBAC5B,OAAO,EAAE,GAAG;gBACZ,aAAa,EAAE,MAAM;aACtB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAEM,aAAa,CAAC,GAAG,IAAsC;QAC5D,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;IACzC,CAAC;IAEM,mBAAmB,CAAC,GAAG,IAA4C;QACxE,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;IAC/C,CAAC;
|
|
1
|
+
{"version":3,"file":"AppConfigurator.js","sourceRoot":"","sources":["../../src/AppConfigurator.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,mBAAmB,GACpB,MAAM,kCAAkC,CAAC;AAE1C,OAAO,KAAK,MAAM,wCAAwC,CAAC;AAE3D,OAAO,IAAI,EAAE,EACX,mBAAmB,EACnB,aAAa,GAEd,MAAM,uCAAuC,CAAC;AAE/C,OAAO,IAAI,MAAM,uCAAuC,CAAC;AAmDzD,MAAM,OAAO,eAKX,SAAQ,mBAA+C;IAS3B;IAN5B;;;OAGG;IACH,MAAM,CAAU,SAAS,GAAW,iBAAiB,CAAC;IAEtD,YAA4B,GAAS;QACnC,KAAK,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QADD,QAAG,GAAH,GAAG,CAAM;QAGnC,IAAI,CAAC,iCAAiC,EAAE,CAAC;IAC3C,CAAC;IAED;;OAEG;IACO,iCAAiC;QACzC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxE,KAAK,MAAM,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAC/D,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE;gBAC5B,OAAO,EAAE,GAAG;gBACZ,aAAa,EAAE,MAAM;aACtB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAEM,aAAa,CAAC,GAAG,IAAsC;QAC5D,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;IACzC,CAAC;IAEM,mBAAmB,CAAC,GAAG,IAA4C;QACxE,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED;;;;;;;;;;;;;OAaG;IACI,yBAAyB,CAC9B,WAAmB;IACnB,8DAA8D;IAC9D,OAAmE;QAEnE,IAAI,CAAC,SAAS,CAAC;YACb,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;gBAC/B,iEAAiE;gBACjE,MAAM,OAAO,GAAG,MAAM,GAAG,EAAE,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;gBACxE,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,MAAM,KAAK,CAAC,gCAAgC,WAAW,GAAG,CAAC,CAAC;gBAC9D,CAAC;gBAED,2EAA2E;gBAC3E,0EAA0E;gBAC1E,uCAAuC;gBACvC,IAAI,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;oBACzD,OAAO,CAAC,IAAI,CACV,GAAG,WAAW;;oCAEU,CACzB,CAAC;oBACF,OAAO;gBACT,CAAC;gBACD,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE;oBAClC,GAAG,OAAO;oBACV,OAAO,EAAE,OAAO,CAAC,GAAG;oBACpB,aAAa,EAAE,OAAO,CAAC,aAAa;iBACrC,CAAC,CAAC;YACL,CAAC;SACF,CAAC,CAAC;IACL,CAAC;;AAGH,eAAe,eAAe,CAAC"}
|
package/dist/esm/version.js
CHANGED