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.
Files changed (250) hide show
  1. package/dist/cjs/index.js +16 -0
  2. package/dist/cjs/index.js.map +1 -1
  3. package/dist/cjs/logger.js +74 -0
  4. package/dist/cjs/logger.js.map +1 -0
  5. package/dist/cjs/middleware/admin-only.js +29 -0
  6. package/dist/cjs/middleware/admin-only.js.map +1 -0
  7. package/dist/cjs/middleware/user.js +4 -4
  8. package/dist/cjs/middleware/user.js.map +1 -1
  9. package/dist/cjs/oauth-providers/dropbox.js +3 -2
  10. package/dist/cjs/oauth-providers/dropbox.js.map +1 -1
  11. package/dist/cjs/oauth-providers/facebook.js +3 -2
  12. package/dist/cjs/oauth-providers/facebook.js.map +1 -1
  13. package/dist/cjs/oauth-providers/google.js +3 -2
  14. package/dist/cjs/oauth-providers/google.js.map +1 -1
  15. package/dist/cjs/oauth-providers/index.js.map +1 -1
  16. package/dist/cjs/oauth-providers/instagram.js +3 -2
  17. package/dist/cjs/oauth-providers/instagram.js.map +1 -1
  18. package/dist/cjs/oauth-providers/oauth-provider.js +23 -0
  19. package/dist/cjs/oauth-providers/oauth-provider.js.map +1 -1
  20. package/dist/cjs/oauth-providers/spotify.js +3 -2
  21. package/dist/cjs/oauth-providers/spotify.js.map +1 -1
  22. package/dist/cjs/routes/auth-change-password.js +7 -4
  23. package/dist/cjs/routes/auth-change-password.js.map +1 -1
  24. package/dist/cjs/routes/auth-delete.js +9 -7
  25. package/dist/cjs/routes/auth-delete.js.map +1 -1
  26. package/dist/cjs/routes/auth-forgot-password.js +9 -6
  27. package/dist/cjs/routes/auth-forgot-password.js.map +1 -1
  28. package/dist/cjs/routes/auth-reset-password.js +5 -3
  29. package/dist/cjs/routes/auth-reset-password.js.map +1 -1
  30. package/dist/cjs/routes/auth-signout.js +6 -4
  31. package/dist/cjs/routes/auth-signout.js.map +1 -1
  32. package/dist/cjs/routes/auth-signup.js +17 -15
  33. package/dist/cjs/routes/auth-signup.js.map +1 -1
  34. package/dist/cjs/routes/auth-update.js +9 -6
  35. package/dist/cjs/routes/auth-update.js.map +1 -1
  36. package/dist/cjs/routes/auth-verify-email.js +6 -3
  37. package/dist/cjs/routes/auth-verify-email.js.map +1 -1
  38. package/dist/cjs/routes/data-index-create.js +3 -5
  39. package/dist/cjs/routes/data-index-create.js.map +1 -1
  40. package/dist/cjs/routes/data-index-delete.js +2 -4
  41. package/dist/cjs/routes/data-index-delete.js.map +1 -1
  42. package/dist/cjs/routes/data-index-list.js +2 -4
  43. package/dist/cjs/routes/data-index-list.js.map +1 -1
  44. package/dist/cjs/routes/data-reflect.js +2 -4
  45. package/dist/cjs/routes/data-reflect.js.map +1 -1
  46. package/dist/cjs/routes/data-schema-get.js +2 -4
  47. package/dist/cjs/routes/data-schema-get.js.map +1 -1
  48. package/dist/cjs/routes/data-schema-set.js +2 -4
  49. package/dist/cjs/routes/data-schema-set.js.map +1 -1
  50. package/dist/cjs/routes/data-schema-test.js +2 -4
  51. package/dist/cjs/routes/data-schema-test.js.map +1 -1
  52. package/dist/cjs/routes/data-schemas-list.js +2 -4
  53. package/dist/cjs/routes/data-schemas-list.js.map +1 -1
  54. package/dist/cjs/routes/data-set.js +11 -7
  55. package/dist/cjs/routes/data-set.js.map +1 -1
  56. package/dist/cjs/routes/data-sync-changes.js.map +1 -1
  57. package/dist/cjs/routes/data-sync-mutations.js.map +1 -1
  58. package/dist/cjs/routes/data-transaction.js +30 -10
  59. package/dist/cjs/routes/data-transaction.js.map +1 -1
  60. package/dist/cjs/routes/data-update.js +11 -6
  61. package/dist/cjs/routes/data-update.js.map +1 -1
  62. package/dist/cjs/routes/meta-info.js.map +1 -1
  63. package/dist/cjs/routes/meta-logs.js +50 -0
  64. package/dist/cjs/routes/meta-logs.js.map +1 -0
  65. package/dist/cjs/routes/meta.js +3 -0
  66. package/dist/cjs/routes/meta.js.map +1 -1
  67. package/dist/cjs/routes/oauth2-signin.js +15 -11
  68. package/dist/cjs/routes/oauth2-signin.js.map +1 -1
  69. package/dist/cjs/rules.js +5 -5
  70. package/dist/cjs/rules.js.map +1 -1
  71. package/dist/cjs/server.js +6 -4
  72. package/dist/cjs/server.js.map +1 -1
  73. package/dist/cjs/settings/index.js +6 -7
  74. package/dist/cjs/settings/index.js.map +1 -1
  75. package/dist/cjs/shared/clients.js.map +1 -1
  76. package/dist/cjs/shared/env.js.map +1 -1
  77. package/dist/cjs/shared/http.js.map +1 -1
  78. package/dist/cjs/shared/signin.js +8 -3
  79. package/dist/cjs/shared/signin.js.map +1 -1
  80. package/dist/cjs/start.js +3 -0
  81. package/dist/cjs/start.js.map +1 -1
  82. package/dist/cjs/websocket/index.js +43 -24
  83. package/dist/cjs/websocket/index.js.map +1 -1
  84. package/dist/cjs/websocket/socket.io.js +8 -11
  85. package/dist/cjs/websocket/socket.io.js.map +1 -1
  86. package/dist/esm/index.js +2 -0
  87. package/dist/esm/index.js.map +1 -1
  88. package/dist/esm/logger.js +52 -0
  89. package/dist/esm/logger.js.map +1 -0
  90. package/dist/esm/middleware/admin-only.js +25 -0
  91. package/dist/esm/middleware/admin-only.js.map +1 -0
  92. package/dist/esm/middleware/user.js +4 -4
  93. package/dist/esm/middleware/user.js.map +1 -1
  94. package/dist/esm/oauth-providers/dropbox.js +3 -2
  95. package/dist/esm/oauth-providers/dropbox.js.map +1 -1
  96. package/dist/esm/oauth-providers/facebook.js +3 -2
  97. package/dist/esm/oauth-providers/facebook.js.map +1 -1
  98. package/dist/esm/oauth-providers/google.js +3 -2
  99. package/dist/esm/oauth-providers/google.js.map +1 -1
  100. package/dist/esm/oauth-providers/index.js.map +1 -1
  101. package/dist/esm/oauth-providers/instagram.js +3 -2
  102. package/dist/esm/oauth-providers/instagram.js.map +1 -1
  103. package/dist/esm/oauth-providers/oauth-provider.js +21 -1
  104. package/dist/esm/oauth-providers/oauth-provider.js.map +1 -1
  105. package/dist/esm/oauth-providers/spotify.js +3 -2
  106. package/dist/esm/oauth-providers/spotify.js.map +1 -1
  107. package/dist/esm/routes/auth-change-password.js +6 -3
  108. package/dist/esm/routes/auth-change-password.js.map +1 -1
  109. package/dist/esm/routes/auth-delete.js +7 -5
  110. package/dist/esm/routes/auth-delete.js.map +1 -1
  111. package/dist/esm/routes/auth-forgot-password.js +8 -6
  112. package/dist/esm/routes/auth-forgot-password.js.map +1 -1
  113. package/dist/esm/routes/auth-reset-password.js +4 -2
  114. package/dist/esm/routes/auth-reset-password.js.map +1 -1
  115. package/dist/esm/routes/auth-signout.js +4 -2
  116. package/dist/esm/routes/auth-signout.js.map +1 -1
  117. package/dist/esm/routes/auth-signup.js +12 -10
  118. package/dist/esm/routes/auth-signup.js.map +1 -1
  119. package/dist/esm/routes/auth-update.js +8 -6
  120. package/dist/esm/routes/auth-update.js.map +1 -1
  121. package/dist/esm/routes/auth-verify-email.js +6 -2
  122. package/dist/esm/routes/auth-verify-email.js.map +1 -1
  123. package/dist/esm/routes/data-index-create.js +4 -6
  124. package/dist/esm/routes/data-index-create.js.map +1 -1
  125. package/dist/esm/routes/data-index-delete.js +3 -5
  126. package/dist/esm/routes/data-index-delete.js.map +1 -1
  127. package/dist/esm/routes/data-index-list.js +3 -5
  128. package/dist/esm/routes/data-index-list.js.map +1 -1
  129. package/dist/esm/routes/data-reflect.js +1 -4
  130. package/dist/esm/routes/data-reflect.js.map +1 -1
  131. package/dist/esm/routes/data-schema-get.js +3 -5
  132. package/dist/esm/routes/data-schema-get.js.map +1 -1
  133. package/dist/esm/routes/data-schema-set.js +3 -5
  134. package/dist/esm/routes/data-schema-set.js.map +1 -1
  135. package/dist/esm/routes/data-schema-test.js +3 -5
  136. package/dist/esm/routes/data-schema-test.js.map +1 -1
  137. package/dist/esm/routes/data-schemas-list.js +3 -5
  138. package/dist/esm/routes/data-schemas-list.js.map +1 -1
  139. package/dist/esm/routes/data-set.js +9 -5
  140. package/dist/esm/routes/data-set.js.map +1 -1
  141. package/dist/esm/routes/data-sync-changes.js.map +1 -1
  142. package/dist/esm/routes/data-sync-mutations.js.map +1 -1
  143. package/dist/esm/routes/data-transaction.js +28 -8
  144. package/dist/esm/routes/data-transaction.js.map +1 -1
  145. package/dist/esm/routes/data-update.js +9 -4
  146. package/dist/esm/routes/data-update.js.map +1 -1
  147. package/dist/esm/routes/meta-info.js.map +1 -1
  148. package/dist/esm/routes/meta-logs.js +36 -0
  149. package/dist/esm/routes/meta-logs.js.map +1 -0
  150. package/dist/esm/routes/meta.js +3 -0
  151. package/dist/esm/routes/meta.js.map +1 -1
  152. package/dist/esm/routes/oauth2-signin.js +14 -10
  153. package/dist/esm/routes/oauth2-signin.js.map +1 -1
  154. package/dist/esm/rules.js +5 -5
  155. package/dist/esm/rules.js.map +1 -1
  156. package/dist/esm/server.js +6 -4
  157. package/dist/esm/server.js.map +1 -1
  158. package/dist/esm/settings/index.js +5 -6
  159. package/dist/esm/settings/index.js.map +1 -1
  160. package/dist/esm/shared/clients.js.map +1 -1
  161. package/dist/esm/shared/env.js.map +1 -1
  162. package/dist/esm/shared/http.js.map +1 -1
  163. package/dist/esm/shared/signin.js +7 -3
  164. package/dist/esm/shared/signin.js.map +1 -1
  165. package/dist/esm/start.js +3 -0
  166. package/dist/esm/start.js.map +1 -1
  167. package/dist/esm/websocket/index.js +38 -23
  168. package/dist/esm/websocket/index.js.map +1 -1
  169. package/dist/esm/websocket/socket.io.js +9 -11
  170. package/dist/esm/websocket/socket.io.js.map +1 -1
  171. package/dist/types/index.d.ts +2 -0
  172. package/dist/types/logger.d.ts +35 -0
  173. package/dist/types/middleware/admin-only.d.ts +19 -0
  174. package/dist/types/oauth-providers/dropbox.d.ts +3 -14
  175. package/dist/types/oauth-providers/facebook.d.ts +3 -7
  176. package/dist/types/oauth-providers/google.d.ts +3 -7
  177. package/dist/types/oauth-providers/index.d.ts +2 -10
  178. package/dist/types/oauth-providers/instagram.d.ts +3 -7
  179. package/dist/types/oauth-providers/oauth-provider.d.ts +25 -21
  180. package/dist/types/oauth-providers/spotify.d.ts +3 -7
  181. package/dist/types/routes/data-query.d.ts +1 -1
  182. package/dist/types/routes/meta-logs.d.ts +20 -0
  183. package/dist/types/rules.d.ts +4 -4
  184. package/dist/types/server.d.ts +9 -7
  185. package/dist/types/settings/email.d.ts +1 -1
  186. package/dist/types/settings/index.d.ts +5 -6
  187. package/dist/types/shared/clients.d.ts +3 -1
  188. package/dist/types/shared/env.d.ts +6 -4
  189. package/dist/types/shared/http.d.ts +2 -0
  190. package/dist/types/shared/signin.d.ts +1 -1
  191. package/dist/types/websocket/index.d.ts +4 -0
  192. package/dist/types/websocket/manager.d.ts +1 -1
  193. package/package.json +12 -11
  194. package/src/index.ts +3 -1
  195. package/src/logger.ts +56 -0
  196. package/src/middleware/admin-only.ts +29 -0
  197. package/src/middleware/user.ts +4 -4
  198. package/src/oauth-providers/dropbox.ts +5 -4
  199. package/src/oauth-providers/facebook.ts +5 -4
  200. package/src/oauth-providers/google.ts +5 -4
  201. package/src/oauth-providers/index.ts +2 -1
  202. package/src/oauth-providers/instagram.ts +5 -4
  203. package/src/oauth-providers/oauth-provider.ts +14 -4
  204. package/src/oauth-providers/spotify.ts +5 -4
  205. package/src/placeholder.d.ts +12 -0
  206. package/src/routes/auth-change-password.ts +6 -3
  207. package/src/routes/auth-delete.ts +7 -5
  208. package/src/routes/auth-forgot-password.ts +10 -6
  209. package/src/routes/auth-reset-password.ts +5 -2
  210. package/src/routes/auth-signout.ts +5 -2
  211. package/src/routes/auth-signup.ts +13 -10
  212. package/src/routes/auth-update.ts +8 -6
  213. package/src/routes/auth-verify-email.ts +11 -3
  214. package/src/routes/data-index-create.ts +4 -7
  215. package/src/routes/data-index-delete.ts +3 -6
  216. package/src/routes/data-index-list.ts +3 -6
  217. package/src/routes/data-query.ts +1 -1
  218. package/src/routes/data-reflect.ts +1 -4
  219. package/src/routes/data-schema-get.ts +3 -5
  220. package/src/routes/data-schema-set.ts +3 -6
  221. package/src/routes/data-schema-test.ts +3 -6
  222. package/src/routes/data-schemas-list.ts +3 -5
  223. package/src/routes/data-set.ts +14 -6
  224. package/src/routes/data-set.yaml +7 -1
  225. package/src/routes/data-sync-changes.ts +1 -1
  226. package/src/routes/data-sync-mutations.ts +1 -1
  227. package/src/routes/data-transaction-finish.yaml +6 -0
  228. package/src/routes/data-transaction.ts +35 -11
  229. package/src/routes/data-update.ts +12 -4
  230. package/src/routes/data-update.yaml +7 -1
  231. package/src/routes/meta-info.ts +1 -1
  232. package/src/routes/meta-logs.ts +57 -0
  233. package/src/routes/meta.ts +4 -0
  234. package/src/routes/oauth2-signin.ts +17 -12
  235. package/src/rules.ts +8 -8
  236. package/src/server.ts +13 -9
  237. package/src/settings/email.ts +1 -1
  238. package/src/settings/index.ts +7 -7
  239. package/src/shared/clients.ts +1 -1
  240. package/src/shared/env.ts +5 -4
  241. package/src/shared/http.ts +2 -0
  242. package/src/shared/signin.ts +10 -4
  243. package/src/start.ts +3 -0
  244. package/src/websocket/index.ts +41 -24
  245. package/src/websocket/manager.ts +1 -1
  246. package/src/websocket/socket.io.ts +9 -10
  247. package/webmanager/acebase-client-browser.min.js +16 -0
  248. package/webmanager/index.html +2 -2
  249. package/webmanager/index.js +3 -6
  250. package/.vscode/launch.json +0 -24
