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
|
@@ -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"}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
|
-
import
|
|
1
|
+
import adminOnly from '../middleware/admin-only.js';
|
|
2
|
+
import { sendError } from '../shared/error.js';
|
|
2
3
|
export const addRoute = (env) => {
|
|
3
4
|
const handleRequest = async (req, res) => {
|
|
4
|
-
if (!req.user || req.user.username !== 'admin') {
|
|
5
|
-
return sendUnauthorizedError(res, 'admin_only', 'only admin can perform index operations');
|
|
6
|
-
}
|
|
7
5
|
try {
|
|
8
6
|
const data = req.body;
|
|
9
7
|
await env.db.indexes.create(data.path, data.key, data.options);
|
|
@@ -14,7 +12,7 @@ export const addRoute = (env) => {
|
|
|
14
12
|
sendError(res, err);
|
|
15
13
|
}
|
|
16
14
|
};
|
|
17
|
-
env.app.post(`/index/${env.db.name}`, async (req, res) => {
|
|
15
|
+
env.app.post(`/index/${env.db.name}`, adminOnly(env), async (req, res) => {
|
|
18
16
|
// Legacy endpoint that was designed to handle multiple actions
|
|
19
17
|
// The only action ever implemented was 'create', so we'll handle that here
|
|
20
18
|
if (req.body?.action !== 'create') {
|
|
@@ -22,7 +20,7 @@ export const addRoute = (env) => {
|
|
|
22
20
|
}
|
|
23
21
|
handleRequest(req, res);
|
|
24
22
|
});
|
|
25
|
-
env.app.post(`/index/${env.db.name}/create`, async (req, res) => {
|
|
23
|
+
env.app.post(`/index/${env.db.name}/create`, adminOnly(env), async (req, res) => {
|
|
26
24
|
// New dedicated create endpoint
|
|
27
25
|
handleRequest(req, res);
|
|
28
26
|
});
|
|
@@ -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,OAAO,SAAS,MAAM,0BAA0B,CAAC;AAEjD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAiD5C,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,MAAM,aAAa,GAAG,KAAK,EAAE,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,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAC;IAEF,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,GAAwE,EAAE,GAAG,EAAE,EAAE;QAC1I,+DAA+D;QAC/D,2EAA2E;QAC3E,IAAI,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,QAAQ,EAAE;YAC/B,OAAO,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAC;SAChF;QACD,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,IAAI,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,GAAY,EAAE,GAAG,EAAE,EAAE;QACrF,gCAAgC;QAChC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
|
@@ -1,10 +1,8 @@
|
|
|
1
|
-
import
|
|
1
|
+
import adminOnly from '../middleware/admin-only.js';
|
|
2
|
+
import { sendError } from '../shared/error.js';
|
|
2
3
|
export const addRoute = (env) => {
|
|
3
|
-
env.app.post(`/index/${env.db.name}/delete`, async (req, res) => {
|
|
4
|
+
env.app.post(`/index/${env.db.name}/delete`, adminOnly(env), async (req, res) => {
|
|
4
5
|
// Delete an index
|
|
5
|
-
if (!req.user || req.user.username !== 'admin') {
|
|
6
|
-
return sendUnauthorizedError(res, 'admin_only', 'only admin can perform index operations');
|
|
7
|
-
}
|
|
8
6
|
try {
|
|
9
7
|
const data = req.body;
|
|
10
8
|
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,OAAO,SAAS,MAAM,0BAA0B,CAAC;AAEjD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAY5C,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,IAAI,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,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,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
|
-
import
|
|
1
|
+
import adminOnly from '../middleware/admin-only.js';
|
|
2
|
+
import { sendError } from '../shared/error.js';
|
|
2
3
|
;
|
|
3
4
|
export const addRoute = (env) => {
|
|
4
|
-
env.app.get(`/index/${env.db.name}`, async (req, res) => {
|
|
5
|
+
env.app.get(`/index/${env.db.name}`, adminOnly(env), async (req, res) => {
|
|
5
6
|
// Get all indexes
|
|
6
|
-
if (!req.user || req.user.username !== 'admin') {
|
|
7
|
-
return sendUnauthorizedError(res, 'admin_only', 'only admin can perform index operations');
|
|
8
|
-
}
|
|
9
7
|
try {
|
|
10
8
|
const indexes = await env.db.indexes.get();
|
|
11
9
|
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,OAAO,SAAS,MAAM,0BAA0B,CAAC;AAEjD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAY3C,CAAC;AAMF,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,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,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
|
@@ -3,16 +3,13 @@ import { sendUnauthorizedError } from '../shared/error.js';
|
|
|
3
3
|
export const addRoute = (env) => {
|
|
4
4
|
env.app.get(`/reflect/${env.db.name}/*`, async (req, res) => {
|
|
5
5
|
// Reflection API
|
|
6
|
-
// if (!req.user || req.user.username !== 'admin') {
|
|
7
|
-
// return sendUnauthorizedError(res, 'admin_only', 'only admin can use reflection api');
|
|
8
|
-
// }
|
|
9
6
|
const path = req.path.slice(env.db.name.length + 10);
|
|
10
7
|
const access = env.rules.userHasAccess(req.user, path, false);
|
|
11
8
|
if (!access.allow) {
|
|
12
9
|
return sendUnauthorizedError(res, access.code, access.message);
|
|
13
10
|
}
|
|
14
11
|
const impersonatedAccess = {
|
|
15
|
-
uid:
|
|
12
|
+
uid: req.user?.uid !== 'admin' ? null : req.query.impersonate,
|
|
16
13
|
read: {
|
|
17
14
|
allow: false,
|
|
18
15
|
error: null
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-reflect.js","sourceRoot":"","sources":["../../../src/routes/data-reflect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgD,QAAQ,EAAE,MAAM,cAAc,CAAC;AAEtF,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAiBxD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,EAAE,KAAK,EAAE,GAAY,EAAE,GAAG,EAAE,EAAE;QACjE,iBAAiB;QACjB,
|
|
1
|
+
{"version":3,"file":"data-reflect.js","sourceRoot":"","sources":["../../../src/routes/data-reflect.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,8 @@
|
|
|
1
|
-
import
|
|
1
|
+
import adminOnly from '../middleware/admin-only.js';
|
|
2
|
+
import { sendError } from '../shared/error.js';
|
|
2
3
|
export const addRoute = (env) => {
|
|
3
|
-
env.app.get(`/schema/${env.db.name}/*`, async (req, res) => {
|
|
4
|
+
env.app.get(`/schema/${env.db.name}/*`, adminOnly(env), async (req, res) => {
|
|
4
5
|
// Get defined schema for a specifc path
|
|
5
|
-
if (!req.user || req.user.username !== 'admin') {
|
|
6
|
-
return sendUnauthorizedError(res, 'admin_only', 'only admin can perform schema operations');
|
|
7
|
-
}
|
|
8
6
|
try {
|
|
9
7
|
const path = req.path.slice(env.db.name.length + 9);
|
|
10
8
|
const schema = await 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,OAAO,SAAS,MAAM,0BAA0B,CAAC;AAEjD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAU5C,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,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,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
|
@@ -1,10 +1,8 @@
|
|
|
1
|
-
import
|
|
1
|
+
import adminOnly from '../middleware/admin-only.js';
|
|
2
|
+
import { sendError } from '../shared/error.js';
|
|
2
3
|
export const addRoute = (env) => {
|
|
3
|
-
env.app.post(`/schema/${env.db.name}`, async (req, res) => {
|
|
4
|
+
env.app.post(`/schema/${env.db.name}`, adminOnly(env), async (req, res) => {
|
|
4
5
|
// defines a schema
|
|
5
|
-
if (!req.user || req.user.username !== 'admin') {
|
|
6
|
-
return sendUnauthorizedError(res, 'admin_only', 'only admin can perform schema operations');
|
|
7
|
-
}
|
|
8
6
|
try {
|
|
9
7
|
const data = req.body;
|
|
10
8
|
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,OAAO,SAAS,MAAM,0BAA0B,CAAC;AAEjD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAc5C,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,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,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
import { SchemaDefinition, Transport } from 'acebase-core';
|
|
2
|
-
import
|
|
2
|
+
import adminOnly from '../middleware/admin-only.js';
|
|
3
|
+
import { sendError } from '../shared/error.js';
|
|
3
4
|
export const addRoute = (env) => {
|
|
4
|
-
env.app.post(`/schema/${env.db.name}/test`, async (req, res) => {
|
|
5
|
+
env.app.post(`/schema/${env.db.name}/test`, adminOnly(env), async (req, res) => {
|
|
5
6
|
// tests a schema
|
|
6
|
-
if (!req.user || req.user.username !== 'admin') {
|
|
7
|
-
return sendUnauthorizedError(res, 'admin_only', 'only admin can perform schema operations');
|
|
8
|
-
}
|
|
9
7
|
try {
|
|
10
8
|
const data = req.body;
|
|
11
9
|
if (typeof data.value?.val === 'undefined' || !['string', 'object', 'undefined'].includes(typeof data.value?.map)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-schema-test.js","sourceRoot":"","sources":["../../../src/routes/data-schema-test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,gBAAgB,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"data-schema-test.js","sourceRoot":"","sources":["../../../src/routes/data-schema-test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,gBAAgB,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAG/E,OAAO,SAAS,MAAM,0BAA0B,CAAC;AAEjD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAe5C,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC,IAAI,OAAO,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,GAAY,EAAE,GAAG,EAAE,EAAE;QACpF,iBAAiB;QACjB,IAAI;YACA,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;YACtB,IAAI,OAAO,IAAI,CAAC,KAAK,EAAE,GAAG,KAAK,WAAW,IAAI,CAAC,CAAC,QAAQ,EAAC,QAAQ,EAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE;gBAC7G,OAAO,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,0BAA0B,EAAE,OAAO,EAAE,2CAA2C,EAAE,CAAC,CAAC;aACrH;YACD,MAAM,KAAK,GAAG,SAAS,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,gBAAgB,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,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
|
@@ -1,10 +1,8 @@
|
|
|
1
|
-
import
|
|
1
|
+
import adminOnly from '../middleware/admin-only.js';
|
|
2
|
+
import { sendError } from '../shared/error.js';
|
|
2
3
|
export const addRoute = (env) => {
|
|
3
|
-
env.app.get(`/schema/${env.db.name}`, async (req, res) => {
|
|
4
|
+
env.app.get(`/schema/${env.db.name}`, adminOnly(env), async (req, res) => {
|
|
4
5
|
// Get all defined schemas
|
|
5
|
-
if (!req.user || req.user.username !== 'admin') {
|
|
6
|
-
return sendUnauthorizedError(res, 'admin_only', 'only admin can perform schema operations');
|
|
7
|
-
}
|
|
8
6
|
try {
|
|
9
7
|
const schemas = await env.db.schema.all();
|
|
10
8
|
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,OAAO,SAAS,MAAM,0BAA0B,CAAC;AAEjD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAS5C,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,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,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
|
@@ -9,10 +9,12 @@ export class SetDataError extends Error {
|
|
|
9
9
|
}
|
|
10
10
|
export const addRoute = (env) => {
|
|
11
11
|
env.app.put(`/data/${env.db.name}/*`, async (req, res) => {
|
|
12
|
-
// Set data
|
|
13
12
|
const path = req.path.slice(env.db.name.length + 7);
|
|
13
|
+
const LOG_ACTION = 'data.set';
|
|
14
|
+
const LOG_DETAILS = { ip: req.ip, uid: req.user?.uid ?? null, path };
|
|
14
15
|
const access = env.rules.userHasAccess(req.user, path, true);
|
|
15
16
|
if (!access.allow) {
|
|
17
|
+
env.log.error(LOG_ACTION, 'unauthorized', { ...LOG_DETAILS, rule_code: access.code, rule_path: access.rulePath ?? null, rule_error: access.details?.message ?? null });
|
|
16
18
|
return sendUnauthorizedError(res, access.code, access.message);
|
|
17
19
|
}
|
|
18
20
|
try {
|
|
@@ -33,24 +35,26 @@ export const addRoute = (env) => {
|
|
|
33
35
|
await env.db.ref(path)
|
|
34
36
|
.context(req.context)
|
|
35
37
|
.set(val);
|
|
38
|
+
// NEW: add cursor to response context, which was added to the request context in `acebase_cursor` if transaction logging is enabled
|
|
39
|
+
const returnContext = { acebase_cursor: req.context.acebase_cursor };
|
|
40
|
+
res.setHeader('AceBase-Context', JSON.stringify(returnContext));
|
|
36
41
|
res.send({ success: true });
|
|
37
42
|
}
|
|
38
43
|
catch (err) {
|
|
39
44
|
if (err instanceof SchemaValidationError) {
|
|
40
|
-
env.
|
|
45
|
+
env.log.error(LOG_ACTION, 'schema_validation_failed', { ...LOG_DETAILS, reason: err.reason });
|
|
41
46
|
res.status(422).send({ code: 'schema_validation_failed', message: err.message });
|
|
42
47
|
}
|
|
43
48
|
else if (err instanceof SetDataError) {
|
|
44
|
-
env.
|
|
49
|
+
env.log.error(LOG_ACTION, err.code, { ...LOG_DETAILS, message: err.message });
|
|
45
50
|
sendBadRequestError(res, err);
|
|
46
51
|
}
|
|
47
52
|
else {
|
|
48
53
|
env.debug.error(`failed to set "${path}":`, err);
|
|
49
|
-
env.
|
|
54
|
+
env.log.error(LOG_ACTION, 'unexpected', LOG_DETAILS, err);
|
|
50
55
|
sendError(res, err);
|
|
51
56
|
}
|
|
52
57
|
}
|
|
53
|
-
;
|
|
54
58
|
});
|
|
55
59
|
};
|
|
56
60
|
export default addRoute;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-set.js","sourceRoot":"","sources":["../../../src/routes/data-set.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAIzC,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAExF,MAAM,OAAO,YAAa,SAAQ,KAAK;IACnC,YAAmB,IAAgC,EAAE,OAAe;QAChE,KAAK,CAAC,OAAO,CAAC,CAAC;QADA,SAAI,GAAJ,IAAI,CAA4B;IAEnD,CAAC;CACJ;AAWD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,EAAE,KAAK,EAAE,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":"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
|
|
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":"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
|
|
1
|
+
{"version":3,"file":"data-sync-mutations.js","sourceRoot":"","sources":["../../../src/routes/data-sync-mutations.ts"],"names":[],"mappings":"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"}
|