asma-helpers 0.4.3 → 0.4.4

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 (6) hide show
  1. package/lib/helpers/checkForRegisteredSubdomains.d.ts +2 -1
  2. package/lib/helpers/checkForRegisteredSubdomains.d.ts.map +1 -1
  3. package/lib/helpers/checkForRegisteredSubdomains.js +19 -16
  4. package/lib/helpers/checkForRegisteredSubdomains.js.map +1 -1
  5. package/package.json +1 -1
  6. package/src/helpers/checkForRegisteredSubdomains.ts +22 -24
package/lib/helpers/checkForRegisteredSubdomains.d.ts CHANGED
@@ -13,7 +13,7 @@ export declare function onThemeChange(callback: (val: {
13
13
  };
14
14
  export declare function getTheme(): string;
15
15
  export declare function setTheme(theme: string): void;
16
- export declare function checkForRegisteredSubdomain({ redirect_if_not_exists, setSelectedCustomer, srvAuthGet, logos, }: {
16
+ export declare function checkForRegisteredSubdomain({ redirect_if_not_exists, setSelectedCustomer, srvAuthGet, logos, authenticated, }: {
17
17
  redirect_if_not_exists?: boolean;
18
18
  setSelectedCustomer?: (customer_id: string) => void;
19
19
  srvAuthGet: <R>(url: string, headers?: Record<string, string> | undefined) => Promise<R>;
@@ -21,5 +21,6 @@ export declare function checkForRegisteredSubdomain({ redirect_if_not_exists, se
21
21
  fretexLogo: string;
22
22
  carasentLogo: string;
23
23
  };
24
+ authenticated: boolean;
24
25
  }): Promise<[registeredSubdomain: boolean, unregister: () => void]>;
25
26
  //# sourceMappingURL=checkForRegisteredSubdomains.d.ts.map
package/lib/helpers/checkForRegisteredSubdomains.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"checkForRegisteredSubdomains.d.ts","sourceRoot":"","sources":["../../src/helpers/checkForRegisteredSubdomains.ts"],"names":[],"mappings":"AAwBA,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QACZ,eAAe,CAAC,EAAE;YACd,QAAQ,EAAE,MAAM,MAAM,CAAA;YACtB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;SACpC,CAAA;KACJ;CACJ;AACD,wBAAgB,aAAa,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,KAAK,IAAI;;EAEvE;AACD,wBAAgB,QAAQ,WAKvB;AACD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,QAKrC;AAED,wBAAsB,2BAA2B,CAAC,EAC9C,sBAA6B,EAC7B,mBAAmB,EACnB,UAAU,EACV,KAAK,GACR,EAAE;IACC,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,mBAAmB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAA;IACnD,UAAU,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;IACxF,KAAK,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,CAAA;CACtD,4DA4BsF,IAAI,GAC1F"}
1
+ {"version":3,"file":"checkForRegisteredSubdomains.d.ts","sourceRoot":"","sources":["../../src/helpers/checkForRegisteredSubdomains.ts"],"names":[],"mappings":"AAwBA,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QACZ,eAAe,CAAC,EAAE;YACd,QAAQ,EAAE,MAAM,MAAM,CAAA;YACtB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;SACpC,CAAA;KACJ;CACJ;AACD,wBAAgB,aAAa,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,KAAK,IAAI;;EAEvE;AACD,wBAAgB,QAAQ,WAKvB;AACD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,QAKrC;AAED,wBAAsB,2BAA2B,CAAC,EAC9C,sBAA6B,EAC7B,mBAAmB,EACnB,UAAU,EACV,KAAK,EACL,aAAa,GAChB,EAAE;IACC,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,mBAAmB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAA;IACnD,UAAU,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;IACxF,KAAK,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,CAAA;IACnD,aAAa,EAAE,OAAO,CAAA;CACzB,4DA2BsF,IAAI,GAC1F"}
package/lib/helpers/checkForRegisteredSubdomains.js CHANGED
@@ -30,27 +30,30 @@ export function setTheme(theme) {
30
30
  }
31
31
  setThemeLocal(theme);
32
32
  }
33
- export async function checkForRegisteredSubdomain({ redirect_if_not_exists = true, setSelectedCustomer, srvAuthGet, logos, }) {
34
- const res = await srvAuthGet('/check?context=subdomain', {
35
- 'asma-origin': window.location.origin,
36
- });
37
- //const client = await directoryGenQLClient(true, { 'x-hasura-subdomain': subdomain })
38
- if (res === null || res === void 0 ? void 0 : res.id) {
39
- setSelectedCustomer === null || setSelectedCustomer === void 0 ? void 0 : setSelectedCustomer(res.id);
40
- }
41
- if (res === null || res === void 0 ? void 0 : res.theme) {
42
- setTheme(res.theme);
43
- }
44
- appendAsmaLogoLink(getTheme(), logos);
45
- if (!!!(res === null || res === void 0 ? void 0 : res.id) && redirect_if_not_exists) {
46
- redirectFromSubdomainToDomain();
47
- }
33
+ export async function checkForRegisteredSubdomain({ redirect_if_not_exists = true, setSelectedCustomer, srvAuthGet, logos, authenticated, }) {
48
34
  const { unregister } = onThemeChange(({ theme }) => {
49
35
  appendAsmaLogoLink(theme, logos);
50
36
  });
37
+ //const client = await directoryGenQLClient(true, { 'x-hasura-subdomain': subdomain })
38
+ let res;
39
+ if (!authenticated) {
40
+ res = await srvAuthGet('/check?context=subdomain', {
41
+ 'asma-origin': window.location.origin,
42
+ });
43
+ if (res === null || res === void 0 ? void 0 : res.id) {
44
+ setSelectedCustomer === null || setSelectedCustomer === void 0 ? void 0 : setSelectedCustomer(res.id);
45
+ }
46
+ if (res === null || res === void 0 ? void 0 : res.theme) {
47
+ setTheme(res.theme);
48
+ }
49
+ appendAsmaLogoLink(getTheme(), logos);
50
+ if (!!!(res === null || res === void 0 ? void 0 : res.id) && redirect_if_not_exists) {
51
+ redirectFromSubdomainToDomain();
52
+ }
53
+ }
51
54
  return [!!(res === null || res === void 0 ? void 0 : res.id), unregister];
52
55
  }
53
- function appendAsmaLogoLink(theme = 'default', { carasentLogo, fretexLogo }) {
56
+ function appendAsmaLogoLink(theme, { carasentLogo, fretexLogo }) {
54
57
  var _a;
55
58
  const body = document.body;
56
59
  body.dataset['theme'] = theme;
package/lib/helpers/checkForRegisteredSubdomains.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"checkForRegisteredSubdomains.js","sourceRoot":"","sources":["../../src/helpers/checkForRegisteredSubdomains.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"checkForRegisteredSubdomains.js","sourceRoot":"","sources":["../../src/helpers/checkForRegisteredSubdomains.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "asma-helpers",
3
- "version": "0.4.3",
3
+ "version": "0.4.4",
4
4
  "description": "helpers methods for asma",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib",
package/src/helpers/checkForRegisteredSubdomains.ts CHANGED
@@ -51,46 +51,44 @@ export async function checkForRegisteredSubdomain({
51
51
  setSelectedCustomer,
52
52
  srvAuthGet,
53
53
  logos,
54
+ authenticated,
54
55
  }: {
55
56
  redirect_if_not_exists?: boolean
56
57
  setSelectedCustomer?: (customer_id: string) => void
57
58
  srvAuthGet: <R>(url: string, headers?: Record<string, string> | undefined) => Promise<R>
58
59
  logos: { fretexLogo: string; carasentLogo: string }
60
+ authenticated: boolean
59
61
  }) {
60
- const res = await srvAuthGet<{ id?: string; theme?: string }>(
61
- '/check?context=subdomain',
62
- {
63
- 'asma-origin': window.location.origin,
64
- },
65
- // deepcode ignore PromiseNotCaughtGeneral: <this is intended to throw if fails>
66
- )
62
+ const { unregister } = onThemeChange(({ theme }) => {
63
+ appendAsmaLogoLink(theme, logos)
64
+ })
65
+
67
66
  //const client = await directoryGenQLClient(true, { 'x-hasura-subdomain': subdomain })
67
+ let res: { id?: string; theme?: string } | undefined
68
68
 
69
- if (res?.id) {
70
- setSelectedCustomer?.(res.id)
71
- }
69
+ if (!authenticated) {
70
+ res = await srvAuthGet<{ id?: string; theme?: string }>('/check?context=subdomain', {
71
+ 'asma-origin': window.location.origin,
72
+ })
73
+ if (res?.id) {
74
+ setSelectedCustomer?.(res.id)
75
+ }
72
76
 
73
- if (res?.theme) {
74
- setTheme(res.theme)
75
- }
77
+ if (res?.theme) {
78
+ setTheme(res.theme)
79
+ }
76
80
 
77
- appendAsmaLogoLink(getTheme(), logos)
81
+ appendAsmaLogoLink(getTheme(), logos)
78
82
 
79
- if (!!!res?.id && redirect_if_not_exists) {
80
- redirectFromSubdomainToDomain()
83
+ if (!!!res?.id && redirect_if_not_exists) {
84
+ redirectFromSubdomainToDomain()
85
+ }
81
86
  }
82
87
 
83
- const { unregister } = onThemeChange(({ theme }) => {
84
- appendAsmaLogoLink(theme, logos)
85
- })
86
-
87
88
  return [!!res?.id, unregister] as [registeredSubdomain: boolean, unregister: () => void]
88
89
  }
89
90
 
90
- function appendAsmaLogoLink(
91
- theme = 'default',
92
- { carasentLogo, fretexLogo }: { fretexLogo: string; carasentLogo: string },
93
- ) {
91
+ function appendAsmaLogoLink(theme: string, { carasentLogo, fretexLogo }: { fretexLogo: string; carasentLogo: string }) {
94
92
  const body = document.body!
95
93
 
96
94
  body.dataset['theme'] = theme