@idp.global/sdk 19.3.0 → 19.4.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.
- package/changelog.md +40 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts_browser/classes.idpclient.js +1 -1
- package/dist_ts_browser/classes.idprequests.js +1 -1
- package/dist_ts_browser/classes.relyingpartybearerclient.d.ts +276 -0
- package/dist_ts_browser/classes.relyingpartybearerclient.js +591 -0
- package/dist_ts_browser/index.d.ts +1 -0
- package/dist_ts_browser/index.js +2 -1
- package/dist_ts_browser/plugins.js +1 -1
- package/dist_ts_browser/secret-delivery.js +1 -1
- package/dist_ts_relyingparty/classes.authorityobserver.d.ts +23 -0
- package/dist_ts_relyingparty/classes.authorityobserver.js +68 -13
- package/dist_ts_relyingparty/classes.errors.d.ts +3 -1
- package/dist_ts_relyingparty/classes.errors.js +2 -1
- package/dist_ts_relyingparty/classes.relyingpartyroutes.d.ts +12 -0
- package/dist_ts_relyingparty/classes.relyingpartyroutes.js +33 -6
- package/dist_ts_relyingparty/classes.relyingpartysessions.d.ts +102 -7
- package/dist_ts_relyingparty/classes.relyingpartysessions.js +228 -29
- package/dist_ts_relyingparty/classes.rpmodels.d.ts +6 -4
- package/dist_ts_relyingparty/classes.rpmodels.js +8 -6
- package/dist_ts_relyingparty/contract.bearer.d.ts +82 -0
- package/dist_ts_relyingparty/contract.bearer.js +9 -0
- package/dist_ts_relyingparty/helpers.bearer.d.ts +3 -3
- package/dist_ts_relyingparty/helpers.bearer.js +3 -3
- package/dist_ts_relyingparty/interfaces.d.ts +34 -24
- package/package.json +2 -1
- package/readme.md +215 -19
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts_browser/classes.relyingpartybearerclient.ts +821 -0
- package/ts_browser/index.ts +1 -0
- package/ts_relyingparty/classes.authorityobserver.ts +80 -12
- package/ts_relyingparty/classes.errors.ts +4 -1
- package/ts_relyingparty/classes.relyingpartyroutes.ts +38 -7
- package/ts_relyingparty/classes.relyingpartysessions.ts +298 -34
- package/ts_relyingparty/classes.rpmodels.ts +7 -4
- package/ts_relyingparty/contract.bearer.ts +99 -0
- package/ts_relyingparty/helpers.bearer.ts +8 -9
- package/ts_relyingparty/interfaces.ts +49 -26
|
@@ -0,0 +1,591 @@
|
|
|
1
|
+
import { RELYING_PARTY_BEARER_MESSAGE_TYPE, } from '../dist_ts_relyingparty/contract.bearer.js';
|
|
2
|
+
export { RELYING_PARTY_BEARER_MESSAGE_TYPE };
|
|
3
|
+
export class RelyingPartyBearerClientError extends Error {
|
|
4
|
+
code;
|
|
5
|
+
status;
|
|
6
|
+
/** the `error` the relying party answered (`TRelyingPartyBearerErrorCode`) */
|
|
7
|
+
answerError;
|
|
8
|
+
/** the `error` a delivery carried (`TRelyingPartyBearerDeliveryError`) */
|
|
9
|
+
deliveryError;
|
|
10
|
+
constructor(code, detailsArg = {}) {
|
|
11
|
+
super(code, detailsArg.cause !== undefined ? { cause: detailsArg.cause } : undefined);
|
|
12
|
+
this.code = code;
|
|
13
|
+
this.name = 'RelyingPartyBearerClientError';
|
|
14
|
+
if (detailsArg.status !== undefined)
|
|
15
|
+
this.status = detailsArg.status;
|
|
16
|
+
if (detailsArg.answerError !== undefined)
|
|
17
|
+
this.answerError = detailsArg.answerError;
|
|
18
|
+
if (detailsArg.deliveryError !== undefined)
|
|
19
|
+
this.deliveryError = detailsArg.deliveryError;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
const DEFAULT_LOGIN_PATH_PREFIX = '/auth/';
|
|
23
|
+
const DEFAULT_REFRESH_SKEW_MS = 60_000;
|
|
24
|
+
const DEFAULT_REQUEST_TIMEOUT_MS = 30_000;
|
|
25
|
+
/** Every tab of the origin waits on the lock while a section runs: two minutes at most. */
|
|
26
|
+
const MAX_REQUEST_TIMEOUT_MS = 120_000;
|
|
27
|
+
/** The life of a login attempt at the relying party (`LOGIN_ATTEMPT_MAX_AGE_SECONDS`). */
|
|
28
|
+
const DEFAULT_POPUP_TIMEOUT_MS = 10 * 60 * 1_000;
|
|
29
|
+
const DEFAULT_POPUP_FEATURES = 'popup,width=480,height=720';
|
|
30
|
+
const POPUP_CLOSED_POLL_MS = 500;
|
|
31
|
+
/** A popup posts and closes at once; its message can arrive after the opener sees it closed. */
|
|
32
|
+
const POPUP_CLOSED_GRACE_MS = 1_000;
|
|
33
|
+
/** 32 random bytes: a 43-character verifier and state (RFC 7636 §4.1). */
|
|
34
|
+
const RANDOM_BYTES = 32;
|
|
35
|
+
const DELIVERY_PARAMS = ['code', 'error', 'state'];
|
|
36
|
+
const base64Url = (bytesArg) => {
|
|
37
|
+
let binary = '';
|
|
38
|
+
for (const byte of bytesArg)
|
|
39
|
+
binary += String.fromCharCode(byte);
|
|
40
|
+
return globalThis.btoa(binary).replace(/\+/gu, '-').replace(/\//gu, '_').replace(/=+$/u, '');
|
|
41
|
+
};
|
|
42
|
+
const randomBase64Url = () => base64Url(globalThis.crypto.getRandomValues(new Uint8Array(RANDOM_BYTES)));
|
|
43
|
+
/** The S256 challenge of a verifier: BASE64URL(SHA-256(ASCII(verifier))). */
|
|
44
|
+
const pkceChallengeOf = async (verifierArg) => base64Url(new Uint8Array(await globalThis.crypto.subtle.digest('SHA-256', new TextEncoder().encode(verifierArg))));
|
|
45
|
+
const isRecord = (valueArg) => typeof valueArg === 'object' && valueArg !== null && !Array.isArray(valueArg);
|
|
46
|
+
const isText = (valueArg) => typeof valueArg === 'string' && valueArg.length > 0;
|
|
47
|
+
const isTime = (valueArg) => typeof valueArg === 'number' && Number.isFinite(valueArg);
|
|
48
|
+
/** Throws `request_failed` once a section's deadline has fired: nothing is sent or written past it. */
|
|
49
|
+
const inTime = (signalArg) => {
|
|
50
|
+
if (signalArg.aborted) {
|
|
51
|
+
throw new RelyingPartyBearerClientError('request_failed');
|
|
52
|
+
}
|
|
53
|
+
};
|
|
54
|
+
/** The one value of a parameter, or `undefined` when it is absent or repeated. */
|
|
55
|
+
const singleParam = (paramsArg, nameArg) => {
|
|
56
|
+
const values = paramsArg.getAll(nameArg);
|
|
57
|
+
return values.length === 1 ? values[0] : undefined;
|
|
58
|
+
};
|
|
59
|
+
/** A token answer exactly as the bearer contract says, or `null`. */
|
|
60
|
+
const tokenAnswerOf = (answerArg) => {
|
|
61
|
+
if (!isRecord(answerArg)
|
|
62
|
+
|| answerArg.tokenType !== 'Bearer'
|
|
63
|
+
|| !isText(answerArg.accessToken)
|
|
64
|
+
|| !isText(answerArg.refreshToken)
|
|
65
|
+
|| !isTime(answerArg.accessTokenExpiresAt)
|
|
66
|
+
|| !isTime(answerArg.expiresIn)
|
|
67
|
+
|| answerArg.expiresIn <= 0
|
|
68
|
+
|| !isTime(answerArg.refreshTokenExpiresAt)
|
|
69
|
+
|| !isRecord(answerArg.session)
|
|
70
|
+
|| !isText(answerArg.session.sessionId)
|
|
71
|
+
|| !isText(answerArg.session.principalId)
|
|
72
|
+
|| !isTime(answerArg.session.expiresAt)) {
|
|
73
|
+
return null;
|
|
74
|
+
}
|
|
75
|
+
return {
|
|
76
|
+
tokenType: 'Bearer',
|
|
77
|
+
accessToken: answerArg.accessToken,
|
|
78
|
+
accessTokenExpiresAt: answerArg.accessTokenExpiresAt,
|
|
79
|
+
expiresIn: answerArg.expiresIn,
|
|
80
|
+
refreshToken: answerArg.refreshToken,
|
|
81
|
+
refreshTokenExpiresAt: answerArg.refreshTokenExpiresAt,
|
|
82
|
+
session: {
|
|
83
|
+
sessionId: answerArg.session.sessionId,
|
|
84
|
+
principalId: answerArg.session.principalId,
|
|
85
|
+
expiresAt: answerArg.session.expiresAt,
|
|
86
|
+
},
|
|
87
|
+
};
|
|
88
|
+
};
|
|
89
|
+
/**
|
|
90
|
+
* The browser side of bearer hand-off (`@idp.global/sdk/relyingparty`
|
|
91
|
+
* `bearer`): it starts a `web` or `popup` login with PKCE and a state,
|
|
92
|
+
* receives the delivery, claims the code once and keeps the token pair in
|
|
93
|
+
* the application's storage. Every refresh, logout and store of a claimed
|
|
94
|
+
* pair holds one Web Lock, so the tabs of an origin rotate the pair one at a
|
|
95
|
+
* time: inside the lock the pair is read from storage again, a pair another
|
|
96
|
+
* tab rotated is used as it is, and a rotated pair is stored before the lock
|
|
97
|
+
* is released and before its access token is handed out. Each claim and
|
|
98
|
+
* each section that holds the lock ends by `requestTimeoutMs`, so a hanging
|
|
99
|
+
* request or write never holds the other tabs. A login replaces the stored
|
|
100
|
+
* pair and ends that pair's session. Rotation is strict at the relying
|
|
101
|
+
* party: a refresh token spent once ends the session when it comes back, so
|
|
102
|
+
* nothing here retries a claim or a refresh.
|
|
103
|
+
*
|
|
104
|
+
* It needs the Web Locks API and Web Crypto, both of them only in a secure
|
|
105
|
+
* context, and has no fallback for either.
|
|
106
|
+
*/
|
|
107
|
+
export class RelyingPartyBearerClient {
|
|
108
|
+
origin;
|
|
109
|
+
#paths;
|
|
110
|
+
#storage;
|
|
111
|
+
#lockName;
|
|
112
|
+
#refreshSkewMs;
|
|
113
|
+
#requestTimeoutMs;
|
|
114
|
+
#locks;
|
|
115
|
+
#fetch;
|
|
116
|
+
#window;
|
|
117
|
+
#now;
|
|
118
|
+
/** the states of the logins received here; a login is received once */
|
|
119
|
+
#receivedStates = new Set();
|
|
120
|
+
constructor(optionsArg) {
|
|
121
|
+
const origin = optionsArg?.origin;
|
|
122
|
+
let parsedOrigin = null;
|
|
123
|
+
try {
|
|
124
|
+
parsedOrigin = typeof origin === 'string' ? new URL(origin) : null;
|
|
125
|
+
}
|
|
126
|
+
catch {
|
|
127
|
+
parsedOrigin = null;
|
|
128
|
+
}
|
|
129
|
+
if (!parsedOrigin || parsedOrigin.origin !== origin || !['https:', 'http:'].includes(parsedOrigin.protocol)) {
|
|
130
|
+
throw new Error('origin must be the relying party\'s exact origin, such as https://app.example');
|
|
131
|
+
}
|
|
132
|
+
const prefix = optionsArg.loginPathPrefix ?? DEFAULT_LOGIN_PATH_PREFIX;
|
|
133
|
+
if (typeof prefix !== 'string' || !/^\/(?:[A-Za-z0-9._~-]+\/)*$/u.test(prefix)) {
|
|
134
|
+
throw new Error('loginPathPrefix must be a path that starts and ends with /');
|
|
135
|
+
}
|
|
136
|
+
const storage = optionsArg.storage;
|
|
137
|
+
if (!storage || typeof storage.get !== 'function' || typeof storage.set !== 'function' || typeof storage.clear !== 'function') {
|
|
138
|
+
throw new Error('storage must have get, set and clear');
|
|
139
|
+
}
|
|
140
|
+
const locks = optionsArg.locks ?? globalThis.navigator?.locks;
|
|
141
|
+
if (!locks || typeof locks.request !== 'function') {
|
|
142
|
+
throw new Error('RelyingPartyBearerClient needs the Web Locks API (navigator.locks)');
|
|
143
|
+
}
|
|
144
|
+
if (typeof globalThis.crypto?.subtle?.digest !== 'function' || typeof globalThis.crypto.getRandomValues !== 'function') {
|
|
145
|
+
throw new Error('RelyingPartyBearerClient needs Web Crypto (crypto.subtle), which a browser offers only in a secure context');
|
|
146
|
+
}
|
|
147
|
+
const fetchFunction = optionsArg.fetch ?? globalThis.fetch?.bind(globalThis);
|
|
148
|
+
if (typeof fetchFunction !== 'function') {
|
|
149
|
+
throw new Error('RelyingPartyBearerClient needs fetch');
|
|
150
|
+
}
|
|
151
|
+
const refreshSkewMs = optionsArg.refreshSkewMs ?? DEFAULT_REFRESH_SKEW_MS;
|
|
152
|
+
if (!Number.isInteger(refreshSkewMs) || refreshSkewMs < 0) {
|
|
153
|
+
throw new Error('refreshSkewMs must be a whole number of milliseconds');
|
|
154
|
+
}
|
|
155
|
+
// only an absent deadline takes the default: any other value that is not one throws
|
|
156
|
+
const requestTimeoutMs = optionsArg.requestTimeoutMs === undefined ? DEFAULT_REQUEST_TIMEOUT_MS : optionsArg.requestTimeoutMs;
|
|
157
|
+
if (typeof requestTimeoutMs !== 'number'
|
|
158
|
+
|| !Number.isFinite(requestTimeoutMs)
|
|
159
|
+
|| requestTimeoutMs <= 0
|
|
160
|
+
|| requestTimeoutMs > MAX_REQUEST_TIMEOUT_MS) {
|
|
161
|
+
throw new Error(`requestTimeoutMs must be more than 0 and at most ${MAX_REQUEST_TIMEOUT_MS} milliseconds`);
|
|
162
|
+
}
|
|
163
|
+
this.origin = origin;
|
|
164
|
+
this.#paths = {
|
|
165
|
+
login: `${origin}${prefix}bearer/login`,
|
|
166
|
+
claim: `${origin}${prefix}bearer/claim`,
|
|
167
|
+
refresh: `${origin}${prefix}bearer/refresh`,
|
|
168
|
+
logout: `${origin}${prefix}bearer/logout`,
|
|
169
|
+
};
|
|
170
|
+
this.#storage = storage;
|
|
171
|
+
this.#lockName = optionsArg.lockName ?? `idp.global/relyingparty:bearer-tokens ${origin}`;
|
|
172
|
+
this.#refreshSkewMs = refreshSkewMs;
|
|
173
|
+
this.#requestTimeoutMs = requestTimeoutMs;
|
|
174
|
+
this.#locks = locks;
|
|
175
|
+
this.#fetch = fetchFunction;
|
|
176
|
+
this.#window = optionsArg.window ?? globalThis.window;
|
|
177
|
+
this.#now = optionsArg.now ?? Date.now;
|
|
178
|
+
}
|
|
179
|
+
/**
|
|
180
|
+
* A new login: a fresh verifier, its S256 challenge and a state, each from
|
|
181
|
+
* 32 random bytes, and the URL that starts it. Make a popup login before
|
|
182
|
+
* the click that opens it: this is async, and a browser opens a popup only
|
|
183
|
+
* within the user's gesture.
|
|
184
|
+
*/
|
|
185
|
+
async createLogin(optionsArg) {
|
|
186
|
+
const { clientKind, returnTarget } = optionsArg ?? {};
|
|
187
|
+
if (clientKind !== 'web' && clientKind !== 'popup') {
|
|
188
|
+
throw new Error('a browser signs in as a web or popup client');
|
|
189
|
+
}
|
|
190
|
+
if (!isText(returnTarget)) {
|
|
191
|
+
throw new Error('returnTarget must name the configured return target');
|
|
192
|
+
}
|
|
193
|
+
const codeVerifier = randomBase64Url();
|
|
194
|
+
const state = randomBase64Url();
|
|
195
|
+
const url = new URL(this.#paths.login);
|
|
196
|
+
url.searchParams.set('client_kind', clientKind);
|
|
197
|
+
url.searchParams.set('return_target', returnTarget);
|
|
198
|
+
url.searchParams.set('code_challenge', await pkceChallengeOf(codeVerifier));
|
|
199
|
+
url.searchParams.set('code_challenge_method', 'S256');
|
|
200
|
+
url.searchParams.set('state', state);
|
|
201
|
+
return { clientKind, returnTarget, state, codeVerifier, url: url.href };
|
|
202
|
+
}
|
|
203
|
+
/**
|
|
204
|
+
* Receives a `web` login on its return target page. The delivery leaves
|
|
205
|
+
* the address first, before anything is checked, so neither a reload nor
|
|
206
|
+
* the history holds the code. A delivery whose state is not the login's is
|
|
207
|
+
* refused unclaimed; a code is claimed once, and a failed claim is not
|
|
208
|
+
* retried. The claimed pair replaces the stored one, whose session is
|
|
209
|
+
* ended then (`IRelyingPartyBearerLoginResult`). Answers `null` on a page
|
|
210
|
+
* that holds no delivery.
|
|
211
|
+
*/
|
|
212
|
+
async completeRedirectLogin(loginArg) {
|
|
213
|
+
const window = this.requireWindow();
|
|
214
|
+
const url = new URL(window.location.href);
|
|
215
|
+
if (!DELIVERY_PARAMS.some((nameArg) => url.searchParams.has(nameArg))) {
|
|
216
|
+
return null;
|
|
217
|
+
}
|
|
218
|
+
const delivered = url.searchParams;
|
|
219
|
+
const code = singleParam(delivered, 'code');
|
|
220
|
+
const error = singleParam(delivered, 'error');
|
|
221
|
+
const state = singleParam(delivered, 'state');
|
|
222
|
+
const kept = new URL(url.href);
|
|
223
|
+
for (const name of DELIVERY_PARAMS) {
|
|
224
|
+
kept.searchParams.delete(name);
|
|
225
|
+
}
|
|
226
|
+
window.history.replaceState(window.history.state, '', kept.pathname + kept.search + kept.hash);
|
|
227
|
+
if (!loginArg || loginArg.clientKind !== 'web' || state === undefined || state !== loginArg.state) {
|
|
228
|
+
throw new RelyingPartyBearerClientError('state_mismatch');
|
|
229
|
+
}
|
|
230
|
+
return this.receive(loginArg, code, error);
|
|
231
|
+
}
|
|
232
|
+
/**
|
|
233
|
+
* Opens a `popup` login and receives what its page posts: a message is
|
|
234
|
+
* taken only from the relying party's origin, from this very popup, of the
|
|
235
|
+
* bearer message type and with the login's state; any other is ignored.
|
|
236
|
+
* The popup opens before this returns, so call it in the click handler
|
|
237
|
+
* itself, with a login made beforehand. The claimed pair replaces the
|
|
238
|
+
* stored one like `completeRedirectLogin`'s.
|
|
239
|
+
*/
|
|
240
|
+
openPopupLogin(loginArg, optionsArg = {}) {
|
|
241
|
+
let window;
|
|
242
|
+
try {
|
|
243
|
+
window = this.requireWindow();
|
|
244
|
+
if (!loginArg || loginArg.clientKind !== 'popup') {
|
|
245
|
+
throw new Error('openPopupLogin needs a popup login');
|
|
246
|
+
}
|
|
247
|
+
if (this.#receivedStates.has(loginArg.state)) {
|
|
248
|
+
throw new RelyingPartyBearerClientError('already_received');
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
catch (error) {
|
|
252
|
+
return Promise.reject(error);
|
|
253
|
+
}
|
|
254
|
+
let popup;
|
|
255
|
+
try {
|
|
256
|
+
popup = window.open(loginArg.url, '_blank', optionsArg.windowFeatures ?? DEFAULT_POPUP_FEATURES);
|
|
257
|
+
}
|
|
258
|
+
catch (error) {
|
|
259
|
+
return Promise.reject(error);
|
|
260
|
+
}
|
|
261
|
+
if (!popup) {
|
|
262
|
+
return Promise.reject(new RelyingPartyBearerClientError('popup_blocked'));
|
|
263
|
+
}
|
|
264
|
+
return this.receivePopup(window, popup, loginArg, optionsArg);
|
|
265
|
+
}
|
|
266
|
+
/**
|
|
267
|
+
* An access token to send right now, or `null` when there is no session.
|
|
268
|
+
* One that is about to end is rotated first, by one tab for all of them.
|
|
269
|
+
*/
|
|
270
|
+
async accessToken() {
|
|
271
|
+
const stored = await this.#storage.get();
|
|
272
|
+
if (!stored) {
|
|
273
|
+
return null;
|
|
274
|
+
}
|
|
275
|
+
if (this.isFresh(stored)) {
|
|
276
|
+
return stored.accessToken;
|
|
277
|
+
}
|
|
278
|
+
return (await this.rotate(stored.refreshToken, null))?.accessToken ?? null;
|
|
279
|
+
}
|
|
280
|
+
/**
|
|
281
|
+
* Rotates the pair now — after the relying party refused
|
|
282
|
+
* `rejectedAccessTokenArg`, say — unless another tab already did, and
|
|
283
|
+
* answers the pair to use: `null` once the session is over, which clears
|
|
284
|
+
* the storage. A relying party that cannot refresh right now
|
|
285
|
+
* (`authority_unavailable`) keeps the pair as it is; try again later.
|
|
286
|
+
*/
|
|
287
|
+
async refresh(rejectedAccessTokenArg) {
|
|
288
|
+
const stored = await this.#storage.get();
|
|
289
|
+
if (!stored) {
|
|
290
|
+
return null;
|
|
291
|
+
}
|
|
292
|
+
return this.rotate(stored.refreshToken, rejectedAccessTokenArg ?? null);
|
|
293
|
+
}
|
|
294
|
+
/**
|
|
295
|
+
* Clears the storage and then ends the session at the relying party with
|
|
296
|
+
* the pair it held, and answers whether that ended a live session. When the
|
|
297
|
+
* relying party cannot be reached, refuses or gives no answer by
|
|
298
|
+
* `requestTimeoutMs`, the call throws `session_not_revoked` with that
|
|
299
|
+
* failure as its `cause`: this device is signed out, and the session may
|
|
300
|
+
* live on at the relying party until it expires, so tell the user they are
|
|
301
|
+
* signed out on this device only. A deadline that fires before the storage
|
|
302
|
+
* is cleared throws `request_failed`, and the pair stays.
|
|
303
|
+
*/
|
|
304
|
+
async logout() {
|
|
305
|
+
let cleared = false;
|
|
306
|
+
const notRevoked = (errorArg) => new RelyingPartyBearerClientError('session_not_revoked', { cause: errorArg });
|
|
307
|
+
return this.#locks.request(this.#lockName, () => this.withDeadline(async (signalArg) => {
|
|
308
|
+
const current = await this.#storage.get();
|
|
309
|
+
if (!current) {
|
|
310
|
+
return false;
|
|
311
|
+
}
|
|
312
|
+
inTime(signalArg);
|
|
313
|
+
await this.#storage.clear({ signal: signalArg });
|
|
314
|
+
cleared = true;
|
|
315
|
+
try {
|
|
316
|
+
return await this.endSessionOf(current, signalArg);
|
|
317
|
+
}
|
|
318
|
+
catch (error) {
|
|
319
|
+
throw notRevoked(error);
|
|
320
|
+
}
|
|
321
|
+
}, () => {
|
|
322
|
+
// once the pair is cleared this device is signed out, whatever the request still does
|
|
323
|
+
const failure = new RelyingPartyBearerClientError('request_failed');
|
|
324
|
+
throw cleared ? notRevoked(failure) : failure;
|
|
325
|
+
}));
|
|
326
|
+
}
|
|
327
|
+
requireWindow() {
|
|
328
|
+
if (!this.#window) {
|
|
329
|
+
throw new Error('the login receivers of RelyingPartyBearerClient need a window');
|
|
330
|
+
}
|
|
331
|
+
return this.#window;
|
|
332
|
+
}
|
|
333
|
+
isFresh(storedArg) {
|
|
334
|
+
const lifetimeMs = storedArg.expiresIn * 1_000;
|
|
335
|
+
const skewMs = Math.min(this.#refreshSkewMs, lifetimeMs / 2);
|
|
336
|
+
return this.#now() < storedArg.receivedAt + lifetimeMs - skewMs;
|
|
337
|
+
}
|
|
338
|
+
/** Takes a delivery for its login, once, claims its code and stores the pair in place of the one before. */
|
|
339
|
+
async receive(loginArg, codeArg, errorArg) {
|
|
340
|
+
if (this.#receivedStates.has(loginArg.state)) {
|
|
341
|
+
throw new RelyingPartyBearerClientError('already_received');
|
|
342
|
+
}
|
|
343
|
+
this.#receivedStates.add(loginArg.state);
|
|
344
|
+
if (errorArg !== undefined) {
|
|
345
|
+
throw new RelyingPartyBearerClientError(isText(errorArg) && codeArg === undefined ? 'login_failed' : 'unexpected_answer', {
|
|
346
|
+
...(isText(errorArg) ? { deliveryError: errorArg } : {}),
|
|
347
|
+
});
|
|
348
|
+
}
|
|
349
|
+
if (!isText(codeArg)) {
|
|
350
|
+
throw new RelyingPartyBearerClientError('unexpected_answer');
|
|
351
|
+
}
|
|
352
|
+
// the claim touches no stored pair, so it holds no lock, only its own deadline; a failed one leaves the stored pair as it was
|
|
353
|
+
const answer = tokenAnswerOf(await this.withDeadline((signalArg) => this.post(this.#paths.claim, { code: codeArg, codeVerifier: loginArg.codeVerifier }, {}, signalArg)));
|
|
354
|
+
if (!answer) {
|
|
355
|
+
throw new RelyingPartyBearerClientError('unexpected_answer', { status: 200 });
|
|
356
|
+
}
|
|
357
|
+
return this.replacePair({ ...answer, receivedAt: this.#now() });
|
|
358
|
+
}
|
|
359
|
+
/**
|
|
360
|
+
* Stores a claimed pair in place of the stored one and then ends the
|
|
361
|
+
* session of that one with its tokens, held here, through the logout
|
|
362
|
+
* route. Both run under the lock a refresh holds, so no tab rotates the
|
|
363
|
+
* replaced pair meanwhile. A session that cannot be ended is the result's
|
|
364
|
+
* `previous_session_not_revoked`, neither thrown nor dropped: the new pair
|
|
365
|
+
* is stored by then.
|
|
366
|
+
*/
|
|
367
|
+
replacePair(tokensArg) {
|
|
368
|
+
/** what the login answers if the deadline fires now: nothing before the pair is stored */
|
|
369
|
+
let atDeadline = null;
|
|
370
|
+
const notRevoked = (errorArg) => ({
|
|
371
|
+
tokens: tokensArg,
|
|
372
|
+
previousSession: 'previous_session_not_revoked',
|
|
373
|
+
previousSessionError: errorArg instanceof RelyingPartyBearerClientError
|
|
374
|
+
? errorArg
|
|
375
|
+
: new RelyingPartyBearerClientError('unexpected_answer', { cause: errorArg }),
|
|
376
|
+
});
|
|
377
|
+
return this.#locks.request(this.#lockName, () => this.withDeadline(async (signalArg) => {
|
|
378
|
+
const previous = await this.#storage.get();
|
|
379
|
+
inTime(signalArg);
|
|
380
|
+
await this.#storage.set(tokensArg, { signal: signalArg });
|
|
381
|
+
if (!previous) {
|
|
382
|
+
return { tokens: tokensArg, previousSession: 'no_previous_session' };
|
|
383
|
+
}
|
|
384
|
+
if (previous.session.sessionId === tokensArg.session.sessionId) {
|
|
385
|
+
return { tokens: tokensArg, previousSession: 'same_session' };
|
|
386
|
+
}
|
|
387
|
+
atDeadline = notRevoked(new RelyingPartyBearerClientError('request_failed'));
|
|
388
|
+
try {
|
|
389
|
+
await this.endSessionOf(previous, signalArg);
|
|
390
|
+
return { tokens: tokensArg, previousSession: 'previous_session_ended' };
|
|
391
|
+
}
|
|
392
|
+
catch (error) {
|
|
393
|
+
return notRevoked(error);
|
|
394
|
+
}
|
|
395
|
+
}, () => {
|
|
396
|
+
// past its write the login stands; only the end of the previous session is cut short
|
|
397
|
+
if (!atDeadline) {
|
|
398
|
+
throw new RelyingPartyBearerClientError('request_failed');
|
|
399
|
+
}
|
|
400
|
+
return atDeadline;
|
|
401
|
+
}));
|
|
402
|
+
}
|
|
403
|
+
receivePopup(windowArg, popupArg, loginArg, optionsArg) {
|
|
404
|
+
return new Promise((resolve, reject) => {
|
|
405
|
+
const cleanups = [];
|
|
406
|
+
let settled = false;
|
|
407
|
+
const settle = (actionArg) => {
|
|
408
|
+
if (settled) {
|
|
409
|
+
return;
|
|
410
|
+
}
|
|
411
|
+
settled = true;
|
|
412
|
+
for (const cleanup of cleanups) {
|
|
413
|
+
cleanup();
|
|
414
|
+
}
|
|
415
|
+
actionArg();
|
|
416
|
+
};
|
|
417
|
+
const fail = (errorArg) => settle(() => reject(errorArg));
|
|
418
|
+
const onMessage = (eventArg) => {
|
|
419
|
+
const data = eventArg?.data;
|
|
420
|
+
if (eventArg?.origin !== this.origin
|
|
421
|
+
|| eventArg.source !== popupArg
|
|
422
|
+
|| !isRecord(data)
|
|
423
|
+
|| data.type !== RELYING_PARTY_BEARER_MESSAGE_TYPE
|
|
424
|
+
|| data.state !== loginArg.state) {
|
|
425
|
+
return;
|
|
426
|
+
}
|
|
427
|
+
settle(() => {
|
|
428
|
+
this.receive(loginArg, data.code, data.error).then(resolve, reject);
|
|
429
|
+
});
|
|
430
|
+
};
|
|
431
|
+
windowArg.addEventListener('message', onMessage);
|
|
432
|
+
cleanups.push(() => windowArg.removeEventListener('message', onMessage));
|
|
433
|
+
const timeout = setTimeout(() => fail(new RelyingPartyBearerClientError('popup_timeout')), optionsArg.timeoutMs ?? DEFAULT_POPUP_TIMEOUT_MS);
|
|
434
|
+
cleanups.push(() => clearTimeout(timeout));
|
|
435
|
+
let closedGrace;
|
|
436
|
+
const closedPoll = setInterval(() => {
|
|
437
|
+
if (popupArg.closed && closedGrace === undefined) {
|
|
438
|
+
closedGrace = setTimeout(() => fail(new RelyingPartyBearerClientError('popup_closed')), POPUP_CLOSED_GRACE_MS);
|
|
439
|
+
}
|
|
440
|
+
}, POPUP_CLOSED_POLL_MS);
|
|
441
|
+
cleanups.push(() => {
|
|
442
|
+
clearInterval(closedPoll);
|
|
443
|
+
if (closedGrace !== undefined) {
|
|
444
|
+
clearTimeout(closedGrace);
|
|
445
|
+
}
|
|
446
|
+
});
|
|
447
|
+
const signal = optionsArg.signal;
|
|
448
|
+
if (signal) {
|
|
449
|
+
if (signal.aborted) {
|
|
450
|
+
fail(signal.reason);
|
|
451
|
+
return;
|
|
452
|
+
}
|
|
453
|
+
const onAbort = () => fail(signal.reason);
|
|
454
|
+
signal.addEventListener('abort', onAbort, { once: true });
|
|
455
|
+
cleanups.push(() => signal.removeEventListener('abort', onAbort));
|
|
456
|
+
}
|
|
457
|
+
});
|
|
458
|
+
}
|
|
459
|
+
/**
|
|
460
|
+
* One rotation under the lock. The pair is read again inside it: one
|
|
461
|
+
* whose refresh token is no longer `seenRefreshTokenArg`, or whose access
|
|
462
|
+
* token is no longer `rejectedAccessTokenArg`, was rotated already and is
|
|
463
|
+
* used as it is. A rotated pair is stored before the lock is released. The
|
|
464
|
+
* whole section has one deadline: past it, the lock is released with
|
|
465
|
+
* `request_failed` and an answer that still arrives is dropped unstored.
|
|
466
|
+
*/
|
|
467
|
+
rotate(seenRefreshTokenArg, rejectedAccessTokenArg) {
|
|
468
|
+
return this.#locks.request(this.#lockName, () => this.withDeadline(async (signalArg) => {
|
|
469
|
+
const current = await this.#storage.get();
|
|
470
|
+
if (!current) {
|
|
471
|
+
return null;
|
|
472
|
+
}
|
|
473
|
+
if (current.refreshToken !== seenRefreshTokenArg
|
|
474
|
+
|| (rejectedAccessTokenArg !== null && current.accessToken !== rejectedAccessTokenArg)) {
|
|
475
|
+
return current;
|
|
476
|
+
}
|
|
477
|
+
let answer;
|
|
478
|
+
try {
|
|
479
|
+
answer = tokenAnswerOf(await this.post(this.#paths.refresh, { refreshToken: current.refreshToken }, {}, signalArg));
|
|
480
|
+
}
|
|
481
|
+
catch (error) {
|
|
482
|
+
if (error instanceof RelyingPartyBearerClientError && error.answerError === 'invalid_bearer_grant') {
|
|
483
|
+
// the session is over: this pair opens nothing any more
|
|
484
|
+
inTime(signalArg);
|
|
485
|
+
await this.#storage.clear({ signal: signalArg });
|
|
486
|
+
return null;
|
|
487
|
+
}
|
|
488
|
+
throw error;
|
|
489
|
+
}
|
|
490
|
+
if (!answer) {
|
|
491
|
+
throw new RelyingPartyBearerClientError('unexpected_answer', { status: 200 });
|
|
492
|
+
}
|
|
493
|
+
const stored = { ...answer, receivedAt: this.#now() };
|
|
494
|
+
inTime(signalArg);
|
|
495
|
+
await this.#storage.set(stored, { signal: signalArg });
|
|
496
|
+
return stored;
|
|
497
|
+
}));
|
|
498
|
+
}
|
|
499
|
+
/** Ends the session of a pair through the logout route and answers whether that ended a live one. */
|
|
500
|
+
async endSessionOf(pairArg, signalArg) {
|
|
501
|
+
const answer = await this.post(this.#paths.logout, { refreshToken: pairArg.refreshToken }, { authorization: `Bearer ${pairArg.accessToken}` }, signalArg);
|
|
502
|
+
if (!isRecord(answer) || typeof answer.endedLiveSession !== 'boolean') {
|
|
503
|
+
throw new RelyingPartyBearerClientError('unexpected_answer', { status: 200 });
|
|
504
|
+
}
|
|
505
|
+
return answer.endedLiveSession;
|
|
506
|
+
}
|
|
507
|
+
/**
|
|
508
|
+
* Runs one operation, a claim or a section that holds the lock, under
|
|
509
|
+
* `requestTimeoutMs`. When the deadline fires, the section's signal aborts
|
|
510
|
+
* its request and its storage write and keeps it from writing anything
|
|
511
|
+
* more (`inTime`), and the call answers `onDeadlineArg()` at once, so the
|
|
512
|
+
* lock is released whatever the request or the storage still does.
|
|
513
|
+
*/
|
|
514
|
+
async withDeadline(sectionArg, onDeadlineArg = () => {
|
|
515
|
+
throw new RelyingPartyBearerClientError('request_failed');
|
|
516
|
+
}) {
|
|
517
|
+
const controller = new AbortController();
|
|
518
|
+
let timer;
|
|
519
|
+
const deadline = new Promise((resolve, reject) => {
|
|
520
|
+
timer = setTimeout(() => {
|
|
521
|
+
controller.abort(new RelyingPartyBearerClientError('request_failed'));
|
|
522
|
+
try {
|
|
523
|
+
resolve(onDeadlineArg());
|
|
524
|
+
}
|
|
525
|
+
catch (error) {
|
|
526
|
+
reject(error);
|
|
527
|
+
}
|
|
528
|
+
}, this.#requestTimeoutMs);
|
|
529
|
+
});
|
|
530
|
+
const section = sectionArg(controller.signal);
|
|
531
|
+
// past the deadline the section's own end, its aborted request among them, has nobody left to answer
|
|
532
|
+
section.catch(() => undefined);
|
|
533
|
+
try {
|
|
534
|
+
return await Promise.race([section, deadline]);
|
|
535
|
+
}
|
|
536
|
+
finally {
|
|
537
|
+
clearTimeout(timer);
|
|
538
|
+
}
|
|
539
|
+
}
|
|
540
|
+
/**
|
|
541
|
+
* A bearer API call: JSON in, JSON out, no cookie, no cache, no redirect.
|
|
542
|
+
* With `signalArg` none is sent past the deadline and an answer that
|
|
543
|
+
* arrives after it counts as none.
|
|
544
|
+
*/
|
|
545
|
+
async post(urlArg, bodyArg, headersArg = {}, signalArg) {
|
|
546
|
+
if (signalArg) {
|
|
547
|
+
inTime(signalArg);
|
|
548
|
+
}
|
|
549
|
+
let response;
|
|
550
|
+
try {
|
|
551
|
+
response = await this.#fetch(urlArg, {
|
|
552
|
+
method: 'POST',
|
|
553
|
+
headers: { 'content-type': 'application/json', ...headersArg },
|
|
554
|
+
body: JSON.stringify(bodyArg),
|
|
555
|
+
credentials: 'omit',
|
|
556
|
+
cache: 'no-store',
|
|
557
|
+
redirect: 'error',
|
|
558
|
+
referrerPolicy: 'no-referrer',
|
|
559
|
+
...(signalArg ? { signal: signalArg } : {}),
|
|
560
|
+
});
|
|
561
|
+
}
|
|
562
|
+
catch (error) {
|
|
563
|
+
throw new RelyingPartyBearerClientError('request_failed', { cause: error });
|
|
564
|
+
}
|
|
565
|
+
let answer;
|
|
566
|
+
try {
|
|
567
|
+
answer = await response.json();
|
|
568
|
+
}
|
|
569
|
+
catch {
|
|
570
|
+
// the parse error is not kept: its message quotes the body
|
|
571
|
+
answer = undefined;
|
|
572
|
+
if (signalArg) {
|
|
573
|
+
inTime(signalArg);
|
|
574
|
+
}
|
|
575
|
+
if (response.status === 200) {
|
|
576
|
+
throw new RelyingPartyBearerClientError('unexpected_answer', { status: 200 });
|
|
577
|
+
}
|
|
578
|
+
}
|
|
579
|
+
if (signalArg) {
|
|
580
|
+
inTime(signalArg);
|
|
581
|
+
}
|
|
582
|
+
if (response.status !== 200) {
|
|
583
|
+
throw new RelyingPartyBearerClientError('request_refused', {
|
|
584
|
+
status: response.status,
|
|
585
|
+
...(isRecord(answer) && isText(answer.error) ? { answerError: answer.error } : {}),
|
|
586
|
+
});
|
|
587
|
+
}
|
|
588
|
+
return answer;
|
|
589
|
+
}
|
|
590
|
+
}
|
|
591
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.relyingpartybearerclient.js","sourceRoot":"","sources":["../../ts_browser/classes.relyingpartybearerclient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iCAAiC,GAGlC,MAAM,uCAAuC,CAAC;AAY/C,OAAO,EAAE,iCAAiC,EAAE,CAAC;AAwJ7C,MAAM,OAAO,6BAA8B,SAAQ,KAAK;IAQpC,IAAI;IAPN,MAAM,CAAU;IAChC,8EAA8E;IAC9D,WAAW,CAAU;IACrC,0EAA0E;IAC1D,aAAa,CAAU;IAEvC,YACkB,IAAwC,EACxD,UAAU,GAAuF,EAAE;QAEnG,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;oBAHtE,IAAI;QAIpB,IAAI,CAAC,IAAI,GAAG,+BAA+B,CAAC;QAC5C,IAAI,UAAU,CAAC,MAAM,KAAK,SAAS;YAAE,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;QACrE,IAAI,UAAU,CAAC,WAAW,KAAK,SAAS;YAAE,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC,WAAW,CAAC;QACpF,IAAI,UAAU,CAAC,aAAa,KAAK,SAAS;YAAE,IAAI,CAAC,aAAa,GAAG,UAAU,CAAC,aAAa,CAAC;IAC5F,CAAC;CACF;AAED,MAAM,yBAAyB,GAAG,QAAQ,CAAC;AAC3C,MAAM,uBAAuB,GAAG,MAAM,CAAC;AACvC,MAAM,0BAA0B,GAAG,MAAM,CAAC;AAC1C,2FAA2F;AAC3F,MAAM,sBAAsB,GAAG,OAAO,CAAC;AACvC,0FAA0F;AAC1F,MAAM,wBAAwB,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC;AACjD,MAAM,sBAAsB,GAAG,4BAA4B,CAAC;AAC5D,MAAM,oBAAoB,GAAG,GAAG,CAAC;AACjC,gGAAgG;AAChG,MAAM,qBAAqB,GAAG,KAAK,CAAC;AACpC,0EAA0E;AAC1E,MAAM,YAAY,GAAG,EAAE,CAAC;AACxB,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAU,CAAC;AAE5D,MAAM,SAAS,GAAG,CAAC,QAAoB,EAAU,EAAE;IACjD,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,KAAK,MAAM,IAAI,IAAI,QAAQ;QAAE,MAAM,IAAI,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACjE,OAAO,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AAC/F,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,GAAW,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;AAEjH,6EAA6E;AAC7E,MAAM,eAAe,GAAG,KAAK,EAAE,WAAmB,EAAmB,EAAE,CACrE,SAAS,CAAC,IAAI,UAAU,CAAC,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;AAErH,MAAM,QAAQ,GAAG,CAAC,QAAiB,EAAuC,EAAE,CAC1E,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AAEhF,MAAM,MAAM,GAAG,CAAC,QAAiB,EAAsB,EAAE,CAAC,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;AAE9G,MAAM,MAAM,GAAG,CAAC,QAAiB,EAAsB,EAAE,CAAC,OAAO,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAEpH,uGAAuG;AACvG,MAAM,MAAM,GAAG,CAAC,SAAsB,EAAQ,EAAE;IAC9C,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;QACtB,MAAM,IAAI,6BAA6B,CAAC,gBAAgB,CAAC,CAAC;IAC5D,CAAC;AACH,CAAC,CAAC;AAEF,kFAAkF;AAClF,MAAM,WAAW,GAAG,CAAC,SAA0B,EAAE,OAAe,EAAsB,EAAE;IACtF,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACzC,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACrD,CAAC,CAAC;AAEF,qEAAqE;AACrE,MAAM,aAAa,GAAG,CAAC,SAAkB,EAAyC,EAAE;IAClF,IACE,CAAC,QAAQ,CAAC,SAAS,CAAC;WACjB,SAAS,CAAC,SAAS,KAAK,QAAQ;WAChC,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC;WAC9B,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC;WAC/B,CAAC,MAAM,CAAC,SAAS,CAAC,oBAAoB,CAAC;WACvC,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC;WAC5B,SAAS,CAAC,SAAS,IAAI,CAAC;WACxB,CAAC,MAAM,CAAC,SAAS,CAAC,qBAAqB,CAAC;WACxC,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC;WAC5B,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC;WACpC,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC;WACtC,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,EACvC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO;QACL,SAAS,EAAE,QAAQ;QACnB,WAAW,EAAE,SAAS,CAAC,WAAW;QAClC,oBAAoB,EAAE,SAAS,CAAC,oBAAoB;QACpD,SAAS,EAAE,SAAS,CAAC,SAAS;QAC9B,YAAY,EAAE,SAAS,CAAC,YAAY;QACpC,qBAAqB,EAAE,SAAS,CAAC,qBAAqB;QACtD,OAAO,EAAE;YACP,SAAS,EAAE,SAAS,CAAC,OAAO,CAAC,SAAS;YACtC,WAAW,EAAE,SAAS,CAAC,OAAO,CAAC,WAAW;YAC1C,SAAS,EAAE,SAAS,CAAC,OAAO,CAAC,SAAS;SACvC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,OAAO,wBAAwB;IACnB,MAAM,CAAS;IACtB,MAAM,CAAoE;IAC1E,QAAQ,CAAkC;IAC1C,SAAS,CAAS;IAClB,cAAc,CAAS;IACvB,iBAAiB,CAAS;IAC1B,MAAM,CAAc;IACpB,MAAM,CAA0B;IAChC,OAAO,CAA8C;IACrD,IAAI,CAAe;IAC5B,uEAAuE;IAC9D,eAAe,GAAG,IAAI,GAAG,EAAU,CAAC;IAE7C,YAAY,UAA4C;QACtD,MAAM,MAAM,GAAG,UAAU,EAAE,MAAM,CAAC;QAClC,IAAI,YAAY,GAAe,IAAI,CAAC;QACpC,IAAI,CAAC;YACH,YAAY,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACrE,CAAC;QAAC,MAAM,CAAC;YACP,YAAY,GAAG,IAAI,CAAC;QACtB,CAAC;QACD,IAAI,CAAC,YAAY,IAAI,YAAY,CAAC,MAAM,KAAK,MAAM,IAAI,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5G,MAAM,IAAI,KAAK,CAAC,+EAA+E,CAAC,CAAC;QACnG,CAAC;QACD,MAAM,MAAM,GAAG,UAAU,CAAC,eAAe,IAAI,yBAAyB,CAAC;QACvE,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,8BAA8B,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YAC/E,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;QAChF,CAAC;QACD,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;QACnC,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,CAAC,GAAG,KAAK,UAAU,IAAI,OAAO,OAAO,CAAC,GAAG,KAAK,UAAU,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;YAC9H,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;QAC1D,CAAC;QACD,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,IAAI,UAAU,CAAC,SAAS,EAAE,KAAK,CAAC;QAC9D,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;YAClD,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;QACxF,CAAC;QACD,IAAI,OAAO,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,UAAU,IAAI,OAAO,UAAU,CAAC,MAAM,CAAC,eAAe,KAAK,UAAU,EAAE,CAAC;YACvH,MAAM,IAAI,KAAK,CAAC,4GAA4G,CAAC,CAAC;QAChI,CAAC;QACD,MAAM,aAAa,GAAG,UAAU,CAAC,KAAK,IAAI,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAC7E,IAAI,OAAO,aAAa,KAAK,UAAU,EAAE,CAAC;YACxC,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;QAC1D,CAAC;QACD,MAAM,aAAa,GAAG,UAAU,CAAC,aAAa,IAAI,uBAAuB,CAAC;QAC1E,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;YAC1D,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;QAC1E,CAAC;QACD,oFAAoF;QACpF,MAAM,gBAAgB,GAAG,UAAU,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,UAAU,CAAC,gBAAgB,CAAC;QAC9H,IACE,OAAO,gBAAgB,KAAK,QAAQ;eACjC,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;eAClC,gBAAgB,IAAI,CAAC;eACrB,gBAAgB,GAAG,sBAAsB,EAC5C,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,oDAAoD,sBAAsB,eAAe,CAAC,CAAC;QAC7G,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG;YACZ,KAAK,EAAE,GAAG,MAAM,GAAG,MAAM,cAAc;YACvC,KAAK,EAAE,GAAG,MAAM,GAAG,MAAM,cAAc;YACvC,OAAO,EAAE,GAAG,MAAM,GAAG,MAAM,gBAAgB;YAC3C,MAAM,EAAE,GAAG,MAAM,GAAG,MAAM,eAAe;SAC1C,CAAC;QACF,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,SAAS,GAAG,UAAU,CAAC,QAAQ,IAAI,yCAAyC,MAAM,EAAE,CAAC;QAC1F,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;QACpC,IAAI,CAAC,iBAAiB,GAAG,gBAAgB,CAAC;QAC1C,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,MAAM,GAAG,aAAa,CAAC;QAC5B,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,MAAM,IAAK,UAA2D,CAAC,MAAM,CAAC;QACxG,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC;IACzC,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,WAAW,CAAC,UAGxB;QACC,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,UAAU,IAAK,EAAwB,CAAC;QAC7E,IAAI,UAAU,KAAK,KAAK,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;YACnD,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACjE,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;QACzE,CAAC;QACD,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;QACvC,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;QAChC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QAChD,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;QACpD,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,gBAAgB,EAAE,MAAM,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC;QAC5E,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC;QACtD,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACrC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC;IAC1E,CAAC;IAED;;;;;;;;OAQG;IACI,KAAK,CAAC,qBAAqB,CAChC,QAA2D;QAE3D,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QACpC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;YACtE,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,SAAS,GAAG,GAAG,CAAC,YAAY,CAAC;QACnC,MAAM,IAAI,GAAG,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAC5C,MAAM,KAAK,GAAG,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC9C,MAAM,KAAK,GAAG,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC9C,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/B,KAAK,MAAM,IAAI,IAAI,eAAe,EAAE,CAAC;YACnC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC;QACD,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/F,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,UAAU,KAAK,KAAK,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,QAAQ,CAAC,KAAK,EAAE,CAAC;YAClG,MAAM,IAAI,6BAA6B,CAAC,gBAAgB,CAAC,CAAC;QAC5D,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC;IAED;;;;;;;OAOG;IACI,cAAc,CACnB,QAAwC,EACxC,UAAU,GAAoC,EAAE;QAEhD,IAAI,MAAuC,CAAC;QAC5C,IAAI,CAAC;YACH,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;YAC9B,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,UAAU,KAAK,OAAO,EAAE,CAAC;gBACjD,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;YACxD,CAAC;YACD,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC7C,MAAM,IAAI,6BAA6B,CAAC,kBAAkB,CAAC,CAAC;YAC9D,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;QACD,IAAI,KAAsC,CAAC;QAC3C,IAAI,CAAC;YACH,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,EAAE,UAAU,CAAC,cAAc,IAAI,sBAAsB,CAAC,CAAC;QACnG,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;QACD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,6BAA6B,CAAC,eAAe,CAAC,CAAC,CAAC;QAC5E,CAAC;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;IAChE,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,WAAW;QACtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QACzC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACzB,OAAO,MAAM,CAAC,WAAW,CAAC;QAC5B,CAAC;QACD,OAAO,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,EAAE,WAAW,IAAI,IAAI,CAAC;IAC7E,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,OAAO,CAAC,sBAA+B;QAClD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QACzC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,sBAAsB,IAAI,IAAI,CAAC,CAAC;IAC1E,CAAC;IAED;;;;;;;;;OASG;IACI,KAAK,CAAC,MAAM;QACjB,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,MAAM,UAAU,GAAG,CAAC,QAAiB,EAAE,EAAE,CAAC,IAAI,6BAA6B,CAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;QACxH,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE;YACrF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;YAC1C,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO,KAAK,CAAC;YACf,CAAC;YACD,MAAM,CAAC,SAAS,CAAC,CAAC;YAClB,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;YACjD,OAAO,GAAG,IAAI,CAAC;YACf,IAAI,CAAC;gBACH,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YACrD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,UAAU,CAAC,KAAK,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC,EAAE,GAAG,EAAE;YACN,sFAAsF;YACtF,MAAM,OAAO,GAAG,IAAI,6BAA6B,CAAC,gBAAgB,CAAC,CAAC;YACpE,MAAM,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;QAChD,CAAC,CAAC,CAAC,CAAC;IACN,CAAC;IAEO,aAAa;QACnB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;QACnF,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAEO,OAAO,CAAC,SAA0C;QACxD,MAAM,UAAU,GAAG,SAAS,CAAC,SAAS,GAAG,KAAK,CAAC;QAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,UAAU,GAAG,CAAC,CAAC,CAAC;QAC7D,OAAO,IAAI,CAAC,IAAI,EAAE,GAAG,SAAS,CAAC,UAAU,GAAG,UAAU,GAAG,MAAM,CAAC;IAClE,CAAC;IAED,4GAA4G;IACpG,KAAK,CAAC,OAAO,CACnB,QAAwC,EACxC,OAAgB,EAChB,QAAiB;QAEjB,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC7C,MAAM,IAAI,6BAA6B,CAAC,kBAAkB,CAAC,CAAC;QAC9D,CAAC;QACD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,MAAM,IAAI,6BAA6B,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,mBAAmB,EAAE;gBACxH,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACzD,CAAC,CAAC;QACL,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YACrB,MAAM,IAAI,6BAA6B,CAAC,mBAAmB,CAAC,CAAC;QAC/D,CAAC;QACD,8HAA8H;QAC9H,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,CAAC,SAAS,EAAE,EAAE,CACjE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,CAAC,YAAY,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;QACxG,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,6BAA6B,CAAC,mBAAmB,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;QAChF,CAAC;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,EAAE,GAAG,MAAM,EAAE,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAClE,CAAC;IAED;;;;;;;OAOG;IACK,WAAW,CAAC,SAA0C;QAC5D,0FAA0F;QAC1F,IAAI,UAAU,GAA0C,IAAI,CAAC;QAC7D,MAAM,UAAU,GAAG,CAAC,QAAiB,EAAkC,EAAE,CAAC,CAAC;YACzE,MAAM,EAAE,SAAS;YACjB,eAAe,EAAE,8BAA8B;YAC/C,oBAAoB,EAAE,QAAQ,YAAY,6BAA6B;gBACrE,CAAC,CAAC,QAAQ;gBACV,CAAC,CAAC,IAAI,6BAA6B,CAAC,mBAAmB,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;SAChF,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAiC,KAAK,EAAE,SAAS,EAAE,EAAE;YACrH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;YAC3C,MAAM,CAAC,SAAS,CAAC,CAAC;YAClB,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;YAC1D,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,qBAAqB,EAAE,CAAC;YACvE,CAAC;YACD,IAAI,QAAQ,CAAC,OAAO,CAAC,SAAS,KAAK,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;gBAC/D,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,cAAc,EAAE,CAAC;YAChE,CAAC;YACD,UAAU,GAAG,UAAU,CAAC,IAAI,6BAA6B,CAAC,gBAAgB,CAAC,CAAC,CAAC;YAC7E,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;gBAC7C,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,wBAAwB,EAAE,CAAC;YAC1E,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC,EAAE,GAAG,EAAE;YACN,qFAAqF;YACrF,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,MAAM,IAAI,6BAA6B,CAAC,gBAAgB,CAAC,CAAC;YAC5D,CAAC;YACD,OAAO,UAAU,CAAC;QACpB,CAAC,CAAC,CAAC,CAAC;IACN,CAAC;IAEO,YAAY,CAClB,SAA0C,EAC1C,QAAkC,EAClC,QAAwC,EACxC,UAA2C;QAE3C,OAAO,IAAI,OAAO,CAAiC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrE,MAAM,QAAQ,GAAsB,EAAE,CAAC;YACvC,IAAI,OAAO,GAAG,KAAK,CAAC;YACpB,MAAM,MAAM,GAAG,CAAC,SAAqB,EAAE,EAAE;gBACvC,IAAI,OAAO,EAAE,CAAC;oBACZ,OAAO;gBACT,CAAC;gBACD,OAAO,GAAG,IAAI,CAAC;gBACf,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;oBAC/B,OAAO,EAAE,CAAC;gBACZ,CAAC;gBACD,SAAS,EAAE,CAAC;YACd,CAAC,CAAC;YACF,MAAM,IAAI,GAAG,CAAC,QAAiB,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;YAEnE,MAAM,SAAS,GAAG,CAAC,QAAyC,EAAE,EAAE;gBAC9D,MAAM,IAAI,GAAY,QAAQ,EAAE,IAAI,CAAC;gBACrC,IACE,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC,MAAM;uBAC7B,QAAQ,CAAC,MAAM,KAAK,QAAQ;uBAC5B,CAAC,QAAQ,CAAC,IAAI,CAAC;uBACf,IAAI,CAAC,IAAI,KAAK,iCAAiC;uBAC/C,IAAI,CAAC,KAAK,KAAK,QAAQ,CAAC,KAAK,EAChC,CAAC;oBACD,OAAO;gBACT,CAAC;gBACD,MAAM,CAAC,GAAG,EAAE;oBACV,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;gBACtE,CAAC,CAAC,CAAC;YACL,CAAC,CAAC;YACF,SAAS,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;YACjD,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,mBAAmB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;YAEzE,MAAM,OAAO,GAAG,UAAU,CACxB,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,6BAA6B,CAAC,eAAe,CAAC,CAAC,EAC9D,UAAU,CAAC,SAAS,IAAI,wBAAwB,CACjD,CAAC;YACF,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;YAC3C,IAAI,WAAsD,CAAC;YAC3D,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE;gBAClC,IAAI,QAAQ,CAAC,MAAM,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;oBACjD,WAAW,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,6BAA6B,CAAC,cAAc,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAC;gBACjH,CAAC;YACH,CAAC,EAAE,oBAAoB,CAAC,CAAC;YACzB,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE;gBACjB,aAAa,CAAC,UAAU,CAAC,CAAC;gBAC1B,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;oBAC9B,YAAY,CAAC,WAAW,CAAC,CAAC;gBAC5B,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;YACjC,IAAI,MAAM,EAAE,CAAC;gBACX,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;oBACnB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;oBACpB,OAAO;gBACT,CAAC;gBACD,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAC1C,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC1D,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;YACpE,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;;OAOG;IACK,MAAM,CACZ,mBAA2B,EAC3B,sBAAqC;QAErC,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE;YACrF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;YAC1C,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO,IAAI,CAAC;YACd,CAAC;YACD,IACE,OAAO,CAAC,YAAY,KAAK,mBAAmB;mBACzC,CAAC,sBAAsB,KAAK,IAAI,IAAI,OAAO,CAAC,WAAW,KAAK,sBAAsB,CAAC,EACtF,CAAC;gBACD,OAAO,OAAO,CAAC;YACjB,CAAC;YACD,IAAI,MAA6C,CAAC;YAClD,IAAI,CAAC;gBACH,MAAM,GAAG,aAAa,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC,CAAC;YACtH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,KAAK,YAAY,6BAA6B,IAAI,KAAK,CAAC,WAAW,KAAK,sBAAsB,EAAE,CAAC;oBACnG,wDAAwD;oBACxD,MAAM,CAAC,SAAS,CAAC,CAAC;oBAClB,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;oBACjD,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,MAAM,KAAK,CAAC;YACd,CAAC;YACD,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,IAAI,6BAA6B,CAAC,mBAAmB,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;YAChF,CAAC;YACD,MAAM,MAAM,GAAoC,EAAE,GAAG,MAAM,EAAE,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;YACvF,MAAM,CAAC,SAAS,CAAC,CAAC;YAClB,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;YACvD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC,CAAC;IACN,CAAC;IAED,qGAAqG;IAC7F,KAAK,CAAC,YAAY,CAAC,OAAwC,EAAE,SAAsB;QACzF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAC5B,IAAI,CAAC,MAAM,CAAC,MAAM,EAClB,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,EACtC,EAAE,aAAa,EAAE,UAAU,OAAO,CAAC,WAAW,EAAE,EAAE,EAClD,SAAS,CACV,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,OAAO,MAAM,CAAC,gBAAgB,KAAK,SAAS,EAAE,CAAC;YACtE,MAAM,IAAI,6BAA6B,CAAC,mBAAmB,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;QAChF,CAAC;QACD,OAAQ,MAAqD,CAAC,gBAAgB,CAAC;IACjF,CAAC;IAED;;;;;;OAMG;IACK,KAAK,CAAC,YAAY,CACxB,UAAkD,EAClD,aAAa,GAAY,GAAG,EAAE;QAC5B,MAAM,IAAI,6BAA6B,CAAC,gBAAgB,CAAC,CAAC;IAC5D,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;QACzC,IAAI,KAAgD,CAAC;QACrD,MAAM,QAAQ,GAAG,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAClD,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;gBACtB,UAAU,CAAC,KAAK,CAAC,IAAI,6BAA6B,CAAC,gBAAgB,CAAC,CAAC,CAAC;gBACtE,IAAI,CAAC;oBACH,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;gBAC3B,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,KAAK,CAAC,CAAC;gBAChB,CAAC;YACH,CAAC,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC9C,qGAAqG;QACrG,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QAC/B,IAAI,CAAC;YACH,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;QACjD,CAAC;gBAAS,CAAC;YACT,YAAY,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,IAAI,CAChB,MAAc,EACd,OAA+B,EAC/B,UAAU,GAA2B,EAAE,EACvC,SAAuB;QAEvB,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,CAAC,SAAS,CAAC,CAAC;QACpB,CAAC;QACD,IAAI,QAAkB,CAAC;QACvB,IAAI,CAAC;YACH,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;gBACnC,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,GAAG,UAAU,EAAE;gBAC9D,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;gBAC7B,WAAW,EAAE,MAAM;gBACnB,KAAK,EAAE,UAAU;gBACjB,QAAQ,EAAE,OAAO;gBACjB,cAAc,EAAE,aAAa;gBAC7B,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC5C,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,6BAA6B,CAAC,gBAAgB,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QAC9E,CAAC;QACD,IAAI,MAAe,CAAC;QACpB,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACjC,CAAC;QAAC,MAAM,CAAC;YACP,2DAA2D;YAC3D,MAAM,GAAG,SAAS,CAAC;YACnB,IAAI,SAAS,EAAE,CAAC;gBACd,MAAM,CAAC,SAAS,CAAC,CAAC;YACpB,CAAC;YACD,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBAC5B,MAAM,IAAI,6BAA6B,CAAC,mBAAmB,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;YAChF,CAAC;QACH,CAAC;QACD,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,CAAC,SAAS,CAAC,CAAC;QACpB,CAAC;QACD,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAC5B,MAAM,IAAI,6BAA6B,CAAC,iBAAiB,EAAE;gBACzD,MAAM,EAAE,QAAQ,CAAC,MAAM;gBACvB,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACnF,CAAC,CAAC;QACL,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}
|
package/dist_ts_browser/index.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export * from './classes.idpclient.js';
|
|
2
2
|
export * from './classes.idprequests.js';
|
|
3
3
|
export * from './secret-delivery.js';
|
|
4
|
-
|
|
4
|
+
export * from './classes.relyingpartybearerclient.js';
|
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90c19icm93c2VyL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsd0JBQXdCLENBQUM7QUFDdkMsY0FBYywwQkFBMEIsQ0FBQztBQUN6QyxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsdUNBQXVDLENBQUMifQ==
|
|
@@ -12,4 +12,4 @@ import * as smarttime from '@push.rocks/smarttime';
|
|
|
12
12
|
import * as smarturl from '@push.rocks/smarturl';
|
|
13
13
|
import * as webstore from '@push.rocks/webstore';
|
|
14
14
|
export { smartjson, smartjwtWeb, smartpromise, smartrx, smarttime, smarturl, webstore };
|
|
15
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
15
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzX2Jyb3dzZXIvcGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssYUFBYSxNQUFNLHdCQUF3QixDQUFDO0FBRXhELE9BQU8sRUFBRSxhQUFhLEVBQUUsQ0FBQztBQUV6QixPQUFPLEtBQUssWUFBWSxNQUFNLDBCQUEwQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxzQkFBc0IsTUFBTSxxQ0FBcUMsQ0FBQztBQUM5RSxPQUFPLEtBQUssV0FBVyxNQUFNLHlCQUF5QixDQUFDO0FBRXZELE9BQU8sRUFBRSxZQUFZLEVBQUUsc0JBQXNCLEVBQUUsV0FBVyxFQUFFLENBQUM7QUFFN0QsT0FBTyxLQUFLLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRCxPQUFPLEtBQUssV0FBVyxNQUFNLDBCQUEwQixDQUFDO0FBQ3hELE9BQU8sS0FBSyxZQUFZLE1BQU0sMEJBQTBCLENBQUM7QUFDekQsT0FBTyxLQUFLLE9BQU8sTUFBTSxxQkFBcUIsQ0FBQztBQUMvQyxPQUFPLEtBQUssU0FBUyxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sS0FBSyxRQUFRLE1BQU0sc0JBQXNCLENBQUM7QUFDakQsT0FBTyxLQUFLLFFBQVEsTUFBTSxzQkFBc0IsQ0FBQztBQUVqRCxPQUFPLEVBQUUsU0FBUyxFQUFFLFdBQVcsRUFBRSxZQUFZLEVBQUUsT0FBTyxFQUFFLFNBQVMsRUFBRSxRQUFRLEVBQUUsUUFBUSxFQUFFLENBQUMifQ==
|