acebase-server 1.10.1 → 1.13.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/.vscode/launch.json +24 -0
- package/dist/cjs/index.d.ts +1 -0
- package/dist/cjs/index.js +16 -0
- package/dist/cjs/logger.js +74 -0
- package/dist/cjs/middleware/admin-only.js +29 -0
- package/dist/cjs/middleware/user.js +4 -4
- package/dist/cjs/oauth-providers/dropbox.js +3 -2
- package/dist/cjs/oauth-providers/facebook.js +3 -2
- package/dist/cjs/oauth-providers/google.js +3 -2
- package/dist/cjs/oauth-providers/instagram.js +3 -2
- package/dist/cjs/oauth-providers/oauth-provider.js +23 -0
- package/dist/cjs/oauth-providers/spotify.js +3 -2
- package/dist/cjs/routes/auth-change-password.js +7 -4
- package/dist/cjs/routes/auth-delete.js +9 -7
- package/dist/cjs/routes/auth-forgot-password.js +9 -6
- package/dist/cjs/routes/auth-reset-password.js +5 -3
- package/dist/cjs/routes/auth-signout.js +6 -4
- package/dist/cjs/routes/auth-signup.js +17 -15
- package/dist/cjs/routes/auth-update.js +9 -6
- package/dist/cjs/routes/auth-verify-email.js +6 -3
- package/dist/cjs/routes/data-index-create.js +3 -5
- package/dist/cjs/routes/data-index-delete.js +2 -4
- package/dist/cjs/routes/data-index-list.js +2 -4
- package/dist/cjs/routes/data-reflect.js +2 -4
- package/dist/cjs/routes/data-schema-get.js +2 -4
- package/dist/cjs/routes/data-schema-set.js +2 -4
- package/dist/cjs/routes/data-schema-test.js +2 -4
- package/dist/cjs/routes/data-schemas-list.js +2 -4
- package/dist/cjs/routes/data-set.js +11 -7
- package/dist/cjs/routes/data-transaction.js +30 -10
- package/dist/cjs/routes/data-update.js +11 -6
- package/dist/cjs/routes/meta-logs.js +50 -0
- package/dist/cjs/routes/meta.js +3 -0
- package/dist/cjs/routes/oauth2-signin.js +15 -11
- package/dist/cjs/rules.js +5 -5
- package/dist/cjs/server.js +6 -4
- package/dist/cjs/settings/index.js +6 -7
- package/dist/cjs/shared/rootpath.js +2 -0
- package/dist/cjs/shared/signin.js +8 -3
- package/dist/cjs/start.js +3 -0
- package/dist/cjs/websocket/index.js +43 -24
- package/dist/cjs/websocket/socket.io.js +8 -11
- package/dist/esm/index.d.ts +1 -0
- package/dist/esm/index.js +2 -0
- package/dist/esm/logger.js +52 -0
- package/dist/esm/middleware/admin-only.js +25 -0
- package/dist/esm/middleware/user.js +4 -4
- package/dist/esm/oauth-providers/dropbox.js +3 -2
- package/dist/esm/oauth-providers/facebook.js +3 -2
- package/dist/esm/oauth-providers/google.js +3 -2
- package/dist/esm/oauth-providers/instagram.js +3 -2
- package/dist/esm/oauth-providers/oauth-provider.js +21 -1
- package/dist/esm/oauth-providers/spotify.js +3 -2
- package/dist/esm/routes/auth-change-password.js +6 -3
- package/dist/esm/routes/auth-delete.js +7 -5
- package/dist/esm/routes/auth-forgot-password.js +8 -6
- package/dist/esm/routes/auth-reset-password.js +4 -2
- package/dist/esm/routes/auth-signout.js +4 -2
- package/dist/esm/routes/auth-signup.js +12 -10
- package/dist/esm/routes/auth-update.js +8 -6
- package/dist/esm/routes/auth-verify-email.js +6 -2
- package/dist/esm/routes/data-index-create.js +4 -6
- package/dist/esm/routes/data-index-delete.js +3 -5
- package/dist/esm/routes/data-index-list.js +3 -5
- package/dist/esm/routes/data-reflect.js +1 -4
- package/dist/esm/routes/data-schema-get.js +3 -5
- package/dist/esm/routes/data-schema-set.js +3 -5
- package/dist/esm/routes/data-schema-test.js +3 -5
- package/dist/esm/routes/data-schemas-list.js +3 -5
- package/dist/esm/routes/data-set.js +9 -5
- package/dist/esm/routes/data-transaction.js +28 -8
- package/dist/esm/routes/data-update.js +9 -4
- package/dist/esm/routes/meta-logs.js +36 -0
- package/dist/esm/routes/meta.js +3 -0
- package/dist/esm/routes/oauth2-signin.js +14 -10
- package/dist/esm/rules.js +5 -5
- package/dist/esm/server.js +6 -4
- package/dist/esm/settings/index.js +5 -6
- package/dist/esm/shared/rootpath.js +2 -0
- package/dist/esm/shared/signin.js +7 -3
- package/dist/esm/start.js +3 -0
- package/dist/esm/websocket/index.js +38 -23
- package/dist/esm/websocket/socket.io.js +9 -11
- 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 +8 -8
- package/webmanager/acebase-client-browser.min.js +16 -0
- package/webmanager/index.html +2 -2
- package/webmanager/index.js +3 -6
- package/create-package-files +0 -12
- package/dist/cjs/auth.js.map +0 -1
- package/dist/cjs/cluster.js.map +0 -1
- package/dist/cjs/index.js.map +0 -1
- package/dist/cjs/middleware/404.js.map +0 -1
- package/dist/cjs/middleware/cache.js.map +0 -1
- package/dist/cjs/middleware/connection.js.map +0 -1
- package/dist/cjs/middleware/context.js.map +0 -1
- package/dist/cjs/middleware/cors.js.map +0 -1
- package/dist/cjs/middleware/swagger.js.map +0 -1
- package/dist/cjs/middleware/user.js.map +0 -1
- package/dist/cjs/oauth-providers/dropbox.js.map +0 -1
- package/dist/cjs/oauth-providers/facebook.js.map +0 -1
- package/dist/cjs/oauth-providers/google.js.map +0 -1
- package/dist/cjs/oauth-providers/index.js.map +0 -1
- package/dist/cjs/oauth-providers/instagram.js.map +0 -1
- package/dist/cjs/oauth-providers/oauth-provider.js.map +0 -1
- package/dist/cjs/oauth-providers/spotify.js.map +0 -1
- package/dist/cjs/routes/auth-change-password.js.map +0 -1
- package/dist/cjs/routes/auth-delete.js.map +0 -1
- package/dist/cjs/routes/auth-forgot-password.js.map +0 -1
- package/dist/cjs/routes/auth-reset-password.js.map +0 -1
- package/dist/cjs/routes/auth-signin.js.map +0 -1
- package/dist/cjs/routes/auth-signout.js.map +0 -1
- package/dist/cjs/routes/auth-signup.js.map +0 -1
- package/dist/cjs/routes/auth-state.js.map +0 -1
- package/dist/cjs/routes/auth-update.js.map +0 -1
- package/dist/cjs/routes/auth-verify-email.js.map +0 -1
- package/dist/cjs/routes/auth.js.map +0 -1
- package/dist/cjs/routes/data-exists.js.map +0 -1
- package/dist/cjs/routes/data-export.js.map +0 -1
- package/dist/cjs/routes/data-get.js.map +0 -1
- package/dist/cjs/routes/data-import.js.map +0 -1
- package/dist/cjs/routes/data-index-create.js.map +0 -1
- package/dist/cjs/routes/data-index-delete.js.map +0 -1
- package/dist/cjs/routes/data-index-list.js.map +0 -1
- package/dist/cjs/routes/data-query.js.map +0 -1
- package/dist/cjs/routes/data-reflect.js.map +0 -1
- package/dist/cjs/routes/data-schema-get.js.map +0 -1
- package/dist/cjs/routes/data-schema-set.js.map +0 -1
- package/dist/cjs/routes/data-schema-test.js.map +0 -1
- package/dist/cjs/routes/data-schemas-list.js.map +0 -1
- package/dist/cjs/routes/data-set.js.map +0 -1
- package/dist/cjs/routes/data-sync-changes.js.map +0 -1
- package/dist/cjs/routes/data-sync-mutations.js.map +0 -1
- package/dist/cjs/routes/data-transaction.js.map +0 -1
- package/dist/cjs/routes/data-update.js.map +0 -1
- package/dist/cjs/routes/data.js.map +0 -1
- package/dist/cjs/routes/docs.js.map +0 -1
- package/dist/cjs/routes/meta-info.js.map +0 -1
- package/dist/cjs/routes/meta-ping.js.map +0 -1
- package/dist/cjs/routes/meta-stats.js.map +0 -1
- package/dist/cjs/routes/meta.js.map +0 -1
- package/dist/cjs/routes/oauth2-init.js.map +0 -1
- package/dist/cjs/routes/oauth2-refresh.js.map +0 -1
- package/dist/cjs/routes/oauth2-signin.js.map +0 -1
- package/dist/cjs/routes/webmanager.js.map +0 -1
- package/dist/cjs/rules.js.map +0 -1
- package/dist/cjs/schema/user.js.map +0 -1
- package/dist/cjs/server.js.map +0 -1
- package/dist/cjs/settings/email.js.map +0 -1
- package/dist/cjs/settings/index.js.map +0 -1
- package/dist/cjs/shared/clients.js.map +0 -1
- package/dist/cjs/shared/email.js.map +0 -1
- package/dist/cjs/shared/env.js.map +0 -1
- package/dist/cjs/shared/error.js.map +0 -1
- package/dist/cjs/shared/http.js.map +0 -1
- package/dist/cjs/shared/password.js.map +0 -1
- package/dist/cjs/shared/rootpath.js.map +0 -1
- package/dist/cjs/shared/signin.js.map +0 -1
- package/dist/cjs/shared/simple-fetch.js.map +0 -1
- package/dist/cjs/shared/tokens.js.map +0 -1
- package/dist/cjs/shared/validate.js.map +0 -1
- package/dist/cjs/start.js.map +0 -1
- package/dist/cjs/test.js.map +0 -1
- package/dist/cjs/websocket/index.js.map +0 -1
- package/dist/cjs/websocket/manager.js.map +0 -1
- package/dist/cjs/websocket/socket.io.js.map +0 -1
- package/dist/esm/auth.js.map +0 -1
- package/dist/esm/cluster.js.map +0 -1
- package/dist/esm/index.js.map +0 -1
- package/dist/esm/middleware/404.js.map +0 -1
- package/dist/esm/middleware/cache.js.map +0 -1
- package/dist/esm/middleware/connection.js.map +0 -1
- package/dist/esm/middleware/context.js.map +0 -1
- package/dist/esm/middleware/cors.js.map +0 -1
- package/dist/esm/middleware/swagger.js.map +0 -1
- package/dist/esm/middleware/user.js.map +0 -1
- package/dist/esm/oauth-providers/dropbox.js.map +0 -1
- package/dist/esm/oauth-providers/facebook.js.map +0 -1
- package/dist/esm/oauth-providers/google.js.map +0 -1
- package/dist/esm/oauth-providers/index.js.map +0 -1
- package/dist/esm/oauth-providers/instagram.js.map +0 -1
- package/dist/esm/oauth-providers/oauth-provider.js.map +0 -1
- package/dist/esm/oauth-providers/spotify.js.map +0 -1
- package/dist/esm/routes/auth-change-password.js.map +0 -1
- package/dist/esm/routes/auth-delete.js.map +0 -1
- package/dist/esm/routes/auth-forgot-password.js.map +0 -1
- package/dist/esm/routes/auth-reset-password.js.map +0 -1
- package/dist/esm/routes/auth-signin.js.map +0 -1
- package/dist/esm/routes/auth-signout.js.map +0 -1
- package/dist/esm/routes/auth-signup.js.map +0 -1
- package/dist/esm/routes/auth-state.js.map +0 -1
- package/dist/esm/routes/auth-update.js.map +0 -1
- package/dist/esm/routes/auth-verify-email.js.map +0 -1
- package/dist/esm/routes/auth.js.map +0 -1
- package/dist/esm/routes/data-exists.js.map +0 -1
- package/dist/esm/routes/data-export.js.map +0 -1
- package/dist/esm/routes/data-get.js.map +0 -1
- package/dist/esm/routes/data-import.js.map +0 -1
- package/dist/esm/routes/data-index-create.js.map +0 -1
- package/dist/esm/routes/data-index-delete.js.map +0 -1
- package/dist/esm/routes/data-index-list.js.map +0 -1
- package/dist/esm/routes/data-query.js.map +0 -1
- package/dist/esm/routes/data-reflect.js.map +0 -1
- package/dist/esm/routes/data-schema-get.js.map +0 -1
- package/dist/esm/routes/data-schema-set.js.map +0 -1
- package/dist/esm/routes/data-schema-test.js.map +0 -1
- package/dist/esm/routes/data-schemas-list.js.map +0 -1
- package/dist/esm/routes/data-set.js.map +0 -1
- package/dist/esm/routes/data-sync-changes.js.map +0 -1
- package/dist/esm/routes/data-sync-mutations.js.map +0 -1
- package/dist/esm/routes/data-transaction.js.map +0 -1
- package/dist/esm/routes/data-update.js.map +0 -1
- package/dist/esm/routes/data.js.map +0 -1
- package/dist/esm/routes/docs.js.map +0 -1
- package/dist/esm/routes/meta-info.js.map +0 -1
- package/dist/esm/routes/meta-ping.js.map +0 -1
- package/dist/esm/routes/meta-stats.js.map +0 -1
- package/dist/esm/routes/meta.js.map +0 -1
- package/dist/esm/routes/oauth2-init.js.map +0 -1
- package/dist/esm/routes/oauth2-refresh.js.map +0 -1
- package/dist/esm/routes/oauth2-signin.js.map +0 -1
- package/dist/esm/routes/webmanager.js.map +0 -1
- package/dist/esm/rules.js.map +0 -1
- package/dist/esm/schema/user.js.map +0 -1
- package/dist/esm/server.js.map +0 -1
- package/dist/esm/settings/email.js.map +0 -1
- package/dist/esm/settings/index.js.map +0 -1
- package/dist/esm/shared/clients.js.map +0 -1
- package/dist/esm/shared/email.js.map +0 -1
- package/dist/esm/shared/env.js.map +0 -1
- package/dist/esm/shared/error.js.map +0 -1
- package/dist/esm/shared/http.js.map +0 -1
- package/dist/esm/shared/password.js.map +0 -1
- package/dist/esm/shared/rootpath.js.map +0 -1
- package/dist/esm/shared/signin.js.map +0 -1
- package/dist/esm/shared/simple-fetch.js.map +0 -1
- package/dist/esm/shared/tokens.js.map +0 -1
- package/dist/esm/shared/validate.js.map +0 -1
- package/dist/esm/start.js.map +0 -1
- package/dist/esm/test.js.map +0 -1
- package/dist/esm/websocket/index.js.map +0 -1
- package/dist/esm/websocket/manager.js.map +0 -1
- package/dist/esm/websocket/socket.io.js.map +0 -1
- package/src/auth.ts +0 -87
- package/src/cluster.ts +0 -62
- package/src/index.ts +0 -2
- package/src/middleware/404.ts +0 -13
- package/src/middleware/cache.ts +0 -15
- package/src/middleware/connection.ts +0 -48
- package/src/middleware/context.ts +0 -23
- package/src/middleware/cors.ts +0 -49
- package/src/middleware/swagger.ts +0 -19
- package/src/middleware/user.ts +0 -51
- package/src/oauth-providers/dropbox.ts +0 -143
- package/src/oauth-providers/facebook.ts +0 -102
- package/src/oauth-providers/google.ts +0 -146
- package/src/oauth-providers/index.ts +0 -20
- package/src/oauth-providers/instagram.ts +0 -97
- package/src/oauth-providers/oauth-provider.ts +0 -55
- package/src/oauth-providers/spotify.ts +0 -126
- package/src/routes/auth-change-password.ts +0 -89
- package/src/routes/auth-change-password.yaml +0 -74
- package/src/routes/auth-delete.ts +0 -47
- package/src/routes/auth-delete.yaml +0 -78
- package/src/routes/auth-forgot-password.ts +0 -73
- package/src/routes/auth-forgot-password.yaml +0 -50
- package/src/routes/auth-reset-password.ts +0 -93
- package/src/routes/auth-reset-password.yaml +0 -54
- package/src/routes/auth-signin.ts +0 -55
- package/src/routes/auth-signin.yaml +0 -130
- package/src/routes/auth-signout.ts +0 -61
- package/src/routes/auth-signout.yaml +0 -46
- package/src/routes/auth-signup.ts +0 -161
- package/src/routes/auth-signup.yaml +0 -136
- package/src/routes/auth-state.ts +0 -20
- package/src/routes/auth-state.yaml +0 -29
- package/src/routes/auth-update.ts +0 -147
- package/src/routes/auth-update.yaml +0 -152
- package/src/routes/auth-verify-email.ts +0 -67
- package/src/routes/auth-verify-email.yaml +0 -53
- package/src/routes/auth.ts +0 -67
- package/src/routes/data-exists.ts +0 -31
- package/src/routes/data-exists.yaml +0 -44
- package/src/routes/data-export.ts +0 -51
- package/src/routes/data-export.yaml +0 -64
- package/src/routes/data-get.ts +0 -68
- package/src/routes/data-get.yaml +0 -54
- package/src/routes/data-import.ts +0 -56
- package/src/routes/data-import.yaml +0 -75
- package/src/routes/data-index-create.ts +0 -85
- package/src/routes/data-index-create.yaml +0 -105
- package/src/routes/data-index-delete.ts +0 -39
- package/src/routes/data-index-delete.yaml +0 -51
- package/src/routes/data-index-list.ts +0 -42
- package/src/routes/data-index-list.yaml +0 -80
- package/src/routes/data-query.ts +0 -97
- package/src/routes/data-query.yaml +0 -166
- package/src/routes/data-reflect.ts +0 -94
- package/src/routes/data-reflect.yaml +0 -124
- package/src/routes/data-schema-get.ts +0 -38
- package/src/routes/data-schema-get.yaml +0 -53
- package/src/routes/data-schema-set.ts +0 -38
- package/src/routes/data-schema-set.yaml +0 -60
- package/src/routes/data-schema-test.ts +0 -53
- package/src/routes/data-schema-test.yaml +0 -66
- package/src/routes/data-schemas-list.ts +0 -33
- package/src/routes/data-schemas-list.yaml +0 -41
- package/src/routes/data-set.ts +0 -76
- package/src/routes/data-set.yaml +0 -71
- package/src/routes/data-sync-changes.ts +0 -78
- package/src/routes/data-sync-changes.yaml +0 -67
- package/src/routes/data-sync-mutations.ts +0 -78
- package/src/routes/data-sync-mutations.yaml +0 -67
- package/src/routes/data-transaction-finish.yaml +0 -76
- package/src/routes/data-transaction-start.yaml +0 -58
- package/src/routes/data-transaction.ts +0 -144
- package/src/routes/data-update.ts +0 -77
- package/src/routes/data-update.yaml +0 -71
- package/src/routes/data.ts +0 -79
- package/src/routes/docs.ts +0 -249
- package/src/routes/meta-info.ts +0 -80
- package/src/routes/meta-info.yaml +0 -41
- package/src/routes/meta-ping.ts +0 -15
- package/src/routes/meta-ping.yaml +0 -23
- package/src/routes/meta-stats.ts +0 -31
- package/src/routes/meta-stats.yaml +0 -41
- package/src/routes/meta.ts +0 -18
- package/src/routes/oauth2-init.ts +0 -44
- package/src/routes/oauth2-init.yaml +0 -63
- package/src/routes/oauth2-refresh.ts +0 -39
- package/src/routes/oauth2-refresh.yaml +0 -65
- package/src/routes/oauth2-signin.ts +0 -281
- package/src/routes/oauth2-signin.yaml +0 -66
- package/src/routes/webmanager.ts +0 -29
- package/src/rules.ts +0 -196
- package/src/schema/user.ts +0 -99
- package/src/server.ts +0 -416
- package/src/settings/email.ts +0 -18
- package/src/settings/index.ts +0 -240
- package/src/shared/clients.ts +0 -31
- package/src/shared/email.ts +0 -33
- package/src/shared/env.ts +0 -38
- package/src/shared/error.ts +0 -37
- package/src/shared/http.ts +0 -24
- package/src/shared/password.ts +0 -41
- package/src/shared/rootpath.ts +0 -15
- package/src/shared/signin.ts +0 -143
- package/src/shared/simple-fetch.ts +0 -65
- package/src/shared/tokens.ts +0 -77
- package/src/shared/validate.ts +0 -53
- package/src/start.ts +0 -45
- package/src/test.ts +0 -10
- package/src/websocket/index.ts +0 -320
- package/src/websocket/manager.ts +0 -46
- package/src/websocket/socket.io.ts +0 -91
- package/tsconfig-cjs.json +0 -10
- package/tsconfig.json +0 -21
|
@@ -57,13 +57,15 @@ export const addRoute = (env) => {
|
|
|
57
57
|
};
|
|
58
58
|
env.app.post(`/auth/${env.db.name}/reset_password`, async (req, res) => {
|
|
59
59
|
const details = req.body;
|
|
60
|
+
const LOG_ACTION = 'auth.reset_password';
|
|
61
|
+
const LOG_DETAILS = { ip: req.ip, uid: req.user?.uid ?? null };
|
|
60
62
|
try {
|
|
61
63
|
const user = await resetPassword(req.ip, details.code, details.password);
|
|
62
|
-
env.
|
|
64
|
+
env.log.event(LOG_ACTION, { ...LOG_DETAILS, reset_uid: user.uid });
|
|
63
65
|
res.send('OK');
|
|
64
66
|
}
|
|
65
67
|
catch (err) {
|
|
66
|
-
env.
|
|
68
|
+
env.log.error(LOG_ACTION, err.code ?? 'unexpected', { ...LOG_DETAILS, message: (err instanceof Error && err.message) ?? err.toString() });
|
|
67
69
|
if (err.code) {
|
|
68
70
|
sendBadRequestError(res, err);
|
|
69
71
|
}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { sendUnexpectedError } from '../shared/error.js';
|
|
2
2
|
export const addRoute = (env) => {
|
|
3
3
|
env.app.post(`/auth/${env.db.name}/signout`, async (req, res) => {
|
|
4
|
+
const LOG_ACTION = 'auth.signout';
|
|
5
|
+
const LOG_DETAILS = { ip: req.ip, uid: req.user?.uid ?? null };
|
|
4
6
|
try {
|
|
5
7
|
if (req.user) {
|
|
6
8
|
const client = typeof req.body.client_id === 'string' ? env.clients.get(req.body.client_id) : null; // NEW in AceBaseClient v0.9.4
|
|
@@ -32,12 +34,12 @@ export const addRoute = (env) => {
|
|
|
32
34
|
user.last_signout_ip = req.ip;
|
|
33
35
|
return user;
|
|
34
36
|
});
|
|
35
|
-
env.
|
|
37
|
+
env.log.event(LOG_ACTION, LOG_DETAILS);
|
|
36
38
|
}
|
|
37
39
|
res.send('Bye!');
|
|
38
40
|
}
|
|
39
41
|
catch (err) {
|
|
40
|
-
env.
|
|
42
|
+
env.log.error(LOG_ACTION, 'unexpected', { ...LOG_DETAILS, message: err instanceof Error ? err.message : err.toString() });
|
|
41
43
|
sendUnexpectedError(res, err);
|
|
42
44
|
}
|
|
43
45
|
});
|
|
@@ -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
|
});
|
|
@@ -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
|
}
|
|
@@ -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,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,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,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 => {
|
|
@@ -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,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,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,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,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 => ({
|
|
@@ -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;
|
|
@@ -13,8 +13,11 @@ export const addRoutes = (env) => {
|
|
|
13
13
|
// Start transaction endpoint:
|
|
14
14
|
env.app.post(`/transaction/${env.db.name}/start`, (req, res) => {
|
|
15
15
|
const data = req.body;
|
|
16
|
+
const LOG_ACTION = 'data.transaction.start';
|
|
17
|
+
const LOG_DETAILS = { ip: req.ip, uid: req.user?.uid ?? null, path: data.path };
|
|
16
18
|
const access = env.rules.userHasAccess(req.user, data.path, true);
|
|
17
19
|
if (!access.allow) {
|
|
20
|
+
env.log.error(LOG_ACTION, 'unauthorized', { ...LOG_DETAILS, rule_code: access.code, rule_path: access.rulePath ?? null }, access.details);
|
|
18
21
|
return sendUnauthorizedError(res, access.code, access.message);
|
|
19
22
|
}
|
|
20
23
|
// Start transaction
|
|
@@ -50,15 +53,18 @@ export const addRoutes = (env) => {
|
|
|
50
53
|
}
|
|
51
54
|
catch (err) {
|
|
52
55
|
env.debug.error(`failed to start transaction on "${tx.path}":`, err);
|
|
53
|
-
env.
|
|
56
|
+
env.log.error(LOG_ACTION, err.code ?? 'unexpected', LOG_DETAILS, typeof err.code === 'undefined' ? err : null);
|
|
54
57
|
sendUnexpectedError(res, err);
|
|
55
58
|
}
|
|
56
59
|
});
|
|
57
60
|
// Finish transaction endpoint:
|
|
58
61
|
env.app.post(`/transaction/${env.db.name}/finish`, async (req, res) => {
|
|
59
62
|
const data = req.body;
|
|
63
|
+
const LOG_ACTION = 'data.transaction.finish';
|
|
64
|
+
const LOG_DETAILS = { ip: req.ip, uid: req.user?.uid ?? null, path: data.path };
|
|
60
65
|
const tx = _transactions.get(data.id);
|
|
61
66
|
if (!tx || tx.path !== data.path) {
|
|
67
|
+
env.log.error(LOG_ACTION, tx ? 'wrong_path' : 'not_found', { ...LOG_DETAILS, id: data.id, tx_path: tx?.path ?? null });
|
|
62
68
|
res.statusCode = 410; // Gone
|
|
63
69
|
res.send(`transaction not found`);
|
|
64
70
|
return;
|
|
@@ -67,34 +73,48 @@ export const addRoutes = (env) => {
|
|
|
67
73
|
_transactions.delete(tx.id);
|
|
68
74
|
const access = env.rules.userHasAccess(req.user, tx.path, true);
|
|
69
75
|
if (!access.allow) {
|
|
76
|
+
env.log.error(LOG_ACTION, 'unauthorized', { ...LOG_DETAILS, rule_code: access.code, rule_path: access.rulePath ?? null }, access.details);
|
|
70
77
|
return sendUnauthorizedError(res, access.code, access.message);
|
|
71
78
|
}
|
|
72
79
|
// Finish transaction
|
|
73
80
|
try {
|
|
74
|
-
|
|
81
|
+
let cancel = false;
|
|
82
|
+
if (typeof data.value === 'object' && (data.value === null || Object.keys(data.value).length === 0)) {
|
|
83
|
+
// Returning undefined from a transaction callback should cancel the transaction
|
|
84
|
+
// acebase-client (Transport.serialize) serializes value undefined as { val: undefined, map: undefined }, which
|
|
85
|
+
// then is sent to the server as an empty object: {}
|
|
86
|
+
cancel = true;
|
|
87
|
+
}
|
|
88
|
+
else if (typeof data.value?.val === 'undefined' || !['string', 'object', 'undefined'].includes(typeof data.value?.map)) {
|
|
75
89
|
throw new DataTransactionError('invalid_serialized_value', 'The sent value is not properly serialized');
|
|
76
90
|
}
|
|
77
|
-
const newValue = Transport.deserialize(data.value);
|
|
91
|
+
const newValue = cancel ? undefined : Transport.deserialize(data.value);
|
|
78
92
|
if (tx.path === '' && req.user?.uid !== 'admin' && newValue !== null && typeof newValue === 'object') {
|
|
79
93
|
// Non-admin user: remove any private properties from the update object
|
|
80
94
|
Object.keys(newValue).filter(key => key.startsWith('__')).forEach(key => delete newValue[key]);
|
|
81
95
|
}
|
|
82
|
-
await tx.finish(newValue);
|
|
96
|
+
const result = await tx.finish(newValue);
|
|
97
|
+
// NEW: capture cursor and return it in the response context header
|
|
98
|
+
if (!tx.context) {
|
|
99
|
+
tx.context = {};
|
|
100
|
+
}
|
|
101
|
+
tx.context.acebase_cursor = result.cursor;
|
|
102
|
+
res.setHeader('AceBase-Context', JSON.stringify(tx.context));
|
|
83
103
|
res.send('done');
|
|
84
104
|
}
|
|
85
105
|
catch (err) {
|
|
86
106
|
tx.finish(); // Finish without value cancels the transaction
|
|
87
107
|
if (err instanceof SchemaValidationError) {
|
|
88
|
-
env.
|
|
108
|
+
env.log.error(LOG_ACTION, 'schema_validation_failed', { ...LOG_DETAILS, reason: err.reason });
|
|
89
109
|
res.status(422).send({ code: 'schema_validation_failed', message: err.message });
|
|
90
110
|
}
|
|
91
111
|
else if (err instanceof DataTransactionError) {
|
|
92
|
-
env.
|
|
112
|
+
env.log.error(LOG_ACTION, err.code, { ...LOG_DETAILS, message: err.message });
|
|
93
113
|
sendBadRequestError(res, err);
|
|
94
114
|
}
|
|
95
115
|
else {
|
|
96
|
-
env.debug.error(`failed to
|
|
97
|
-
env.
|
|
116
|
+
env.debug.error(`failed to finish transaction on "${tx.path}":`, err);
|
|
117
|
+
env.log.error(LOG_ACTION, 'unexpected', LOG_DETAILS, err);
|
|
98
118
|
sendError(res, err);
|
|
99
119
|
}
|
|
100
120
|
}
|
|
@@ -9,10 +9,12 @@ export class UpdateDataError extends Error {
|
|
|
9
9
|
}
|
|
10
10
|
export const addRoute = (env) => {
|
|
11
11
|
env.app.post(`/data/${env.db.name}/*`, async (req, res) => {
|
|
12
|
-
// update data
|
|
13
12
|
const path = req.path.slice(env.db.name.length + 7);
|
|
13
|
+
const LOG_ACTION = 'data.update';
|
|
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,20 +35,23 @@ export const addRoute = (env) => {
|
|
|
33
35
|
await env.db.ref(path)
|
|
34
36
|
.context(req.context)
|
|
35
37
|
.update(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 UpdateDataError) {
|
|
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 update "${path}":`, err);
|
|
49
|
-
env.
|
|
54
|
+
env.log.error(LOG_ACTION, 'unexpected', LOG_DETAILS, err);
|
|
50
55
|
sendError(res, err);
|
|
51
56
|
}
|
|
52
57
|
}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import adminOnly from '../middleware/admin-only.js';
|
|
2
|
+
export const addRoute = (env) => {
|
|
3
|
+
env.app.get(`/logs/${env.db.name}`, adminOnly(env), async (req, res) => {
|
|
4
|
+
// Get database logs
|
|
5
|
+
// Create indexes if not there yet
|
|
6
|
+
const db = env.log.ref.db;
|
|
7
|
+
const createIndexes = [
|
|
8
|
+
db.indexes.create(env.log.ref.path, 'date')
|
|
9
|
+
];
|
|
10
|
+
if (req.query.filter_col === 'action') {
|
|
11
|
+
createIndexes.push(db.indexes.create(env.log.ref.path, 'action', { include: ['date'] }));
|
|
12
|
+
}
|
|
13
|
+
if (req.query.filter_col === 'code') {
|
|
14
|
+
createIndexes.push(db.indexes.create(env.log.ref.path, 'code', { include: ['date'] }));
|
|
15
|
+
}
|
|
16
|
+
await Promise.all(createIndexes);
|
|
17
|
+
try {
|
|
18
|
+
const query = env.log.query()
|
|
19
|
+
.take(parseInt(req.query.take ?? '100'))
|
|
20
|
+
.skip(parseInt(req.query.skip ?? '0'))
|
|
21
|
+
.sort(req.query.sort ?? 'date', false);
|
|
22
|
+
if (req.query.filter_col) {
|
|
23
|
+
query.filter(req.query.filter_col, req.query.filter_op, req.query.filter_val);
|
|
24
|
+
}
|
|
25
|
+
const snaps = await query.get();
|
|
26
|
+
const logs = snaps.getValues();
|
|
27
|
+
res.send(logs);
|
|
28
|
+
}
|
|
29
|
+
catch (err) {
|
|
30
|
+
res.statusCode = 500;
|
|
31
|
+
res.send(err.message);
|
|
32
|
+
}
|
|
33
|
+
});
|
|
34
|
+
};
|
|
35
|
+
export default addRoute;
|
|
36
|
+
//# sourceMappingURL=meta-logs.js.map
|
package/dist/esm/routes/meta.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import addInfoRoute from './meta-info.js';
|
|
2
2
|
import addPingRoute from './meta-ping.js';
|
|
3
3
|
import addStatsRoute from './meta-stats.js';
|
|
4
|
+
import addLogsRoute from './meta-logs.js';
|
|
4
5
|
export const addRoutes = (env) => {
|
|
5
6
|
// Add info endpoint
|
|
6
7
|
addInfoRoute(env);
|
|
@@ -8,6 +9,8 @@ export const addRoutes = (env) => {
|
|
|
8
9
|
addPingRoute(env);
|
|
9
10
|
// Add database stats endpoint
|
|
10
11
|
addStatsRoute(env);
|
|
12
|
+
// Add logs endpoint (admin only)
|
|
13
|
+
addLogsRoute(env);
|
|
11
14
|
};
|
|
12
15
|
export default addRoutes;
|
|
13
16
|
//# sourceMappingURL=meta.js.map
|