@@ -13,7 +13,9 @@ exports.addRoute = void 0;
13
13
  const error_1 = require("../shared/error");
14
14
  const addRoute = (env) => {
15
15
  env.app.post(`/auth/${env.db.name}/signout`, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
16
- var _a;
16
+ var _a, _b, _c;
17
+ const LOG_ACTION = 'auth.signout';
18
+ 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 };
17
19
  try {
18
20
  if (req.user) {
19
21
  const client = typeof req.body.client_id === 'string' ? env.clients.get(req.body.client_id) : null; // NEW in AceBaseClient v0.9.4
@@ -27,7 +29,7 @@ const addRoute = (env) => {
27
29
  env.authCache.remove(req.user.uid);
28
30
  // Remove user binding from all clients signed in with current user
29
31
  for (let client of env.clients.values()) {
30
- if (((_a = client.user) === null || _a === void 0 ? void 0 : _a.uid) === req.user.uid) {
32
+ if (((_c = client.user) === null || _c === void 0 ? void 0 : _c.uid) === req.user.uid) {
31
33
  client.user = null;
32
34
  }
33
35
  }
@@ -45,12 +47,12 @@ const addRoute = (env) => {
45
47
  user.last_signout_ip = req.ip;
46
48
  return user;
47
49
  });
48
- env.logRef.push({ action: 'signout', success: true, uid: req.user.uid, ip: req.ip, date: new Date() });
50
+ env.log.event(LOG_ACTION, LOG_DETAILS);
49
51
  }
50
52
  res.send('Bye!');
51
53
  }
52
54
  catch (err) {
53
- env.logRef.push({ action: 'signout', success: false, code: 'unexpected', message: err.message, uid: req.user.uid, ip: req.ip, date: new Date() });
55
+ env.log.error(LOG_ACTION, 'unexpected', Object.assign(Object.assign({}, LOG_DETAILS), { message: err instanceof Error ? err.message : err.toString() }));
54
56
  (0, error_1.sendUnexpectedError)(res, err);
55
57
  }
56
58
  }));
