@rotty3000/config-node 0.4.1 → 0.5.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.
@@ -4,19 +4,19 @@ export declare enum OAuthApplicationProfile {
4
4
  }
5
5
  export interface LXCOAuthApplication {
6
6
  readonly applicationType: OAuthApplicationProfile;
7
- readonly audience: () => string;
8
- readonly authorizationUri: () => string;
9
- readonly clientId: () => string;
10
- readonly clientSecret: () => string;
11
- readonly introspectionUri: () => string;
12
- readonly jwksUri: () => string;
13
- readonly scopes: () => string[];
14
- readonly tokenUri: () => string;
7
+ readonly audience: () => string | undefined;
8
+ readonly authorizationUri: () => string | undefined;
9
+ readonly clientId: () => string | undefined;
10
+ readonly clientSecret: () => string | undefined;
11
+ readonly introspectionUri: () => string | undefined;
12
+ readonly jwksUri: () => string | undefined;
13
+ readonly scopes: () => string[] | undefined;
14
+ readonly tokenUri: () => string | undefined;
15
15
  }
16
16
  export interface LXCConfig {
17
17
  readonly dxpDomains: () => string[];
18
- readonly dxpMainDomain: () => string;
19
- readonly dxpProtocol: () => string;
20
- readonly oauthApplication: (erc: string) => LXCOAuthApplication;
18
+ readonly dxpMainDomain: () => string | undefined;
19
+ readonly dxpProtocol: () => string | undefined;
20
+ readonly oauthApplication: (erc: string) => LXCOAuthApplication | undefined;
21
21
  }
22
22
  export declare const lxcConfig: LXCConfig;
@@ -8,12 +8,31 @@ var OAuthApplicationProfile;
8
8
  OAuthApplicationProfile[OAuthApplicationProfile["USER_AGENT"] = 1] = "USER_AGENT";
9
9
  })(OAuthApplicationProfile || (exports.OAuthApplicationProfile = OAuthApplicationProfile = {}));
10
10
  const oauthApplications = new Map();
