asma-helpers 0.3.2 → 0.3.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/generateGenqlClient.d.ts.map +1 -1
- package/lib/helpers/generateGenqlClient.js +2 -2
- package/lib/helpers/generateGenqlClient.js.map +1 -1
- package/lib/helpers/generateSrvAuthBindings.d.ts +4 -0
- package/lib/helpers/generateSrvAuthBindings.d.ts.map +1 -1
- package/lib/helpers/generateSrvAuthBindings.js +11 -8
- package/lib/helpers/generateSrvAuthBindings.js.map +1 -1
- package/package.json +1 -1
- package/src/helpers/generateGenqlClient.ts +4 -5
- package/src/helpers/generateSrvAuthBindings.ts +11 -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;
|
|
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;AAKnD,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"}
|
|
@@ -5,13 +5,13 @@ export function generateGenqlClient({ setReqConfig, createClient, serviceUrl, pa
|
|
|
5
5
|
let wsClient = null;
|
|
6
6
|
let local_abort_registry = [];
|
|
7
7
|
registerCallbackOnSrvAuthEvents('logout_event', () => {
|
|
8
|
-
local_abort_registry.forEach((abort) => abort());
|
|
8
|
+
local_abort_registry.forEach((abort) => abort === null || abort === void 0 ? void 0 : abort());
|
|
9
9
|
resetClients();
|
|
10
|
-
local_abort_registry = [];
|
|
11
10
|
});
|
|
12
11
|
function resetClients() {
|
|
13
12
|
client = null;
|
|
14
13
|
wsClient = null;
|
|
14
|
+
local_abort_registry = [];
|
|
15
15
|
}
|
|
16
16
|
//registerCallbackOnSrvAuthEvents('logout_event', resetClients)
|
|
17
17
|
async function getGenqlClient() {
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"generateGenqlClient.js","sourceRoot":"","sources":["../../src/helpers/generateGenqlClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,11 @@ export declare function generateSrvAuthBindings<FeatureEnums = never>(SRV_AUTH:
|
|
|
27
27
|
responseType: ResponseType | undefined;
|
|
28
28
|
headers: Record<string, string>;
|
|
29
29
|
}>;
|
|
30
|
+
/**
|
|
31
|
+
* @deprecated use getCachedJwt
|
|
32
|
+
* */
|
|
30
33
|
getJwtTokenAsync: () => Promise<string | undefined>;
|
|
34
|
+
getCachedJwt: () => Promise<string | undefined>;
|
|
31
35
|
getNewJwtToken: () => Promise<string | undefined>;
|
|
32
36
|
/**
|
|
33
37
|
* @deprecated use registerCallbackOnSrvAuthEvents directly
|
|
@@ -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;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;
|
|
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;8BAsLc,YAAY;;;kBA3GlB,MAAM,YAAY,OAAO,MAAM,EAAE,MAAM,CAAC;eACxB,MAAM;kBAAY,YAAY,EAAE;;yBAtDzC,MAAM,YAAY,OAAO,MAAM,EAAE,MAAM,CAAC;;qEA0GR,YAAY;;;;;IAkE1E;;UAEM;;;;IAIN;;OAEG;;;;;;;;qBA/Ge,MAAM;;iBA6ES,MAAM;aAAO,MAAM;;;iCAvGtB,OAAO;EAsJ5C;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.error(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
|
-
|
|
72
|
+
setAuthData({ token: '' });
|
|
73
73
|
srvAuthGet('/signout');
|
|
74
74
|
unregister();
|
|
75
75
|
});
|
|
@@ -88,12 +88,11 @@ export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOper
|
|
|
88
88
|
jwtToken = '';
|
|
89
89
|
parsed_jwt = undefined;
|
|
90
90
|
features = undefined;
|
|
91
|
-
dispatchLogoutEvent();
|
|
92
91
|
}
|
|
93
92
|
function getJwtToken() {
|
|
94
93
|
return jwtToken;
|
|
95
94
|
}
|
|
96
|
-
async function
|
|
95
|
+
async function getCachedJwt() {
|
|
97
96
|
if (isJwtInvalid()) {
|
|
98
97
|
const new_jwt = await getNewJwtToken();
|
|
99
98
|
return new_jwt;
|
|
@@ -103,7 +102,7 @@ export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOper
|
|
|
103
102
|
}
|
|
104
103
|
}
|
|
105
104
|
async function setReqConfig(data, responseType) {
|
|
106
|
-
const token = await
|
|
105
|
+
const token = await getCachedJwt();
|
|
107
106
|
const res = {
|
|
108
107
|
data: data,
|
|
109
108
|
responseType: responseType,
|
|
@@ -122,14 +121,14 @@ export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOper
|
|
|
122
121
|
} */
|
|
123
122
|
const data = await srvAuthGet('/token');
|
|
124
123
|
if (!data || ((_a = data.data) === null || _a === void 0 ? void 0 : _a.errors) || !data.data.token) {
|
|
125
|
-
|
|
124
|
+
dispatchLogoutEvent();
|
|
126
125
|
return;
|
|
127
126
|
}
|
|
128
127
|
setAuthData({ token: data.data.token, features: data.data.features || [] });
|
|
129
128
|
return jwtToken;
|
|
130
129
|
}
|
|
131
130
|
catch (error) {
|
|
132
|
-
|
|
131
|
+
dispatchLogoutEvent();
|
|
133
132
|
console.error(error);
|
|
134
133
|
return jwtToken;
|
|
135
134
|
}
|
|
@@ -159,7 +158,11 @@ export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOper
|
|
|
159
158
|
srvAuthGet,
|
|
160
159
|
signoutAuth: dispatchLogoutEvent,
|
|
161
160
|
setReqConfig,
|
|
162
|
-
|
|
161
|
+
/**
|
|
162
|
+
* @deprecated use getCachedJwt
|
|
163
|
+
* */
|
|
164
|
+
getJwtTokenAsync: getCachedJwt,
|
|
165
|
+
getCachedJwt,
|
|
163
166
|
getNewJwtToken,
|
|
164
167
|
/**
|
|
165
168
|
* @deprecated use registerCallbackOnSrvAuthEvents directly
|
|
@@ -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,CAInG,eAAe,CAAC,CAAA;AAEnB,SAAS,mBAAmB;IACxB,qBAAqB,CAAC,cAAc,EAAE,EAAE,EAAE,KAAK,CAAC,CAAA;AACpD,CAAC;AACD,SAAS,uBAAuB;IAC5B,qBAAqB,CAAC,aAAa,EAAE,EAAE,EAAE,KAAK,CAAC,CAAA;AACnD,CAAC;AAED,MAAM,UAAU,uBAAuB,CACnC,QAAsB,EACtB,WAA0B,EAC1B,sBAAoC,EACpC,MAAmB;;IAEnB,IAAI,MAAM,EAAE;QACR,+BAA+B,CAAC,cAAc,EAAE,MAAM,CAAC,CAAA;KAC1D;IAED,IAAI,MAAA,MAAM,CAAC,eAAe,0CAAE,aAAa,EAAE;QACvC,OAAO,MAAM,CAAC,eAAe,CAAC,aAAqC,CAAA;KACtE;IAED,IAAI,QAAQ,GAAG,EAAE,CAAA;IAEjB,IAAI,QAAuC,CAAA;IAE3C,IAAI,UAA+B,CAAA;IAEnC,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC,CAAC,QAAQ,IAAI,qBAAqB,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAA;IAE7E,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,CAAC,YAAY,EAAE,CAAA;IAExC,MAAM,eAAe,GAAyC,EAAE,CAAA;IAEhE,KAAK,UAAU,UAAU,CAAI,GAAW,EAAE,OAAgC;QACtE,IAAI,WAAW,EAAE,IAAI,sBAAsB,EAAE,EAAE;YAC3C,IAAI,sBAAsB,EAAE,IAAI,gBAAgB,EAAE;gBAC9C,GAAG,GAAG,GAAG,GAAG,QAAQ,sBAAsB,EAAE,EAAE,CAAA;gBAE9C,oGAAoG;gBACpG,GAAG,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;aAC9E;iBAAM;gBACH,OAAO,CAAC,IAAI,CACR,0DAA0D,EAC1D,kBAAkB,EAClB,gBAAgB,EAChB,eAAe,EACf,sBAAsB,EAAE,CAC3B,CAAA;aACJ;SACJ;QAED,MAAM,OAAO,GACT,eAAe,CAAC,GAAG,CAAC;YACpB,KAAK,CAAC,GAAG,CAA4B,GAAG,QAAQ,EAAE,GAAG,GAAG,EAAE,EAAE;gBACxD,OAAO,EAAE;oBACL,GAAG,OAAO;oBACV,aAAa,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM;iBACxC;gBACD,eAAe,EAAE,IAAI;aACxB,CAAC,CAAA;QAEN,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE;YACvB,eAAe,CAAC,GAAG,CAAC,GAAG,OAAO,CAAA;SACjC;
|
|
1
|
+
{"version":3,"file":"generateSrvAuthBindings.js","sourceRoot":"","sources":["../../src/helpers/generateSrvAuthBindings.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -3,7 +3,6 @@ import type { createClient } from '@genql/runtime'
|
|
|
3
3
|
import type { ClientOptions } from '@genql/runtime'
|
|
4
4
|
import { httpToWs } from './Config'
|
|
5
5
|
import { registerCallbackOnSrvAuthEvents } from './generateSrvAuthBindings'
|
|
6
|
-
|
|
7
6
|
//import { parseJwt } from '../helpers/parseJwt'
|
|
8
7
|
|
|
9
8
|
interface CliOptions extends Omit<ClientOptions, 'url' | 'signal'> {
|
|
@@ -25,20 +24,20 @@ export function generateGenqlClient<T extends ReturnType<typeof createClient>>({
|
|
|
25
24
|
|
|
26
25
|
let wsClient: T | null = null
|
|
27
26
|
|
|
28
|
-
let local_abort_registry: (() => void)[] = []
|
|
27
|
+
let local_abort_registry: (() => void | undefined)[] = []
|
|
29
28
|
|
|
30
29
|
registerCallbackOnSrvAuthEvents('logout_event', () => {
|
|
31
|
-
local_abort_registry.forEach((abort) => abort())
|
|
30
|
+
local_abort_registry.forEach((abort) => abort?.())
|
|
32
31
|
|
|
33
32
|
resetClients()
|
|
34
|
-
|
|
35
|
-
local_abort_registry = []
|
|
36
33
|
})
|
|
37
34
|
|
|
38
35
|
function resetClients() {
|
|
39
36
|
client = null
|
|
40
37
|
|
|
41
38
|
wsClient = null
|
|
39
|
+
|
|
40
|
+
local_abort_registry = []
|
|
42
41
|
}
|
|
43
42
|
|
|
44
43
|
//registerCallbackOnSrvAuthEvents('logout_event', resetClients)
|
|
@@ -74,13 +74,12 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
|
|
|
74
74
|
if (!promiseRegistry[url]) {
|
|
75
75
|
promiseRegistry[url] = promise
|
|
76
76
|
}
|
|
77
|
-
|
|
78
77
|
try {
|
|
79
78
|
const res = await promise
|
|
80
79
|
|
|
81
80
|
return res as AxiosResponse<R, any>
|
|
82
81
|
} catch (e) {
|
|
83
|
-
console.
|
|
82
|
+
console.error(e)
|
|
84
83
|
return
|
|
85
84
|
} finally {
|
|
86
85
|
delete promiseRegistry[url]
|
|
@@ -106,7 +105,7 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
|
|
|
106
105
|
}
|
|
107
106
|
|
|
108
107
|
const { unregister } = registerCallbackOnSrvAuthEvents('logout_event', () => {
|
|
109
|
-
|
|
108
|
+
setAuthData({ token: '' })
|
|
110
109
|
|
|
111
110
|
srvAuthGet('/signout')
|
|
112
111
|
|
|
@@ -134,15 +133,13 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
|
|
|
134
133
|
parsed_jwt = undefined
|
|
135
134
|
|
|
136
135
|
features = undefined
|
|
137
|
-
|
|
138
|
-
dispatchLogoutEvent()
|
|
139
136
|
}
|
|
140
137
|
|
|
141
138
|
function getJwtToken() {
|
|
142
139
|
return jwtToken
|
|
143
140
|
}
|
|
144
141
|
|
|
145
|
-
async function
|
|
142
|
+
async function getCachedJwt() {
|
|
146
143
|
if (isJwtInvalid()) {
|
|
147
144
|
const new_jwt = await getNewJwtToken()
|
|
148
145
|
|
|
@@ -153,7 +150,7 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
|
|
|
153
150
|
}
|
|
154
151
|
|
|
155
152
|
async function setReqConfig<T = unknown>(data?: T, responseType?: ResponseType) {
|
|
156
|
-
const token = await
|
|
153
|
+
const token = await getCachedJwt()
|
|
157
154
|
|
|
158
155
|
const res = {
|
|
159
156
|
data: data,
|
|
@@ -177,14 +174,14 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
|
|
|
177
174
|
const data = await srvAuthGet<{ errors?: string; token: string; features: FeatureEnums[] }>('/token')
|
|
178
175
|
|
|
179
176
|
if (!data || data.data?.errors || !data.data.token) {
|
|
180
|
-
|
|
177
|
+
dispatchLogoutEvent()
|
|
181
178
|
return
|
|
182
179
|
}
|
|
183
180
|
|
|
184
181
|
setAuthData({ token: data.data.token, features: data.data.features || [] })
|
|
185
182
|
return jwtToken
|
|
186
183
|
} catch (error) {
|
|
187
|
-
|
|
184
|
+
dispatchLogoutEvent()
|
|
188
185
|
|
|
189
186
|
console.error(error)
|
|
190
187
|
|
|
@@ -218,7 +215,11 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
|
|
|
218
215
|
srvAuthGet,
|
|
219
216
|
signoutAuth: dispatchLogoutEvent,
|
|
220
217
|
setReqConfig,
|
|
221
|
-
|
|
218
|
+
/**
|
|
219
|
+
* @deprecated use getCachedJwt
|
|
220
|
+
* */
|
|
221
|
+
getJwtTokenAsync: getCachedJwt,
|
|
222
|
+
getCachedJwt,
|
|
222
223
|
getNewJwtToken,
|
|
223
224
|
/**
|
|
224
225
|
* @deprecated use registerCallbackOnSrvAuthEvents directly
|