@molecule/api-resource-user 1.1.1 → 1.2.1
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/README.md +2 -1
- package/dist/authorization.d.ts +20 -1
- package/dist/authorization.d.ts.map +1 -1
- package/dist/authorization.js +7 -3
- package/dist/authorization.js.map +1 -1
- package/dist/handlers/create.d.ts +2 -12
- package/dist/handlers/create.d.ts.map +1 -1
- package/dist/handlers/create.js +4 -1
- package/dist/handlers/create.js.map +1 -1
- package/dist/handlers/logIn.d.ts +2 -36
- package/dist/handlers/logIn.d.ts.map +1 -1
- package/dist/handlers/logIn.js +5 -1
- package/dist/handlers/logIn.js.map +1 -1
- package/dist/handlers/logInOAuth.d.ts +1 -18
- package/dist/handlers/logInOAuth.d.ts.map +1 -1
- package/dist/handlers/logInOAuth.js +5 -1
- package/dist/handlers/logInOAuth.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -3,7 +3,7 @@ AUTO-GENERATED — DO NOT EDIT THIS FILE.
|
|
|
3
3
|
Generated by `mlcl sync-docs` from the package's src/index.ts JSDoc + mlcl/registry.json.
|
|
4
4
|
Edits here are overwritten on the next commit (molecule's pre-commit hook regenerates).
|
|
5
5
|
To change this document, edit the module-level JSDoc in src/index.ts.
|
|
6
|
-
Generated: 2026-08-
|
|
6
|
+
Generated: 2026-08-14T16:52:47.963Z
|
|
7
7
|
-->
|
|
8
8
|
|
|
9
9
|
# @molecule/api-resource-user
|
|
@@ -511,6 +511,7 @@ Members:
|
|
|
511
511
|
- `authorization.invalidateDeviceExistsCache` — function: Evict a single device's positive entry from the device-exists cache so the
|
|
512
512
|
- `authorization.invalidateAllDeviceExistsCache` — function: Evict ALL positive entries from the device-exists cache.
|
|
513
513
|
- `authorization.set` — function: Set authorization headers and cookie for a session.
|
|
514
|
+
- `authorization.VerifyMiddlewareOptions` — interface: Options for {@link verifyMiddleware}.
|
|
514
515
|
- `authorization.verifyMiddleware` — function: Middleware that verifies the JWT token from the `Authorization` header and sets `res.locals.session`.
|
|
515
516
|
|
|
516
517
|
#### `authorizers`
|
package/dist/authorization.d.ts
CHANGED
|
@@ -98,10 +98,29 @@ export declare const invalidateAllDeviceExistsCache: () => void;
|
|
|
98
98
|
* @returns The signed JWT token string, or null if signing failed.
|
|
99
99
|
*/
|
|
100
100
|
export declare const set: (_req: MoleculeRequest, res: MoleculeResponse, session: Session) => string | null;
|
|
101
|
+
/** Options for {@link verifyMiddleware}. */
|
|
102
|
+
export interface VerifyMiddlewareOptions {
|
|
103
|
+
/**
|
|
104
|
+
* Decide whether an aging token may be transparently re-issued for this
|
|
105
|
+
* session. The auto-refresh calls `set()`, which rewrites the session cookies
|
|
106
|
+
* AND the non-httpOnly `mol_auth` presence hint — the signal the auth client
|
|
107
|
+
* uses to hydrate a signed-in user on the next page load. Return `false` to
|
|
108
|
+
* skip the refresh for sessions that must never mint that hint (e.g. an
|
|
109
|
+
* anonymous/guest session whose httpOnly cookie authenticates API calls but
|
|
110
|
+
* whose user must not appear signed-in client-side). A thrown error is
|
|
111
|
+
* treated as `false` (refresh is best-effort and fails safe: no hint).
|
|
112
|
+
* Defaults to refreshing every session.
|
|
113
|
+
* @param session - The verified session about to be refreshed.
|
|
114
|
+
* @param req - The current request.
|
|
115
|
+
* @returns Whether the session may be re-issued.
|
|
116
|
+
*/
|
|
117
|
+
shouldRefreshSession?: (session: Session, req: MoleculeRequest) => boolean | Promise<boolean>;
|
|
118
|
+
}
|
|
101
119
|
/**
|
|
102
120
|
* Middleware that verifies the JWT token from the `Authorization` header and sets `res.locals.session`.
|
|
103
121
|
* Falls back to cookie-based session for browser clients. Auto-refreshes tokens older than `JWT_REFRESH_TIME`.
|
|
122
|
+
* @param options - {@link VerifyMiddlewareOptions} controlling the auto-refresh.
|
|
104
123
|
* @returns An Express-compatible middleware function.
|
|
105
124
|
*/
|
|
106
|
-
export declare const verifyMiddleware: () => MoleculeRequestHandler;
|
|
125
|
+
export declare const verifyMiddleware: (options?: VerifyMiddlewareOptions) => MoleculeRequestHandler;
|
|
107
126
|
//# sourceMappingURL=authorization.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authorization.d.ts","sourceRoot":"","sources":["../src/authorization.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,cAAc,CAAA;AAMrB,OAAO,KAAK,EACV,eAAe,EACf,sBAAsB,EACtB,gBAAgB,EACjB,MAAM,wBAAwB,CAAA;AAE/B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAwB1C;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,iBAAiB,GAAI,MAAM,MAAM,KAAG,MACP,CAAA;AA4B1C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,eAAO,MAAM,oBAAoB,QAAO;IACtC,MAAM,EAAE,OAAO,CAAA;IACf,QAAQ,EAAE,KAAK,GAAG,MAAM,CAAA;IACxB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,IAAI,EAAE,MAAM,CAAA;CAQb,CAAA;AAiDD;;;;;;;;;GASG;AACH,eAAO,MAAM,2BAA2B,GAAI,UAAU,MAAM,KAAG,IAE9D,CAAA;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,8BAA8B,QAAO,IAEjD,CAAA;AAsDD;;;;;;;GAOG;AACH,eAAO,MAAM,GAAG,GACd,MAAM,eAAe,EACrB,KAAK,gBAAgB,EACrB,SAAS,OAAO,KACf,MAAM,GAAG,IA6DX,CAAA;AAED
|
|
1
|
+
{"version":3,"file":"authorization.d.ts","sourceRoot":"","sources":["../src/authorization.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,cAAc,CAAA;AAMrB,OAAO,KAAK,EACV,eAAe,EACf,sBAAsB,EACtB,gBAAgB,EACjB,MAAM,wBAAwB,CAAA;AAE/B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAwB1C;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,iBAAiB,GAAI,MAAM,MAAM,KAAG,MACP,CAAA;AA4B1C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,eAAO,MAAM,oBAAoB,QAAO;IACtC,MAAM,EAAE,OAAO,CAAA;IACf,QAAQ,EAAE,KAAK,GAAG,MAAM,CAAA;IACxB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,IAAI,EAAE,MAAM,CAAA;CAQb,CAAA;AAiDD;;;;;;;;;GASG;AACH,eAAO,MAAM,2BAA2B,GAAI,UAAU,MAAM,KAAG,IAE9D,CAAA;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,8BAA8B,QAAO,IAEjD,CAAA;AAsDD;;;;;;;GAOG;AACH,eAAO,MAAM,GAAG,GACd,MAAM,eAAe,EACrB,KAAK,gBAAgB,EACrB,SAAS,OAAO,KACf,MAAM,GAAG,IA6DX,CAAA;AAED,4CAA4C;AAC5C,MAAM,WAAW,uBAAuB;IACtC;;;;;;;;;;;;;OAaG;IACH,oBAAoB,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,eAAe,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;CAC9F;AAED;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,GAC1B,UAAU,uBAAuB,KAAG,sBA4EpC,CAAA"}
|
package/dist/authorization.js
CHANGED
|
@@ -307,9 +307,10 @@ export const set = (_req, res, session) => {
|
|
|
307
307
|
/**
|
|
308
308
|
* Middleware that verifies the JWT token from the `Authorization` header and sets `res.locals.session`.
|
|
309
309
|
* Falls back to cookie-based session for browser clients. Auto-refreshes tokens older than `JWT_REFRESH_TIME`.
|
|
310
|
+
* @param options - {@link VerifyMiddlewareOptions} controlling the auto-refresh.
|
|
310
311
|
* @returns An Express-compatible middleware function.
|
|
311
312
|
*/
|
|
312
|
-
export const verifyMiddleware = () => async (req, res, next) => {
|
|
313
|
+
export const verifyMiddleware = (options) => async (req, res, next) => {
|
|
313
314
|
try {
|
|
314
315
|
// Get token from Authorization header, falling back to the `token`
|
|
315
316
|
// cookie that `set()` writes alongside the header. The JSDoc above
|
|
@@ -354,7 +355,8 @@ export const verifyMiddleware = () => async (req, res, next) => {
|
|
|
354
355
|
const decoded = decode(token);
|
|
355
356
|
if (decoded?.iat) {
|
|
356
357
|
const tokenAge = Date.now() - decoded.iat * 1000;
|
|
357
|
-
if (tokenAge > getJwtRefreshTime()
|
|
358
|
+
if (tokenAge > getJwtRefreshTime() &&
|
|
359
|
+
(await options?.shouldRefreshSession?.(session, req)) !== false) {
|
|
358
360
|
// Update device last seen timestamp via bond.
|
|
359
361
|
await get('device')?.updateLastSeen(session.deviceId);
|
|
360
362
|
// Issue a fresh token.
|
|
@@ -363,7 +365,9 @@ export const verifyMiddleware = () => async (req, res, next) => {
|
|
|
363
365
|
}
|
|
364
366
|
}
|
|
365
367
|
catch (_error) {
|
|
366
|
-
// Non-critical — token refresh is best-effort; continue with existing
|
|
368
|
+
// Non-critical — token refresh is best-effort; continue with existing
|
|
369
|
+
// session. A throwing shouldRefreshSession lands here too, which is the
|
|
370
|
+
// safe direction: no re-issue, no `mol_auth` hint.
|
|
367
371
|
}
|
|
368
372
|
}
|
|
369
373
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authorization.js","sourceRoot":"","sources":["../src/authorization.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"authorization.js","sourceRoot":"","sources":["../src/authorization.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,19 +34,9 @@ export declare const create: ({ name, tableName, schema }: types.Resource) => (r
|
|
|
34
34
|
} | {
|
|
35
35
|
statusCode: number;
|
|
36
36
|
body: {
|
|
37
|
-
props:
|
|
38
|
-
username?: string | undefined;
|
|
39
|
-
name?: string | undefined;
|
|
40
|
-
email?: string | null | undefined;
|
|
41
|
-
id: string;
|
|
42
|
-
};
|
|
37
|
+
props: Record<string, unknown>;
|
|
43
38
|
accessToken: string | null;
|
|
44
|
-
user:
|
|
45
|
-
username?: string | undefined;
|
|
46
|
-
name?: string | undefined;
|
|
47
|
-
email?: string | null | undefined;
|
|
48
|
-
id: string;
|
|
49
|
-
};
|
|
39
|
+
user: Record<string, unknown>;
|
|
50
40
|
};
|
|
51
41
|
}>;
|
|
52
42
|
//# sourceMappingURL=create.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../src/handlers/create.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAI/E,OAAO,KAAK,KAAK,KAAK,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../src/handlers/create.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAI/E,OAAO,KAAK,KAAK,KAAK,MAAM,aAAa,CAAA;AAOzC,mFAAmF;AACnF,MAAM,WAAW,aAAc,SAAQ,eAAe;IACpD,IAAI,EAAE,KAAK,CAAC,WAAW,GAAG;QACxB,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,UAAU,CAAC,EAAE,MAAM,CAAA;KACpB,CAAA;CACF;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,MAAM,GAAI,6BAA6B,KAAK,CAAC,QAAQ,MAOlD,KAAK,aAAa,EAAE,KAAK,gBAAgB;;;;;aALrD,CAAJ;;;;;;;;;;;;;;;;EAqNC,CAAA"}
|
package/dist/handlers/create.js
CHANGED
|
@@ -6,6 +6,7 @@ import { hash } from '@molecule/api-password';
|
|
|
6
6
|
import { create as resourceCreate } from '@molecule/api-resource';
|
|
7
7
|
import * as authorization from '../authorization.js';
|
|
8
8
|
import { normalizeEmail } from '../utilities/normalizeEmail.js';
|
|
9
|
+
import { stripSensitiveUserColumns } from '../utilities/stripSensitiveUserColumns.js';
|
|
9
10
|
const analytics = getAnalytics();
|
|
10
11
|
const logger = getLogger();
|
|
11
12
|
/**
|
|
@@ -183,7 +184,9 @@ export const create = ({ name, tableName, schema }) => {
|
|
|
183
184
|
.catch(() => { });
|
|
184
185
|
// Include accessToken and user in the response body so the frontend
|
|
185
186
|
// auth client can store them (it expects { accessToken, user }).
|
|
186
|
-
|
|
187
|
+
// Never echo secret columns (a consuming app may write e.g. an email-
|
|
188
|
+
// confirmation token onto the row) — same denylist as a self-read.
|
|
189
|
+
const user = stripSensitiveUserColumns((createdResponse.body?.props ?? { id, ...props }));
|
|
187
190
|
return {
|
|
188
191
|
statusCode: 201,
|
|
189
192
|
body: { props: user, accessToken, user },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/handlers/create.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,IAAI,IAAI,EAAE,MAAM,MAAM,CAAA;AAEjC,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AACjE,OAAO,EAAE,MAAM,IAAI,WAAW,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AACvE,OAAO,EAAE,CAAC,EAAE,MAAM,oBAAoB,CAAA;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAA;AAE7C,OAAO,EAAE,MAAM,IAAI,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAEjE,OAAO,KAAK,aAAa,MAAM,qBAAqB,CAAA;AAEpD,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAA;
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/handlers/create.ts"],"names":[],"mappings":"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"}
|
package/dist/handlers/logIn.d.ts
CHANGED
|
@@ -46,43 +46,9 @@ export declare const logIn: ({ name: _name, tableName, schema: _schema }: types.
|
|
|
46
46
|
} | {
|
|
47
47
|
statusCode: number;
|
|
48
48
|
body: {
|
|
49
|
-
props:
|
|
50
|
-
id: string;
|
|
51
|
-
createdAt: string;
|
|
52
|
-
updatedAt: string;
|
|
53
|
-
username?: string | undefined;
|
|
54
|
-
name?: string | undefined;
|
|
55
|
-
email?: string | null | undefined;
|
|
56
|
-
emailVerified?: boolean | undefined;
|
|
57
|
-
avatar?: string | null | undefined;
|
|
58
|
-
bio?: string | null | undefined;
|
|
59
|
-
twoFactorEnabled?: boolean | undefined;
|
|
60
|
-
oauthServer?: string | undefined;
|
|
61
|
-
oauthId?: string | undefined;
|
|
62
|
-
oauthData?: Record<string, unknown> | undefined;
|
|
63
|
-
planKey?: string | undefined;
|
|
64
|
-
planExpiresAt?: string | undefined;
|
|
65
|
-
planAutoRenews?: boolean | undefined;
|
|
66
|
-
};
|
|
49
|
+
props: Record<string, unknown>;
|
|
67
50
|
accessToken: string | null;
|
|
68
|
-
user:
|
|
69
|
-
id: string;
|
|
70
|
-
createdAt: string;
|
|
71
|
-
updatedAt: string;
|
|
72
|
-
username?: string | undefined;
|
|
73
|
-
name?: string | undefined;
|
|
74
|
-
email?: string | null | undefined;
|
|
75
|
-
emailVerified?: boolean | undefined;
|
|
76
|
-
avatar?: string | null | undefined;
|
|
77
|
-
bio?: string | null | undefined;
|
|
78
|
-
twoFactorEnabled?: boolean | undefined;
|
|
79
|
-
oauthServer?: string | undefined;
|
|
80
|
-
oauthId?: string | undefined;
|
|
81
|
-
oauthData?: Record<string, unknown> | undefined;
|
|
82
|
-
planKey?: string | undefined;
|
|
83
|
-
planExpiresAt?: string | undefined;
|
|
84
|
-
planAutoRenews?: boolean | undefined;
|
|
85
|
-
};
|
|
51
|
+
user: Record<string, unknown>;
|
|
86
52
|
error?: undefined;
|
|
87
53
|
errorKey?: undefined;
|
|
88
54
|
twoFactorRequired?: undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logIn.d.ts","sourceRoot":"","sources":["../../src/handlers/logIn.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAG/E,OAAO,KAAK,KAAK,KAAK,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"logIn.d.ts","sourceRoot":"","sources":["../../src/handlers/logIn.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAG/E,OAAO,KAAK,KAAK,KAAK,MAAM,aAAa,CAAA;AAuBzC,oFAAoF;AACpF,MAAM,WAAW,YAAa,SAAQ,eAAe;IACnD,IAAI,EAAE;QACJ,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,kBAAkB,CAAC,EAAE,MAAM,CAAA;QAC3B,cAAc,CAAC,EAAE,MAAM,CAAA;QACvB,UAAU,CAAC,EAAE,MAAM,CAAA;KACpB,CAAA;CACF;AAED;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,KAAK,GAAI,6CAA6C,KAAK,CAAC,QAAQ,MACjE,KAAK,YAAY,EAAE,KAAK,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgNvD,CAAA"}
|
package/dist/handlers/logIn.js
CHANGED
|
@@ -7,6 +7,7 @@ import * as authorization from '../authorization.js';
|
|
|
7
7
|
import { hashResetToken } from '../utilities/hashResetToken.js';
|
|
8
8
|
import { normalizeEmail } from '../utilities/normalizeEmail.js';
|
|
9
9
|
import { notify } from '../utilities/notify.js';
|
|
10
|
+
import { stripSensitiveUserColumns } from '../utilities/stripSensitiveUserColumns.js';
|
|
10
11
|
const analytics = getAnalytics();
|
|
11
12
|
const logger = getLogger();
|
|
12
13
|
/**
|
|
@@ -209,7 +210,10 @@ export const logIn = ({ name: _name, tableName, schema: _schema }) => {
|
|
|
209
210
|
properties: { method: body.passwordResetToken ? 'reset_token' : 'password' },
|
|
210
211
|
})
|
|
211
212
|
.catch(() => { });
|
|
212
|
-
|
|
213
|
+
// `user` is a `SELECT *` row — strip secret columns (email-confirmation /
|
|
214
|
+
// reset tokens, OAuth material, app-added secrets) exactly like a self-read.
|
|
215
|
+
const safeUser = stripSensitiveUserColumns(user);
|
|
216
|
+
return { statusCode: 200, body: { props: safeUser, accessToken, user: safeUser } };
|
|
213
217
|
}
|
|
214
218
|
catch (error) {
|
|
215
219
|
logger.error(error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logIn.js","sourceRoot":"","sources":["../../src/handlers/logIn.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAA;AAEhC,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AACjE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACtE,OAAO,EAAE,CAAC,EAAE,MAAM,oBAAoB,CAAA;AACtC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAA;AAGtD,OAAO,KAAK,aAAa,MAAM,qBAAqB,CAAA;AAEpD,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAA;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAA;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"logIn.js","sourceRoot":"","sources":["../../src/handlers/logIn.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,24 +40,7 @@ export declare const logInOAuth: ({ name, tableName, schema }: types.Resource) =
|
|
|
40
40
|
} | {
|
|
41
41
|
statusCode: number;
|
|
42
42
|
body: {
|
|
43
|
-
props:
|
|
44
|
-
id: string;
|
|
45
|
-
createdAt: string;
|
|
46
|
-
updatedAt: string;
|
|
47
|
-
username?: string | undefined;
|
|
48
|
-
name?: string | undefined;
|
|
49
|
-
email?: string | null | undefined;
|
|
50
|
-
emailVerified?: boolean | undefined;
|
|
51
|
-
avatar?: string | null | undefined;
|
|
52
|
-
bio?: string | null | undefined;
|
|
53
|
-
twoFactorEnabled?: boolean | undefined;
|
|
54
|
-
oauthServer?: string | undefined;
|
|
55
|
-
oauthId?: string | undefined;
|
|
56
|
-
oauthData?: Record<string, unknown> | undefined;
|
|
57
|
-
planKey?: string | undefined;
|
|
58
|
-
planExpiresAt?: string | undefined;
|
|
59
|
-
planAutoRenews?: boolean | undefined;
|
|
60
|
-
};
|
|
43
|
+
props: Record<string, unknown>;
|
|
61
44
|
error?: undefined;
|
|
62
45
|
errorKey?: undefined;
|
|
63
46
|
twoFactorRequired?: undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logInOAuth.d.ts","sourceRoot":"","sources":["../../src/handlers/logInOAuth.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAK/E,OAAO,KAAK,KAAK,KAAK,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"logInOAuth.d.ts","sourceRoot":"","sources":["../../src/handlers/logInOAuth.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAK/E,OAAO,KAAK,KAAK,KAAK,MAAM,aAAa,CAAA;AAyBzC,4GAA4G;AAC5G,MAAM,WAAW,iBAAkB,SAAQ,eAAe;IACxD,IAAI,EAAE;QACJ,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,YAAY,CAAC,EAAE,MAAM,CAAA;QACrB,YAAY,CAAC,EAAE,MAAM,CAAA;QACrB,UAAU,CAAC,EAAE,MAAM,CAAA;KACpB,CAAA;CACF;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,UAAU,GAAI,6BAA6B,KAAK,CAAC,QAAQ,MAOtD,KAAK,iBAAiB,EAAE,KAAK,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;EAohB5D,CAAA"}
|
|
@@ -9,6 +9,7 @@ import * as authorization from '../authorization.js';
|
|
|
9
9
|
import { MAX_BIO_LENGTH } from '../schema.js';
|
|
10
10
|
import { fetchAvatarDataUri } from '../utilities/fetchAvatarDataUri.js';
|
|
11
11
|
import { normalizeEmail } from '../utilities/normalizeEmail.js';
|
|
12
|
+
import { stripSensitiveUserColumns } from '../utilities/stripSensitiveUserColumns.js';
|
|
12
13
|
const analytics = getAnalytics();
|
|
13
14
|
const logger = getLogger();
|
|
14
15
|
/**
|
|
@@ -486,7 +487,10 @@ export const logInOAuth = ({ name, tableName, schema }) => {
|
|
|
486
487
|
oauthServer: oauthProps.oauthServer,
|
|
487
488
|
oauthId: oauthProps.oauthId,
|
|
488
489
|
});
|
|
489
|
-
return {
|
|
490
|
+
return {
|
|
491
|
+
statusCode: 200,
|
|
492
|
+
body: { props: stripSensitiveUserColumns(user) },
|
|
493
|
+
};
|
|
490
494
|
}
|
|
491
495
|
catch (error) {
|
|
492
496
|
// Never log the raw error here: an OAuth verify failure rethrows an
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logInOAuth.js","sourceRoot":"","sources":["../../src/handlers/logInOAuth.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"logInOAuth.js","sourceRoot":"","sources":["../../src/handlers/logInOAuth.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAA;AAEhC,OAAO,EAAE,EAAE,IAAI,IAAI,EAAE,MAAM,MAAM,CAAA;AAEjC,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AACjE,OAAO,EAAE,GAAG,IAAI,SAAS,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,MAAM,IAAI,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAC7F,OAAO,EAAE,CAAC,EAAE,MAAM,oBAAoB,CAAA;AAEtC,OAAO,EAAE,MAAM,IAAI,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAEjE,OAAO,KAAK,aAAa,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAE7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAA;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAA;AAC/D,OAAO,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAA;AAErF,MAAM,SAAS,GAAG,YAAY,EAAE,CAAA;AAChC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;AAE1B;;;;;;;GAOG;AACH,MAAM,qBAAqB,GAAG,CAAC,CAAS,EAAE,CAAS,EAAW,EAAE;IAC9D,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACzB,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACzB,IAAI,EAAE,CAAC,MAAM,KAAK,EAAE,CAAC,MAAM,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAA;IACd,CAAC;IACD,OAAO,MAAM,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;AACvC,CAAC,CAAA;AAcD;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAkB,EAAE,EAAE;IACxE,MAAM,cAAc,GAAG,cAAc,CAAC;QACpC,IAAI;QACJ,SAAS;QACT,MAAM;KACP,CAAC,CAAA;IAEF,OAAO,KAAK,EAAE,GAAsB,EAAE,GAAqB,EAAE,EAAE;QAC7D,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAA;QAEpB,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YAC/B,OAAO;gBACL,UAAU,EAAE,GAAG;gBACf,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,uBAAuB,CAAC,EAAE,QAAQ,EAAE,uBAAuB,EAAE;aAC/E,CAAA;QACH,CAAC;QAED,2EAA2E;QAC3E,yEAAyE;QACzE,yEAAyE;QACzE,uEAAuE;QACvE,uEAAuE;QACvE,2EAA2E;QAC3E,0EAA0E;QAC1E,2EAA2E;QAC3E,6DAA6D;QAC7D,MAAM,YAAY,GAAG,SAAS,CAAS,qBAAqB,EAAE,MAAM,CAAC,KAAK,OAAO,CAAA;QACjF,IAAI,YAAY,EAAE,CAAC;YACjB,0EAA0E;YAC1E,8EAA8E;YAC9E,4EAA4E;YAC5E,8EAA8E;YAC9E,0EAA0E;YAC1E,4EAA4E;YAC5E,+EAA+E;YAC/E,0EAA0E;YAC1E,MAAM,YAAY,GAAI,GAAuD,CAAC,OAAO,CAAA;YACrF,MAAM,WAAW,GACf,SAAS,CAAS,UAAU,CAAC,KAAK,YAAY;gBAC5C,CAAC,CAAC,YAAY,EAAE,CAAC,aAAa,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;gBAChE,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,aAAa,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;oBAC/D,YAAY,EAAE,WAAW,CAAC,CAAA;YAChC,MAAM,UAAU,GAAG,GAElB,CAAA;YACD,0EAA0E;YAC1E,4EAA4E;YAC5E,gEAAgE;YAChE,oEAAoE;YACpE,wEAAwE;YACxE,mCAAmC;YACnC,MAAM,gBAAgB,GAAG,GAAS,EAAE;gBAClC,IAAI,OAAO,UAAU,CAAC,WAAW,KAAK,UAAU,EAAE,CAAC;oBACjD,UAAU,CAAC,WAAW,CAAC,aAAa,CAAC,iBAAiB,CAAC,aAAa,CAAC,EAAE;wBACrE,GAAG,aAAa,CAAC,oBAAoB,EAAE;qBACxC,CAAC,CAAA;oBACF,UAAU,CAAC,WAAW,CAAC,aAAa,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAA;gBACtD,CAAC;YACH,CAAC,CAAA;YACD,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,WAAW,IAAI,CAAC,qBAAqB,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBACnF,gBAAgB,EAAE,CAAA;gBAClB,OAAO;oBACL,UAAU,EAAE,GAAG;oBACf,IAAI,EAAE;wBACJ,KAAK,EAAE,CAAC,CAAC,+BAA+B,EAAE,SAAS,EAAE;4BACnD,YAAY,EAAE,6CAA6C;yBAC5D,CAAC;wBACF,QAAQ,EAAE,+BAA+B;qBAC1C;iBACF,CAAA;YACH,CAAC;YACD,gBAAgB,EAAE,CAAA;QACpB,CAAC;QAED,+EAA+E;QAC/E,kFAAkF;QAClF,mFAAmF;QACnF,8EAA8E;QAC9E,mFAAmF;QACnF,kFAAkF;QAClF,oFAAoF;QACpF,gFAAgF;QAChF,MAAM,eAAe,GAAI,GAAuD,CAAC,OAAO,CAAA;QACxF,MAAM,cAAc,GAClB,SAAS,CAAS,UAAU,CAAC,KAAK,YAAY;YAC5C,CAAC,CAAC,eAAe,EAAE,CAAC,aAAa,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;YACtE,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,aAAa,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;gBACrE,eAAe,EAAE,cAAc,CAAC,CAAA;QACtC,MAAM,kBAAkB,GAAG,GAE1B,CAAA;QACD,IAAI,OAAO,kBAAkB,CAAC,WAAW,KAAK,UAAU,EAAE,CAAC;YACzD,mEAAmE;YACnE,oEAAoE;YACpE,sCAAsC;YACtC,kBAAkB,CAAC,WAAW,CAAC,aAAa,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,EAAE;gBAChF,GAAG,aAAa,CAAC,oBAAoB,EAAE;aACxC,CAAC,CAAA;YACF,kBAAkB,CAAC,WAAW,CAAC,gBAAgB,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAA;QACjE,CAAC;QACD,MAAM,YAAY,GAAG,cAAc,IAAI,IAAI,CAAC,YAAY,CAAA;QAExD,MAAM,aAAa,GAAG,GAAG,CAuBtB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QACxB,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO;gBACL,UAAU,EAAE,GAAG;gBACf,IAAI,EAAE;oBACJ,KAAK,EAAE,CAAC,CAAC,qCAAqC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAO,EAAE,CAAC;oBACzE,QAAQ,EAAE,qCAAqC;iBAChD;aACF,CAAA;QACH,CAAC;QAED,IAAI,CAAC;YACH,kDAAkD;YAClD,gFAAgF;YAChF,+EAA+E;YAC/E,6EAA6E;YAC7E,6EAA6E;YAC7E,4EAA4E;YAC5E,2EAA2E;YAC3E,wEAAwE;YACxE,MAAM,eAAe,GAAI,GAAuD,CAAC,OAAO,CAAA;YACxF,MAAM,cAAc,GAClB,SAAS,CAAS,UAAU,CAAC,KAAK,YAAY;gBAC5C,CAAC,CAAC,eAAe,EAAE,CAAC,aAAa,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;gBACtE,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,aAAa,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;oBACrE,eAAe,EAAE,cAAc,CAAC,CAAA;YACtC,IAAI,OAAO,kBAAkB,CAAC,WAAW,KAAK,UAAU,EAAE,CAAC;gBACzD,kBAAkB,CAAC,WAAW,CAAC,aAAa,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,EAAE;oBAChF,GAAG,aAAa,CAAC,oBAAoB,EAAE;iBACxC,CAAC,CAAA;gBACF,kBAAkB,CAAC,WAAW,CAAC,gBAAgB,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAA;YACjE,CAAC;YACD,MAAM,SAAS,GAAG,SAAS,CAAS,YAAY,EAAE,EAAE,CAAC,CAAA;YACrD,0EAA0E;YAC1E,yEAAyE;YACzE,MAAM,gBAAgB,GACpB,OAAO,cAAc,KAAK,QAAQ;gBAClC,cAAc,CAAC,UAAU,CAAC,GAAG,CAAC;gBAC9B,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC;gBAChC,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAC5B,CAAC,CAAC,cAAc;gBAChB,CAAC,CAAC,EAAE,CAAA;YACR,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,MAAM,CAC3C,IAAI,CAAC,IAAI,EACT,YAAY,EACZ,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,GAAG,gBAAgB,EAAE,CAAC,CAAC,CAAC,SAAS,CAC1D,CAAA;YAED,IAAI,CAAC,UAAU,EAAE,OAAO,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,CAAC;gBACrD,SAAS;qBACN,KAAK,CAAC;oBACL,IAAI,EAAE,mBAAmB;oBACzB,UAAU,EAAE,EAAE,MAAM,EAAE,2BAA2B,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE;iBAC3E,CAAC;qBACD,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;gBAClB,OAAO;oBACL,UAAU,EAAE,GAAG;oBACf,IAAI,EAAE;wBACJ,KAAK,EAAE,CAAC,CAAC,oCAAoC,CAAC;wBAC9C,QAAQ,EAAE,oCAAoC;qBAC/C;iBACF,CAAA;YACH,CAAC;YAED,mEAAmE;YACnE,qEAAqE;YACrE,qEAAqE;YACrE,MAAM,KAAK,GAAG,cAAc,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;YAC9C,qEAAqE;YACrE,mEAAmE;YACnE,yBAAyB;YACzB,MAAM,kBAAkB,GAAG,UAAU,CAAC,aAAa,KAAK,IAAI,CAAA;YAE5D,qDAAqD;YACrD,IAAI,IAAI,GAAG,MAAM,OAAO,CAAc,SAAS,EAAE;gBAC/C,EAAE,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,UAAU,CAAC,WAAW,EAAE;gBACtE,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,UAAU,CAAC,OAAO,EAAE;aAC/D,CAAC,CAAA;YAEF,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,oEAAoE;gBACpE,kEAAkE;gBAClE,gEAAgE;gBAChE,qEAAqE;gBACrE,kCAAkC;gBAClC,EAAE;gBACF,kEAAkE;gBAClE,sEAAsE;gBACtE,sEAAsE;gBACtE,sEAAsE;gBACtE,kEAAkE;gBAClE,mEAAmE;gBACnE,wEAAwE;gBACxE,uEAAuE;gBACvE,kDAAkD;gBAClD,IAAI,KAAK,EAAE,CAAC;oBACV,MAAM,eAAe,GAAG,MAAM,OAAO,CAAc,SAAS,EAAE;wBAC5D,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE;qBAChD,CAAC,CAAA;oBACF,IAAI,eAAe,EAAE,CAAC;wBACpB,MAAM,gBAAgB,GAAG,eAAe,CAAC,aAAa,KAAK,IAAI,CAAA;wBAE/D,IAAI,kBAAkB,IAAI,CAAC,gBAAgB,EAAE,CAAC;4BAC5C,8DAA8D;4BAC9D,+DAA+D;4BAC/D,oEAAoE;4BACpE,sEAAsE;4BACtE,MAAM,UAAU,CAAC,SAAS,EAAE,eAAe,CAAC,EAAE,EAAE;gCAC9C,WAAW,EAAE,UAAU,CAAC,WAAW;gCACnC,OAAO,EAAE,UAAU,CAAC,OAAO;gCAC3B,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC;gCAC/C,aAAa,EAAE,IAAI;gCACnB,KAAK;gCACL,gBAAgB,EAAE,KAAK;gCACvB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;6BACpC,CAAC,CAAA;4BAEF,iEAAiE;4BACjE,+DAA+D;4BAC/D,gEAAgE;4BAChE,+DAA+D;4BAC/D,2DAA2D;4BAC3D,kEAAkE;4BAClE,gEAAgE;4BAChE,4DAA4D;4BAC5D,kEAAkE;4BAClE,+DAA+D;4BAC/D,MAAM,UAAU,CAAC,GAAG,SAAS,SAAS,EAAE,eAAe,CAAC,EAAE,EAAE;gCAC1D,YAAY,EAAE,IAAI;gCAClB,kBAAkB,EAAE,IAAI;gCACxB,oBAAoB,EAAE,IAAI;gCAC1B,sBAAsB,EAAE,IAAI;gCAC5B,eAAe,EAAE,IAAI;gCACrB,qBAAqB,EAAE,IAAI;6BAC5B,CAAC,CAAA;4BAEF,IAAI,CAAC;gCACH,MAAM,GAAG,CACP,QAAQ,CACT,EAAE,cAAc,CAAC,eAAe,CAAC,EAAE,CAAC,CAAA;gCACrC,gEAAgE;gCAChE,8DAA8D;gCAC9D,6DAA6D;gCAC7D,aAAa,CAAC,8BAA8B,EAAE,CAAA;4BAChD,CAAC;4BAAC,OAAO,GAAG,EAAE,CAAC;gCACb,MAAM,CAAC,IAAI,CAAC,iEAAiE,EAAE;oCAC7E,MAAM,EAAE,eAAe,CAAC,EAAE;oCAC1B,KAAK,EAAE,GAAG;iCACX,CAAC,CAAA;4BACJ,CAAC;4BAED,SAAS;iCACN,KAAK,CAAC;gCACL,IAAI,EAAE,mBAAmB;gCACzB,MAAM,EAAE,eAAe,CAAC,EAAE;gCAC1B,UAAU,EAAE;oCACV,QAAQ,EAAE,UAAU,CAAC,WAAW;oCAChC,MAAM,EAAE,2CAA2C;iCACpD;6BACF,CAAC;iCACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gCACb,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAA;4BACnE,CAAC,CAAC,CAAA;4BAEJ,qEAAqE;4BACrE,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAc,SAAS,EAAE,eAAe,CAAC,EAAE,CAAC,CAAC,IAAI,eAAe,CAAA;wBACxF,CAAC;6BAAM,CAAC;4BACN,SAAS;iCACN,KAAK,CAAC;gCACL,IAAI,EAAE,mBAAmB;gCACzB,UAAU,EAAE;oCACV,MAAM,EAAE,uBAAuB;oCAC/B,QAAQ,EAAE,UAAU,CAAC,WAAW;iCACjC;6BACF,CAAC;iCACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gCACb,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAA;4BACnE,CAAC,CAAC,CAAA;4BACJ,OAAO;gCACL,UAAU,EAAE,GAAG;gCACf,IAAI,EAAE;oCACJ,KAAK,EAAE,CAAC,CAAC,mCAAmC,EAAE,SAAS,EAAE;wCACvD,YAAY,EACV,yIAAyI;qCAC5I,CAAC;oCACF,QAAQ,EAAE,mCAAmC;iCAC9C;6BACF,CAAA;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;YAED,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,qBAAqB;gBACrB,MAAM,EAAE,GAAG,IAAI,EAAE,CAAA;gBAEjB,8CAA8C;gBAC9C,IAAI,QAAQ,GAAG,UAAU,CAAC,QAAQ,IAAI,UAAU,CAAC,OAAO,CAAA;gBACxD,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;gBAElE,6BAA6B;gBAC7B,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAiB,SAAS,EAAE;oBACxD,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE;iBACtD,CAAC,CAAA;gBAEF,IAAI,QAAQ,EAAE,CAAC;oBACb,QAAQ,GAAG,GAAG,QAAQ,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAA;gBAC/C,CAAC;gBAED,qEAAqE;gBACrE,uEAAuE;gBACvE,uEAAuE;gBACvE,2DAA2D;gBAC3D,MAAM,WAAW,GACf,UAAU,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,SAAS,CAAA;gBAE3E,qEAAqE;gBACrE,mEAAmE;gBACnE,+BAA+B;gBAC/B,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;gBAEpF,+DAA+D;gBAC/D,kEAAkE;gBAClE,qEAAqE;gBACrE,oEAAoE;gBACpE,kCAAkC;gBAClC,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,kBAAkB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;gBAE1F,MAAM,cAAc,GAAG,MAAM,cAAc,CAAC;oBAC1C,KAAK,EAAE;wBACL,QAAQ;wBACR,IAAI,EAAE,WAAW;wBACjB,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wBACvB,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wBAC7B,KAAK,EAAE,KAAK,IAAI,IAAI;wBACpB,aAAa,EAAE,kBAAkB;wBACjC,WAAW,EAAE,UAAU,CAAC,WAAW;wBACnC,OAAO,EAAE,UAAU,CAAC,OAAO;wBAC3B,SAAS,EAAE,UAAU,CAAC,SAAS;qBAChC;oBACD,EAAE;iBACH,CAAC,CAAA;gBAEF,IAAI,cAAc,EAAE,UAAU,KAAK,GAAG,EAAE,CAAC;oBACvC,IAAI,GAAG,cAAc,CAAC,IAAI,EAAE,KAA+B,CAAA;gBAC7D,CAAC;gBAED,IAAI,CAAC,IAAI,EAAE,CAAC;oBACV,qEAAqE;oBACrE,+DAA+D;oBAC/D,kEAAkE;oBAClE,iEAAiE;oBACjE,iEAAiE;oBACjE,4BAA4B;oBAC5B,IAAI,KAAK,EAAE,CAAC;wBACV,MAAM,YAAY,GAAG,MAAM,OAAO,CAAiB,SAAS,EAAE;4BAC5D,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE;yBAChD,CAAC,CAAA;wBACF,IAAI,YAAY,EAAE,CAAC;4BACjB,SAAS;iCACN,KAAK,CAAC;gCACL,IAAI,EAAE,mBAAmB;gCACzB,UAAU,EAAE;oCACV,MAAM,EAAE,4BAA4B;oCACpC,QAAQ,EAAE,UAAU,CAAC,WAAW;iCACjC;6BACF,CAAC;iCACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gCACb,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAA;4BACnE,CAAC,CAAC,CAAA;4BACJ,OAAO;gCACL,UAAU,EAAE,GAAG;gCACf,IAAI,EAAE;oCACJ,KAAK,EAAE,CAAC,CAAC,mCAAmC,EAAE,SAAS,EAAE;wCACvD,YAAY,EACV,yIAAyI;qCAC5I,CAAC;oCACF,QAAQ,EAAE,mCAAmC;iCAC9C;6BACF,CAAA;wBACH,CAAC;oBACH,CAAC;oBAED,OAAO;wBACL,UAAU,EAAE,GAAG;wBACf,IAAI,EAAE;4BACJ,KAAK,EAAE,CAAC,CAAC,+BAA+B,CAAC;4BACzC,QAAQ,EAAE,+BAA+B;yBAC1C;qBACF,CAAA;gBACH,CAAC;gBAED,oDAAoD;gBACpD,MAAM,WAAW,CAAC,GAAG,SAAS,SAAS,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;oBAC7D,MAAM,CAAC,IAAI,CAAC,+BAA+B,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAA;gBAC1E,CAAC,CAAC,CAAA;gBAEF,SAAS;qBACN,KAAK,CAAC;oBACL,IAAI,EAAE,aAAa;oBACnB,MAAM,EAAE,IAAI,CAAC,EAAE;oBACf,UAAU,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,CAAC,WAAW,EAAE;iBAClE,CAAC;qBACD,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;gBAClB,SAAS;qBACN,QAAQ,CAAC;oBACR,MAAM,EAAE,IAAI,CAAC,EAAE;oBACf,KAAK,EAAE,UAAU,CAAC,KAAK,IAAI,SAAS;oBACpC,IAAI,EAAE,WAAW;iBAClB,CAAC;qBACD,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;YACpB,CAAC;iBAAM,CAAC;gBACN,qEAAqE;gBACrE,sEAAsE;gBACtE,oEAAoE;gBACpE,mCAAmC;gBACnC,MAAM,QAAQ,GAA2B,EAAE,CAAA;gBAC3C,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;oBACf,MAAM,YAAY,GAChB,UAAU,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,SAAS,CAAA;oBAC3E,IAAI,YAAY;wBAAE,QAAQ,CAAC,IAAI,GAAG,YAAY,CAAA;gBAChD,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,UAAU,CAAC,GAAG,EAAE,CAAC;oBAChC,QAAQ,CAAC,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,cAAc,CAAC,CAAA;gBAC5D,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;oBACtC,2DAA2D;oBAC3D,mEAAmE;oBACnE,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;oBAC3D,IAAI,OAAO;wBAAE,QAAQ,CAAC,MAAM,GAAG,OAAO,CAAA;gBACxC,CAAC;gBAED,sCAAsC;gBACtC,MAAM,UAAU,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE;oBACnC,GAAG,QAAQ;oBACX,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC;oBAC/C,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;iBACpC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;oBACf,MAAM,CAAC,IAAI,CAAC,6BAA6B,EAAE,EAAE,MAAM,EAAE,IAAK,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAA;gBAC9E,CAAC,CAAC,CAAA;gBACF,8DAA8D;gBAC9D,IAAI,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,QAAQ,EAAE,CAAA;gBAE/B,SAAS;qBACN,KAAK,CAAC;oBACL,IAAI,EAAE,YAAY;oBAClB,MAAM,EAAE,IAAI,CAAC,EAAE;oBACf,UAAU,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,CAAC,WAAW,EAAE;iBAClE,CAAC;qBACD,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;YACpB,CAAC;YAED,4EAA4E;YAC5E,wEAAwE;YACxE,4EAA4E;YAC5E,4EAA4E;YAC5E,4EAA4E;YAC5E,4EAA4E;YAC5E,2EAA2E;YAC3E,uEAAuE;YACvE,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAC1B,OAAO;oBACL,UAAU,EAAE,GAAG;oBACf,IAAI,EAAE;wBACJ,KAAK,EAAE,CAAC,CAAC,sCAAsC,EAAE,SAAS,EAAE;4BAC1D,YAAY,EACV,yGAAyG;yBAC5G,CAAC;wBACF,QAAQ,EAAE,sCAAsC;wBAChD,iBAAiB,EAAE,IAAI;qBACxB;iBACF,CAAA;YACH,CAAC;YAED,2BAA2B;YAC3B,MAAM,QAAQ,GAAG,MAAM,GAAG,CAEvB,QAAQ,CAAC,EAAE,cAAc,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,UAAU,IAAI,SAAS,CAAC,CAAA;YAEnE,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,OAAO;oBACL,UAAU,EAAE,GAAG;oBACf,IAAI,EAAE;wBACJ,KAAK,EAAE,CAAC,CAAC,kCAAkC,CAAC;wBAC5C,QAAQ,EAAE,kCAAkC;qBAC7C;iBACF,CAAA;YACH,CAAC;YAED,qBAAqB;YACrB,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE;gBAC1B,MAAM,EAAE,IAAI,CAAC,EAAE;gBACf,QAAQ;gBACR,WAAW,EAAE,UAAU,CAAC,WAAW;gBACnC,OAAO,EAAE,UAAU,CAAC,OAAO;aAC5B,CAAC,CAAA;YAEF,OAAO;gBACL,UAAU,EAAE,GAAG;gBACf,IAAI,EAAE,EAAE,KAAK,EAAE,yBAAyB,CAAC,IAA+B,CAAC,EAAE;aAC5E,CAAA;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,oEAAoE;YACpE,uEAAuE;YACvE,sEAAsE;YACtE,qBAAqB;YACrB,MAAM,CAAC,KAAK,CAAC,qBAAqB,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;YAC3F,OAAO;gBACL,UAAU,EAAE,GAAG;gBACf,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,6BAA6B,CAAC,EAAE,QAAQ,EAAE,6BAA6B,EAAE;aAC3F,CAAA;QACH,CAAC;IACH,CAAC,CAAA;AACH,CAAC,CAAA"}
|