@@ -1 +1 @@
1
- {"version":3,"file":"auth-signout.js","sourceRoot":"","sources":["../../../src/routes/auth-signout.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,2CAAsD;AAS/C,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAClD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,IAAI,UAAU,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE;;QAErE,IAAI;YACA,IAAI,GAAG,CAAC,IAAI,EAAE;gBACV,MAAM,MAAM,GAAG,OAAO,GAAG,CAAC,IAAI,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,8BAA8B;gBAClI,IAAI,MAAM,EAAE;oBACR,yCAAyC;oBACzC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;iBACtB;gBAED,MAAM,iBAAiB,GAAG,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,KAAK,IAAI,CAAC,CAAC,+BAA+B;gBACvH,IAAI,iBAAiB,EAAE;oBACnB,0BAA0B;oBAC1B,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBAEnC,mEAAmE;oBACnE,KAAK,IAAI,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE;wBACrC,IAAI,CAAA,MAAA,MAAM,CAAC,IAAI,0CAAE,GAAG,MAAK,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE;4BACnC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;yBACtB;qBACJ;iBACJ;gBAED,qCAAqC;gBACrC,MAAM,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;oBACrD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE;wBAAE,OAAO;qBAAE;oBAE/B,MAAM,IAAI,GAAyB,IAAI,CAAC,GAAG,EAAE,CAAC;oBAC9C,IAAI,iBAAiB,EAAE;wBACnB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;qBAC5B;oBACD,IAAI,CAAC,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC;oBAC/B,IAAI,CAAC,eAAe,GAAG,GAAG,CAAC,EAAE,CAAC;oBAC9B,OAAO,IAAI,CAAC;gBAChB,CAAC,CAAC,CAAC;gBAEH,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;aAC1G;YACD,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACpB;QACD,OAAM,GAAG,EAAE;YACP,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;YAClJ,IAAA,2BAAmB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACjC;IAEL,CAAC,CAAA,CAAC,CAAC;AACP,CAAC,CAAC;AA/CW,QAAA,QAAQ,YA+CnB;AAEF,kBAAe,gBAAQ,CAAC"}
1
+ {"version":3,"file":"auth-signout.js","sourceRoot":"","sources":["../../../src/routes/auth-signout.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,2CAAsD;AAS/C,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAClD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,IAAI,UAAU,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE;;QAErE,MAAM,UAAU,GAAG,cAAc,CAAC;QAClC,MAAM,WAAW,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,MAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,GAAG,mCAAI,IAAI,EAAE,CAAC;QAE/D,IAAI;YACA,IAAI,GAAG,CAAC,IAAI,EAAE;gBACV,MAAM,MAAM,GAAG,OAAO,GAAG,CAAC,IAAI,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,8BAA8B;gBAClI,IAAI,MAAM,EAAE;oBACR,yCAAyC;oBACzC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;iBACtB;gBAED,MAAM,iBAAiB,GAAG,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,KAAK,IAAI,CAAC,CAAC,+BAA+B;gBACvH,IAAI,iBAAiB,EAAE;oBACnB,0BAA0B;oBAC1B,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBAEnC,mEAAmE;oBACnE,KAAK,IAAI,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE;wBACrC,IAAI,CAAA,MAAA,MAAM,CAAC,IAAI,0CAAE,GAAG,MAAK,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE;4BACnC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;yBACtB;qBACJ;iBACJ;gBAED,qCAAqC;gBACrC,MAAM,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;oBACrD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE;wBAAE,OAAO;qBAAE;oBAE/B,MAAM,IAAI,GAAyB,IAAI,CAAC,GAAG,EAAE,CAAC;oBAC9C,IAAI,iBAAiB,EAAE;wBACnB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;qBAC5B;oBACD,IAAI,CAAC,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC;oBAC/B,IAAI,CAAC,eAAe,GAAG,GAAG,CAAC,EAAE,CAAC;oBAC9B,OAAO,IAAI,CAAC;gBAChB,CAAC,CAAC,CAAC;gBAEH,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;aAC1C;YACD,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACpB;QACD,OAAM,GAAG,EAAE;YACP,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,YAAY,kCAAO,WAAW,KAAE,OAAO,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAG,CAAC;YAC1H,IAAA,2BAAmB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACjC;IAEL,CAAC,CAAA,CAAC,CAAC;AACP,CAAC,CAAC;AAlDW,QAAA,QAAQ,YAkDnB;AAEF,kBAAe,gBAAQ,CAAC"}
@@ -25,11 +25,12 @@ class SignupError extends Error {
25
25
  exports.SignupError = SignupError;
26
26
  const addRoute = (env) => {
27
27
  env.app.post(`/auth/${env.db.name}/signup`, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
28
- var _a, _b, _c, _d, _e;
29
- if (!env.config.auth.allowUserSignup && (!req.user || req.user.username !== 'admin')) {
30
- env.logRef.push({ action: 'signup', success: false, code: 'user_signup_disabled', ip: req.ip, date: new Date() });
31
- res.statusCode = 403; // Forbidden
32
- return res.send({ code: 'admin_only', message: 'Only admin is allowed to create users' });
28
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j;
29
+ const LOG_ACTION = 'auth.signup';
30
+ 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 };
31
+ if (!env.config.auth.allowUserSignup && ((_c = req.user) === null || _c === void 0 ? void 0 : _c.uid) !== 'admin') {
32
+ env.log.error(LOG_ACTION, 'user_signup_disabled', LOG_DETAILS);
33
+ return (0, error_1.sendUnauthorizedError)(res, 'admin_only', 'Only admin is allowed to create users');
33
34
  }
34
35
  // Create user if it doesn't exist yet.
35
36
  // TODO: Rate-limit nr of signups per IP to prevent abuse
@@ -68,13 +69,13 @@ const addRoute = (env) => {
68
69
  err = validate_1.invalidPictureError;
69
70
  }
70
71
  if (err === validate_1.emailExistsError || err === validate_1.usernameExistsError) {
71
- env.logRef.push({ action: 'signup', success: false, code: 'conflict', ip: req.ip, date: new Date(), username: details.username, email: details.email });
72
+ env.log.error(LOG_ACTION, 'conflict', Object.assign(Object.assign({}, LOG_DETAILS), { username: details.username, email: details.email }));
72
73
  res.statusCode = 409; // conflict
73
74
  return res.send(validate_1.emailOrUsernameExistsError);
74
75
  }
75
76
  else if (err) {
76
77
  // Log failure
77
- env.logRef.push({ action: 'signup', success: false, code: err.code, ip: req.ip, date: new Date() });
78
+ env.log.error(LOG_ACTION, (_d = err.code) !== null && _d !== void 0 ? _d : 'unexpected', LOG_DETAILS);
78
79
  res.statusCode = 422; // Unprocessable Entity
79
80
  return res.send(err);
80
81
  }
@@ -83,8 +84,8 @@ const addRoute = (env) => {
83
84
  let pwd = (0, password_1.createPasswordHash)(details.password);
84
85
  const user = {
85
86
  uid: null,
86
- username: (_a = details.username) !== null && _a !== void 0 ? _a : null,
87
- email: (_b = details.email) !== null && _b !== void 0 ? _b : null,
87
+ username: (_e = details.username) !== null && _e !== void 0 ? _e : null,
88
+ email: (_f = details.email) !== null && _f !== void 0 ? _f : null,
88
89
  email_verified: false,
89
90
  display_name: details.displayName,
90
91
  password: pwd.hash,
@@ -95,13 +96,14 @@ const addRoute = (env) => {
95
96
  access_token_created: new Date(),
96
97
  last_signin: new Date(),
97
98
  last_signin_ip: req.ip,
98
- picture: (_c = details.picture) !== null && _c !== void 0 ? _c : null,
99
- settings: (_d = details.settings) !== null && _d !== void 0 ? _d : {}
99
+ picture: (_g = details.picture) !== null && _g !== void 0 ? _g : null,
100
+ settings: (_h = details.settings) !== null && _h !== void 0 ? _h : {}
100
101
  };
101
102
  const userRef = yield env.authRef.push(user);
102
103
  user.uid = userRef.key;
104
+ LOG_DETAILS.uid = user.uid;
103
105
  // Log success
104
- env.logRef.push({ action: 'signup', success: true, ip: req.ip, date: new Date(), uid: user.uid });
106
+ env.log.event(LOG_ACTION, LOG_DETAILS);
105
107
  // Cache the user
106
108
  env.authCache.set(user.uid, user);
107
109
  // Request welcome e-mail to be sent
@@ -120,8 +122,8 @@ const addRoute = (env) => {
120
122
  activationCode: (0, tokens_1.createSignedPublicToken)({ uid: user.uid }, env.tokenSalt),
121
123
  emailVerified: false
122
124
  };
123
- (_e = env.config.email) === null || _e === void 0 ? void 0 : _e.send(request).catch(err => {
124
- env.logRef.push({ action: 'signup_email', success: false, code: 'unexpected', ip: req.ip, date: new Date(), error: err.message, request });
125
+ (_j = env.config.email) === null || _j === void 0 ? void 0 : _j.send(request).catch(err => {
126
+ env.log.error(LOG_ACTION + '.email', 'unexpected', Object.assign(Object.assign({}, LOG_DETAILS), { request }), err);
125
127
  });
126
128
  // Return the positive news
127
129
  const isAdmin = req.user && req.user.uid === 'admin';
@@ -131,7 +133,7 @@ const addRoute = (env) => {
131
133
  });
132
134
  }
133
135
  catch (err) {
134
- env.logRef.push({ action: 'signup', success: false, code: 'unexpected', ip: req.ip, date: new Date(), error: err.message, username: details.username, email: details.email });
136
+ env.log.error(LOG_ACTION, 'unexpected', Object.assign(Object.assign({}, LOG_DETAILS), { message: err instanceof Error ? err.message : err.toString(), username: details.username, email: details.email }));
135
137
  (0, error_1.sendUnexpectedError)(res, err);
136
138
  }
137
139
  }));
@@ -1 +1 @@
1
- {"version":3,"file":"auth-signup.js","sourceRoot":"","sources":["../../../src/routes/auth-signup.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"auth-signup.js","sourceRoot":"","sources":["../../../src/routes/auth-signup.ts"],"names":[],"mappings":"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"}
@@ -22,14 +22,17 @@ class UpdateError extends Error {
22
22
  exports.UpdateError = UpdateError;
23
23
  const addRoute = (env) => {
24
24
  env.app.post(`/auth/${env.db.name}/update`, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
25
+ var _a, _b, _c, _d;
25
26
  let details = req.body;
27
+ const LOG_ACTION = 'auth.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, update_uid: (_c = details.uid) !== null && _c !== void 0 ? _c : null };
26
29
  if (!req.user) {
27
- env.logRef.push({ action: 'update', success: false, code: 'unauthenticated_update', update_uid: details.uid, ip: req.ip, date: new Date() });
30
+ env.log.error(LOG_ACTION, 'unauthenticated_update', LOG_DETAILS);
28
31
  return (0, error_1.sendNotAuthenticatedError)(res, 'unauthenticated_update', 'Sign in to change details');
29
32
  }
30
33
  const uid = details.uid || req.user.uid;
31
34
  if (req.user.uid !== 'admin' && (uid !== req.user.uid || typeof details.is_disabled === 'boolean')) {
32
- env.logRef.push({ action: 'update', success: false, code: 'unauthorized_update', auth_uid: req.user.uid, update_uid: details.uid, ip: req.ip, date: new Date() });
35
+ env.log.error(LOG_ACTION, 'unauthorized_update', LOG_DETAILS);
33
36
  return (0, error_1.sendUnauthorizedError)(res, 'unauthorized_update', 'You are not authorized to perform this update. This attempt has been logged.');
34
37
  }
35
38
  if (typeof details.display_name === 'undefined' && typeof details.displayName === 'string') {
@@ -61,7 +64,7 @@ const addRoute = (env) => {
61
64
  }
62
65
  if (err) {
63
66
  // Log failure
64
- env.logRef.push({ action: 'update', success: false, code: err.code, auth_uid: req.user.uid, update_uid: uid, ip: req.ip, date: new Date() });
67
+ env.log.error(LOG_ACTION, err.code, LOG_DETAILS);
65
68
  res.status(422).send(err); // Unprocessable Entity
66
69
  return;
67
70
  }
@@ -94,7 +97,7 @@ const addRoute = (env) => {
94
97
  });
95
98
  if (!(0, validate_1.isValidSettings)(user.settings)) {
96
99
  err = validate_1.invalidSettingsError;
97
- env.logRef.push({ action: 'update', success: false, code: 'too_many_settings', auth_uid: req.user.uid, update_uid: details.uid, ip: req.ip, date: new Date() });
100
+ env.log.error(LOG_ACTION, 'too_many_settings', LOG_DETAILS);
98
101
  res.statusCode = 422; // Unprocessable Entity
99
102
  res.send(err);
100
103
  return;
@@ -113,13 +116,13 @@ const addRoute = (env) => {
113
116
  catch (err) {
114
117
  // All known errors except user_not_found will have been sent already
115
118
  if (err.code === 'user_not_found') {
116
- env.logRef.push({ action: 'update', success: false, code: err.code, auth_uid: req.user.uid, update_uid: details.uid, ip: req.ip, date: new Date() });
119
+ env.log.error(LOG_ACTION, err.code, LOG_DETAILS);
117
120
  res.statusCode = 404; // Not Found
118
121
  res.send(err);
119
122
  }
120
123
  else {
121
124
  // Unexpected
122
- env.logRef.push({ action: 'update', success: false, code: err.code || 'unexpected', message: err.message, auth_uid: req.user.uid, update_uid: details.uid, ip: req.ip, date: new Date() });
125
+ env.log.error(LOG_ACTION, (_d = err.code) !== null && _d !== void 0 ? _d : 'unexpected', LOG_DETAILS, err);
123
126
  (0, error_1.sendUnexpectedError)(res, err);
124
127
  }
125
128
  }
@@ -1 +1 @@
1
- {"version":3,"file":"auth-update.js","sourceRoot":"","sources":["../../../src/routes/auth-update.ts"],"names":[],"mappings":"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"}
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.logRef.push({ action: 'verify_email', success: true, ip: clientIp, date: new Date(), uid: user.uid });
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;QAChE,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,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QAC7D,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE;YAChB,MAAM,IAAI,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,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAC9G,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;QACzB,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,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,GAAG,EAAE,MAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,GAAG,mCAAI,IAAI,EAAE,CAAC,CAAC;YAC5J,IAAI,GAAG,CAAC,IAAI,EAAE;gBACV,IAAA,2BAAmB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;aACjC;iBACI;gBACD,IAAA,2BAAmB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;aACjC;SACJ;IACL,CAAC,CAAA,CAAC,CAAC;IAEH,OAAO,kBAAkB,CAAC;AAC9B,CAAC,CAAC;AA3CW,QAAA,QAAQ,YA2CnB;AAEF,kBAAe,gBAAQ,CAAC"}
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":";;;;;;;;;;;;AACA,2CAAmE;AAiD5D,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,MAAM,aAAa,GAAG,CAAO,GAAY,EAAE,GAAa,EAAE,EAAE;QACxD,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,OAAO,EAAE;YAC5C,OAAO,IAAA,6BAAqB,EAAC,GAAG,EAAE,YAAY,EAAE,yCAAyC,CAAC,CAAC;SAC9F;QAED,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,CAAO,GAAwE,EAAE,GAAG,EAAE,EAAE;;QAC1H,+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,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE;QACrE,gCAAgC;QAChC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC5B,CAAC,CAAA,CAAC,CAAC;AAEP,CAAC,CAAC;AAhCW,QAAA,QAAQ,YAgCnB;AAEF,kBAAe,gBAAQ,CAAC"}
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":";;;;;;;;;;;;AACA,2CAAmE;AAY5D,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,IAAI,SAAS,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE;QACrE,kBAAkB;QAClB,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,OAAO,EAAE;YAC5C,OAAO,IAAA,6BAAqB,EAAC,GAAG,EAAE,YAAY,EAAE,yCAAyC,CAAC,CAAC;SAC9F;QAED,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;AAvBW,QAAA,QAAQ,YAuBnB;AAEF,kBAAe,gBAAQ,CAAC"}
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":";;;;;;;;;;;;AACA,2CAAmE;AAYlE,CAAC;AAMK,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE;QAC7D,kBAAkB;QAClB,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,OAAO,EAAE;YAC5C,OAAO,IAAA,6BAAqB,EAAC,GAAG,EAAE,YAAY,EAAE,yCAAyC,CAAC,CAAC;SAC9F;QAED,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;AApBW,QAAA,QAAQ,YAoBnB;AAEF,kBAAe,gBAAQ,CAAC"}
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: (!req.user || req.user.username !== 'admin') ? null : req.query.impersonate,
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":"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"}
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":";;;;;;;;;;;;AACA,2CAAmE;AAU5D,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE;QAChE,wCAAwC;QACxC,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,OAAO,EAAE;YAC5C,OAAO,IAAA,6BAAqB,EAAC,GAAG,EAAE,YAAY,EAAE,0CAA0C,CAAC,CAAC;SAC/F;QACD,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;AAxBW,QAAA,QAAQ,YAwBnB;AAEF,kBAAe,gBAAQ,CAAC"}
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":";;;;;;;;;;;;AACA,2CAAmE;AAc5D,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE;QAC/D,mBAAmB;QACnB,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,OAAO,EAAE;YAC5C,OAAO,IAAA,6BAAqB,EAAC,GAAG,EAAE,YAAY,EAAE,0CAA0C,CAAC,CAAC;SAC/F;QAED,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;AApBW,QAAA,QAAQ,YAoBnB;AAEF,kBAAe,gBAAQ,CAAC"}
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;AAI/E,2CAAmE;AAe5D,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC,IAAI,OAAO,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE;;QACpE,iBAAiB;QACjB,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,OAAO,EAAE;YAC5C,OAAO,IAAA,6BAAqB,EAAC,GAAG,EAAE,YAAY,EAAE,0CAA0C,CAAC,CAAC;SAC/F;QAED,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;AA/BW,QAAA,QAAQ,YA+BnB;AAEF,kBAAe,gBAAQ,CAAC"}
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":";;;;;;;;;;;;AACA,2CAAmE;AAS5D,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE;QAC9D,0BAA0B;QAC1B,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,OAAO,EAAE;YAC5C,OAAO,IAAA,6BAAqB,EAAC,GAAG,EAAE,YAAY,EAAE,0CAA0C,CAAC,CAAC;SAC/F;QACD,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;AApBW,QAAA,QAAQ,YAoBnB;AAEF,kBAAe,gBAAQ,CAAC"}
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"}