asma-helpers 0.3.1 → 0.3.2
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/generateGenqlClient.d.ts.map +1 -1
- package/lib/helpers/generateGenqlClient.js +7 -9
- package/lib/helpers/generateGenqlClient.js.map +1 -1
- package/lib/helpers/generateSrvAuthBindings.d.ts +6 -3
- package/lib/helpers/generateSrvAuthBindings.d.ts.map +1 -1
- package/lib/helpers/generateSrvAuthBindings.js +12 -8
- package/lib/helpers/generateSrvAuthBindings.js.map +1 -1
- package/package.json +1 -1
- package/src/helpers/generateGenqlClient.ts +13 -12
- package/src/helpers/generateSrvAuthBindings.ts +18 -10
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateGenqlClient.d.ts","sourceRoot":"","sources":["../../src/helpers/generateGenqlClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAA;AAE/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAMnD,UAAU,UAAW,SAAQ,IAAI,CAAC,aAAa,EAAE,KAAK,GAAG,QAAQ,CAAC;IAC9D,SAAS,CAAC,EAAE,OAAO,CAAA;CACtB;AAED,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,UAAU,CAAC,OAAO,YAAY,CAAC,EAAE,EAC3E,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,IAAoB,GACvB,EAAE;IACC,YAAY,EAAE,MAAM,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAA;IACpD,YAAY,EAAE,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,SAAS,KAAK,CAAC,CAAA;IACxD,UAAU,EAAE,MAAM,MAAM,CAAA;IACxB,IAAI,CAAC,EAAE,MAAM,CAAA;CAChB;;;
|
|
1
|
+
{"version":3,"file":"generateGenqlClient.d.ts","sourceRoot":"","sources":["../../src/helpers/generateGenqlClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAA;AAE/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAMnD,UAAU,UAAW,SAAQ,IAAI,CAAC,aAAa,EAAE,KAAK,GAAG,QAAQ,CAAC;IAC9D,SAAS,CAAC,EAAE,OAAO,CAAA;CACtB;AAED,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,UAAU,CAAC,OAAO,YAAY,CAAC,EAAE,EAC3E,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,IAAoB,GACvB,EAAE;IACC,YAAY,EAAE,MAAM,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAA;IACpD,YAAY,EAAE,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,SAAS,KAAK,CAAC,CAAA;IACxD,UAAU,EAAE,MAAM,MAAM,CAAA;IACxB,IAAI,CAAC,EAAE,MAAM,CAAA;CAChB;;;4BAyCuC,UAAU,GAAG;QAAE,eAAe,CAAC,EAAE,eAAe,CAAA;KAAE,KAAQ,QAAQ,CAAC,CAAC;;EAkD3G"}
|
|
@@ -3,6 +3,12 @@ import { registerCallbackOnSrvAuthEvents } from './generateSrvAuthBindings';
|
|
|
3
3
|
export function generateGenqlClient({ setReqConfig, createClient, serviceUrl, path = '/v1/graphql', }) {
|
|
4
4
|
let client = null;
|
|
5
5
|
let wsClient = null;
|
|
6
|
+
let local_abort_registry = [];
|
|
7
|
+
registerCallbackOnSrvAuthEvents('logout_event', () => {
|
|
8
|
+
local_abort_registry.forEach((abort) => abort());
|
|
9
|
+
resetClients();
|
|
10
|
+
local_abort_registry = [];
|
|
11
|
+
});
|
|
6
12
|
function resetClients() {
|
|
7
13
|
client = null;
|
|
8
14
|
wsClient = null;
|
|
@@ -20,12 +26,6 @@ export function generateGenqlClient({ setReqConfig, createClient, serviceUrl, pa
|
|
|
20
26
|
client = null;
|
|
21
27
|
wsClient = null;
|
|
22
28
|
}
|
|
23
|
-
let logoutEventAbort = new AbortController();
|
|
24
|
-
registerCallbackOnSrvAuthEvents('logout_event', () => {
|
|
25
|
-
logoutEventAbort === null || logoutEventAbort === void 0 ? void 0 : logoutEventAbort.abort();
|
|
26
|
-
resetClients();
|
|
27
|
-
logoutEventAbort = new AbortController();
|
|
28
|
-
});
|
|
29
29
|
async function genqlClient(options = {}) {
|
|
30
30
|
const { headers, abortController: abortControlleFromOpts, ...rest } = options;
|
|
31
31
|
if (!serviceUrl()) {
|
|
@@ -65,9 +65,7 @@ export function generateGenqlClient({ setReqConfig, createClient, serviceUrl, pa
|
|
|
65
65
|
}
|
|
66
66
|
function createabortControllerAndAbortOnLogoutEvent(abortControllerFromFnSig) {
|
|
67
67
|
const localAbrotController = abortControllerFromFnSig || new AbortController();
|
|
68
|
-
|
|
69
|
-
localAbrotController.abort();
|
|
70
|
-
};
|
|
68
|
+
local_abort_registry.push(localAbrotController.abort);
|
|
71
69
|
return localAbrotController;
|
|
72
70
|
}
|
|
73
71
|
return { getGenqlClient, resetGenqlClient, genqlClient, genqlClientWs };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateGenqlClient.js","sourceRoot":"","sources":["../../src/helpers/generateGenqlClient.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AACnC,OAAO,EAAE,+BAA+B,EAAE,MAAM,2BAA2B,CAAA;AAQ3E,MAAM,UAAU,mBAAmB,CAA4C,EAC3E,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,IAAI,GAAG,aAAa,GAMvB;IACG,IAAI,MAAM,GAAa,IAAI,CAAA;IAE3B,IAAI,QAAQ,GAAa,IAAI,CAAA;IAE7B,SAAS,YAAY;QACjB,MAAM,GAAG,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"generateGenqlClient.js","sourceRoot":"","sources":["../../src/helpers/generateGenqlClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { type AxiosResponse, type ResponseType } from 'axios';
|
|
2
2
|
import { EnvironmentEnums } from '..';
|
|
3
|
-
export declare const dispatchSrvAuthEvents: <Key extends "logout_event" | "jwt_changed">(event: Key, arg: {
|
|
3
|
+
export declare const dispatchSrvAuthEvents: <Key extends "logout_event" | "jwt_changed" | "customer_changed">(event: Key, arg: {
|
|
4
4
|
jwt_changed: {};
|
|
5
5
|
logout_event: {};
|
|
6
|
-
|
|
6
|
+
customer_changed: {};
|
|
7
|
+
}[Key], shouldPersist?: boolean | undefined) => void, registerCallbackOnSrvAuthEvents: <Key_1 extends "logout_event" | "jwt_changed" | "customer_changed">(event: Key_1, callback: (val: {
|
|
7
8
|
jwt_changed: {};
|
|
8
9
|
logout_event: {};
|
|
10
|
+
customer_changed: {};
|
|
9
11
|
}[Key_1]) => void) => {
|
|
10
12
|
unregister: () => void;
|
|
11
13
|
};
|
|
@@ -30,9 +32,10 @@ export declare function generateSrvAuthBindings<FeatureEnums = never>(SRV_AUTH:
|
|
|
30
32
|
/**
|
|
31
33
|
* @deprecated use registerCallbackOnSrvAuthEvents directly
|
|
32
34
|
*/
|
|
33
|
-
registerOnJwtChanges: <Key_1 extends "logout_event" | "jwt_changed">(event: Key_1, callback: (val: {
|
|
35
|
+
registerOnJwtChanges: <Key_1 extends "logout_event" | "jwt_changed" | "customer_changed">(event: Key_1, callback: (val: {
|
|
34
36
|
jwt_changed: {};
|
|
35
37
|
logout_event: {};
|
|
38
|
+
customer_changed: {};
|
|
36
39
|
}[Key_1]) => void) => {
|
|
37
40
|
unregister: () => void;
|
|
38
41
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateSrvAuthBindings.d.ts","sourceRoot":"","sources":["../../src/helpers/generateSrvAuthBindings.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,MAAM,OAAO,CAAA;AAEpE,OAAO,EAAE,gBAAgB,EAAY,MAAM,IAAI,CAAA;AAI/C,eAAO,MAAkB,qBAAqB;iBAC7B,EAAE;kBACD,EAAE;
|
|
1
|
+
{"version":3,"file":"generateSrvAuthBindings.d.ts","sourceRoot":"","sources":["../../src/helpers/generateSrvAuthBindings.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,MAAM,OAAO,CAAA;AAEpE,OAAO,EAAE,gBAAgB,EAAY,MAAM,IAAI,CAAA;AAI/C,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;8BAyLc,YAAY;;;kBA7GlB,MAAM,YAAY,OAAO,MAAM,EAAE,MAAM,CAAC;eACxB,MAAM;kBAAY,YAAY,EAAE;;yBAvDzC,MAAM,YAAY,OAAO,MAAM,EAAE,MAAM,CAAC;;qEA6GR,YAAY;;;;;;;IAoE1E;;OAEG;;;;;;;;qBA7Ge,MAAM;;iBA+ES,MAAM;aAAO,MAAM;;;iCAzGtB,OAAO;EAoJ5C;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"}
|
|
@@ -50,7 +50,7 @@ export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOper
|
|
|
50
50
|
return res;
|
|
51
51
|
}
|
|
52
52
|
catch (e) {
|
|
53
|
-
console.
|
|
53
|
+
console.warn(e);
|
|
54
54
|
return;
|
|
55
55
|
}
|
|
56
56
|
finally {
|
|
@@ -69,7 +69,7 @@ export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOper
|
|
|
69
69
|
return data;
|
|
70
70
|
}
|
|
71
71
|
const { unregister } = registerCallbackOnSrvAuthEvents('logout_event', () => {
|
|
72
|
-
setAuthData({ token: '' })
|
|
72
|
+
// setAuthData({ token: '' })
|
|
73
73
|
srvAuthGet('/signout');
|
|
74
74
|
unregister();
|
|
75
75
|
});
|
|
@@ -78,12 +78,17 @@ export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOper
|
|
|
78
78
|
return ((_a = getParsedJwt()) === null || _a === void 0 ? void 0 : _a['user_id']) || '-1';
|
|
79
79
|
}
|
|
80
80
|
function setAuthData(data) {
|
|
81
|
-
if (data) {
|
|
81
|
+
if (data === null || data === void 0 ? void 0 : data.token) {
|
|
82
82
|
jwtToken = data === null || data === void 0 ? void 0 : data.token;
|
|
83
83
|
features = new Set(data.features);
|
|
84
84
|
parsed_jwt = parseJwt(jwtToken);
|
|
85
|
+
dispatchJwtChangedEvent();
|
|
86
|
+
return;
|
|
85
87
|
}
|
|
86
|
-
|
|
88
|
+
jwtToken = '';
|
|
89
|
+
parsed_jwt = undefined;
|
|
90
|
+
features = undefined;
|
|
91
|
+
dispatchLogoutEvent();
|
|
87
92
|
}
|
|
88
93
|
function getJwtToken() {
|
|
89
94
|
return jwtToken;
|
|
@@ -117,15 +122,14 @@ export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOper
|
|
|
117
122
|
} */
|
|
118
123
|
const data = await srvAuthGet('/token');
|
|
119
124
|
if (!data || ((_a = data.data) === null || _a === void 0 ? void 0 : _a.errors) || !data.data.token) {
|
|
120
|
-
|
|
125
|
+
setAuthData({ token: '' });
|
|
121
126
|
return;
|
|
122
127
|
}
|
|
123
|
-
setAuthData({ token: data.data.token
|
|
128
|
+
setAuthData({ token: data.data.token, features: data.data.features || [] });
|
|
124
129
|
return jwtToken;
|
|
125
130
|
}
|
|
126
131
|
catch (error) {
|
|
127
|
-
|
|
128
|
-
setAuthData({ token: '', features: [] });
|
|
132
|
+
setAuthData({ token: '' });
|
|
129
133
|
console.error(error);
|
|
130
134
|
return jwtToken;
|
|
131
135
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateSrvAuthBindings.js","sourceRoot":"","sources":["../../src/helpers/generateSrvAuthBindings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAgD,MAAM,OAAO,CAAA;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAA;AACxD,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAA;AAE/C,8BAA8B;AAE9B,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,qBAAqB,EAAE,QAAQ,EAAE,+BAA+B,EAAE,GAAG,QAAQ,
|
|
1
|
+
{"version":3,"file":"generateSrvAuthBindings.js","sourceRoot":"","sources":["../../src/helpers/generateSrvAuthBindings.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -25,8 +25,19 @@ export function generateGenqlClient<T extends ReturnType<typeof createClient>>({
|
|
|
25
25
|
|
|
26
26
|
let wsClient: T | null = null
|
|
27
27
|
|
|
28
|
+
let local_abort_registry: (() => void)[] = []
|
|
29
|
+
|
|
30
|
+
registerCallbackOnSrvAuthEvents('logout_event', () => {
|
|
31
|
+
local_abort_registry.forEach((abort) => abort())
|
|
32
|
+
|
|
33
|
+
resetClients()
|
|
34
|
+
|
|
35
|
+
local_abort_registry = []
|
|
36
|
+
})
|
|
37
|
+
|
|
28
38
|
function resetClients() {
|
|
29
39
|
client = null
|
|
40
|
+
|
|
30
41
|
wsClient = null
|
|
31
42
|
}
|
|
32
43
|
|
|
@@ -46,17 +57,9 @@ export function generateGenqlClient<T extends ReturnType<typeof createClient>>({
|
|
|
46
57
|
|
|
47
58
|
function resetGenqlClient() {
|
|
48
59
|
client = null
|
|
60
|
+
|
|
49
61
|
wsClient = null
|
|
50
62
|
}
|
|
51
|
-
let logoutEventAbort = new AbortController()
|
|
52
|
-
|
|
53
|
-
registerCallbackOnSrvAuthEvents('logout_event', () => {
|
|
54
|
-
logoutEventAbort?.abort()
|
|
55
|
-
|
|
56
|
-
resetClients()
|
|
57
|
-
|
|
58
|
-
logoutEventAbort = new AbortController()
|
|
59
|
-
})
|
|
60
63
|
|
|
61
64
|
async function genqlClient(options: CliOptions & { abortController?: AbortController } = {}): Promise<T> {
|
|
62
65
|
const { headers, abortController: abortControlleFromOpts, ...rest } = options
|
|
@@ -102,9 +105,7 @@ export function generateGenqlClient<T extends ReturnType<typeof createClient>>({
|
|
|
102
105
|
function createabortControllerAndAbortOnLogoutEvent(abortControllerFromFnSig?: AbortController) {
|
|
103
106
|
const localAbrotController = abortControllerFromFnSig || new AbortController()
|
|
104
107
|
|
|
105
|
-
|
|
106
|
-
localAbrotController.abort()
|
|
107
|
-
}
|
|
108
|
+
local_abort_registry.push(localAbrotController.abort)
|
|
108
109
|
|
|
109
110
|
return localAbrotController
|
|
110
111
|
}
|
|
@@ -7,6 +7,7 @@ import { EnvironmentEnums, parseJwt } from '..'
|
|
|
7
7
|
export const { dispatch: dispatchSrvAuthEvents, register: registerCallbackOnSrvAuthEvents } = EventBus<{
|
|
8
8
|
jwt_changed: {}
|
|
9
9
|
logout_event: {}
|
|
10
|
+
customer_changed: {}
|
|
10
11
|
}>('auth-bindings')
|
|
11
12
|
|
|
12
13
|
function dispatchLogoutEvent() {
|
|
@@ -79,7 +80,7 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
|
|
|
79
80
|
|
|
80
81
|
return res as AxiosResponse<R, any>
|
|
81
82
|
} catch (e) {
|
|
82
|
-
console.
|
|
83
|
+
console.warn(e)
|
|
83
84
|
return
|
|
84
85
|
} finally {
|
|
85
86
|
delete promiseRegistry[url]
|
|
@@ -105,7 +106,7 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
|
|
|
105
106
|
}
|
|
106
107
|
|
|
107
108
|
const { unregister } = registerCallbackOnSrvAuthEvents('logout_event', () => {
|
|
108
|
-
setAuthData({ token: '' })
|
|
109
|
+
// setAuthData({ token: '' })
|
|
109
110
|
|
|
110
111
|
srvAuthGet('/signout')
|
|
111
112
|
|
|
@@ -117,15 +118,24 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
|
|
|
117
118
|
}
|
|
118
119
|
|
|
119
120
|
function setAuthData(data?: { token: string; features?: FeatureEnums[] }) {
|
|
120
|
-
if (data) {
|
|
121
|
+
if (data?.token) {
|
|
121
122
|
jwtToken = data?.token
|
|
122
123
|
|
|
123
124
|
features = new Set(data.features)
|
|
124
125
|
|
|
125
126
|
parsed_jwt = parseJwt(jwtToken)
|
|
127
|
+
|
|
128
|
+
dispatchJwtChangedEvent()
|
|
129
|
+
|
|
130
|
+
return
|
|
126
131
|
}
|
|
132
|
+
jwtToken = ''
|
|
133
|
+
|
|
134
|
+
parsed_jwt = undefined
|
|
127
135
|
|
|
128
|
-
|
|
136
|
+
features = undefined
|
|
137
|
+
|
|
138
|
+
dispatchLogoutEvent()
|
|
129
139
|
}
|
|
130
140
|
|
|
131
141
|
function getJwtToken() {
|
|
@@ -167,19 +177,17 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
|
|
|
167
177
|
const data = await srvAuthGet<{ errors?: string; token: string; features: FeatureEnums[] }>('/token')
|
|
168
178
|
|
|
169
179
|
if (!data || data.data?.errors || !data.data.token) {
|
|
170
|
-
|
|
171
|
-
|
|
180
|
+
setAuthData({ token: '' })
|
|
172
181
|
return
|
|
173
182
|
}
|
|
174
183
|
|
|
175
|
-
setAuthData({ token: data.data.token
|
|
184
|
+
setAuthData({ token: data.data.token, features: data.data.features || [] })
|
|
176
185
|
return jwtToken
|
|
177
186
|
} catch (error) {
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
setAuthData({ token: '', features: [] })
|
|
187
|
+
setAuthData({ token: '' })
|
|
181
188
|
|
|
182
189
|
console.error(error)
|
|
190
|
+
|
|
183
191
|
return jwtToken
|
|
184
192
|
}
|
|
185
193
|
}
|