acebase-server 1.11.0 → 1.12.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/dist/cjs/logger.js +74 -0
- package/dist/cjs/logger.js.map +1 -0
- package/dist/cjs/middleware/admin-only.js +29 -0
- package/dist/cjs/middleware/admin-only.js.map +1 -0
- package/dist/cjs/middleware/user.js +4 -4
- package/dist/cjs/middleware/user.js.map +1 -1
- package/dist/cjs/routes/auth-change-password.js +7 -4
- package/dist/cjs/routes/auth-change-password.js.map +1 -1
- package/dist/cjs/routes/auth-delete.js +9 -7
- package/dist/cjs/routes/auth-delete.js.map +1 -1
- package/dist/cjs/routes/auth-forgot-password.js +9 -6
- package/dist/cjs/routes/auth-forgot-password.js.map +1 -1
- package/dist/cjs/routes/auth-reset-password.js +5 -3
- package/dist/cjs/routes/auth-reset-password.js.map +1 -1
- package/dist/cjs/routes/auth-signout.js +6 -4
- package/dist/cjs/routes/auth-signout.js.map +1 -1
- package/dist/cjs/routes/auth-signup.js +17 -15
- package/dist/cjs/routes/auth-signup.js.map +1 -1
- package/dist/cjs/routes/auth-update.js +9 -6
- package/dist/cjs/routes/auth-update.js.map +1 -1
- package/dist/cjs/routes/auth-verify-email.js +6 -3
- package/dist/cjs/routes/auth-verify-email.js.map +1 -1
- package/dist/cjs/routes/data-index-create.js +3 -5
- package/dist/cjs/routes/data-index-create.js.map +1 -1
- package/dist/cjs/routes/data-index-delete.js +2 -4
- package/dist/cjs/routes/data-index-delete.js.map +1 -1
- package/dist/cjs/routes/data-index-list.js +2 -4
- package/dist/cjs/routes/data-index-list.js.map +1 -1
- package/dist/cjs/routes/data-reflect.js +2 -4
- package/dist/cjs/routes/data-reflect.js.map +1 -1
- package/dist/cjs/routes/data-schema-get.js +2 -4
- package/dist/cjs/routes/data-schema-get.js.map +1 -1
- package/dist/cjs/routes/data-schema-set.js +2 -4
- package/dist/cjs/routes/data-schema-set.js.map +1 -1
- package/dist/cjs/routes/data-schema-test.js +2 -4
- package/dist/cjs/routes/data-schema-test.js.map +1 -1
- package/dist/cjs/routes/data-schemas-list.js +2 -4
- package/dist/cjs/routes/data-schemas-list.js.map +1 -1
- package/dist/cjs/routes/data-set.js +8 -7
- package/dist/cjs/routes/data-set.js.map +1 -1
- package/dist/cjs/routes/data-transaction.js +15 -8
- package/dist/cjs/routes/data-transaction.js.map +1 -1
- package/dist/cjs/routes/data-update.js +8 -6
- package/dist/cjs/routes/data-update.js.map +1 -1
- package/dist/cjs/routes/meta-logs.js +50 -0
- package/dist/cjs/routes/meta-logs.js.map +1 -0
- package/dist/cjs/routes/meta.js +3 -0
- package/dist/cjs/routes/meta.js.map +1 -1
- package/dist/cjs/routes/oauth2-signin.js +9 -6
- package/dist/cjs/routes/oauth2-signin.js.map +1 -1
- package/dist/cjs/server.js +3 -1
- package/dist/cjs/server.js.map +1 -1
- package/dist/cjs/shared/env.js.map +1 -1
- package/dist/cjs/shared/signin.js +8 -3
- package/dist/cjs/shared/signin.js.map +1 -1
- package/dist/cjs/start.js +3 -0
- package/dist/cjs/start.js.map +1 -1
- package/dist/cjs/websocket/index.js +42 -23
- package/dist/cjs/websocket/index.js.map +1 -1
- package/dist/esm/logger.js +52 -0
- package/dist/esm/logger.js.map +1 -0
- package/dist/esm/middleware/admin-only.js +25 -0
- package/dist/esm/middleware/admin-only.js.map +1 -0
- package/dist/esm/middleware/user.js +4 -4
- package/dist/esm/middleware/user.js.map +1 -1
- package/dist/esm/routes/auth-change-password.js +6 -3
- package/dist/esm/routes/auth-change-password.js.map +1 -1
- package/dist/esm/routes/auth-delete.js +7 -5
- package/dist/esm/routes/auth-delete.js.map +1 -1
- package/dist/esm/routes/auth-forgot-password.js +8 -6
- package/dist/esm/routes/auth-forgot-password.js.map +1 -1
- package/dist/esm/routes/auth-reset-password.js +4 -2
- package/dist/esm/routes/auth-reset-password.js.map +1 -1
- package/dist/esm/routes/auth-signout.js +4 -2
- package/dist/esm/routes/auth-signout.js.map +1 -1
- package/dist/esm/routes/auth-signup.js +12 -10
- package/dist/esm/routes/auth-signup.js.map +1 -1
- package/dist/esm/routes/auth-update.js +8 -6
- package/dist/esm/routes/auth-update.js.map +1 -1
- package/dist/esm/routes/auth-verify-email.js +6 -2
- package/dist/esm/routes/auth-verify-email.js.map +1 -1
- package/dist/esm/routes/data-index-create.js +4 -6
- package/dist/esm/routes/data-index-create.js.map +1 -1
- package/dist/esm/routes/data-index-delete.js +3 -5
- package/dist/esm/routes/data-index-delete.js.map +1 -1
- package/dist/esm/routes/data-index-list.js +3 -5
- package/dist/esm/routes/data-index-list.js.map +1 -1
- package/dist/esm/routes/data-reflect.js +1 -4
- package/dist/esm/routes/data-reflect.js.map +1 -1
- package/dist/esm/routes/data-schema-get.js +3 -5
- package/dist/esm/routes/data-schema-get.js.map +1 -1
- package/dist/esm/routes/data-schema-set.js +3 -5
- package/dist/esm/routes/data-schema-set.js.map +1 -1
- package/dist/esm/routes/data-schema-test.js +3 -5
- package/dist/esm/routes/data-schema-test.js.map +1 -1
- package/dist/esm/routes/data-schemas-list.js +3 -5
- package/dist/esm/routes/data-schemas-list.js.map +1 -1
- package/dist/esm/routes/data-set.js +6 -5
- package/dist/esm/routes/data-set.js.map +1 -1
- package/dist/esm/routes/data-transaction.js +12 -5
- package/dist/esm/routes/data-transaction.js.map +1 -1
- package/dist/esm/routes/data-update.js +6 -4
- package/dist/esm/routes/data-update.js.map +1 -1
- package/dist/esm/routes/meta-logs.js +36 -0
- package/dist/esm/routes/meta-logs.js.map +1 -0
- package/dist/esm/routes/meta.js +3 -0
- package/dist/esm/routes/meta.js.map +1 -1
- package/dist/esm/routes/oauth2-signin.js +8 -5
- package/dist/esm/routes/oauth2-signin.js.map +1 -1
- package/dist/esm/server.js +3 -1
- package/dist/esm/server.js.map +1 -1
- package/dist/esm/shared/env.js.map +1 -1
- package/dist/esm/shared/signin.js +7 -3
- package/dist/esm/shared/signin.js.map +1 -1
- package/dist/esm/start.js +3 -0
- package/dist/esm/start.js.map +1 -1
- package/dist/esm/websocket/index.js +37 -22
- package/dist/esm/websocket/index.js.map +1 -1
- package/dist/types/logger.d.ts +35 -0
- package/dist/types/middleware/admin-only.d.ts +19 -0
- package/dist/types/routes/meta-logs.d.ts +20 -0
- package/dist/types/rules.d.ts +2 -2
- package/dist/types/shared/env.d.ts +3 -1
- package/dist/types/shared/signin.d.ts +1 -1
- package/dist/types/websocket/index.d.ts +4 -0
- package/package.json +5 -5
- package/src/logger.ts +56 -0
- package/src/middleware/admin-only.ts +29 -0
- package/src/middleware/user.ts +4 -4
- package/src/routes/auth-change-password.ts +6 -3
- package/src/routes/auth-delete.ts +7 -5
- package/src/routes/auth-forgot-password.ts +10 -6
- package/src/routes/auth-reset-password.ts +5 -2
- package/src/routes/auth-signout.ts +5 -2
- package/src/routes/auth-signup.ts +13 -10
- package/src/routes/auth-update.ts +8 -6
- package/src/routes/auth-verify-email.ts +11 -3
- package/src/routes/data-index-create.ts +4 -7
- package/src/routes/data-index-delete.ts +3 -6
- package/src/routes/data-index-list.ts +3 -6
- package/src/routes/data-reflect.ts +1 -4
- package/src/routes/data-schema-get.ts +3 -5
- package/src/routes/data-schema-set.ts +3 -6
- package/src/routes/data-schema-test.ts +3 -6
- package/src/routes/data-schemas-list.ts +3 -5
- package/src/routes/data-set.ts +10 -6
- package/src/routes/data-transaction.ts +14 -5
- package/src/routes/data-update.ts +8 -4
- package/src/routes/meta-logs.ts +57 -0
- package/src/routes/meta.ts +4 -0
- package/src/routes/oauth2-signin.ts +11 -7
- package/src/rules.ts +1 -1
- package/src/server.ts +3 -1
- package/src/shared/env.ts +2 -1
- package/src/shared/signin.ts +10 -4
- package/src/start.ts +3 -0
- package/src/websocket/index.ts +40 -23
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
export class DatabaseLog {
|
|
2
|
+
constructor(logRef) {
|
|
3
|
+
this.logRef = logRef;
|
|
4
|
+
}
|
|
5
|
+
/**
|
|
6
|
+
* Logs an action initiated by a client/user with a positive or negative outcome. Used by `success` and `failure`
|
|
7
|
+
* @param action action identifier
|
|
8
|
+
* @param success whether the action was successful
|
|
9
|
+
* @param details any additional details to be logged
|
|
10
|
+
*/
|
|
11
|
+
async event(action, details) {
|
|
12
|
+
await this.logRef?.push({ type: 'event', action, date: new Date(), ...details });
|
|
13
|
+
}
|
|
14
|
+
/**
|
|
15
|
+
* Logs a system warning
|
|
16
|
+
* @param action action identifier
|
|
17
|
+
* @param code warning code
|
|
18
|
+
* @param details any additional details to be logged
|
|
19
|
+
*/
|
|
20
|
+
async warning(action, code, details) {
|
|
21
|
+
await this.logRef?.push({ type: 'warning', action, code, date: new Date(), ...details });
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* Logs a system or client/user error
|
|
25
|
+
* @param action action identifier
|
|
26
|
+
* @param code error code
|
|
27
|
+
* @param details any additional details to be logged
|
|
28
|
+
*/
|
|
29
|
+
async error(action, code, details, unexpectedError) {
|
|
30
|
+
const errorDetails = unexpectedError instanceof Error
|
|
31
|
+
? { error: unexpectedError.stack ?? unexpectedError.message }
|
|
32
|
+
: { error: unexpectedError?.message ?? unexpectedError?.toString() ?? null };
|
|
33
|
+
await this.logRef?.push({ type: 'error', action, code, date: new Date(), ...errorDetails, ...details });
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* Query the logs
|
|
37
|
+
* @returns
|
|
38
|
+
*/
|
|
39
|
+
query() {
|
|
40
|
+
if (!this.logRef) {
|
|
41
|
+
throw new Error('Logging is not enabled');
|
|
42
|
+
}
|
|
43
|
+
return this.logRef.query();
|
|
44
|
+
}
|
|
45
|
+
/**
|
|
46
|
+
* Reference to the logs database collection
|
|
47
|
+
*/
|
|
48
|
+
get ref() {
|
|
49
|
+
return this?.logRef;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
//# sourceMappingURL=logger.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,WAAW;IACpB,YAAoB,MAAqB;QAArB,WAAM,GAAN,MAAM,CAAe;IAAG,CAAC;IAE7C;;;;;OAKG;IACH,KAAK,CAAC,KAAK,CAAC,MAAc,EAAE,OAAY;QACpC,MAAM,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;IACrF,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,OAAO,CAAC,MAAc,EAAE,IAAY,EAAE,OAAY;QACpD,MAAM,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;IAC7F,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,KAAK,CAAC,MAAc,EAAE,IAAY,EAAE,OAAY,EAAE,eAAqB;QACzE,MAAM,YAAY,GAAG,eAAe,YAAY,KAAK;YACjD,CAAC,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,KAAK,IAAI,eAAe,CAAC,OAAO,EAAE;YAC7D,CAAC,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,OAAO,IAAI,eAAe,EAAE,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC;QACjF,MAAM,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,GAAG,YAAY,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;IAC5G,CAAC;IAED;;;OAGG;IACH,KAAK;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;SAC7C;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IAC/B,CAAC;IAED;;OAEG;IACH,IAAI,GAAG;QACH,OAAO,IAAI,EAAE,MAAM,CAAC;IACxB,CAAC;CACJ"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { sendUnauthorizedError } from "../shared/error.js";
|
|
2
|
+
/**
|
|
3
|
+
* Middleware function that checks if the current user is `admin`. An 403 Forbidden error will be sent in the response if
|
|
4
|
+
* authentication is enabled on the server and the user is not signed in as admin.
|
|
5
|
+
*
|
|
6
|
+
* Can be applied to any route by adding it in the router chain.
|
|
7
|
+
* @example
|
|
8
|
+
* app.get('/endpoint', adminOnly(env), (req, res) => {
|
|
9
|
+
* // If we get here we are either an admin,
|
|
10
|
+
* // or the server doesn't have authentication enabled.
|
|
11
|
+
* })
|
|
12
|
+
* @param env Middle
|
|
13
|
+
* @param errorMessage
|
|
14
|
+
* @returns
|
|
15
|
+
*/
|
|
16
|
+
export const adminOnly = (env, errorMessage = 'only admin can perform this operation') => {
|
|
17
|
+
return (req, res, next) => {
|
|
18
|
+
if (env.config.auth.enabled && (!req.user || req.user.uid !== 'admin')) {
|
|
19
|
+
return sendUnauthorizedError(res, 'admin_only', errorMessage);
|
|
20
|
+
}
|
|
21
|
+
next();
|
|
22
|
+
};
|
|
23
|
+
};
|
|
24
|
+
export default adminOnly;
|
|
25
|
+
//# sourceMappingURL=admin-only.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"admin-only.js","sourceRoot":"","sources":["../../../src/middleware/admin-only.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAA;AAGvD;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,GAAyB,EAAE,eAAuB,uCAAuC,EAAE,EAAE;IACnH,OAAO,CAAC,GAAiB,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QAC5D,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,OAAO,CAAC,EAAE;YACpE,OAAO,qBAAqB,CAAC,GAAG,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;SACjE;QACD,IAAI,EAAE,CAAC;IACX,CAAC,CAAA;AACL,CAAC,CAAA;AAED,eAAe,SAAS,CAAC"}
|
|
@@ -6,9 +6,9 @@ export const addMiddleware = (env) => {
|
|
|
6
6
|
env.app.use(async (req, res, next) => {
|
|
7
7
|
let authorization = req.get('Authorization');
|
|
8
8
|
if (typeof authorization !== 'string' && 'auth_token' in req.query) {
|
|
9
|
-
// Enables browser calls to be authenticated
|
|
10
|
-
if (req.path.startsWith('/export/')) {
|
|
11
|
-
// For now, only allow
|
|
9
|
+
// Enables browser calls to be authenticated by adding the access token as auth_token query parameter
|
|
10
|
+
if (req.path.startsWith('/export/') || req.path.startsWith('/logs')) {
|
|
11
|
+
// For now, only allow '/export' or '/logs' api calls
|
|
12
12
|
// In the future, use these prerequisites:
|
|
13
13
|
// - user must be currently authenticated (in cache)
|
|
14
14
|
// - ip address must match the token
|
|
@@ -29,7 +29,7 @@ export const addMiddleware = (env) => {
|
|
|
29
29
|
if (!req.user) {
|
|
30
30
|
// Query database to get user for this token
|
|
31
31
|
try {
|
|
32
|
-
await signIn({ method: '
|
|
32
|
+
await signIn({ method: 'internal', access_token: tokenDetails.access_token }, env, req);
|
|
33
33
|
}
|
|
34
34
|
catch (err) {
|
|
35
35
|
return sendNotAuthenticatedError(res, err.code, err.message);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../src/middleware/user.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,GAAyB,EAAE,EAAE;IAEvD,uCAAuC;IACvC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,GAAyD,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAEvF,IAAI,aAAa,GAAG,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAC7C,IAAI,OAAO,aAAa,KAAK,QAAQ,IAAI,YAAY,IAAI,GAAG,CAAC,KAAK,EAAE;YAChE,
|
|
1
|
+
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../src/middleware/user.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,GAAyB,EAAE,EAAE;IAEvD,uCAAuC;IACvC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,GAAyD,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAEvF,IAAI,aAAa,GAAG,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAC7C,IAAI,OAAO,aAAa,KAAK,QAAQ,IAAI,YAAY,IAAI,GAAG,CAAC,KAAK,EAAE;YAChE,qGAAqG;YACrG,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;gBACjE,qDAAqD;gBACrD,0CAA0C;gBAC1C,oDAAoD;gBACpD,oCAAoC;gBACpC,aAAa,GAAG,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC;aACpD;SACJ;QAED,IAAI,OAAO,aAAa,KAAK,QAAQ,IAAI,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;YAC1E,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACrC,IAAI,YAAwD,CAAC;YAC7D,IAAI;gBACA,YAAY,GAAG,uBAAuB,CAAC,KAAK,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;aAChE;YACD,OAAO,GAAG,EAAE;gBACR,OAAO,yBAAyB,CAAC,GAAG,EAAE,eAAe,EAAE,4CAA4C,CAAC,CAAC;aACxG;YAED,wBAAwB;YACxB,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YAC/C,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;gBACX,4CAA4C;gBAC5C,IAAI;oBACA,MAAM,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,YAAY,CAAC,YAAY,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;iBAC3F;gBACD,OAAO,GAAG,EAAE;oBACR,OAAO,yBAAyB,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;iBAChE;aACJ;YAED,IAAI,GAAG,CAAC,IAAI,CAAC,WAAW,KAAK,IAAI,EAAE;gBAC/B,OAAO,yBAAyB,CAAC,GAAG,EAAE,kBAAkB,EAAE,qEAAqE,CAAC,CAAC;aACpI;SACJ;QACD,IAAI,EAAE,CAAC;IACX,CAAC,CAAC,CAAC;AACP,CAAC,CAAC"}
|
|
@@ -12,13 +12,15 @@ export const addRoute = (env) => {
|
|
|
12
12
|
env.app.post(`/auth/${env.db.name}/change_password`, async (req, res) => {
|
|
13
13
|
let access_token = req.user?.access_token;
|
|
14
14
|
const details = req.body;
|
|
15
|
+
const LOG_ACTION = 'auth.change_password';
|
|
16
|
+
const LOG_DETAILS = { ip: req.ip, uid: details.uid ?? null };
|
|
15
17
|
if (typeof details !== 'object' || typeof details.uid !== 'string' || typeof details.password !== 'string' || typeof details.new_password !== 'string') {
|
|
16
|
-
env.
|
|
18
|
+
env.log.error(LOG_ACTION, 'invalid_details', LOG_DETAILS);
|
|
17
19
|
res.status(400).send('Bad Request'); // Bad Request
|
|
18
20
|
return;
|
|
19
21
|
}
|
|
20
22
|
if (details.new_password.length < 8 || details.new_password.includes(' ') || !/[0-9]/.test(details.new_password) || !/[a-z]/.test(details.new_password) || !/[A-Z]/.test(details.new_password)) {
|
|
21
|
-
env.
|
|
23
|
+
env.log.error(LOG_ACTION, 'new_password_denied', LOG_DETAILS);
|
|
22
24
|
const err = 'Invalid new password, must be at least 8 characters and contain a combination of numbers and letters (both lower and uppercase)';
|
|
23
25
|
res.status(422).send(err); // Unprocessable Entity
|
|
24
26
|
return;
|
|
@@ -53,10 +55,11 @@ export const addRoute = (env) => {
|
|
|
53
55
|
publicAccessToken = createPublicAccessToken(user.uid, req.ip, user.access_token, env.tokenSalt);
|
|
54
56
|
return user; // Update db
|
|
55
57
|
});
|
|
58
|
+
env.log.event(LOG_ACTION, LOG_DETAILS);
|
|
56
59
|
res.send({ access_token: publicAccessToken }); // Client must use this new access token from now on
|
|
57
60
|
}
|
|
58
61
|
catch (err) {
|
|
59
|
-
env.
|
|
62
|
+
env.log.error(LOG_ACTION, err.code, LOG_DETAILS);
|
|
60
63
|
if (err.code) {
|
|
61
64
|
sendBadRequestError(res, err);
|
|
62
65
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-change-password.js","sourceRoot":"","sources":["../../../src/routes/auth-change-password.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC7F,OAAO,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAClC,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,MAAM,OAAO,mBAAoB,SAAQ,KAAK;IAC1C,YAAmB,IAAyD,EAAE,OAAe;QACzF,KAAK,CAAC,OAAO,CAAC,CAAC;QADA,SAAI,GAAJ,IAAI,CAAqD;IAE5E,CAAC;CACJ;AAOD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAClD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,IAAI,kBAAkB,EAAE,KAAK,EAAE,GAAY,EAAE,GAAG,EAAE,EAAE;QAC7E,IAAI,YAAY,GAAG,GAAG,CAAC,IAAI,EAAE,YAAY,CAAC;QAC1C,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"auth-change-password.js","sourceRoot":"","sources":["../../../src/routes/auth-change-password.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,26 +8,28 @@ export class DeleteError extends Error {
|
|
|
8
8
|
export const addRoute = (env) => {
|
|
9
9
|
env.app.post(`/auth/${env.db.name}/delete`, async (req, res) => {
|
|
10
10
|
let details = req.body;
|
|
11
|
+
const LOG_ACTION = 'auth.delete';
|
|
12
|
+
const LOG_DETAILS = { ip: req.ip, uid: req.user?.uid ?? null, delete_uid: details.uid };
|
|
11
13
|
if (!req.user) {
|
|
12
|
-
env.
|
|
14
|
+
env.log.error(LOG_ACTION, 'unauthenticated_delete', LOG_DETAILS);
|
|
13
15
|
return sendNotAuthenticatedError(res, 'unauthenticated_delete', 'You are not authorized to perform this operation, your attempt has been logged');
|
|
14
16
|
}
|
|
15
17
|
if (req.user.uid !== 'admin' && details.uid !== req.user.uid) {
|
|
16
|
-
env.
|
|
18
|
+
env.log.error(LOG_ACTION, 'unauthorized_delete', LOG_DETAILS);
|
|
17
19
|
return sendUnauthorizedError(res, 'unauthorized_delete', 'You are not authorized to perform this operation, your attempt has been logged');
|
|
18
20
|
}
|
|
19
21
|
const uid = details.uid ?? req.user.uid;
|
|
20
22
|
if (uid === 'admin') {
|
|
21
|
-
env.
|
|
23
|
+
env.log.error(LOG_ACTION, 'unauthorized_delete', LOG_DETAILS);
|
|
22
24
|
return sendUnauthorizedError(res, 'unauthorized_delete', 'The admin account cannot be deleted, your attempt has been logged');
|
|
23
25
|
}
|
|
24
26
|
try {
|
|
25
27
|
await env.authRef.child(uid).remove();
|
|
26
|
-
env.
|
|
28
|
+
env.log.event(LOG_ACTION, LOG_DETAILS);
|
|
27
29
|
res.send('Farewell');
|
|
28
30
|
}
|
|
29
31
|
catch (err) {
|
|
30
|
-
env.
|
|
32
|
+
env.log.error(LOG_ACTION, 'unexpected', { ...LOG_DETAILS, message: (err instanceof Error && err.message) ?? err.toString() });
|
|
31
33
|
sendUnexpectedError(res, err);
|
|
32
34
|
}
|
|
33
35
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-delete.js","sourceRoot":"","sources":["../../../src/routes/auth-delete.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAExG,MAAM,OAAO,WAAY,SAAQ,KAAK;IAClC,YAAmB,IAAoD,EAAE,OAAe;QACpF,KAAK,CAAC,OAAO,CAAC,CAAC;QADA,SAAI,GAAJ,IAAI,CAAgD;IAEvE,CAAC;CACJ;AAOD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAClD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,IAAI,SAAS,EAAE,KAAK,EAAE,GAAY,EAAE,GAAG,EAAE,EAAE;QACpE,IAAI,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"auth-delete.js","sourceRoot":"","sources":["../../../src/routes/auth-delete.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAExG,MAAM,OAAO,WAAY,SAAQ,KAAK;IAClC,YAAmB,IAAoD,EAAE,OAAe;QACpF,KAAK,CAAC,OAAO,CAAC,CAAC;QADA,SAAI,GAAJ,IAAI,CAAgD;IAEvE,CAAC;CACJ;AAOD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAClD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,IAAI,SAAS,EAAE,KAAK,EAAE,GAAY,EAAE,GAAG,EAAE,EAAE;QACpE,IAAI,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC;QACvB,MAAM,UAAU,GAAG,aAAa,CAAC;QACjC,MAAM,WAAW,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,IAAI,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;QAExF,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;YACX,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,wBAAwB,EAAE,WAAW,CAAC,CAAC;YACjE,OAAO,yBAAyB,CAAC,GAAG,EAAE,wBAAwB,EAAE,gFAAgF,CAAC,CAAC;SACrJ;QAED,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,OAAO,IAAI,OAAO,CAAC,GAAG,KAAK,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE;YAC1D,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,qBAAqB,EAAE,WAAW,CAAC,CAAC;YAC9D,OAAO,qBAAqB,CAAC,GAAG,EAAE,qBAAqB,EAAE,gFAAgF,CAAC,CAAC;SAC9I;QAED,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC;QACxC,IAAI,GAAG,KAAK,OAAO,EAAE;YACjB,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,qBAAqB,EAAE,WAAW,CAAC,CAAC;YAC9D,OAAO,qBAAqB,CAAC,GAAG,EAAE,qBAAqB,EAAE,mEAAmE,CAAC,CAAC;SACjI;QAED,IAAI;YACA,MAAM,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;YACtC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;YACvC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SACxB;QACD,OAAO,GAAG,EAAE;YACR,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,YAAY,EAAE,EAAE,GAAG,WAAW,EAAE,OAAO,EAAE,CAAC,GAAG,YAAY,KAAK,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAC9H,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACjC;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
|
@@ -10,6 +10,8 @@ export class ForgotPasswordError extends Error {
|
|
|
10
10
|
export const addRoute = (env) => {
|
|
11
11
|
env.app.post(`/auth/${env.db.name}/forgot_password`, async (req, res) => {
|
|
12
12
|
const details = req.body;
|
|
13
|
+
const LOG_ACTION = 'auth.forgot_password';
|
|
14
|
+
const LOG_DETAILS = { ip: req.ip, uid: req.user?.uid ?? null, email: details.email };
|
|
13
15
|
try {
|
|
14
16
|
if (!env.config.email || typeof env.config.email.send !== 'function') {
|
|
15
17
|
throw new ForgotPasswordError('server_email_config', 'Server email settings have not been configured');
|
|
@@ -39,15 +41,15 @@ export const addRoute = (env) => {
|
|
|
39
41
|
displayName: user.display_name
|
|
40
42
|
}
|
|
41
43
|
};
|
|
42
|
-
await
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
env.
|
|
44
|
+
await snap.ref.update({ password_reset_code: user.password_reset_code });
|
|
45
|
+
await env.config.email.send(request).catch(err => {
|
|
46
|
+
env.log.error(LOG_ACTION + '.email', 'unexpected', { ...LOG_DETAILS, request }, err);
|
|
47
|
+
});
|
|
48
|
+
env.log.event(LOG_ACTION, LOG_DETAILS);
|
|
47
49
|
res.send('OK');
|
|
48
50
|
}
|
|
49
51
|
catch (err) {
|
|
50
|
-
env.
|
|
52
|
+
env.log.error(LOG_ACTION, err.code || 'unexpected', { ...LOG_DETAILS, message: (err instanceof Error && err.message) ?? err.toString() });
|
|
51
53
|
if (err.code) {
|
|
52
54
|
sendBadRequestError(res, err);
|
|
53
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-forgot-password.js","sourceRoot":"","sources":["../../../src/routes/auth-forgot-password.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAElC,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAE3E,MAAM,OAAO,mBAAoB,SAAQ,KAAK;IAC1C,YAAmB,IAA6D,EAAE,OAAe;QAC7F,KAAK,CAAC,OAAO,CAAC,CAAC;QADA,SAAI,GAAJ,IAAI,CAAyD;IAEhF,CAAC;CACJ;AAOD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,IAAI,kBAAkB,EAAE,KAAK,EAAE,GAAY,EAAE,GAAG,EAAE,EAAE;QAE7E,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC;QACzB,IAAI;YACA,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,OAAO,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE;gBAClE,MAAM,IAAI,mBAAmB,CAAC,qBAAqB,EAAE,gDAAgD,CAAC,CAAC;aAC1G;YACD,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,QAAQ,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;gBAChG,MAAM,IAAI,mBAAmB,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;aACvE;YACD,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC;YACnF,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;gBACpB,MAAM,IAAI,mBAAmB,CAAC,eAAe,EAAE,qDAAqD,CAAC,CAAC;aACzG;YACD,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACtB,MAAM,IAAI,GAAyB,IAAI,CAAC,GAAG,EAAE,CAAC;YAC9C,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAa,CAAC;YAC9B,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;YAEzC,6CAA6C;YAC7C,MAAM,OAAO,GAAyC;gBAClD,IAAI,EAAE,qBAAqB;gBAC3B,IAAI,EAAE,IAAI,IAAI,EAAE;gBAChB,EAAE,EAAE,GAAG,CAAC,EAAE;gBACV,SAAS,EAAE,uBAAuB,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,mBAAmB,EAAE,EAAE,GAAG,CAAC,SAAS,CAAC;gBACpG,IAAI,EAAE;oBACF,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,GAAG,EAAE,IAAI,CAAC,GAAG;oBACb,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,WAAW,EAAE,IAAI,CAAC,YAAY;iBACjC;aACJ,CAAC;
|
|
1
|
+
{"version":3,"file":"auth-forgot-password.js","sourceRoot":"","sources":["../../../src/routes/auth-forgot-password.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,13 +57,15 @@ export const addRoute = (env) => {
|
|
|
57
57
|
};
|
|
58
58
|
env.app.post(`/auth/${env.db.name}/reset_password`, async (req, res) => {
|
|
59
59
|
const details = req.body;
|
|
60
|
+
const LOG_ACTION = 'auth.reset_password';
|
|
61
|
+
const LOG_DETAILS = { ip: req.ip, uid: req.user?.uid ?? null };
|
|
60
62
|
try {
|
|
61
63
|
const user = await resetPassword(req.ip, details.code, details.password);
|
|
62
|
-
env.
|
|
64
|
+
env.log.event(LOG_ACTION, { ...LOG_DETAILS, reset_uid: user.uid });
|
|
63
65
|
res.send('OK');
|
|
64
66
|
}
|
|
65
67
|
catch (err) {
|
|
66
|
-
env.
|
|
68
|
+
env.log.error(LOG_ACTION, err.code ?? 'unexpected', { ...LOG_DETAILS, message: (err instanceof Error && err.message) ?? err.toString() });
|
|
67
69
|
if (err.code) {
|
|
68
70
|
sendBadRequestError(res, err);
|
|
69
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-reset-password.js","sourceRoot":"","sources":["../../../src/routes/auth-reset-password.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAGxD,MAAM,OAAO,kBAAmB,SAAQ,KAAK;IACzC,YAAmB,IAAmE,EAAE,OAAe;QACnG,KAAK,CAAC,OAAO,CAAC,CAAC;QADA,SAAI,GAAJ,IAAI,CAA+D;IAEtF,CAAC;CACJ;AAOD;;;;GAIG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,MAAM,aAAa,GAAG,KAAK,EAAE,QAAgB,EAAE,IAAY,EAAE,WAAmB,EAAE,EAAE;QAChF,IAAI;YACA,IAAI,YAAY,GAAG,sBAAsB,CAAC,IAAI,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;SAClE;QACD,OAAM,GAAG,EAAE;YACP,MAAM,IAAI,kBAAkB,CAAC,cAAc,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;SAC7D;QACD,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QAC7D,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE;YAChB,MAAM,IAAI,kBAAkB,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;SAC/D;QACD,MAAM,IAAI,GAAyB,IAAI,CAAC,GAAG,EAAE,CAAC;QAC9C,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAa,CAAC;QAE9B,IAAI,IAAI,CAAC,mBAAmB,KAAK,YAAY,CAAC,IAAI,EAAE;YAChD,MAAM,IAAI,kBAAkB,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;SAChE;QACD,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACrD,MAAM,IAAI,kBAAkB,CAAC,+BAA+B,EAAE,mEAAmE,CAAC,CAAC;SACtI;QAED,wBAAwB;QACxB,MAAM,GAAG,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;QAC5C,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;YAClB,QAAQ,EAAE,GAAG,CAAC,IAAI;YAClB,aAAa,EAAE,GAAG,CAAC,IAAI;YACvB,mBAAmB,EAAE,IAAI;SAC5B,CAAC,CAAA;QACF,0BAA0B;QAC1B,MAAM,OAAO,GAAgD;YACzD,IAAI,EAAE,6BAA6B;YACnC,IAAI,EAAE,IAAI,IAAI,EAAE;YAChB,EAAE,EAAE,QAAQ;YACZ,IAAI,EAAE;gBACF,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,WAAW,EAAE,IAAI,CAAC,YAAY;gBAC9B,QAAQ,EAAE,IAAI,CAAC,QAAQ;aAC1B;SACJ,CAAC;QACF,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAChC,OAAO,IAAI,CAAC;IAChB,CAAC,CAAC;IAEF,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,IAAI,iBAAiB,EAAE,KAAK,EAAE,GAAY,EAAE,GAAG,EAAE,EAAE;QAE5E,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC;QACzB,
|
|
1
|
+
{"version":3,"file":"auth-reset-password.js","sourceRoot":"","sources":["../../../src/routes/auth-reset-password.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { sendUnexpectedError } from '../shared/error.js';
|
|
2
2
|
export const addRoute = (env) => {
|
|
3
3
|
env.app.post(`/auth/${env.db.name}/signout`, async (req, res) => {
|
|
4
|
+
const LOG_ACTION = 'auth.signout';
|
|
5
|
+
const LOG_DETAILS = { ip: req.ip, uid: req.user?.uid ?? null };
|
|
4
6
|
try {
|
|
5
7
|
if (req.user) {
|
|
6
8
|
const client = typeof req.body.client_id === 'string' ? env.clients.get(req.body.client_id) : null; // NEW in AceBaseClient v0.9.4
|
|
@@ -32,12 +34,12 @@ export const addRoute = (env) => {
|
|
|
32
34
|
user.last_signout_ip = req.ip;
|
|
33
35
|
return user;
|
|
34
36
|
});
|
|
35
|
-
env.
|
|
37
|
+
env.log.event(LOG_ACTION, LOG_DETAILS);
|
|
36
38
|
}
|
|
37
39
|
res.send('Bye!');
|
|
38
40
|
}
|
|
39
41
|
catch (err) {
|
|
40
|
-
env.
|
|
42
|
+
env.log.error(LOG_ACTION, 'unexpected', { ...LOG_DETAILS, message: err instanceof Error ? err.message : err.toString() });
|
|
41
43
|
sendUnexpectedError(res, err);
|
|
42
44
|
}
|
|
43
45
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-signout.js","sourceRoot":"","sources":["../../../src/routes/auth-signout.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAStD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAClD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,IAAI,UAAU,EAAE,KAAK,EAAE,GAAY,EAAE,GAAG,EAAE,EAAE;QAErE,IAAI;YACA,IAAI,GAAG,CAAC,IAAI,EAAE;gBACV,MAAM,MAAM,GAAG,OAAO,GAAG,CAAC,IAAI,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,8BAA8B;gBAClI,IAAI,MAAM,EAAE;oBACR,yCAAyC;oBACzC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;iBACtB;gBAED,MAAM,iBAAiB,GAAG,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,KAAK,IAAI,CAAC,CAAC,+BAA+B;gBACvH,IAAI,iBAAiB,EAAE;oBACnB,0BAA0B;oBAC1B,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBAEnC,mEAAmE;oBACnE,KAAK,IAAI,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE;wBACrC,IAAI,MAAM,CAAC,IAAI,EAAE,GAAG,KAAK,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE;4BACnC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;yBACtB;qBACJ;iBACJ;gBAED,qCAAqC;gBACrC,MAAM,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;oBACrD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE;wBAAE,OAAO;qBAAE;oBAE/B,MAAM,IAAI,GAAyB,IAAI,CAAC,GAAG,EAAE,CAAC;oBAC9C,IAAI,iBAAiB,EAAE;wBACnB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;qBAC5B;oBACD,IAAI,CAAC,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC;oBAC/B,IAAI,CAAC,eAAe,GAAG,GAAG,CAAC,EAAE,CAAC;oBAC9B,OAAO,IAAI,CAAC;gBAChB,CAAC,CAAC,CAAC;gBAEH,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"auth-signout.js","sourceRoot":"","sources":["../../../src/routes/auth-signout.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAStD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAClD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,IAAI,UAAU,EAAE,KAAK,EAAE,GAAY,EAAE,GAAG,EAAE,EAAE;QAErE,MAAM,UAAU,GAAG,cAAc,CAAC;QAClC,MAAM,WAAW,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC;QAE/D,IAAI;YACA,IAAI,GAAG,CAAC,IAAI,EAAE;gBACV,MAAM,MAAM,GAAG,OAAO,GAAG,CAAC,IAAI,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,8BAA8B;gBAClI,IAAI,MAAM,EAAE;oBACR,yCAAyC;oBACzC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;iBACtB;gBAED,MAAM,iBAAiB,GAAG,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,KAAK,IAAI,CAAC,CAAC,+BAA+B;gBACvH,IAAI,iBAAiB,EAAE;oBACnB,0BAA0B;oBAC1B,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBAEnC,mEAAmE;oBACnE,KAAK,IAAI,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE;wBACrC,IAAI,MAAM,CAAC,IAAI,EAAE,GAAG,KAAK,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE;4BACnC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;yBACtB;qBACJ;iBACJ;gBAED,qCAAqC;gBACrC,MAAM,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;oBACrD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE;wBAAE,OAAO;qBAAE;oBAE/B,MAAM,IAAI,GAAyB,IAAI,CAAC,GAAG,EAAE,CAAC;oBAC9C,IAAI,iBAAiB,EAAE;wBACnB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;qBAC5B;oBACD,IAAI,CAAC,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC;oBAC/B,IAAI,CAAC,eAAe,GAAG,GAAG,CAAC,EAAE,CAAC;oBAC9B,OAAO,IAAI,CAAC;gBAChB,CAAC,CAAC,CAAC;gBAEH,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;aAC1C;YACD,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACpB;QACD,OAAM,GAAG,EAAE;YACP,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,YAAY,EAAE,EAAE,GAAG,WAAW,EAAE,OAAO,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAC1H,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACjC;IAEL,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
|
@@ -3,7 +3,7 @@ import { emailExistsError, emailOrUsernameExistsError, invalidDisplayNameError,
|
|
|
3
3
|
import { createPasswordHash } from '../shared/password.js';
|
|
4
4
|
import { ID } from 'acebase-core';
|
|
5
5
|
import { createPublicAccessToken, createSignedPublicToken } from '../shared/tokens.js';
|
|
6
|
-
import { sendUnexpectedError } from '../shared/error.js';
|
|
6
|
+
import { sendUnauthorizedError, sendUnexpectedError } from '../shared/error.js';
|
|
7
7
|
export class SignupError extends Error {
|
|
8
8
|
constructor(code, message) {
|
|
9
9
|
super(message);
|
|
@@ -12,10 +12,11 @@ export class SignupError extends Error {
|
|
|
12
12
|
}
|
|
13
13
|
export const addRoute = (env) => {
|
|
14
14
|
env.app.post(`/auth/${env.db.name}/signup`, async (req, res) => {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
15
|
+
const LOG_ACTION = 'auth.signup';
|
|
16
|
+
const LOG_DETAILS = { ip: req.ip, uid: req.user?.uid ?? null };
|
|
17
|
+
if (!env.config.auth.allowUserSignup && req.user?.uid !== 'admin') {
|
|
18
|
+
env.log.error(LOG_ACTION, 'user_signup_disabled', LOG_DETAILS);
|
|
19
|
+
return sendUnauthorizedError(res, 'admin_only', 'Only admin is allowed to create users');
|
|
19
20
|
}
|
|
20
21
|
// Create user if it doesn't exist yet.
|
|
21
22
|
// TODO: Rate-limit nr of signups per IP to prevent abuse
|
|
@@ -54,13 +55,13 @@ export const addRoute = (env) => {
|
|
|
54
55
|
err = invalidPictureError;
|
|
55
56
|
}
|
|
56
57
|
if (err === emailExistsError || err === usernameExistsError) {
|
|
57
|
-
env.
|
|
58
|
+
env.log.error(LOG_ACTION, 'conflict', { ...LOG_DETAILS, username: details.username, email: details.email });
|
|
58
59
|
res.statusCode = 409; // conflict
|
|
59
60
|
return res.send(emailOrUsernameExistsError);
|
|
60
61
|
}
|
|
61
62
|
else if (err) {
|
|
62
63
|
// Log failure
|
|
63
|
-
env.
|
|
64
|
+
env.log.error(LOG_ACTION, err.code ?? 'unexpected', LOG_DETAILS);
|
|
64
65
|
res.statusCode = 422; // Unprocessable Entity
|
|
65
66
|
return res.send(err);
|
|
66
67
|
}
|
|
@@ -86,8 +87,9 @@ export const addRoute = (env) => {
|
|
|
86
87
|
};
|
|
87
88
|
const userRef = await env.authRef.push(user);
|
|
88
89
|
user.uid = userRef.key;
|
|
90
|
+
LOG_DETAILS.uid = user.uid;
|
|
89
91
|
// Log success
|
|
90
|
-
env.
|
|
92
|
+
env.log.event(LOG_ACTION, LOG_DETAILS);
|
|
91
93
|
// Cache the user
|
|
92
94
|
env.authCache.set(user.uid, user);
|
|
93
95
|
// Request welcome e-mail to be sent
|
|
@@ -107,7 +109,7 @@ export const addRoute = (env) => {
|
|
|
107
109
|
emailVerified: false
|
|
108
110
|
};
|
|
109
111
|
env.config.email?.send(request).catch(err => {
|
|
110
|
-
env.
|
|
112
|
+
env.log.error(LOG_ACTION + '.email', 'unexpected', { ...LOG_DETAILS, request }, err);
|
|
111
113
|
});
|
|
112
114
|
// Return the positive news
|
|
113
115
|
const isAdmin = req.user && req.user.uid === 'admin';
|
|
@@ -117,7 +119,7 @@ export const addRoute = (env) => {
|
|
|
117
119
|
});
|
|
118
120
|
}
|
|
119
121
|
catch (err) {
|
|
120
|
-
env.
|
|
122
|
+
env.log.error(LOG_ACTION, 'unexpected', { ...LOG_DETAILS, message: err instanceof Error ? err.message : err.toString(), username: details.username, email: details.email });
|
|
121
123
|
sendUnexpectedError(res, err);
|
|
122
124
|
}
|
|
123
125
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-signup.js","sourceRoot":"","sources":["../../../src/routes/auth-signup.ts"],"names":[],"mappings":"AACA,OAAO,EAAqC,uBAAuB,EAAsB,MAAM,gBAAgB,CAAC;AAChH,OAAO,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,YAAY,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,eAAe,EAAE,cAAc,EAAE,eAAe,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC3X,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAElC,OAAO,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AACpF,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"auth-signup.js","sourceRoot":"","sources":["../../../src/routes/auth-signup.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,13 +10,15 @@ export class UpdateError extends Error {
|
|
|
10
10
|
export const addRoute = (env) => {
|
|
11
11
|
env.app.post(`/auth/${env.db.name}/update`, async (req, res) => {
|
|
12
12
|
let details = req.body;
|
|
13
|
+
const LOG_ACTION = 'auth.update';
|
|
14
|
+
const LOG_DETAILS = { ip: req.ip, uid: req.user?.uid ?? null, update_uid: details.uid ?? null };
|
|
13
15
|
if (!req.user) {
|
|
14
|
-
env.
|
|
16
|
+
env.log.error(LOG_ACTION, 'unauthenticated_update', LOG_DETAILS);
|
|
15
17
|
return sendNotAuthenticatedError(res, 'unauthenticated_update', 'Sign in to change details');
|
|
16
18
|
}
|
|
17
19
|
const uid = details.uid || req.user.uid;
|
|
18
20
|
if (req.user.uid !== 'admin' && (uid !== req.user.uid || typeof details.is_disabled === 'boolean')) {
|
|
19
|
-
env.
|
|
21
|
+
env.log.error(LOG_ACTION, 'unauthorized_update', LOG_DETAILS);
|
|
20
22
|
return sendUnauthorizedError(res, 'unauthorized_update', 'You are not authorized to perform this update. This attempt has been logged.');
|
|
21
23
|
}
|
|
22
24
|
if (typeof details.display_name === 'undefined' && typeof details.displayName === 'string') {
|
|
@@ -48,7 +50,7 @@ export const addRoute = (env) => {
|
|
|
48
50
|
}
|
|
49
51
|
if (err) {
|
|
50
52
|
// Log failure
|
|
51
|
-
env.
|
|
53
|
+
env.log.error(LOG_ACTION, err.code, LOG_DETAILS);
|
|
52
54
|
res.status(422).send(err); // Unprocessable Entity
|
|
53
55
|
return;
|
|
54
56
|
}
|
|
@@ -81,7 +83,7 @@ export const addRoute = (env) => {
|
|
|
81
83
|
});
|
|
82
84
|
if (!isValidSettings(user.settings)) {
|
|
83
85
|
err = invalidSettingsError;
|
|
84
|
-
env.
|
|
86
|
+
env.log.error(LOG_ACTION, 'too_many_settings', LOG_DETAILS);
|
|
85
87
|
res.statusCode = 422; // Unprocessable Entity
|
|
86
88
|
res.send(err);
|
|
87
89
|
return;
|
|
@@ -100,13 +102,13 @@ export const addRoute = (env) => {
|
|
|
100
102
|
catch (err) {
|
|
101
103
|
// All known errors except user_not_found will have been sent already
|
|
102
104
|
if (err.code === 'user_not_found') {
|
|
103
|
-
env.
|
|
105
|
+
env.log.error(LOG_ACTION, err.code, LOG_DETAILS);
|
|
104
106
|
res.statusCode = 404; // Not Found
|
|
105
107
|
res.send(err);
|
|
106
108
|
}
|
|
107
109
|
else {
|
|
108
110
|
// Unexpected
|
|
109
|
-
env.
|
|
111
|
+
env.log.error(LOG_ACTION, err.code ?? 'unexpected', LOG_DETAILS, err);
|
|
110
112
|
sendUnexpectedError(res, err);
|
|
111
113
|
}
|
|
112
114
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-update.js","sourceRoot":"","sources":["../../../src/routes/auth-update.ts"],"names":[],"mappings":"AACA,OAAO,EAAqC,uBAAuB,EAAsB,MAAM,gBAAgB,CAAC;AAChH,OAAO,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,YAAY,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,cAAc,EAAE,eAAe,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACxT,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAExG,MAAM,OAAO,WAAY,SAAQ,KAAK;IAClC,YAAmB,IAAyM,EAAE,OAAe;QACzO,KAAK,CAAC,OAAO,CAAC,CAAC;QADA,SAAI,GAAJ,IAAI,CAAqM;IAE5N,CAAC;CACJ;AAyBD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAClD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,IAAI,SAAS,EAAE,KAAK,EAAE,GAAY,EAAE,GAAG,EAAE,EAAE;QAEpE,IAAI,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"auth-update.js","sourceRoot":"","sources":["../../../src/routes/auth-update.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,15 +12,19 @@ export class VerifyEmailError extends Error {
|
|
|
12
12
|
* @returns returns the verification function
|
|
13
13
|
*/
|
|
14
14
|
export const addRoute = (env) => {
|
|
15
|
+
const LOG_ACTION = 'auth.verify_email';
|
|
15
16
|
const verifyEmailAddress = async (clientIp, code) => {
|
|
17
|
+
const LOG_DETAILS = { ip: clientIp, uid: null };
|
|
16
18
|
try {
|
|
17
19
|
var verification = parseSignedPublicToken(code, env.tokenSalt);
|
|
18
20
|
}
|
|
19
21
|
catch (err) {
|
|
20
22
|
throw new VerifyEmailError('invalid_code', err.message);
|
|
21
23
|
}
|
|
24
|
+
LOG_DETAILS.uid = verification.uid;
|
|
22
25
|
const snap = await env.authRef.child(verification.uid).get();
|
|
23
26
|
if (!snap.exists()) {
|
|
27
|
+
env.log.error(LOG_ACTION, 'unknown_user', LOG_DETAILS);
|
|
24
28
|
throw new VerifyEmailError('unknown_user', 'Unknown user');
|
|
25
29
|
}
|
|
26
30
|
const user = snap.val();
|
|
@@ -28,7 +32,7 @@ export const addRoute = (env) => {
|
|
|
28
32
|
// No need to do further checks, code was signed by us so we can trust the contents
|
|
29
33
|
// Mark account as verified
|
|
30
34
|
await snap.ref.update({ email_verified: true });
|
|
31
|
-
env.
|
|
35
|
+
env.log.event(LOG_ACTION, LOG_DETAILS);
|
|
32
36
|
};
|
|
33
37
|
env.app.post(`/auth/${env.db.name}/verify_email`, async (req, res) => {
|
|
34
38
|
const details = req.body;
|
|
@@ -37,11 +41,11 @@ export const addRoute = (env) => {
|
|
|
37
41
|
res.send('OK');
|
|
38
42
|
}
|
|
39
43
|
catch (err) {
|
|
40
|
-
env.logRef.push({ action: 'verify_email', success: false, code: err.code, message: err.message, ip: req.ip, date: new Date(), uid: req.user?.uid ?? null });
|
|
41
44
|
if (err.code) {
|
|
42
45
|
sendBadRequestError(res, err);
|
|
43
46
|
}
|
|
44
47
|
else {
|
|
48
|
+
env.log.error(LOG_ACTION, 'unexpected', { ip: req.ip, message: err.message, verificaion_code: details.code });
|
|
45
49
|
sendUnexpectedError(res, err);
|
|
46
50
|
}
|
|
47
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-verify-email.js","sourceRoot":"","sources":["../../../src/routes/auth-verify-email.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAE3E,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IACvC,YAAmB,IAAmC,EAAE,OAAe;QACnE,KAAK,CAAC,OAAO,CAAC,CAAC;QADA,SAAI,GAAJ,IAAI,CAA+B;IAEtD,CAAC;CACJ;AAOD;;;;GAIG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,MAAM,kBAAkB,GAAG,KAAK,EAAE,QAAgB,EAAE,IAAY,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"auth-verify-email.js","sourceRoot":"","sources":["../../../src/routes/auth-verify-email.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAE3E,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IACvC,YAAmB,IAAmC,EAAE,OAAe;QACnE,KAAK,CAAC,OAAO,CAAC,CAAC;QADA,SAAI,GAAJ,IAAI,CAA+B;IAEtD,CAAC;CACJ;AAOD;;;;GAIG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,MAAM,UAAU,GAAG,mBAAmB,CAAC;IAEvC,MAAM,kBAAkB,GAAG,KAAK,EAAE,QAAgB,EAAE,IAAY,EAAE,EAAE;QAEhE,MAAM,WAAW,GAAG,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;QAEhD,IAAI;YACA,IAAI,YAAY,GAAG,sBAAsB,CAAC,IAAI,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;SAClE;QACD,OAAO,GAAG,EAAE;YACR,MAAM,IAAI,gBAAgB,CAAC,cAAc,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;SAC3D;QAED,WAAW,CAAC,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC;QACnC,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QAC7D,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE;YAChB,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC;YACvD,MAAM,IAAI,gBAAgB,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;SAC9D;QACD,MAAM,IAAI,GAAyB,IAAI,CAAC,GAAG,EAAE,CAAC;QAC9C,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAa,CAAC;QAE9B,mFAAmF;QACnF,2BAA2B;QAC3B,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;QAEhD,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IAC3C,CAAC,CAAC;IAEF,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,IAAI,eAAe,EAAE,KAAK,EAAE,GAAY,EAAE,GAAG,EAAE,EAAE;QAE1E,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC;QAEzB,IAAI;YACA,MAAM,kBAAkB,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;YAC/C,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAClB;QACD,OAAO,GAAG,EAAE;YACR,IAAI,GAAG,CAAC,IAAI,EAAE;gBACV,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;aACjC;iBACI;gBACD,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,YAAY,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,gBAAgB,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC9G,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;aACjC;SACJ;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,kBAAkB,CAAC;AAC9B,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|