asma-helpers 0.4.2 → 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.
- package/lib/helpers/checkForRegisteredSubdomains.d.ts +2 -1
- package/lib/helpers/checkForRegisteredSubdomains.d.ts.map +1 -1
- package/lib/helpers/checkForRegisteredSubdomains.js +19 -16
- package/lib/helpers/checkForRegisteredSubdomains.js.map +1 -1
- package/lib/helpers/generateSrvAuthBindings.d.ts.map +1 -1
- package/lib/helpers/generateSrvAuthBindings.js +2 -0
- package/lib/helpers/generateSrvAuthBindings.js.map +1 -1
- package/package.json +1 -1
- package/src/helpers/checkForRegisteredSubdomains.ts +22 -24
- package/src/helpers/generateSrvAuthBindings.ts +3 -1
|
@@ -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
|
|
@@ -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,
|
|
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"}
|
|
@@ -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
|
|
56
|
+
function appendAsmaLogoLink(theme, { carasentLogo, fretexLogo }) {
|
|
54
57
|
var _a;
|
|
55
58
|
const body = document.body;
|
|
56
59
|
body.dataset['theme'] = theme;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkForRegisteredSubdomains.js","sourceRoot":"","sources":["../../src/helpers/checkForRegisteredSubdomains.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAA;AACxD,OAAO,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAA;AAE9D;;GAEG;AACH,IAAI,KAAK,GAAG,SAAS,CAAA;AAErB,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,QAAQ,CACjE,YAAY,CACf,CAAA;AAED,SAAS,aAAa;IAClB,OAAO,KAAK,CAAA;AAChB,CAAC;AACD,SAAS,aAAa,CAAC,WAAmB;IACtC,IAAI,KAAK,KAAK,WAAW,EAAE;QACvB,aAAa,CAAC,iBAAiB,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,KAAK,CAAC,CAAA;QAE/D,KAAK,GAAG,WAAW,CAAA;KACtB;AACL,CAAC;AACD,MAAM,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,IAAI,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAA;AAUvG,MAAM,UAAU,aAAa,CAAC,QAA0C;IACpE,OAAO,aAAa,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAA;AACrD,CAAC;AACD,MAAM,UAAU,QAAQ;IACpB,IAAI,MAAM,CAAC,eAAe,EAAE;QACxB,OAAO,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAA;KAC3C;IACD,OAAO,aAAa,EAAE,CAAA;AAC1B,CAAC;AACD,MAAM,UAAU,QAAQ,CAAC,KAAa;IAClC,IAAI,MAAM,CAAC,eAAe,EAAE;QACxB,OAAO,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;KAChD;IACD,aAAa,CAAC,KAAK,CAAC,CAAA;AACxB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,EAC9C,sBAAsB,GAAG,IAAI,EAC7B,mBAAmB,EACnB,UAAU,EACV,KAAK,
|
|
1
|
+
{"version":3,"file":"checkForRegisteredSubdomains.js","sourceRoot":"","sources":["../../src/helpers/checkForRegisteredSubdomains.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateSrvAuthBindings.d.ts","sourceRoot":"","sources":["../../src/helpers/generateSrvAuthBindings.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"generateSrvAuthBindings.d.ts","sourceRoot":"","sources":["../../src/helpers/generateSrvAuthBindings.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAMtD,eAAO,MAAkB,qBAAqB;iBAC7B,EAAE;kBACD,EAAE;sBACE,EAAE;sDAHkC,+BAA+B;iBACxE,EAAE;kBACD,EAAE;sBACE,EAAE;;;CACL,CAAA;AAEnB,iBAAS,mBAAmB,SAE3B;AAKD,wBAAgB,uBAAuB,CAAC,YAAY,GAAG,KAAK,EACxD,QAAQ,EAAE,MAAM,MAAM,EACtB,WAAW,EAAE,MAAM,OAAO,EAC1B,sBAAsB,EAAE,MAAM,MAAM,EACpC,MAAM,CAAC,EAAE,MAAM,IAAI;8BAqMc,YAAY;;;;kBAhHlB,MAAM,YAAY,OAAO,MAAM,EAAE,MAAM,CAAC;eACxB,MAAM;kBAAY,YAAY,EAAE;;;yBA7DzC,MAAM,YAAY,OAAO,MAAM,EAAE,MAAM,CAAC;IA2LtE;;OAEG;;;qEA7EY,aAAa,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM,GAAG,MAAM,GAAG,QAAQ;;;;;IAiF/E;;UAEM;;;;IAIN;;OAEG;;;;;;;;qBArIe,MAAM;;iBA0FS,MAAM;aAAO,MAAM;;;iCAtHtB,OAAO;EA8K5C;AACD;;;GAGG;AACH,wBAAgB,+BAA+B,CAC3C,QAAQ,EAAE,MAAM,MAAM,EACtB,WAAW,EAAE,MAAM,OAAO,EAC1B,sBAAsB,EAAE,MAAM,gBAAgB,EAC9C,MAAM,CAAC,EAAE,MAAM,IAAI,MAMtB"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
//import axios, { type AxiosResponse, type ResponseType } from 'axios'
|
|
2
2
|
import { EventBus } from 'asma-event-bus/lib/event-buss';
|
|
3
3
|
import { EnvironmentEnums } from '../interfaces/enums';
|
|
4
|
+
import { setTheme } from './checkForRegisteredSubdomains';
|
|
4
5
|
import { parseJwt } from './parseJwt';
|
|
5
6
|
//let logoutsuccesfull = false
|
|
6
7
|
export const { dispatch: dispatchSrvAuthEvents, register: registerCallbackOnSrvAuthEvents } = EventBus('auth-bindings');
|
|
@@ -84,6 +85,7 @@ export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOper
|
|
|
84
85
|
connector = data.connector;
|
|
85
86
|
parsed_jwt = parseJwt(jwtToken);
|
|
86
87
|
dispatchJwtChangedEvent();
|
|
88
|
+
data.theme && setTheme(data.theme);
|
|
87
89
|
return;
|
|
88
90
|
}
|
|
89
91
|
jwtToken = '';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateSrvAuthBindings.js","sourceRoot":"","sources":["../../src/helpers/generateSrvAuthBindings.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"generateSrvAuthBindings.js","sourceRoot":"","sources":["../../src/helpers/generateSrvAuthBindings.ts"],"names":[],"mappings":"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"}
|
package/package.json
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
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
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 (
|
|
70
|
-
|
|
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
|
-
|
|
74
|
-
|
|
75
|
-
|
|
77
|
+
if (res?.theme) {
|
|
78
|
+
setTheme(res.theme)
|
|
79
|
+
}
|
|
76
80
|
|
|
77
|
-
|
|
81
|
+
appendAsmaLogoLink(getTheme(), logos)
|
|
78
82
|
|
|
79
|
-
|
|
80
|
-
|
|
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
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
//import axios, { type AxiosResponse, type ResponseType } from 'axios'
|
|
2
2
|
import { EventBus } from 'asma-event-bus/lib/event-buss'
|
|
3
3
|
import { EnvironmentEnums } from '../interfaces/enums'
|
|
4
|
+
import { setTheme } from './checkForRegisteredSubdomains'
|
|
4
5
|
import { parseJwt } from './parseJwt'
|
|
5
6
|
|
|
6
7
|
//let logoutsuccesfull = false
|
|
@@ -119,7 +120,7 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
|
|
|
119
120
|
return getParsedJwt()?.['user_id'] || '-1'
|
|
120
121
|
}
|
|
121
122
|
|
|
122
|
-
function setAuthData(data?: { token: string; features?: FeatureEnums[]; connector?: string }) {
|
|
123
|
+
function setAuthData(data?: { token: string; features?: FeatureEnums[]; connector?: string; theme?: string }) {
|
|
123
124
|
if (data?.token) {
|
|
124
125
|
jwtToken = data?.token
|
|
125
126
|
|
|
@@ -130,6 +131,7 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
|
|
|
130
131
|
parsed_jwt = parseJwt(jwtToken)
|
|
131
132
|
|
|
132
133
|
dispatchJwtChangedEvent()
|
|
134
|
+
data.theme && setTheme(data.theme)
|
|
133
135
|
|
|
134
136
|
return
|
|
135
137
|
}
|