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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-update.js","sourceRoot":"","sources":["../../../src/routes/auth-update.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,yCAAgH;AAChH,iDAAwT;AACxT,2CAAwG;AAExG,MAAa,WAAY,SAAQ,KAAK;IAClC,YAAmB,IAAyM,EAAE,OAAe;QACzO,KAAK,CAAC,OAAO,CAAC,CAAC;QADA,SAAI,GAAJ,IAAI,CAAqM;IAE5N,CAAC;CACJ;AAJD,kCAIC;AAyBM,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAClD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,IAAI,SAAS,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"auth-update.js","sourceRoot":"","sources":["../../../src/routes/auth-update.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,15 +25,19 @@ exports.VerifyEmailError = VerifyEmailError;
|
|
|
25
25
|
* @returns returns the verification function
|
|
26
26
|
*/
|
|
27
27
|
const addRoute = (env) => {
|
|
28
|
+
const LOG_ACTION = 'auth.verify_email';
|
|
28
29
|
const verifyEmailAddress = (clientIp, code) => __awaiter(void 0, void 0, void 0, function* () {
|
|
30
|
+
const LOG_DETAILS = { ip: clientIp, uid: null };
|
|
29
31
|
try {
|
|
30
32
|
var verification = (0, tokens_1.parseSignedPublicToken)(code, env.tokenSalt);
|
|
31
33
|
}
|
|
32
34
|
catch (err) {
|
|
33
35
|
throw new VerifyEmailError('invalid_code', err.message);
|
|
34
36
|
}
|
|
37
|
+
LOG_DETAILS.uid = verification.uid;
|
|
35
38
|
const snap = yield env.authRef.child(verification.uid).get();
|
|
36
39
|
if (!snap.exists()) {
|
|
40
|
+
env.log.error(LOG_ACTION, 'unknown_user', LOG_DETAILS);
|
|
37
41
|
throw new VerifyEmailError('unknown_user', 'Unknown user');
|
|
38
42
|
}
|
|
39
43
|
const user = snap.val();
|
|
@@ -41,21 +45,20 @@ const addRoute = (env) => {
|
|
|
41
45
|
// No need to do further checks, code was signed by us so we can trust the contents
|
|
42
46
|
// Mark account as verified
|
|
43
47
|
yield snap.ref.update({ email_verified: true });
|
|
44
|
-
env.
|
|
48
|
+
env.log.event(LOG_ACTION, LOG_DETAILS);
|
|
45
49
|
});
|
|
46
50
|
env.app.post(`/auth/${env.db.name}/verify_email`, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
47
|
-
var _a, _b;
|
|
48
51
|
const details = req.body;
|
|
49
52
|
try {
|
|
50
53
|
yield verifyEmailAddress(req.ip, details.code);
|
|
51
54
|
res.send('OK');
|
|
52
55
|
}
|
|
53
56
|
catch (err) {
|
|
54
|
-
env.logRef.push({ action: 'verify_email', success: false, code: err.code, message: err.message, ip: req.ip, date: new Date(), uid: (_b = (_a = req.user) === null || _a === void 0 ? void 0 : _a.uid) !== null && _b !== void 0 ? _b : null });
|
|
55
57
|
if (err.code) {
|
|
56
58
|
(0, error_1.sendBadRequestError)(res, err);
|
|
57
59
|
}
|
|
58
60
|
else {
|
|
61
|
+
env.log.error(LOG_ACTION, 'unexpected', { ip: req.ip, message: err.message, verificaion_code: details.code });
|
|
59
62
|
(0, error_1.sendUnexpectedError)(res, err);
|
|
60
63
|
}
|
|
61
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-verify-email.js","sourceRoot":"","sources":["../../../src/routes/auth-verify-email.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,6CAA0D;AAC1D,2CAA2E;AAE3E,MAAa,gBAAiB,SAAQ,KAAK;IACvC,YAAmB,IAAmC,EAAE,OAAe;QACnE,KAAK,CAAC,OAAO,CAAC,CAAC;QADA,SAAI,GAAJ,IAAI,CAA+B;IAEtD,CAAC;CACJ;AAJD,4CAIC;AAOD;;;;GAIG;AACI,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,MAAM,kBAAkB,GAAG,CAAO,QAAgB,EAAE,IAAY,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"auth-verify-email.js","sourceRoot":"","sources":["../../../src/routes/auth-verify-email.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,6CAA0D;AAC1D,2CAA2E;AAE3E,MAAa,gBAAiB,SAAQ,KAAK;IACvC,YAAmB,IAAmC,EAAE,OAAe;QACnE,KAAK,CAAC,OAAO,CAAC,CAAC;QADA,SAAI,GAAJ,IAAI,CAA+B;IAEtD,CAAC;CACJ;AAJD,4CAIC;AAOD;;;;GAIG;AACI,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,MAAM,UAAU,GAAG,mBAAmB,CAAC;IAEvC,MAAM,kBAAkB,GAAG,CAAO,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,IAAA,+BAAsB,EAAC,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,CAAA,CAAC;IAEF,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,IAAI,eAAe,EAAE,CAAO,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,IAAA,2BAAmB,EAAC,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,IAAA,2BAAmB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;aACjC;SACJ;IACL,CAAC,CAAA,CAAC,CAAC;IAEH,OAAO,kBAAkB,CAAC;AAC9B,CAAC,CAAC;AAnDW,QAAA,QAAQ,YAmDnB;AAEF,kBAAe,gBAAQ,CAAC"}
|
|
@@ -10,12 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.addRoute = void 0;
|
|
13
|
+
const admin_only_1 = require("../middleware/admin-only");
|
|
13
14
|
const error_1 = require("../shared/error");
|
|
14
15
|
const addRoute = (env) => {
|
|
15
16
|
const handleRequest = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
16
|
-
if (!req.user || req.user.username !== 'admin') {
|
|
17
|
-
return (0, error_1.sendUnauthorizedError)(res, 'admin_only', 'only admin can perform index operations');
|
|
18
|
-
}
|
|
19
17
|
try {
|
|
20
18
|
const data = req.body;
|
|
21
19
|
yield env.db.indexes.create(data.path, data.key, data.options);
|
|
@@ -26,7 +24,7 @@ const addRoute = (env) => {
|
|
|
26
24
|
(0, error_1.sendError)(res, err);
|
|
27
25
|
}
|
|
28
26
|
});
|
|
29
|
-
env.app.post(`/index/${env.db.name}`, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
27
|
+
env.app.post(`/index/${env.db.name}`, (0, admin_only_1.default)(env), (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
30
28
|
var _a;
|
|
31
29
|
// Legacy endpoint that was designed to handle multiple actions
|
|
32
30
|
// The only action ever implemented was 'create', so we'll handle that here
|
|
@@ -35,7 +33,7 @@ const addRoute = (env) => {
|
|
|
35
33
|
}
|
|
36
34
|
handleRequest(req, res);
|
|
37
35
|
}));
|
|
38
|
-
env.app.post(`/index/${env.db.name}/create`, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
36
|
+
env.app.post(`/index/${env.db.name}/create`, (0, admin_only_1.default)(env), (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
39
37
|
// New dedicated create endpoint
|
|
40
38
|
handleRequest(req, res);
|
|
41
39
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-index-create.js","sourceRoot":"","sources":["../../../src/routes/data-index-create.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"data-index-create.js","sourceRoot":"","sources":["../../../src/routes/data-index-create.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAiD;AAEjD,2CAA4C;AAiDrC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,MAAM,aAAa,GAAG,CAAO,GAAY,EAAE,GAAa,EAAE,EAAE;QACxD,IAAI;YACA,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;YACtB,MAAM,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAC/D,GAAG,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SAC/D;QACD,OAAM,GAAG,EAAE;YACP,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,gCAAgC,EAAE,GAAG,CAAC,CAAC;YACvD,IAAA,iBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAA,CAAC;IAEF,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,IAAA,oBAAS,EAAC,GAAG,CAAC,EAAE,CAAO,GAAwE,EAAE,GAAG,EAAE,EAAE;;QAC1I,+DAA+D;QAC/D,2EAA2E;QAC3E,IAAI,CAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,MAAM,MAAK,QAAQ,EAAE;YAC/B,OAAO,IAAA,iBAAS,EAAC,GAAG,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAC;SAChF;QACD,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC5B,CAAC,CAAA,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,IAAI,SAAS,EAAE,IAAA,oBAAS,EAAC,GAAG,CAAC,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE;QACrF,gCAAgC;QAChC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC5B,CAAC,CAAA,CAAC,CAAC;AAEP,CAAC,CAAC;AA5BW,QAAA,QAAQ,YA4BnB;AAEF,kBAAe,gBAAQ,CAAC"}
|
|
@@ -10,13 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.addRoute = void 0;
|
|
13
|
+
const admin_only_1 = require("../middleware/admin-only");
|
|
13
14
|
const error_1 = require("../shared/error");
|
|
14
15
|
const addRoute = (env) => {
|
|
15
|
-
env.app.post(`/index/${env.db.name}/delete`, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
16
|
+
env.app.post(`/index/${env.db.name}/delete`, (0, admin_only_1.default)(env), (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
16
17
|
// Delete an index
|
|
17
|
-
if (!req.user || req.user.username !== 'admin') {
|
|
18
|
-
return (0, error_1.sendUnauthorizedError)(res, 'admin_only', 'only admin can perform index operations');
|
|
19
|
-
}
|
|
20
18
|
try {
|
|
21
19
|
const data = req.body;
|
|
22
20
|
if (!data.fileName) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-index-delete.js","sourceRoot":"","sources":["../../../src/routes/data-index-delete.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"data-index-delete.js","sourceRoot":"","sources":["../../../src/routes/data-index-delete.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAiD;AAEjD,2CAA4C;AAYrC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,IAAI,SAAS,EAAE,IAAA,oBAAS,EAAC,GAAG,CAAC,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE;QACrF,kBAAkB;QAClB,IAAI;YACA,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;YACtB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAChB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;aACzC;YAED,MAAM,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,iDAAiD;YAC7F,GAAG,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SAC/D;QACD,OAAM,GAAG,EAAE;YACP,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,gCAAgC,EAAE,GAAG,CAAC,CAAC;YACvD,IAAA,iBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAA,CAAC,CAAC;AAEP,CAAC,CAAC;AAnBW,QAAA,QAAQ,YAmBnB;AAEF,kBAAe,gBAAQ,CAAC"}
|
|
@@ -10,14 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.addRoute = void 0;
|
|
13
|
+
const admin_only_1 = require("../middleware/admin-only");
|
|
13
14
|
const error_1 = require("../shared/error");
|
|
14
15
|
;
|
|
15
16
|
const addRoute = (env) => {
|
|
16
|
-
env.app.get(`/index/${env.db.name}`, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
17
|
+
env.app.get(`/index/${env.db.name}`, (0, admin_only_1.default)(env), (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
17
18
|
// Get all indexes
|
|
18
|
-
if (!req.user || req.user.username !== 'admin') {
|
|
19
|
-
return (0, error_1.sendUnauthorizedError)(res, 'admin_only', 'only admin can perform index operations');
|
|
20
|
-
}
|
|
21
19
|
try {
|
|
22
20
|
const indexes = yield env.db.indexes.get();
|
|
23
21
|
res.contentType('application/json').send(indexes.map(index => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-index-list.js","sourceRoot":"","sources":["../../../src/routes/data-index-list.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"data-index-list.js","sourceRoot":"","sources":["../../../src/routes/data-index-list.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAiD;AAEjD,2CAA4C;AAY3C,CAAC;AAMK,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,IAAA,oBAAS,EAAC,GAAG,CAAC,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE;QAC7E,kBAAkB;QAClB,IAAI;YACA,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;YAC3C,GAAG,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;gBACzD,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW,EAAE,iBAAiB,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;gBACpH,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW,EAAE,iBAAiB,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC;YACjH,CAAC,CAAC,CAAC,CAAC;SACP;QACD,OAAO,GAAG,EAAE;YACR,IAAA,iBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAA,CAAC,CAAC;AAEP,CAAC,CAAC;AAhBW,QAAA,QAAQ,YAgBnB;AAEF,kBAAe,gBAAQ,CAAC"}
|
|
@@ -14,17 +14,15 @@ const acebase_core_1 = require("acebase-core");
|
|
|
14
14
|
const error_1 = require("../shared/error");
|
|
15
15
|
const addRoute = (env) => {
|
|
16
16
|
env.app.get(`/reflect/${env.db.name}/*`, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
17
|
+
var _a;
|
|
17
18
|
// Reflection API
|
|
18
|
-
// if (!req.user || req.user.username !== 'admin') {
|
|
19
|
-
// return sendUnauthorizedError(res, 'admin_only', 'only admin can use reflection api');
|
|
20
|
-
// }
|
|
21
19
|
const path = req.path.slice(env.db.name.length + 10);
|
|
22
20
|
const access = env.rules.userHasAccess(req.user, path, false);
|
|
23
21
|
if (!access.allow) {
|
|
24
22
|
return (0, error_1.sendUnauthorizedError)(res, access.code, access.message);
|
|
25
23
|
}
|
|
26
24
|
const impersonatedAccess = {
|
|
27
|
-
uid: (
|
|
25
|
+
uid: ((_a = req.user) === null || _a === void 0 ? void 0 : _a.uid) !== 'admin' ? null : req.query.impersonate,
|
|
28
26
|
read: {
|
|
29
27
|
allow: false,
|
|
30
28
|
error: null
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-reflect.js","sourceRoot":"","sources":["../../../src/routes/data-reflect.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAsF;AAEtF,2CAAwD;AAiBjD,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"data-reflect.js","sourceRoot":"","sources":["../../../src/routes/data-reflect.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,13 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.addRoute = void 0;
|
|
13
|
+
const admin_only_1 = require("../middleware/admin-only");
|
|
13
14
|
const error_1 = require("../shared/error");
|
|
14
15
|
const addRoute = (env) => {
|
|
15
|
-
env.app.get(`/schema/${env.db.name}/*`, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
16
|
+
env.app.get(`/schema/${env.db.name}/*`, (0, admin_only_1.default)(env), (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
16
17
|
// Get defined schema for a specifc path
|
|
17
|
-
if (!req.user || req.user.username !== 'admin') {
|
|
18
|
-
return (0, error_1.sendUnauthorizedError)(res, 'admin_only', 'only admin can perform schema operations');
|
|
19
|
-
}
|
|
20
18
|
try {
|
|
21
19
|
const path = req.path.slice(env.db.name.length + 9);
|
|
22
20
|
const schema = yield env.db.schema.get(path);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-schema-get.js","sourceRoot":"","sources":["../../../src/routes/data-schema-get.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"data-schema-get.js","sourceRoot":"","sources":["../../../src/routes/data-schema-get.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAiD;AAEjD,2CAA4C;AAUrC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,EAAE,IAAA,oBAAS,EAAC,GAAG,CAAC,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE;QAChF,wCAAwC;QACxC,IAAI;YACA,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACpD,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC7C,IAAI,CAAC,MAAM,EAAE;gBACT,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aAC5C;YACD,GAAG,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC;gBACrC,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,MAAM,EAAE,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI;gBACvE,IAAI,EAAE,MAAM,CAAC,IAAI;aACpB,CAAC,CAAC;SACN;QACD,OAAM,GAAG,EAAE;YACP,IAAA,iBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAA,CAAC,CAAC;AAEP,CAAC,CAAC;AArBW,QAAA,QAAQ,YAqBnB;AAEF,kBAAe,gBAAQ,CAAC"}
|
|
@@ -10,13 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.addRoute = void 0;
|
|
13
|
+
const admin_only_1 = require("../middleware/admin-only");
|
|
13
14
|
const error_1 = require("../shared/error");
|
|
14
15
|
const addRoute = (env) => {
|
|
15
|
-
env.app.post(`/schema/${env.db.name}`, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
16
|
+
env.app.post(`/schema/${env.db.name}`, (0, admin_only_1.default)(env), (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
16
17
|
// defines a schema
|
|
17
|
-
if (!req.user || req.user.username !== 'admin') {
|
|
18
|
-
return (0, error_1.sendUnauthorizedError)(res, 'admin_only', 'only admin can perform schema operations');
|
|
19
|
-
}
|
|
20
18
|
try {
|
|
21
19
|
const data = req.body;
|
|
22
20
|
const { path, schema } = data;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-schema-set.js","sourceRoot":"","sources":["../../../src/routes/data-schema-set.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"data-schema-set.js","sourceRoot":"","sources":["../../../src/routes/data-schema-set.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAiD;AAEjD,2CAA4C;AAcrC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,IAAA,oBAAS,EAAC,GAAG,CAAC,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE;QAC/E,mBAAmB;QACnB,IAAI;YACA,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;YACtB,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;YAC9B,MAAM,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAEtC,GAAG,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SAC/D;QACD,OAAM,GAAG,EAAE;YACP,IAAA,iBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAA,CAAC,CAAC;AAEP,CAAC,CAAC;AAhBW,QAAA,QAAQ,YAgBnB;AAEF,kBAAe,gBAAQ,CAAC"}
|
|
@@ -11,14 +11,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.addRoute = void 0;
|
|
13
13
|
const acebase_core_1 = require("acebase-core");
|
|
14
|
+
const admin_only_1 = require("../middleware/admin-only");
|
|
14
15
|
const error_1 = require("../shared/error");
|
|
15
16
|
const addRoute = (env) => {
|
|
16
|
-
env.app.post(`/schema/${env.db.name}/test`, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
17
|
+
env.app.post(`/schema/${env.db.name}/test`, (0, admin_only_1.default)(env), (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
17
18
|
var _a, _b;
|
|
18
19
|
// tests a schema
|
|
19
|
-
if (!req.user || req.user.username !== 'admin') {
|
|
20
|
-
return (0, error_1.sendUnauthorizedError)(res, 'admin_only', 'only admin can perform schema operations');
|
|
21
|
-
}
|
|
22
20
|
try {
|
|
23
21
|
const data = req.body;
|
|
24
22
|
if (typeof ((_a = data.value) === null || _a === void 0 ? void 0 : _a.val) === 'undefined' || !['string', 'object', 'undefined'].includes(typeof ((_b = data.value) === null || _b === void 0 ? void 0 : _b.map))) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-schema-test.js","sourceRoot":"","sources":["../../../src/routes/data-schema-test.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAA+E;
|
|
1
|
+
{"version":3,"file":"data-schema-test.js","sourceRoot":"","sources":["../../../src/routes/data-schema-test.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAA+E;AAG/E,yDAAiD;AAEjD,2CAA4C;AAerC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC,IAAI,OAAO,EAAE,IAAA,oBAAS,EAAC,GAAG,CAAC,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE;;QACpF,iBAAiB;QACjB,IAAI;YACA,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;YACtB,IAAI,OAAO,CAAA,MAAA,IAAI,CAAC,KAAK,0CAAE,GAAG,CAAA,KAAK,WAAW,IAAI,CAAC,CAAC,QAAQ,EAAC,QAAQ,EAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAA,MAAA,IAAI,CAAC,KAAK,0CAAE,GAAG,CAAA,CAAC,EAAE;gBAC7G,OAAO,IAAA,iBAAS,EAAC,GAAG,EAAE,EAAE,IAAI,EAAE,0BAA0B,EAAE,OAAO,EAAE,2CAA2C,EAAE,CAAC,CAAC;aACrH;YACD,MAAM,KAAK,GAAG,wBAAS,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAChD,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;YACvC,IAAI,MAA0B,CAAC;YAC/B,IAAI,MAAM,EAAE;gBACR,MAAM,UAAU,GAAG,IAAI,+BAAgB,CAAC,MAAM,CAAC,CAAC;gBAChD,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;aACnD;iBACI;gBACD,MAAM,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;aAC7D;YAED,GAAG,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACpD;QACD,OAAM,GAAG,EAAE;YACP,IAAA,iBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAA,CAAC,CAAC;AAEP,CAAC,CAAC;AA3BW,QAAA,QAAQ,YA2BnB;AAEF,kBAAe,gBAAQ,CAAC"}
|
|
@@ -10,13 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.addRoute = void 0;
|
|
13
|
+
const admin_only_1 = require("../middleware/admin-only");
|
|
13
14
|
const error_1 = require("../shared/error");
|
|
14
15
|
const addRoute = (env) => {
|
|
15
|
-
env.app.get(`/schema/${env.db.name}`, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
16
|
+
env.app.get(`/schema/${env.db.name}`, (0, admin_only_1.default)(env), (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
16
17
|
// Get all defined schemas
|
|
17
|
-
if (!req.user || req.user.username !== 'admin') {
|
|
18
|
-
return (0, error_1.sendUnauthorizedError)(res, 'admin_only', 'only admin can perform schema operations');
|
|
19
|
-
}
|
|
20
18
|
try {
|
|
21
19
|
const schemas = yield env.db.schema.all();
|
|
22
20
|
res.contentType('application/json').send(schemas.map(schema => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-schemas-list.js","sourceRoot":"","sources":["../../../src/routes/data-schemas-list.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"data-schemas-list.js","sourceRoot":"","sources":["../../../src/routes/data-schemas-list.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAiD;AAEjD,2CAA4C;AASrC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,IAAA,oBAAS,EAAC,GAAG,CAAC,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE;QAC9E,0BAA0B;QAC1B,IAAI;YACA,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;YAC1C,GAAG,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAC5D,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,MAAM,EAAE,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI;gBACvE,IAAI,EAAE,MAAM,CAAC,IAAI;aACpB,CAAC,CAAC,CAAC,CAAC;SACR;QACD,OAAM,GAAG,EAAE;YACP,IAAA,iBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAA,CAAC,CAAC;AAEP,CAAC,CAAC;AAjBW,QAAA,QAAQ,YAiBnB;AAEF,kBAAe,gBAAQ,CAAC"}
|
|
@@ -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
|
}
|
|
@@ -54,20 +56,19 @@ const addRoute = (env) => {
|
|
|
54
56
|
}
|
|
55
57
|
catch (err) {
|
|
56
58
|
if (err instanceof acebase_1.SchemaValidationError) {
|
|
57
|
-
|
|
59
|
+
env.log.error(LOG_ACTION, 'schema_validation_failed', Object.assign(Object.assign({}, LOG_DETAILS), { reason: err.reason }));
|
|
58
60
|
res.status(422).send({ code: 'schema_validation_failed', message: err.message });
|
|
59
61
|
}
|
|
60
62
|
else if (err instanceof SetDataError) {
|
|
61
|
-
|
|
63
|
+
env.log.error(LOG_ACTION, err.code, Object.assign(Object.assign({}, LOG_DETAILS), { message: err.message }));
|
|
62
64
|
(0, error_1.sendBadRequestError)(res, err);
|
|
63
65
|
}
|
|
64
66
|
else {
|
|
65
67
|
env.debug.error(`failed to set "${path}":`, err);
|
|
66
|
-
|
|
68
|
+
env.log.error(LOG_ACTION, 'unexpected', LOG_DETAILS, err);
|
|
67
69
|
(0, error_1.sendError)(res, err);
|
|
68
70
|
}
|
|
69
71
|
}
|
|
70
|
-
;
|
|
71
72
|
}));
|
|
72
73
|
};
|
|
73
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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"}
|
|
@@ -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,6 +88,7 @@ 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
|
|
@@ -93,11 +100,11 @@ const addRoutes = (env) => {
|
|
|
93
100
|
// then is sent to the server as an empty object: {}
|
|
94
101
|
cancel = true;
|
|
95
102
|
}
|
|
96
|
-
else if (typeof ((
|
|
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))) {
|
|
97
104
|
throw new DataTransactionError('invalid_serialized_value', 'The sent value is not properly serialized');
|
|
98
105
|
}
|
|
99
106
|
const newValue = cancel ? undefined : acebase_core_1.Transport.deserialize(data.value);
|
|
100
|
-
if (tx.path === '' && ((
|
|
107
|
+
if (tx.path === '' && ((_g = req.user) === null || _g === void 0 ? void 0 : _g.uid) !== 'admin' && newValue !== null && typeof newValue === 'object') {
|
|
101
108
|
// Non-admin user: remove any private properties from the update object
|
|
102
109
|
Object.keys(newValue).filter(key => key.startsWith('__')).forEach(key => delete newValue[key]);
|
|
103
110
|
}
|
|
@@ -113,16 +120,16 @@ const addRoutes = (env) => {
|
|
|
113
120
|
catch (err) {
|
|
114
121
|
tx.finish(); // Finish without value cancels the transaction
|
|
115
122
|
if (err instanceof acebase_1.SchemaValidationError) {
|
|
116
|
-
|
|
123
|
+
env.log.error(LOG_ACTION, 'schema_validation_failed', Object.assign(Object.assign({}, LOG_DETAILS), { reason: err.reason }));
|
|
117
124
|
res.status(422).send({ code: 'schema_validation_failed', message: err.message });
|
|
118
125
|
}
|
|
119
126
|
else if (err instanceof DataTransactionError) {
|
|
120
|
-
|
|
127
|
+
env.log.error(LOG_ACTION, err.code, Object.assign(Object.assign({}, LOG_DETAILS), { message: err.message }));
|
|
121
128
|
(0, error_1.sendBadRequestError)(res, err);
|
|
122
129
|
}
|
|
123
130
|
else {
|
|
124
|
-
env.debug.error(`failed to
|
|
125
|
-
|
|
131
|
+
env.debug.error(`failed to finish transaction on "${tx.path}":`, err);
|
|
132
|
+
env.log.error(LOG_ACTION, 'unexpected', LOG_DETAILS, err);
|
|
126
133
|
(0, error_1.sendError)(res, err);
|
|
127
134
|
}
|
|
128
135
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-transaction.js","sourceRoot":"","sources":["../../../src/routes/data-transaction.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgD;AAChD,+CAA6C;AAI7C,2CAA6G;AAEhG,QAAA,sBAAsB,GAAG,KAAK,CAAC,CAAC,sCAAsC;AAEnF,MAAa,oBAAqB,SAAQ,KAAK;IAC3C,YAAmB,IAAgC,EAAE,OAAe;QAChE,KAAK,CAAC,OAAO,CAAC,CAAC;QADA,SAAI,GAAJ,IAAI,CAA4B;IAEnD,CAAC;CACJ;AAJD,oDAIC;AA0BM,MAAM,SAAS,GAAG,CAAC,GAAyB,EAAE,EAAE;IAEnD,MAAM,aAAa,GAAG,IAAI,GAAG,EAAuB,CAAC;IAErD,8BAA8B;IAC9B,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,GAAG,CAAC,EAAE,CAAC,IAAI,QAAQ,EAAE,CAAC,GAAiB,EAAE,GAAG,EAAE,EAAE;;QACzE,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;
|
|
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
|
}
|
|
@@ -54,16 +56,16 @@ const addRoute = (env) => {
|
|
|
54
56
|
}
|
|
55
57
|
catch (err) {
|
|
56
58
|
if (err instanceof acebase_1.SchemaValidationError) {
|
|
57
|
-
|
|
59
|
+
env.log.error(LOG_ACTION, 'schema_validation_failed', Object.assign(Object.assign({}, LOG_DETAILS), { reason: err.reason }));
|
|
58
60
|
res.status(422).send({ code: 'schema_validation_failed', message: err.message });
|
|
59
61
|
}
|
|
60
62
|
else if (err instanceof UpdateDataError) {
|
|
61
|
-
|
|
63
|
+
env.log.error(LOG_ACTION, err.code, Object.assign(Object.assign({}, LOG_DETAILS), { message: err.message }));
|
|
62
64
|
(0, error_1.sendBadRequestError)(res, err);
|
|
63
65
|
}
|
|
64
66
|
else {
|
|
65
67
|
env.debug.error(`failed to update "${path}":`, err);
|
|
66
|
-
|
|
68
|
+
env.log.error(LOG_ACTION, 'unexpected', LOG_DETAILS, err);
|
|
67
69
|
(0, error_1.sendError)(res, err);
|
|
68
70
|
}
|
|
69
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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"}
|