11
+ /**
12
+ * Values reach this API in three shapes depending on where they came from: a comma delimited env var arrives
13
+ * already split into a string[] by `unquote`, a multi-line value (the volume mounted ConfigMap/Secret form)
14
+ * arrives as a single string, and an unset key arrives as undefined. Normalize all three to a list of trimmed,
15
+ * non-empty entries so callers never have to care which shape they got.
16
+ */
17
+ function toList(value) {
18
+ let values;
19
+ if (Array.isArray(value)) {
20
+ values = value;
21
+ }
22
+ else if (value) {
23
+ values = `${value}`.split(/[,\r\n]+/);
24
+ }
25
+ else {
26
+ values = [];
27
+ }
28
+ return values.map((entry) => entry.trim()).filter((entry) => entry.length > 0);
29
+ }
11
30
  exports.lxcConfig = {
12
- dxpDomains: () => (0, config_node_1.lookupConfig)('com.liferay.lxc.dxp.domains').split('\n'),
31
+ dxpDomains: () => toList((0, config_node_1.lookupConfig)('com.liferay.lxc.dxp.domains')),
13
32
  dxpMainDomain: () => {
14
- let value = (0, config_node_1.lookupConfig)('com.liferay.lxc.dxp.main.domain');
33
+ let value = toList((0, config_node_1.lookupConfig)('com.liferay.lxc.dxp.main.domain'))[0];
15
34
  if (!value) {
16
- value = (0, config_node_1.lookupConfig)('com.liferay.lxc.dxp.mainDomain');
35
+ value = toList((0, config_node_1.lookupConfig)('com.liferay.lxc.dxp.mainDomain'))[0];
17
36
  }
18
37
  return value;
19
38
  },
@@ -27,7 +46,7 @@ exports.lxcConfig = {
27
46
  if (ercs) {
28
47
  ercs = Array.isArray(ercs) ? ercs : [ercs];
29
48
  }
30
- if (ercs.includes(erc)) {
49
+ if (ercs && ercs.includes(erc)) {
31
50
  let applicationType = OAuthApplicationProfile.USER_AGENT;
32
51
  if ((0, config_node_1.lookupConfig)(`${erc}.oauth2.headless.server.client.id`)) {
33
52
  applicationType = OAuthApplicationProfile.HEADLESS_SERVER;
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config-lxc/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config-lxc/index.ts"],"names":[],"mappings":";;;AAAA,gDAA4C;AAE5C,IAAY,uBAGX;AAHD,WAAY,uBAAuB;IACjC,2FAAe,CAAA;IACf,iFAAU,CAAA;AACZ,CAAC,EAHW,uBAAuB,uCAAvB,uBAAuB,QAGlC;AAqBD,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAA+B,CAAC;AAEjE;;;;;GAKG;AACH,SAAS,MAAM,CAAC,KAAoC;IAClD,IAAI,MAAgB,CAAC;IAErB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,GAAG,KAAK,CAAC;IACjB,CAAC;SACI,IAAI,KAAK,EAAE,CAAC;QACf,MAAM,GAAG,GAAG,KAAK,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACxC,CAAC;SACI,CAAC;QACJ,MAAM,GAAG,EAAE,CAAC;IACd,CAAC;IAED,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AACjF,CAAC;AAEY,QAAA,SAAS,GAAc;IAClC,UAAU,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAA,0BAAY,EAAC,6BAA6B,CAAC,CAAC;IACrE,aAAa,EAAE,GAAG,EAAE;QAClB,IAAI,KAAK,GAAG,MAAM,CAAC,IAAA,0BAAY,EAAC,iCAAiC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAEvE,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,KAAK,GAAG,MAAM,CAAC,IAAA,0BAAY,EAAC,gCAAgC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IACD,WAAW,EAAE,GAAG,EAAE,CAAC,IAAA,0BAAY,EAAC,qCAAqC,CAAuB;IAC5F,gBAAgB,EAAE,CAAC,GAAW,EAAE,EAAE;QAChC,IAAI,gBAAgB,GAAG,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAElD,IAAI,gBAAgB,EAAE,CAAC;YACrB,OAAO,gBAAgB,CAAC;QAC1B,CAAC;QAED,IAAI,IAAI,GAAG,IAAA,0BAAY,EAAC,oDAAoD,CAAC,CAAC;QAE9E,IAAI,IAAI,EAAE,CAAC;YACT,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC7C,CAAC;QAED,IAAI,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/B,IAAI,eAAe,GAAG,uBAAuB,CAAC,UAAU,CAAC;YAEzD,IAAI,IAAA,0BAAY,EAAC,GAAG,GAAG,mCAAmC,CAAC,EAAE,CAAC;gBAC5D,eAAe,GAAG,uBAAuB,CAAC,eAAe,CAAC;YAC5D,CAAC;YAED,gBAAgB,GAAG;gBACjB,eAAe;gBACf,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,eAAe,KAAK,uBAAuB,CAAC,eAAe,CAAC,CAAC;oBAC5E,IAAA,0BAAY,EAAC,GAAG,GAAG,kCAAkC,CAAC,CAAC,CAAC;oBACxD,IAAA,0BAAY,EAAC,GAAG,GAAG,6BAA6B,CAAC,CAAuB;gBAC1E,gBAAgB,EAAE,GAAG,EAAE,CAAC,IAAA,0BAAY,EAAC,GAAG,GAAG,2BAA2B,CAAuB;gBAC7F,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,eAAe,KAAK,uBAAuB,CAAC,eAAe,CAAC,CAAC;oBAC5E,IAAA,0BAAY,EAAC,GAAG,GAAG,mCAAmC,CAAC,CAAC,CAAC;oBACzD,IAAA,0BAAY,EAAC,GAAG,GAAG,8BAA8B,CAAC,CAAuB;gBAC3E,YAAY,EAAE,GAAG,EAAE,CAAC,IAAA,0BAAY,EAAC,GAAG,GAAG,uCAAuC,CAAuB;gBACrG,gBAAgB,EAAE,GAAG,EAAE,CAAC,IAAA,0BAAY,EAAC,GAAG,GAAG,2BAA2B,CAAuB;gBAC7F,OAAO,EAAE,GAAG,EAAE,CAAC,IAAA,0BAAY,EAAC,GAAG,GAAG,kBAAkB,CAAuB;gBAC3E,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,eAAe,KAAK,uBAAuB,CAAC,eAAe,CAAC,CAAC;oBAC1E,IAAA,0BAAY,EAAC,GAAG,GAAG,gCAAgC,CAAC,CAAC,CAAC;oBACtD,IAAA,0BAAY,EAAC,GAAG,GAAG,2BAA2B,CAAC,CAAyB;gBAC1E,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAA,0BAAY,EAAC,GAAG,GAAG,mBAAmB,CAAuB;aAC9E,CAAC;YAEF,iBAAiB,CAAC,GAAG,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO,gBAAgB,CAAC;IAC1B,CAAC;CACF,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rotty3000/config-node",
3
- "version": "0.4.1",
3
+ "version": "0.5.0",
4
4
  "description": "A library for obtaining external configuration for your application.",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",