acebase-server 1.10.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/index.js +16 -0
- package/dist/cjs/index.js.map +1 -1
- 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/oauth-providers/dropbox.js +3 -2
- package/dist/cjs/oauth-providers/dropbox.js.map +1 -1
- package/dist/cjs/oauth-providers/facebook.js +3 -2
- package/dist/cjs/oauth-providers/facebook.js.map +1 -1
- package/dist/cjs/oauth-providers/google.js +3 -2
- package/dist/cjs/oauth-providers/google.js.map +1 -1
- package/dist/cjs/oauth-providers/index.js.map +1 -1
- package/dist/cjs/oauth-providers/instagram.js +3 -2
- package/dist/cjs/oauth-providers/instagram.js.map +1 -1
- package/dist/cjs/oauth-providers/oauth-provider.js +23 -0
- package/dist/cjs/oauth-providers/oauth-provider.js.map +1 -1
- package/dist/cjs/oauth-providers/spotify.js +3 -2
- package/dist/cjs/oauth-providers/spotify.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 +11 -7
- package/dist/cjs/routes/data-set.js.map +1 -1
- package/dist/cjs/routes/data-sync-changes.js.map +1 -1
- package/dist/cjs/routes/data-sync-mutations.js.map +1 -1
- package/dist/cjs/routes/data-transaction.js +30 -10
- package/dist/cjs/routes/data-transaction.js.map +1 -1
- package/dist/cjs/routes/data-update.js +11 -6
- package/dist/cjs/routes/data-update.js.map +1 -1
- package/dist/cjs/routes/meta-info.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 +15 -11
- package/dist/cjs/routes/oauth2-signin.js.map +1 -1
- package/dist/cjs/rules.js +5 -5
- package/dist/cjs/rules.js.map +1 -1
- package/dist/cjs/server.js +6 -4
- package/dist/cjs/server.js.map +1 -1
- package/dist/cjs/settings/index.js +6 -7
- package/dist/cjs/settings/index.js.map +1 -1
- package/dist/cjs/shared/clients.js.map +1 -1
- package/dist/cjs/shared/env.js.map +1 -1
- package/dist/cjs/shared/http.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 +43 -24
- package/dist/cjs/websocket/index.js.map +1 -1
- package/dist/cjs/websocket/socket.io.js +8 -11
- package/dist/cjs/websocket/socket.io.js.map +1 -1
- package/dist/esm/index.js +2 -0
- package/dist/esm/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/oauth-providers/dropbox.js +3 -2
- package/dist/esm/oauth-providers/dropbox.js.map +1 -1
- package/dist/esm/oauth-providers/facebook.js +3 -2
- package/dist/esm/oauth-providers/facebook.js.map +1 -1
- package/dist/esm/oauth-providers/google.js +3 -2
- package/dist/esm/oauth-providers/google.js.map +1 -1
- package/dist/esm/oauth-providers/index.js.map +1 -1
- package/dist/esm/oauth-providers/instagram.js +3 -2
- package/dist/esm/oauth-providers/instagram.js.map +1 -1
- package/dist/esm/oauth-providers/oauth-provider.js +21 -1
- package/dist/esm/oauth-providers/oauth-provider.js.map +1 -1
- package/dist/esm/oauth-providers/spotify.js +3 -2
- package/dist/esm/oauth-providers/spotify.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 +9 -5
- package/dist/esm/routes/data-set.js.map +1 -1
- package/dist/esm/routes/data-sync-changes.js.map +1 -1
- package/dist/esm/routes/data-sync-mutations.js.map +1 -1
- package/dist/esm/routes/data-transaction.js +28 -8
- package/dist/esm/routes/data-transaction.js.map +1 -1
- package/dist/esm/routes/data-update.js +9 -4
- package/dist/esm/routes/data-update.js.map +1 -1
- package/dist/esm/routes/meta-info.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 +14 -10
- package/dist/esm/routes/oauth2-signin.js.map +1 -1
- package/dist/esm/rules.js +5 -5
- package/dist/esm/rules.js.map +1 -1
- package/dist/esm/server.js +6 -4
- package/dist/esm/server.js.map +1 -1
- package/dist/esm/settings/index.js +5 -6
- package/dist/esm/settings/index.js.map +1 -1
- package/dist/esm/shared/clients.js.map +1 -1
- package/dist/esm/shared/env.js.map +1 -1
- package/dist/esm/shared/http.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 +38 -23
- package/dist/esm/websocket/index.js.map +1 -1
- package/dist/esm/websocket/socket.io.js +9 -11
- package/dist/esm/websocket/socket.io.js.map +1 -1
- package/dist/types/index.d.ts +2 -0
- package/dist/types/logger.d.ts +35 -0
- package/dist/types/middleware/admin-only.d.ts +19 -0
- package/dist/types/oauth-providers/dropbox.d.ts +3 -14
- package/dist/types/oauth-providers/facebook.d.ts +3 -7
- package/dist/types/oauth-providers/google.d.ts +3 -7
- package/dist/types/oauth-providers/index.d.ts +2 -10
- package/dist/types/oauth-providers/instagram.d.ts +3 -7
- package/dist/types/oauth-providers/oauth-provider.d.ts +25 -21
- package/dist/types/oauth-providers/spotify.d.ts +3 -7
- package/dist/types/routes/data-query.d.ts +1 -1
- package/dist/types/routes/meta-logs.d.ts +20 -0
- package/dist/types/rules.d.ts +4 -4
- package/dist/types/server.d.ts +9 -7
- package/dist/types/settings/email.d.ts +1 -1
- package/dist/types/settings/index.d.ts +5 -6
- package/dist/types/shared/clients.d.ts +3 -1
- package/dist/types/shared/env.d.ts +6 -4
- package/dist/types/shared/http.d.ts +2 -0
- package/dist/types/shared/signin.d.ts +1 -1
- package/dist/types/websocket/index.d.ts +4 -0
- package/dist/types/websocket/manager.d.ts +1 -1
- package/package.json +12 -11
- package/src/index.ts +3 -1
- package/src/logger.ts +56 -0
- package/src/middleware/admin-only.ts +29 -0
- package/src/middleware/user.ts +4 -4
- package/src/oauth-providers/dropbox.ts +5 -4
- package/src/oauth-providers/facebook.ts +5 -4
- package/src/oauth-providers/google.ts +5 -4
- package/src/oauth-providers/index.ts +2 -1
- package/src/oauth-providers/instagram.ts +5 -4
- package/src/oauth-providers/oauth-provider.ts +14 -4
- package/src/oauth-providers/spotify.ts +5 -4
- package/src/placeholder.d.ts +12 -0
- 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-query.ts +1 -1
- 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 +14 -6
- package/src/routes/data-set.yaml +7 -1
- package/src/routes/data-sync-changes.ts +1 -1
- package/src/routes/data-sync-mutations.ts +1 -1
- package/src/routes/data-transaction-finish.yaml +6 -0
- package/src/routes/data-transaction.ts +35 -11
- package/src/routes/data-update.ts +12 -4
- package/src/routes/data-update.yaml +7 -1
- package/src/routes/meta-info.ts +1 -1
- package/src/routes/meta-logs.ts +57 -0
- package/src/routes/meta.ts +4 -0
- package/src/routes/oauth2-signin.ts +17 -12
- package/src/rules.ts +8 -8
- package/src/server.ts +13 -9
- package/src/settings/email.ts +1 -1
- package/src/settings/index.ts +7 -7
- package/src/shared/clients.ts +1 -1
- package/src/shared/env.ts +5 -4
- package/src/shared/http.ts +2 -0
- package/src/shared/signin.ts +10 -4
- package/src/start.ts +3 -0
- package/src/websocket/index.ts +41 -24
- package/src/websocket/manager.ts +1 -1
- package/src/websocket/socket.io.ts +9 -10
- package/webmanager/acebase-client-browser.min.js +16 -0
- package/webmanager/index.html +2 -2
- package/webmanager/index.js +3 -6
- package/.vscode/launch.json +0 -24
|
@@ -22,11 +22,13 @@ class SetDataError extends Error {
|
|
|
22
22
|
exports.SetDataError = SetDataError;
|
|
23
23
|
const addRoute = (env) => {
|
|
24
24
|
env.app.put(`/data/${env.db.name}/*`, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
25
|
-
var _a, _b, _c, _d, _e, _f
|
|
26
|
-
// Set data
|
|
25
|
+
var _a, _b, _c, _d, _e, _f;
|
|
27
26
|
const path = req.path.slice(env.db.name.length + 7);
|
|
27
|
+
const LOG_ACTION = 'data.set';
|
|
28
|
+
const LOG_DETAILS = { ip: req.ip, uid: (_b = (_a = req.user) === null || _a === void 0 ? void 0 : _a.uid) !== null && _b !== void 0 ? _b : null, path };
|
|
28
29
|
const access = env.rules.userHasAccess(req.user, path, true);
|
|
29
30
|
if (!access.allow) {
|
|
31
|
+
env.log.error(LOG_ACTION, 'unauthorized', Object.assign(Object.assign({}, LOG_DETAILS), { rule_code: access.code, rule_path: (_c = access.rulePath) !== null && _c !== void 0 ? _c : null, rule_error: (_e = (_d = access.details) === null || _d === void 0 ? void 0 : _d.message) !== null && _e !== void 0 ? _e : null }));
|
|
30
32
|
return (0, error_1.sendUnauthorizedError)(res, access.code, access.message);
|
|
31
33
|
}
|
|
32
34
|
try {
|
|
@@ -35,7 +37,7 @@ const addRoute = (env) => {
|
|
|
35
37
|
throw new SetDataError('invalid_serialized_value', 'The sent value is not properly serialized');
|
|
36
38
|
}
|
|
37
39
|
const val = acebase_core_1.Transport.deserialize(data);
|
|
38
|
-
if (path === '' && ((
|
|
40
|
+
if (path === '' && ((_f = req.user) === null || _f === void 0 ? void 0 : _f.uid) !== 'admin' && val !== null && typeof val === 'object') {
|
|
39
41
|
// Non-admin user: remove any private properties from the update object
|
|
40
42
|
Object.keys(val).filter(key => key.startsWith('__')).forEach(key => delete val[key]);
|
|
41
43
|
}
|
|
@@ -47,24 +49,26 @@ const addRoute = (env) => {
|
|
|
47
49
|
yield env.db.ref(path)
|
|
48
50
|
.context(req.context)
|
|
49
51
|
.set(val);
|
|
52
|
+
// NEW: add cursor to response context, which was added to the request context in `acebase_cursor` if transaction logging is enabled
|
|
53
|
+
const returnContext = { acebase_cursor: req.context.acebase_cursor };
|
|
54
|
+
res.setHeader('AceBase-Context', JSON.stringify(returnContext));
|
|
50
55
|
res.send({ success: true });
|
|
51
56
|
}
|
|
52
57
|
catch (err) {
|
|
53
58
|
if (err instanceof acebase_1.SchemaValidationError) {
|
|
54
|
-
|
|
59
|
+
env.log.error(LOG_ACTION, 'schema_validation_failed', Object.assign(Object.assign({}, LOG_DETAILS), { reason: err.reason }));
|
|
55
60
|
res.status(422).send({ code: 'schema_validation_failed', message: err.message });
|
|
56
61
|
}
|
|
57
62
|
else if (err instanceof SetDataError) {
|
|
58
|
-
|
|
63
|
+
env.log.error(LOG_ACTION, err.code, Object.assign(Object.assign({}, LOG_DETAILS), { message: err.message }));
|
|
59
64
|
(0, error_1.sendBadRequestError)(res, err);
|
|
60
65
|
}
|
|
61
66
|
else {
|
|
62
67
|
env.debug.error(`failed to set "${path}":`, err);
|
|
63
|
-
|
|
68
|
+
env.log.error(LOG_ACTION, 'unexpected', LOG_DETAILS, err);
|
|
64
69
|
(0, error_1.sendError)(res, err);
|
|
65
70
|
}
|
|
66
71
|
}
|
|
67
|
-
;
|
|
68
72
|
}));
|
|
69
73
|
};
|
|
70
74
|
exports.addRoute = addRoute;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-set.js","sourceRoot":"","sources":["../../../src/routes/data-set.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgD;AAChD,+CAAyC;AAIzC,2CAAwF;AAExF,MAAa,YAAa,SAAQ,KAAK;IACnC,YAAmB,IAAgC,EAAE,OAAe;QAChE,KAAK,CAAC,OAAO,CAAC,CAAC;QADA,SAAI,GAAJ,IAAI,CAA4B;IAEnD,CAAC;CACJ;AAJD,oCAIC;AAWM,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE;;
|
|
1
|
+
{"version":3,"file":"data-set.js","sourceRoot":"","sources":["../../../src/routes/data-set.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-sync-changes.js","sourceRoot":"","sources":["../../../src/routes/data-sync-changes.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,+CAAmD;AAEnD,2CAAwF;AAiBjF,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,iBAAiB,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE;;QACpE,wFAAwF;QACxF,IAAI,CAAC,CAAA,MAAA,GAAG,CAAC,MAAM,CAAC,YAAY,0CAAE,GAAG,CAAA,EAAE;YAC/B,OAAO,IAAA,2BAAmB,EAAC,GAAG,EAAE,EAAE,IAAI,EAAE,wBAAwB,EAAE,OAAO,EAAE,iCAAiC,EAAE,CAAC,CAAC;SACnH;QACD,IAAI;YACA,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC;YACvB,IAAI,OAAO,GAAG,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ;gBACvC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC1C,CAAC,CAAC,OAAO,IAAI,CAAC,GAAG,KAAK,QAAQ;oBAC1B,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;oBACtB,CAAC,CAAC,IAAI,CAAC;YACf,IAAI,OAAO,KAAK,IAAI,EAAE;gBAClB,OAAO,IAAA,2BAAmB,EAAC,GAAG,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,yBAAyB,EAAE,CAAC,CAAC;aACpG;YACD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;gBACtB,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;aACjD;YACD,+DAA+D;YAC/D,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;gBAC9B,IAAI,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;gBACvB,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,qGAAqG;oBACxK,oEAAoE;oBACpE,IAAI,GAAG,uBAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;iBAC5C;gBACD,OAAO,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC;YAChE,CAAC,CAAC,CAAC;YACH,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;gBACtB,OAAO,IAAA,6BAAqB,EAAC,GAAG,EAAE,gBAAgB,EAAE,4CAA4C,CAAC,CAAC;aACrG;YAED,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;YACxB,IAAI,SAAiB,CAAC;YACtB,IAAI,OAAO,IAAI,CAAC,SAAS,KAAK,WAAW,EAAE;gBACvC,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACrC,IAAI,KAAK,CAAC,SAAS,CAAC,EAAE;oBAClB,OAAO,IAAA,2BAAmB,EAAC,GAAG,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,2BAA2B,EAAE,CAAC,CAAC;iBACtG;aACJ;YACD,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;YAEhF,GAAG,CAAC,SAAS,CAAC,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,cAAc,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;YACxF,GAAG,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;YAEpC,MAAM,UAAU,GAAG,wBAAS,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACxD,GAAG,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"data-sync-changes.js","sourceRoot":"","sources":["../../../src/routes/data-sync-changes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-sync-mutations.js","sourceRoot":"","sources":["../../../src/routes/data-sync-mutations.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAmD;AAGnD,2CAAwF;AAiBjF,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,mBAAmB,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE;;QACtE,gFAAgF;QAChF,IAAI,CAAC,CAAA,MAAA,GAAG,CAAC,MAAM,CAAC,YAAY,0CAAE,GAAG,CAAA,EAAE;YAC/B,OAAO,IAAA,2BAAmB,EAAC,GAAG,EAAE,EAAE,IAAI,EAAE,wBAAwB,EAAE,OAAO,EAAE,iCAAiC,EAAE,CAAC,CAAC;SACnH;QACD,IAAI;YACA,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC;YACvB,IAAI,OAAO,GAAG,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ;gBACvC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC1C,CAAC,CAAC,OAAO,IAAI,CAAC,GAAG,KAAK,QAAQ;oBAC1B,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;oBACtB,CAAC,CAAC,IAAI,CAAC;YACf,IAAI,OAAO,KAAK,IAAI,EAAE;gBAClB,OAAO,IAAA,2BAAmB,EAAC,GAAG,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,2BAA2B,EAAE,CAAC,CAAC;aACtG;YACD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;gBACtB,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;aACjD;YACD,+DAA+D;YAC/D,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;gBAC9B,IAAI,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;gBACvB,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,qGAAqG;oBACxK,oEAAoE;oBACpE,IAAI,GAAG,uBAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;iBAC5C;gBACD,OAAO,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC;YAChE,CAAC,CAAC,CAAC;YACH,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;gBACtB,OAAO,IAAA,6BAAqB,EAAC,GAAG,EAAE,gBAAgB,EAAE,4CAA4C,CAAC,CAAC;aACrG;YAED,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;YACxB,IAAI,SAAiB,CAAC;YACtB,IAAI,OAAO,IAAI,CAAC,SAAS,KAAK,WAAW,EAAE;gBACvC,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACrC,IAAI,KAAK,CAAC,SAAS,CAAC,EAAE;oBAClB,OAAO,IAAA,2BAAmB,EAAC,GAAG,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,2BAA2B,EAAE,CAAC,CAAC;iBACtG;aACJ;YACD,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;YAElF,GAAG,CAAC,SAAS,CAAC,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,cAAc,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;YACxF,GAAG,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;YAEpC,MAAM,UAAU,GAAG,wBAAS,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC1D,GAAG,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"data-sync-mutations.js","sourceRoot":"","sources":["../../../src/routes/data-sync-mutations.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,8 +27,11 @@ const addRoutes = (env) => {
|
|
|
27
27
|
env.app.post(`/transaction/${env.db.name}/start`, (req, res) => {
|
|
28
28
|
var _a, _b, _c, _d;
|
|
29
29
|
const data = req.body;
|
|
30
|
+
const LOG_ACTION = 'data.transaction.start';
|
|
31
|
+
const LOG_DETAILS = { ip: req.ip, uid: (_b = (_a = req.user) === null || _a === void 0 ? void 0 : _a.uid) !== null && _b !== void 0 ? _b : null, path: data.path };
|
|
30
32
|
const access = env.rules.userHasAccess(req.user, data.path, true);
|
|
31
33
|
if (!access.allow) {
|
|
34
|
+
env.log.error(LOG_ACTION, 'unauthorized', Object.assign(Object.assign({}, LOG_DETAILS), { rule_code: access.code, rule_path: (_c = access.rulePath) !== null && _c !== void 0 ? _c : null }), access.details);
|
|
32
35
|
return (0, error_1.sendUnauthorizedError)(res, access.code, access.message);
|
|
33
36
|
}
|
|
34
37
|
// Start transaction
|
|
@@ -64,16 +67,19 @@ const addRoutes = (env) => {
|
|
|
64
67
|
}
|
|
65
68
|
catch (err) {
|
|
66
69
|
env.debug.error(`failed to start transaction on "${tx.path}":`, err);
|
|
67
|
-
|
|
70
|
+
env.log.error(LOG_ACTION, (_d = err.code) !== null && _d !== void 0 ? _d : 'unexpected', LOG_DETAILS, typeof err.code === 'undefined' ? err : null);
|
|
68
71
|
(0, error_1.sendUnexpectedError)(res, err);
|
|
69
72
|
}
|
|
70
73
|
});
|
|
71
74
|
// Finish transaction endpoint:
|
|
72
75
|
env.app.post(`/transaction/${env.db.name}/finish`, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
73
|
-
var _a, _b, _c, _d, _e, _f, _g
|
|
76
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
74
77
|
const data = req.body;
|
|
78
|
+
const LOG_ACTION = 'data.transaction.finish';
|
|
79
|
+
const LOG_DETAILS = { ip: req.ip, uid: (_b = (_a = req.user) === null || _a === void 0 ? void 0 : _a.uid) !== null && _b !== void 0 ? _b : null, path: data.path };
|
|
75
80
|
const tx = _transactions.get(data.id);
|
|
76
81
|
if (!tx || tx.path !== data.path) {
|
|
82
|
+
env.log.error(LOG_ACTION, tx ? 'wrong_path' : 'not_found', Object.assign(Object.assign({}, LOG_DETAILS), { id: data.id, tx_path: (_c = tx === null || tx === void 0 ? void 0 : tx.path) !== null && _c !== void 0 ? _c : null }));
|
|
77
83
|
res.statusCode = 410; // Gone
|
|
78
84
|
res.send(`transaction not found`);
|
|
79
85
|
return;
|
|
@@ -82,34 +88,48 @@ const addRoutes = (env) => {
|
|
|
82
88
|
_transactions.delete(tx.id);
|
|
83
89
|
const access = env.rules.userHasAccess(req.user, tx.path, true);
|
|
84
90
|
if (!access.allow) {
|
|
91
|
+
env.log.error(LOG_ACTION, 'unauthorized', Object.assign(Object.assign({}, LOG_DETAILS), { rule_code: access.code, rule_path: (_d = access.rulePath) !== null && _d !== void 0 ? _d : null }), access.details);
|
|
85
92
|
return (0, error_1.sendUnauthorizedError)(res, access.code, access.message);
|
|
86
93
|
}
|
|
87
94
|
// Finish transaction
|
|
88
95
|
try {
|
|
89
|
-
|
|
96
|
+
let cancel = false;
|
|
97
|
+
if (typeof data.value === 'object' && (data.value === null || Object.keys(data.value).length === 0)) {
|
|
98
|
+
// Returning undefined from a transaction callback should cancel the transaction
|
|
99
|
+
// acebase-client (Transport.serialize) serializes value undefined as { val: undefined, map: undefined }, which
|
|
100
|
+
// then is sent to the server as an empty object: {}
|
|
101
|
+
cancel = true;
|
|
102
|
+
}
|
|
103
|
+
else if (typeof ((_e = data.value) === null || _e === void 0 ? void 0 : _e.val) === 'undefined' || !['string', 'object', 'undefined'].includes(typeof ((_f = data.value) === null || _f === void 0 ? void 0 : _f.map))) {
|
|
90
104
|
throw new DataTransactionError('invalid_serialized_value', 'The sent value is not properly serialized');
|
|
91
105
|
}
|
|
92
|
-
const newValue = acebase_core_1.Transport.deserialize(data.value);
|
|
93
|
-
if (tx.path === '' && ((
|
|
106
|
+
const newValue = cancel ? undefined : acebase_core_1.Transport.deserialize(data.value);
|
|
107
|
+
if (tx.path === '' && ((_g = req.user) === null || _g === void 0 ? void 0 : _g.uid) !== 'admin' && newValue !== null && typeof newValue === 'object') {
|
|
94
108
|
// Non-admin user: remove any private properties from the update object
|
|
95
109
|
Object.keys(newValue).filter(key => key.startsWith('__')).forEach(key => delete newValue[key]);
|
|
96
110
|
}
|
|
97
|
-
yield tx.finish(newValue);
|
|
111
|
+
const result = yield tx.finish(newValue);
|
|
112
|
+
// NEW: capture cursor and return it in the response context header
|
|
113
|
+
if (!tx.context) {
|
|
114
|
+
tx.context = {};
|
|
115
|
+
}
|
|
116
|
+
tx.context.acebase_cursor = result.cursor;
|
|
117
|
+
res.setHeader('AceBase-Context', JSON.stringify(tx.context));
|
|
98
118
|
res.send('done');
|
|
99
119
|
}
|
|
100
120
|
catch (err) {
|
|
101
121
|
tx.finish(); // Finish without value cancels the transaction
|
|
102
122
|
if (err instanceof acebase_1.SchemaValidationError) {
|
|
103
|
-
|
|
123
|
+
env.log.error(LOG_ACTION, 'schema_validation_failed', Object.assign(Object.assign({}, LOG_DETAILS), { reason: err.reason }));
|
|
104
124
|
res.status(422).send({ code: 'schema_validation_failed', message: err.message });
|
|
105
125
|
}
|
|
106
126
|
else if (err instanceof DataTransactionError) {
|
|
107
|
-
|
|
127
|
+
env.log.error(LOG_ACTION, err.code, Object.assign(Object.assign({}, LOG_DETAILS), { message: err.message }));
|
|
108
128
|
(0, error_1.sendBadRequestError)(res, err);
|
|
109
129
|
}
|
|
110
130
|
else {
|
|
111
|
-
env.debug.error(`failed to
|
|
112
|
-
|
|
131
|
+
env.debug.error(`failed to finish transaction on "${tx.path}":`, err);
|
|
132
|
+
env.log.error(LOG_ACTION, 'unexpected', LOG_DETAILS, err);
|
|
113
133
|
(0, error_1.sendError)(res, err);
|
|
114
134
|
}
|
|
115
135
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-transaction.js","sourceRoot":"","sources":["../../../src/routes/data-transaction.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgD;AAChD,+CAA6C;
|
|
1
|
+
{"version":3,"file":"data-transaction.js","sourceRoot":"","sources":["../../../src/routes/data-transaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,11 +22,13 @@ class UpdateDataError extends Error {
|
|
|
22
22
|
exports.UpdateDataError = UpdateDataError;
|
|
23
23
|
const addRoute = (env) => {
|
|
24
24
|
env.app.post(`/data/${env.db.name}/*`, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
25
|
-
var _a, _b, _c, _d, _e, _f
|
|
26
|
-
// update data
|
|
25
|
+
var _a, _b, _c, _d, _e, _f;
|
|
27
26
|
const path = req.path.slice(env.db.name.length + 7);
|
|
27
|
+
const LOG_ACTION = 'data.update';
|
|
28
|
+
const LOG_DETAILS = { ip: req.ip, uid: (_b = (_a = req.user) === null || _a === void 0 ? void 0 : _a.uid) !== null && _b !== void 0 ? _b : null, path };
|
|
28
29
|
const access = env.rules.userHasAccess(req.user, path, true);
|
|
29
30
|
if (!access.allow) {
|
|
31
|
+
env.log.error(LOG_ACTION, 'unauthorized', Object.assign(Object.assign({}, LOG_DETAILS), { rule_code: access.code, rule_path: (_c = access.rulePath) !== null && _c !== void 0 ? _c : null, rule_error: (_e = (_d = access.details) === null || _d === void 0 ? void 0 : _d.message) !== null && _e !== void 0 ? _e : null }));
|
|
30
32
|
return (0, error_1.sendUnauthorizedError)(res, access.code, access.message);
|
|
31
33
|
}
|
|
32
34
|
try {
|
|
@@ -35,7 +37,7 @@ const addRoute = (env) => {
|
|
|
35
37
|
throw new UpdateDataError('invalid_serialized_value', 'The sent value is not properly serialized');
|
|
36
38
|
}
|
|
37
39
|
const val = acebase_core_1.Transport.deserialize(data);
|
|
38
|
-
if (path === '' && ((
|
|
40
|
+
if (path === '' && ((_f = req.user) === null || _f === void 0 ? void 0 : _f.uid) !== 'admin' && val !== null && typeof val === 'object') {
|
|
39
41
|
// Non-admin user: remove any private properties from the update object
|
|
40
42
|
Object.keys(val).filter(key => key.startsWith('__')).forEach(key => delete val[key]);
|
|
41
43
|
}
|
|
@@ -47,20 +49,23 @@ const addRoute = (env) => {
|
|
|
47
49
|
yield env.db.ref(path)
|
|
48
50
|
.context(req.context)
|
|
49
51
|
.update(val);
|
|
52
|
+
// NEW: add cursor to response context, which was added to the request context in `acebase_cursor` if transaction logging is enabled
|
|
53
|
+
const returnContext = { acebase_cursor: req.context.acebase_cursor };
|
|
54
|
+
res.setHeader('AceBase-Context', JSON.stringify(returnContext));
|
|
50
55
|
res.send({ success: true });
|
|
51
56
|
}
|
|
52
57
|
catch (err) {
|
|
53
58
|
if (err instanceof acebase_1.SchemaValidationError) {
|
|
54
|
-
|
|
59
|
+
env.log.error(LOG_ACTION, 'schema_validation_failed', Object.assign(Object.assign({}, LOG_DETAILS), { reason: err.reason }));
|
|
55
60
|
res.status(422).send({ code: 'schema_validation_failed', message: err.message });
|
|
56
61
|
}
|
|
57
62
|
else if (err instanceof UpdateDataError) {
|
|
58
|
-
|
|
63
|
+
env.log.error(LOG_ACTION, err.code, Object.assign(Object.assign({}, LOG_DETAILS), { message: err.message }));
|
|
59
64
|
(0, error_1.sendBadRequestError)(res, err);
|
|
60
65
|
}
|
|
61
66
|
else {
|
|
62
67
|
env.debug.error(`failed to update "${path}":`, err);
|
|
63
|
-
|
|
68
|
+
env.log.error(LOG_ACTION, 'unexpected', LOG_DETAILS, err);
|
|
64
69
|
(0, error_1.sendError)(res, err);
|
|
65
70
|
}
|
|
66
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-update.js","sourceRoot":"","sources":["../../../src/routes/data-update.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgD;AAChD,+CAAyC;AAIzC,2CAAwF;AAExF,MAAa,eAAgB,SAAQ,KAAK;IACtC,YAAmB,IAAgC,EAAE,OAAe;QAChE,KAAK,CAAC,OAAO,CAAC,CAAC;QADA,SAAI,GAAJ,IAAI,CAA4B;IAEnD,CAAC;CACJ;AAJD,0CAIC;AAYM,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE;;
|
|
1
|
+
{"version":3,"file":"data-update.js","sourceRoot":"","sources":["../../../src/routes/data-update.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"meta-info.js","sourceRoot":"","sources":["../../../src/routes/meta-info.ts"],"names":[],"mappings":";;;AACA,2BAAkC;AAClC,iDAAqD;AACrD,+BAAyC;AACzC,yBAAyB;AAWlB,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,wCAAwC;IACxC,MAAM,QAAQ,GAAG,IAAA,WAAS,EAAC,0BAAe,EAAE,eAAe,CAAC,CAAC;IAC7D,MAAM,IAAI,GAAG,IAAA,iBAAY,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC7C,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAErC,oBAAoB;IACpB,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,GAAY,EAAE,GAAG,EAAE,EAAE;QAEtD,MAAM,IAAI,GAAG;YACT,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE;YAChB,OAAO,EAAE,OAAO,CAAC,GAAG;SACvB,CAAC;QACF,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,OAAO,EAAE;YACtC,MAAM,gBAAgB,GAAG,MAAM,CAAC,EAAE;gBAC9B,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,IAAI,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC;YACjE,CAAC,CAAA;YACD,MAAM,UAAU,GAAG,EAAE,CAAC;YACtB,MAAM,QAAQ,GAAG,UAAU,GAAG,EAAE,CAAC;YACjC,MAAM,OAAO,GAAG,QAAQ,GAAG,EAAE,CAAC;YAC9B,MAAM,YAAY,GAAG,MAAM,CAAC,EAAE;gBAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC,CAAC;gBAC1C,MAAM,IAAI,OAAO,GAAG,IAAI,CAAC;gBACzB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,QAAQ,CAAC,CAAC;gBAC5C,MAAM,IAAI,KAAK,GAAG,QAAQ,CAAC;gBAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,UAAU,CAAC,CAAC;gBAChD,MAAM,IAAI,OAAO,GAAG,UAAU,CAAC;gBAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBACnC,OAAO,GAAG,IAAI,IAAI,KAAK,IAAI,OAAO,IAAI,OAAO,GAAG,CAAC;YACrD,CAAC,CAAC;YACF,MAAM,GAAG,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;YAClC,MAAM,SAAS,GAAG;gBACd,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,IAAI;gBACnB,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE;gBACvB,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE;gBACf,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE;gBACrB,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE;gBACnB,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC;gBACjC,IAAI,EAAE,EAAE,CAAC,OAAO,EAAE;gBAClB,GAAG,EAAE;oBACD,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;oBACtC,IAAI,EAAE,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC;oBACpC,OAAO,EAAE;wBACL,YAAY,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"meta-info.js","sourceRoot":"","sources":["../../../src/routes/meta-info.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.addRoute = void 0;
|
|
13
|
+
const admin_only_1 = require("../middleware/admin-only");
|
|
14
|
+
const addRoute = (env) => {
|
|
15
|
+
env.app.get(`/logs/${env.db.name}`, (0, admin_only_1.default)(env), (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
16
|
+
// Get database logs
|
|
17
|
+
var _a, _b, _c;
|
|
18
|
+
// Create indexes if not there yet
|
|
19
|
+
const db = env.log.ref.db;
|
|
20
|
+
const createIndexes = [
|
|
21
|
+
db.indexes.create(env.log.ref.path, 'date')
|
|
22
|
+
];
|
|
23
|
+
if (req.query.filter_col === 'action') {
|
|
24
|
+
createIndexes.push(db.indexes.create(env.log.ref.path, 'action', { include: ['date'] }));
|
|
25
|
+
}
|
|
26
|
+
if (req.query.filter_col === 'code') {
|
|
27
|
+
createIndexes.push(db.indexes.create(env.log.ref.path, 'code', { include: ['date'] }));
|
|
28
|
+
}
|
|
29
|
+
yield Promise.all(createIndexes);
|
|
30
|
+
try {
|
|
31
|
+
const query = env.log.query()
|
|
32
|
+
.take(parseInt((_a = req.query.take) !== null && _a !== void 0 ? _a : '100'))
|
|
33
|
+
.skip(parseInt((_b = req.query.skip) !== null && _b !== void 0 ? _b : '0'))
|
|
34
|
+
.sort((_c = req.query.sort) !== null && _c !== void 0 ? _c : 'date', false);
|
|
35
|
+
if (req.query.filter_col) {
|
|
36
|
+
query.filter(req.query.filter_col, req.query.filter_op, req.query.filter_val);
|
|
37
|
+
}
|
|
38
|
+
const snaps = yield query.get();
|
|
39
|
+
const logs = snaps.getValues();
|
|
40
|
+
res.send(logs);
|
|
41
|
+
}
|
|
42
|
+
catch (err) {
|
|
43
|
+
res.statusCode = 500;
|
|
44
|
+
res.send(err.message);
|
|
45
|
+
}
|
|
46
|
+
}));
|
|
47
|
+
};
|
|
48
|
+
exports.addRoute = addRoute;
|
|
49
|
+
exports.default = exports.addRoute;
|
|
50
|
+
//# sourceMappingURL=meta-logs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"meta-logs.js","sourceRoot":"","sources":["../../../src/routes/meta-logs.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,yDAAiD;AAc1C,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,IAAA,oBAAS,EAAC,GAAG,CAAC,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE;QAC5E,oBAAoB;;QAEpB,kCAAkC;QAClC,MAAM,EAAE,GAAI,GAAG,CAAC,GAAG,CAAC,GAAW,CAAC,EAAa,CAAC;QAC9C,MAAM,aAAa,GAAG;YAClB,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC;SAC9C,CAAC;QACF,IAAI,GAAG,CAAC,KAAK,CAAC,UAAU,KAAK,QAAQ,EAAE;YACnC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;SAC5F;QACD,IAAI,GAAG,CAAC,KAAK,CAAC,UAAU,KAAK,MAAM,EAAE;YACjC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;SAC1F;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAEjC,IAAI;YACA,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE;iBACxB,IAAI,CAAC,QAAQ,CAAC,MAAA,GAAG,CAAC,KAAK,CAAC,IAAI,mCAAI,KAAK,CAAC,CAAC;iBACvC,IAAI,CAAC,QAAQ,CAAC,MAAA,GAAG,CAAC,KAAK,CAAC,IAAI,mCAAI,GAAG,CAAC,CAAC;iBACrC,IAAI,CAAC,MAAA,GAAG,CAAC,KAAK,CAAC,IAAI,mCAAI,MAAM,EAAE,KAAK,CAAC,CAAC;YAE3C,IAAI,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE;gBACtB,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;aACjF;YAED,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,CAAC;YAChC,MAAM,IAAI,GAAG,KAAK,CAAC,SAAS,EAAsB,CAAC;YACnD,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAClB;QACD,OAAO,GAAG,EAAE;YACR,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;YACrB,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;SACzB;IACL,CAAC,CAAA,CAAC,CAAC;AAEP,CAAC,CAAC;AAtCW,QAAA,QAAQ,YAsCnB;AAEF,kBAAe,gBAAQ,CAAC"}
|
package/dist/cjs/routes/meta.js
CHANGED
|
@@ -4,6 +4,7 @@ exports.addRoutes = void 0;
|
|
|
4
4
|
const meta_info_1 = require("./meta-info");
|
|
5
5
|
const meta_ping_1 = require("./meta-ping");
|
|
6
6
|
const meta_stats_1 = require("./meta-stats");
|
|
7
|
+
const meta_logs_1 = require("./meta-logs");
|
|
7
8
|
const addRoutes = (env) => {
|
|
8
9
|
// Add info endpoint
|
|
9
10
|
(0, meta_info_1.default)(env);
|
|
@@ -11,6 +12,8 @@ const addRoutes = (env) => {
|
|
|
11
12
|
(0, meta_ping_1.default)(env);
|
|
12
13
|
// Add database stats endpoint
|
|
13
14
|
(0, meta_stats_1.default)(env);
|
|
15
|
+
// Add logs endpoint (admin only)
|
|
16
|
+
(0, meta_logs_1.default)(env);
|
|
14
17
|
};
|
|
15
18
|
exports.addRoutes = addRoutes;
|
|
16
19
|
exports.default = exports.addRoutes;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"meta.js","sourceRoot":"","sources":["../../../src/routes/meta.ts"],"names":[],"mappings":";;;AACA,2CAAuC;AACvC,2CAAuC;AACvC,6CAAyC;
|
|
1
|
+
{"version":3,"file":"meta.js","sourceRoot":"","sources":["../../../src/routes/meta.ts"],"names":[],"mappings":";;;AACA,2CAAuC;AACvC,2CAAuC;AACvC,6CAAyC;AACzC,2CAAuC;AAEhC,MAAM,SAAS,GAAG,CAAC,GAAyB,EAAE,EAAE;IAEnD,oBAAoB;IACpB,IAAA,mBAAY,EAAC,GAAG,CAAC,CAAC;IAElB,oBAAoB;IACpB,IAAA,mBAAY,EAAC,GAAG,CAAC,CAAC;IAElB,8BAA8B;IAC9B,IAAA,oBAAa,EAAC,GAAG,CAAC,CAAC;IAEnB,iCAAiC;IACjC,IAAA,mBAAY,EAAC,GAAG,CAAC,CAAC;AACtB,CAAC,CAAC;AAbW,QAAA,SAAS,aAapB;AAEF,kBAAe,iBAAS,CAAC"}
|
|
@@ -18,8 +18,10 @@ const socketSignInSuccess = `<html><script>window.close()</script><body>Signed i
|
|
|
18
18
|
const socketSignInFailed = `<html><script>window.close()</script><body>Failed to sign in. You can <a href="javascript:window.close()">close</a> this page</body></html>`;
|
|
19
19
|
const addRoute = (env) => {
|
|
20
20
|
env.app.get(`/oauth2/${env.db.name}/signin`, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
|
-
var _a, _b;
|
|
22
21
|
// This is where the user is redirected to by the provider after signin or error
|
|
22
|
+
var _a, _b;
|
|
23
|
+
const LOG_ACTION = 'oauth2.signin';
|
|
24
|
+
const LOG_DETAILS = { ip: req.ip, provider: null };
|
|
23
25
|
try {
|
|
24
26
|
const state = (0, tokens_1.parseSignedPublicToken)(req.query.state, env.tokenSalt);
|
|
25
27
|
if (req.query.error) {
|
|
@@ -36,6 +38,7 @@ const addRoute = (env) => {
|
|
|
36
38
|
// Got authorization code
|
|
37
39
|
const authCode = req.query.code;
|
|
38
40
|
const provider = env.authProviders[state.provider];
|
|
41
|
+
LOG_DETAILS.provider = state.provider;
|
|
39
42
|
// Get access & refresh tokens
|
|
40
43
|
const tokens = yield provider.getAccessToken({ type: 'auth', auth_code: authCode, redirect_url: `${req.protocol}://${req.headers.host}/oauth2/${env.db.name}/signin` });
|
|
41
44
|
let user_details;
|
|
@@ -55,12 +58,13 @@ const addRoute = (env) => {
|
|
|
55
58
|
if (contentType === 'image/png') { //state.provider === 'google' &&
|
|
56
59
|
// Don't accept image/png, because it's probably a placeholder image. Google does this by creating a png with people's initials
|
|
57
60
|
user_details.picture = [];
|
|
58
|
-
return;
|
|
59
61
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
62
|
+
else {
|
|
63
|
+
const image = yield response.arrayBuffer();
|
|
64
|
+
let buff = Buffer.from(image);
|
|
65
|
+
best.url = `data:${contentType};base64,${buff.toString('base64')}`;
|
|
66
|
+
user_details.picture = [best]; // Only keep the best one
|
|
67
|
+
}
|
|
64
68
|
}
|
|
65
69
|
catch (err) {
|
|
66
70
|
env.debug.warn(`Could not fetch profile picture from "${best.url}": `, err);
|
|
@@ -141,7 +145,7 @@ const addRoute = (env) => {
|
|
|
141
145
|
// Add provider details
|
|
142
146
|
yield env.authRef.child(uid).child('settings').update(getProviderSettings());
|
|
143
147
|
// Log success
|
|
144
|
-
env.
|
|
148
|
+
env.log.event(LOG_ACTION, Object.assign(Object.assign({}, LOG_DETAILS), { uid }));
|
|
145
149
|
// Cache the user
|
|
146
150
|
env.authCache.set(user.uid, user);
|
|
147
151
|
// Request signin e-mail to be sent
|
|
@@ -161,13 +165,13 @@ const addRoute = (env) => {
|
|
|
161
165
|
provider: state.provider
|
|
162
166
|
};
|
|
163
167
|
(_a = env.config.email) === null || _a === void 0 ? void 0 : _a.send(request).catch(err => {
|
|
164
|
-
env.
|
|
168
|
+
env.log.error(LOG_ACTION + '.email', 'unexpected', Object.assign(Object.assign({}, LOG_DETAILS), { uid, request }), err);
|
|
165
169
|
});
|
|
166
170
|
}
|
|
167
171
|
else if (snaps.length === 0) {
|
|
168
172
|
// User does not exist, create
|
|
169
173
|
if (!env.config.auth.allowUserSignup) {
|
|
170
|
-
env.
|
|
174
|
+
env.log.error(LOG_ACTION, 'user_signup_disabled', Object.assign(Object.assign({}, LOG_DETAILS), { email: user_details.email }));
|
|
171
175
|
res.statusCode = 403; // Forbidden
|
|
172
176
|
return res.send({ code: 'admin_only', message: 'Only admin is allowed to create users' });
|
|
173
177
|
}
|
|
@@ -194,7 +198,7 @@ const addRoute = (env) => {
|
|
|
194
198
|
const uid = userRef.key;
|
|
195
199
|
user.uid = uid;
|
|
196
200
|
// Log success
|
|
197
|
-
env.
|
|
201
|
+
env.log.event(LOG_ACTION, Object.assign(Object.assign({}, LOG_DETAILS), { uid }));
|
|
198
202
|
// Cache the user
|
|
199
203
|
env.authCache.set(user.uid, user);
|
|
200
204
|
// Request welcome e-mail to be sent
|
|
@@ -214,7 +218,7 @@ const addRoute = (env) => {
|
|
|
214
218
|
provider: state.provider
|
|
215
219
|
};
|
|
216
220
|
(_b = env.config.email) === null || _b === void 0 ? void 0 : _b.send(request).catch(err => {
|
|
217
|
-
env.
|
|
221
|
+
env.log.error(LOG_ACTION + '.email', 'unexpected', Object.assign(Object.assign({}, LOG_DETAILS), { uid, request }), err);
|
|
218
222
|
});
|
|
219
223
|
}
|
|
220
224
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth2-signin.js","sourceRoot":"","sources":["../../../src/routes/oauth2-signin.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"oauth2-signin.js","sourceRoot":"","sources":["../../../src/routes/oauth2-signin.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/rules.js
CHANGED
|
@@ -64,11 +64,11 @@ class PathBasedRules {
|
|
|
64
64
|
rule.getText = () => {
|
|
65
65
|
return text;
|
|
66
66
|
};
|
|
67
|
-
parent[key] = rule;
|
|
67
|
+
return parent[key] = rule;
|
|
68
68
|
}
|
|
69
69
|
else if (key === '.schema') {
|
|
70
70
|
// Add schema
|
|
71
|
-
env.db.schema.set(path, rule)
|
|
71
|
+
return env.db.schema.set(path, rule)
|
|
72
72
|
.catch(err => {
|
|
73
73
|
env.debug.error(`Error parsing ${path}/.schema: ${err.message}`);
|
|
74
74
|
});
|
|
@@ -83,15 +83,15 @@ class PathBasedRules {
|
|
|
83
83
|
};
|
|
84
84
|
processRules('', accessRules.rules, []);
|
|
85
85
|
// Watch file for changes
|
|
86
|
-
const
|
|
86
|
+
const watchFileListener = () => {
|
|
87
87
|
// Reload access rules
|
|
88
88
|
const accessRules = readRules();
|
|
89
89
|
processRules('', accessRules, []);
|
|
90
90
|
this.accessRules = accessRules;
|
|
91
91
|
};
|
|
92
|
-
fs.watchFile(rulesFilePath,
|
|
92
|
+
fs.watchFile(rulesFilePath, watchFileListener);
|
|
93
93
|
this.stop = () => {
|
|
94
|
-
fs.unwatchFile(rulesFilePath,
|
|
94
|
+
fs.unwatchFile(rulesFilePath, watchFileListener);
|
|
95
95
|
};
|
|
96
96
|
process.on('SIGINT', this.stop);
|
|
97
97
|
this.authEnabled = env.authEnabled;
|