acebase-server 1.11.0 → 1.12.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (157) hide show
  1. package/dist/cjs/logger.js +74 -0
  2. package/dist/cjs/logger.js.map +1 -0
  3. package/dist/cjs/middleware/admin-only.js +29 -0
  4. package/dist/cjs/middleware/admin-only.js.map +1 -0
  5. package/dist/cjs/middleware/user.js +4 -4
  6. package/dist/cjs/middleware/user.js.map +1 -1
  7. package/dist/cjs/routes/auth-change-password.js +7 -4
  8. package/dist/cjs/routes/auth-change-password.js.map +1 -1
  9. package/dist/cjs/routes/auth-delete.js +9 -7
  10. package/dist/cjs/routes/auth-delete.js.map +1 -1
  11. package/dist/cjs/routes/auth-forgot-password.js +9 -6
  12. package/dist/cjs/routes/auth-forgot-password.js.map +1 -1
  13. package/dist/cjs/routes/auth-reset-password.js +5 -3
  14. package/dist/cjs/routes/auth-reset-password.js.map +1 -1
  15. package/dist/cjs/routes/auth-signout.js +6 -4
  16. package/dist/cjs/routes/auth-signout.js.map +1 -1
  17. package/dist/cjs/routes/auth-signup.js +17 -15
  18. package/dist/cjs/routes/auth-signup.js.map +1 -1
  19. package/dist/cjs/routes/auth-update.js +9 -6
  20. package/dist/cjs/routes/auth-update.js.map +1 -1
  21. package/dist/cjs/routes/auth-verify-email.js +6 -3
  22. package/dist/cjs/routes/auth-verify-email.js.map +1 -1
  23. package/dist/cjs/routes/data-index-create.js +3 -5
  24. package/dist/cjs/routes/data-index-create.js.map +1 -1
  25. package/dist/cjs/routes/data-index-delete.js +2 -4
  26. package/dist/cjs/routes/data-index-delete.js.map +1 -1
  27. package/dist/cjs/routes/data-index-list.js +2 -4
  28. package/dist/cjs/routes/data-index-list.js.map +1 -1
  29. package/dist/cjs/routes/data-reflect.js +2 -4
  30. package/dist/cjs/routes/data-reflect.js.map +1 -1
  31. package/dist/cjs/routes/data-schema-get.js +2 -4
  32. package/dist/cjs/routes/data-schema-get.js.map +1 -1
  33. package/dist/cjs/routes/data-schema-set.js +2 -4
  34. package/dist/cjs/routes/data-schema-set.js.map +1 -1
  35. package/dist/cjs/routes/data-schema-test.js +2 -4
  36. package/dist/cjs/routes/data-schema-test.js.map +1 -1
  37. package/dist/cjs/routes/data-schemas-list.js +2 -4
  38. package/dist/cjs/routes/data-schemas-list.js.map +1 -1
  39. package/dist/cjs/routes/data-set.js +8 -7
  40. package/dist/cjs/routes/data-set.js.map +1 -1
  41. package/dist/cjs/routes/data-transaction.js +15 -8
  42. package/dist/cjs/routes/data-transaction.js.map +1 -1
  43. package/dist/cjs/routes/data-update.js +8 -6
  44. package/dist/cjs/routes/data-update.js.map +1 -1
  45. package/dist/cjs/routes/meta-logs.js +50 -0
  46. package/dist/cjs/routes/meta-logs.js.map +1 -0
  47. package/dist/cjs/routes/meta.js +3 -0
  48. package/dist/cjs/routes/meta.js.map +1 -1
  49. package/dist/cjs/routes/oauth2-signin.js +9 -6
  50. package/dist/cjs/routes/oauth2-signin.js.map +1 -1
  51. package/dist/cjs/server.js +3 -1
  52. package/dist/cjs/server.js.map +1 -1
  53. package/dist/cjs/shared/env.js.map +1 -1
  54. package/dist/cjs/shared/signin.js +8 -3
  55. package/dist/cjs/shared/signin.js.map +1 -1
  56. package/dist/cjs/start.js +3 -0
  57. package/dist/cjs/start.js.map +1 -1
  58. package/dist/cjs/websocket/index.js +42 -23
  59. package/dist/cjs/websocket/index.js.map +1 -1
  60. package/dist/esm/logger.js +52 -0
  61. package/dist/esm/logger.js.map +1 -0
  62. package/dist/esm/middleware/admin-only.js +25 -0
  63. package/dist/esm/middleware/admin-only.js.map +1 -0
  64. package/dist/esm/middleware/user.js +4 -4
  65. package/dist/esm/middleware/user.js.map +1 -1
  66. package/dist/esm/routes/auth-change-password.js +6 -3
  67. package/dist/esm/routes/auth-change-password.js.map +1 -1
  68. package/dist/esm/routes/auth-delete.js +7 -5
  69. package/dist/esm/routes/auth-delete.js.map +1 -1
  70. package/dist/esm/routes/auth-forgot-password.js +8 -6
  71. package/dist/esm/routes/auth-forgot-password.js.map +1 -1
  72. package/dist/esm/routes/auth-reset-password.js +4 -2
  73. package/dist/esm/routes/auth-reset-password.js.map +1 -1
  74. package/dist/esm/routes/auth-signout.js +4 -2
  75. package/dist/esm/routes/auth-signout.js.map +1 -1
  76. package/dist/esm/routes/auth-signup.js +12 -10
  77. package/dist/esm/routes/auth-signup.js.map +1 -1
  78. package/dist/esm/routes/auth-update.js +8 -6
  79. package/dist/esm/routes/auth-update.js.map +1 -1
  80. package/dist/esm/routes/auth-verify-email.js +6 -2
  81. package/dist/esm/routes/auth-verify-email.js.map +1 -1
  82. package/dist/esm/routes/data-index-create.js +4 -6
  83. package/dist/esm/routes/data-index-create.js.map +1 -1
  84. package/dist/esm/routes/data-index-delete.js +3 -5
  85. package/dist/esm/routes/data-index-delete.js.map +1 -1
  86. package/dist/esm/routes/data-index-list.js +3 -5
  87. package/dist/esm/routes/data-index-list.js.map +1 -1
  88. package/dist/esm/routes/data-reflect.js +1 -4
  89. package/dist/esm/routes/data-reflect.js.map +1 -1
  90. package/dist/esm/routes/data-schema-get.js +3 -5
  91. package/dist/esm/routes/data-schema-get.js.map +1 -1
  92. package/dist/esm/routes/data-schema-set.js +3 -5
  93. package/dist/esm/routes/data-schema-set.js.map +1 -1
  94. package/dist/esm/routes/data-schema-test.js +3 -5
  95. package/dist/esm/routes/data-schema-test.js.map +1 -1
  96. package/dist/esm/routes/data-schemas-list.js +3 -5
  97. package/dist/esm/routes/data-schemas-list.js.map +1 -1
  98. package/dist/esm/routes/data-set.js +6 -5
  99. package/dist/esm/routes/data-set.js.map +1 -1
  100. package/dist/esm/routes/data-transaction.js +12 -5
  101. package/dist/esm/routes/data-transaction.js.map +1 -1
  102. package/dist/esm/routes/data-update.js +6 -4
  103. package/dist/esm/routes/data-update.js.map +1 -1
  104. package/dist/esm/routes/meta-logs.js +36 -0
  105. package/dist/esm/routes/meta-logs.js.map +1 -0
  106. package/dist/esm/routes/meta.js +3 -0
  107. package/dist/esm/routes/meta.js.map +1 -1
  108. package/dist/esm/routes/oauth2-signin.js +8 -5
  109. package/dist/esm/routes/oauth2-signin.js.map +1 -1
  110. package/dist/esm/server.js +3 -1
  111. package/dist/esm/server.js.map +1 -1
  112. package/dist/esm/shared/env.js.map +1 -1
  113. package/dist/esm/shared/signin.js +7 -3
  114. package/dist/esm/shared/signin.js.map +1 -1
  115. package/dist/esm/start.js +3 -0
  116. package/dist/esm/start.js.map +1 -1
  117. package/dist/esm/websocket/index.js +37 -22
  118. package/dist/esm/websocket/index.js.map +1 -1
  119. package/dist/types/logger.d.ts +35 -0
  120. package/dist/types/middleware/admin-only.d.ts +19 -0
  121. package/dist/types/routes/meta-logs.d.ts +20 -0
  122. package/dist/types/rules.d.ts +2 -2
  123. package/dist/types/shared/env.d.ts +3 -1
  124. package/dist/types/shared/signin.d.ts +1 -1
  125. package/dist/types/websocket/index.d.ts +4 -0
  126. package/package.json +5 -5
  127. package/src/logger.ts +56 -0
  128. package/src/middleware/admin-only.ts +29 -0
  129. package/src/middleware/user.ts +4 -4
  130. package/src/routes/auth-change-password.ts +6 -3
  131. package/src/routes/auth-delete.ts +7 -5
  132. package/src/routes/auth-forgot-password.ts +10 -6
  133. package/src/routes/auth-reset-password.ts +5 -2
  134. package/src/routes/auth-signout.ts +5 -2
  135. package/src/routes/auth-signup.ts +13 -10
  136. package/src/routes/auth-update.ts +8 -6
  137. package/src/routes/auth-verify-email.ts +11 -3
  138. package/src/routes/data-index-create.ts +4 -7
  139. package/src/routes/data-index-delete.ts +3 -6
  140. package/src/routes/data-index-list.ts +3 -6
  141. package/src/routes/data-reflect.ts +1 -4
  142. package/src/routes/data-schema-get.ts +3 -5
  143. package/src/routes/data-schema-set.ts +3 -6
  144. package/src/routes/data-schema-test.ts +3 -6
  145. package/src/routes/data-schemas-list.ts +3 -5
  146. package/src/routes/data-set.ts +10 -6
  147. package/src/routes/data-transaction.ts +14 -5
  148. package/src/routes/data-update.ts +8 -4
  149. package/src/routes/meta-logs.ts +57 -0
  150. package/src/routes/meta.ts +4 -0
  151. package/src/routes/oauth2-signin.ts +11 -7
  152. package/src/rules.ts +1 -1
  153. package/src/server.ts +3 -1
  154. package/src/shared/env.ts +2 -1
  155. package/src/shared/signin.ts +10 -4
  156. package/src/start.ts +3 -0
  157. package/src/websocket/index.ts +40 -23
@@ -1,9 +1,7 @@
1
- import { sendError, sendUnauthorizedError } from '../shared/error.js';
1
+ import adminOnly from '../middleware/admin-only.js';
2
+ import { sendError } from '../shared/error.js';
2
3
  export const addRoute = (env) => {
3
4
  const handleRequest = async (req, res) => {
4
- if (!req.user || req.user.username !== 'admin') {
5
- return sendUnauthorizedError(res, 'admin_only', 'only admin can perform index operations');
6
- }
7
5
  try {
8
6
  const data = req.body;
9
7
  await env.db.indexes.create(data.path, data.key, data.options);
@@ -14,7 +12,7 @@ export const addRoute = (env) => {
14
12
  sendError(res, err);
15
13
  }
16
14
  };
17
- env.app.post(`/index/${env.db.name}`, async (req, res) => {
15
+ env.app.post(`/index/${env.db.name}`, adminOnly(env), async (req, res) => {
18
16
  // Legacy endpoint that was designed to handle multiple actions
19
17
  // The only action ever implemented was 'create', so we'll handle that here
20
18
  if (req.body?.action !== 'create') {
@@ -22,7 +20,7 @@ export const addRoute = (env) => {
22
20
  }
23
21
  handleRequest(req, res);
24
22
  });
25
- env.app.post(`/index/${env.db.name}/create`, async (req, res) => {
23
+ env.app.post(`/index/${env.db.name}/create`, adminOnly(env), async (req, res) => {
26
24
  // New dedicated create endpoint
27
25
  handleRequest(req, res);
28
26
  });
@@ -1 +1 @@
1
- {"version":3,"file":"data-index-create.js","sourceRoot":"","sources":["../../../src/routes/data-index-create.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAiDnE,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,MAAM,aAAa,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;QACxD,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,OAAO,EAAE;YAC5C,OAAO,qBAAqB,CAAC,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,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAC;IAEF,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,GAAwE,EAAE,GAAG,EAAE,EAAE;QAC1H,+DAA+D;QAC/D,2EAA2E;QAC3E,IAAI,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,QAAQ,EAAE;YAC/B,OAAO,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAC;SAChF;QACD,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,IAAI,SAAS,EAAE,KAAK,EAAE,GAAY,EAAE,GAAG,EAAE,EAAE;QACrE,gCAAgC;QAChC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
1
+ {"version":3,"file":"data-index-create.js","sourceRoot":"","sources":["../../../src/routes/data-index-create.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,0BAA0B,CAAC;AAEjD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAiD5C,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,MAAM,aAAa,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;QACxD,IAAI;YACA,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;YACtB,MAAM,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAC/D,GAAG,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SAC/D;QACD,OAAM,GAAG,EAAE;YACP,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,gCAAgC,EAAE,GAAG,CAAC,CAAC;YACvD,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAC;IAEF,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,GAAwE,EAAE,GAAG,EAAE,EAAE;QAC1I,+DAA+D;QAC/D,2EAA2E;QAC3E,IAAI,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,QAAQ,EAAE;YAC/B,OAAO,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAC;SAChF;QACD,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,IAAI,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,GAAY,EAAE,GAAG,EAAE,EAAE;QACrF,gCAAgC;QAChC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
@@ -1,10 +1,8 @@
1
- import { sendError, sendUnauthorizedError } from '../shared/error.js';
1
+ import adminOnly from '../middleware/admin-only.js';
2
+ import { sendError } from '../shared/error.js';
2
3
  export const addRoute = (env) => {
3
- env.app.post(`/index/${env.db.name}/delete`, async (req, res) => {
4
+ env.app.post(`/index/${env.db.name}/delete`, adminOnly(env), async (req, res) => {
4
5
  // Delete an index
5
- if (!req.user || req.user.username !== 'admin') {
6
- return sendUnauthorizedError(res, 'admin_only', 'only admin can perform index operations');
7
- }
8
6
  try {
9
7
  const data = req.body;
10
8
  if (!data.fileName) {
@@ -1 +1 @@
1
- {"version":3,"file":"data-index-delete.js","sourceRoot":"","sources":["../../../src/routes/data-index-delete.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAYnE,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,IAAI,SAAS,EAAE,KAAK,EAAE,GAAY,EAAE,GAAG,EAAE,EAAE;QACrE,kBAAkB;QAClB,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,OAAO,EAAE;YAC5C,OAAO,qBAAqB,CAAC,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,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
1
+ {"version":3,"file":"data-index-delete.js","sourceRoot":"","sources":["../../../src/routes/data-index-delete.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,0BAA0B,CAAC;AAEjD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAY5C,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,IAAI,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,GAAY,EAAE,GAAG,EAAE,EAAE;QACrF,kBAAkB;QAClB,IAAI;YACA,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;YACtB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAChB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;aACzC;YAED,MAAM,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,iDAAiD;YAC7F,GAAG,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SAC/D;QACD,OAAM,GAAG,EAAE;YACP,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,gCAAgC,EAAE,GAAG,CAAC,CAAC;YACvD,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
@@ -1,11 +1,9 @@
1
- import { sendError, sendUnauthorizedError } from '../shared/error.js';
1
+ import adminOnly from '../middleware/admin-only.js';
2
+ import { sendError } from '../shared/error.js';
2
3
  ;
3
4
  export const addRoute = (env) => {
4
- env.app.get(`/index/${env.db.name}`, async (req, res) => {
5
+ env.app.get(`/index/${env.db.name}`, adminOnly(env), async (req, res) => {
5
6
  // Get all indexes
6
- if (!req.user || req.user.username !== 'admin') {
7
- return sendUnauthorizedError(res, 'admin_only', 'only admin can perform index operations');
8
- }
9
7
  try {
10
8
  const indexes = await env.db.indexes.get();
11
9
  res.contentType('application/json').send(indexes.map(index => {
@@ -1 +1 @@
1
- {"version":3,"file":"data-index-list.js","sourceRoot":"","sources":["../../../src/routes/data-index-list.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAYlE,CAAC;AAMF,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,GAAY,EAAE,GAAG,EAAE,EAAE;QAC7D,kBAAkB;QAClB,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,OAAO,EAAE;YAC5C,OAAO,qBAAqB,CAAC,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,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
1
+ {"version":3,"file":"data-index-list.js","sourceRoot":"","sources":["../../../src/routes/data-index-list.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,0BAA0B,CAAC;AAEjD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAY3C,CAAC;AAMF,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,GAAY,EAAE,GAAG,EAAE,EAAE;QAC7E,kBAAkB;QAClB,IAAI;YACA,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;YAC3C,GAAG,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;gBACzD,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW,EAAE,iBAAiB,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;gBACpH,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW,EAAE,iBAAiB,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC;YACjH,CAAC,CAAC,CAAC,CAAC;SACP;QACD,OAAO,GAAG,EAAE;YACR,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
@@ -3,16 +3,13 @@ import { sendUnauthorizedError } from '../shared/error.js';
3
3
  export const addRoute = (env) => {
4
4
  env.app.get(`/reflect/${env.db.name}/*`, async (req, res) => {
5
5
  // Reflection API
6
- // if (!req.user || req.user.username !== 'admin') {
7
- // return sendUnauthorizedError(res, 'admin_only', 'only admin can use reflection api');
8
- // }
9
6
  const path = req.path.slice(env.db.name.length + 10);
10
7
  const access = env.rules.userHasAccess(req.user, path, false);
11
8
  if (!access.allow) {
12
9
  return sendUnauthorizedError(res, access.code, access.message);
13
10
  }
14
11
  const impersonatedAccess = {
15
- uid: (!req.user || req.user.username !== 'admin') ? null : req.query.impersonate,
12
+ uid: req.user?.uid !== 'admin' ? null : req.query.impersonate,
16
13
  read: {
17
14
  allow: false,
18
15
  error: null
@@ -1 +1 @@
1
- {"version":3,"file":"data-reflect.js","sourceRoot":"","sources":["../../../src/routes/data-reflect.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"data-reflect.js","sourceRoot":"","sources":["../../../src/routes/data-reflect.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,8 @@
1
- import { sendError, sendUnauthorizedError } from '../shared/error.js';
1
+ import adminOnly from '../middleware/admin-only.js';
2
+ import { sendError } from '../shared/error.js';
2
3
  export const addRoute = (env) => {
3
- env.app.get(`/schema/${env.db.name}/*`, async (req, res) => {
4
+ env.app.get(`/schema/${env.db.name}/*`, adminOnly(env), async (req, res) => {
4
5
  // Get defined schema for a specifc path
5
- if (!req.user || req.user.username !== 'admin') {
6
- return sendUnauthorizedError(res, 'admin_only', 'only admin can perform schema operations');
7
- }
8
6
  try {
9
7
  const path = req.path.slice(env.db.name.length + 9);
10
8
  const schema = await env.db.schema.get(path);
@@ -1 +1 @@
1
- {"version":3,"file":"data-schema-get.js","sourceRoot":"","sources":["../../../src/routes/data-schema-get.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAUnE,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,EAAE,KAAK,EAAE,GAAY,EAAE,GAAG,EAAE,EAAE;QAChE,wCAAwC;QACxC,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,OAAO,EAAE;YAC5C,OAAO,qBAAqB,CAAC,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,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
1
+ {"version":3,"file":"data-schema-get.js","sourceRoot":"","sources":["../../../src/routes/data-schema-get.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,0BAA0B,CAAC;AAEjD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAU5C,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,GAAY,EAAE,GAAG,EAAE,EAAE;QAChF,wCAAwC;QACxC,IAAI;YACA,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACpD,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC7C,IAAI,CAAC,MAAM,EAAE;gBACT,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aAC5C;YACD,GAAG,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC;gBACrC,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,MAAM,EAAE,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI;gBACvE,IAAI,EAAE,MAAM,CAAC,IAAI;aACpB,CAAC,CAAC;SACN;QACD,OAAM,GAAG,EAAE;YACP,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
@@ -1,10 +1,8 @@
1
- import { sendError, sendUnauthorizedError } from '../shared/error.js';
1
+ import adminOnly from '../middleware/admin-only.js';
2
+ import { sendError } from '../shared/error.js';
2
3
  export const addRoute = (env) => {
3
- env.app.post(`/schema/${env.db.name}`, async (req, res) => {
4
+ env.app.post(`/schema/${env.db.name}`, adminOnly(env), async (req, res) => {
4
5
  // defines a schema
5
- if (!req.user || req.user.username !== 'admin') {
6
- return sendUnauthorizedError(res, 'admin_only', 'only admin can perform schema operations');
7
- }
8
6
  try {
9
7
  const data = req.body;
10
8
  const { path, schema } = data;
@@ -1 +1 @@
1
- {"version":3,"file":"data-schema-set.js","sourceRoot":"","sources":["../../../src/routes/data-schema-set.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAcnE,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,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,qBAAqB,CAAC,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,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
1
+ {"version":3,"file":"data-schema-set.js","sourceRoot":"","sources":["../../../src/routes/data-schema-set.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,0BAA0B,CAAC;AAEjD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAc5C,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,GAAY,EAAE,GAAG,EAAE,EAAE;QAC/E,mBAAmB;QACnB,IAAI;YACA,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;YACtB,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;YAC9B,MAAM,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAEtC,GAAG,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SAC/D;QACD,OAAM,GAAG,EAAE;YACP,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
@@ -1,11 +1,9 @@
1
1
  import { SchemaDefinition, Transport } from 'acebase-core';
2
- import { sendError, sendUnauthorizedError } from '../shared/error.js';
2
+ import adminOnly from '../middleware/admin-only.js';
3
+ import { sendError } from '../shared/error.js';
3
4
  export const addRoute = (env) => {
4
- env.app.post(`/schema/${env.db.name}/test`, async (req, res) => {
5
+ env.app.post(`/schema/${env.db.name}/test`, adminOnly(env), async (req, res) => {
5
6
  // tests a schema
6
- if (!req.user || req.user.username !== 'admin') {
7
- return sendUnauthorizedError(res, 'admin_only', 'only admin can perform schema operations');
8
- }
9
7
  try {
10
8
  const data = req.body;
11
9
  if (typeof data.value?.val === 'undefined' || !['string', 'object', 'undefined'].includes(typeof data.value?.map)) {
@@ -1 +1 @@
1
- {"version":3,"file":"data-schema-test.js","sourceRoot":"","sources":["../../../src/routes/data-schema-test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,gBAAgB,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAI/E,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAenE,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC,IAAI,OAAO,EAAE,KAAK,EAAE,GAAY,EAAE,GAAG,EAAE,EAAE;QACpE,iBAAiB;QACjB,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,OAAO,EAAE;YAC5C,OAAO,qBAAqB,CAAC,GAAG,EAAE,YAAY,EAAE,0CAA0C,CAAC,CAAC;SAC/F;QAED,IAAI;YACA,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;YACtB,IAAI,OAAO,IAAI,CAAC,KAAK,EAAE,GAAG,KAAK,WAAW,IAAI,CAAC,CAAC,QAAQ,EAAC,QAAQ,EAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE;gBAC7G,OAAO,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,0BAA0B,EAAE,OAAO,EAAE,2CAA2C,EAAE,CAAC,CAAC;aACrH;YACD,MAAM,KAAK,GAAG,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAChD,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;YACvC,IAAI,MAA0B,CAAC;YAC/B,IAAI,MAAM,EAAE;gBACR,MAAM,UAAU,GAAG,IAAI,gBAAgB,CAAC,MAAM,CAAC,CAAC;gBAChD,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;aACnD;iBACI;gBACD,MAAM,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;aAC7D;YAED,GAAG,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACpD;QACD,OAAM,GAAG,EAAE;YACP,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
1
+ {"version":3,"file":"data-schema-test.js","sourceRoot":"","sources":["../../../src/routes/data-schema-test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,gBAAgB,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAG/E,OAAO,SAAS,MAAM,0BAA0B,CAAC;AAEjD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAe5C,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC,IAAI,OAAO,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,GAAY,EAAE,GAAG,EAAE,EAAE;QACpF,iBAAiB;QACjB,IAAI;YACA,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;YACtB,IAAI,OAAO,IAAI,CAAC,KAAK,EAAE,GAAG,KAAK,WAAW,IAAI,CAAC,CAAC,QAAQ,EAAC,QAAQ,EAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE;gBAC7G,OAAO,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,0BAA0B,EAAE,OAAO,EAAE,2CAA2C,EAAE,CAAC,CAAC;aACrH;YACD,MAAM,KAAK,GAAG,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAChD,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;YACvC,IAAI,MAA0B,CAAC;YAC/B,IAAI,MAAM,EAAE;gBACR,MAAM,UAAU,GAAG,IAAI,gBAAgB,CAAC,MAAM,CAAC,CAAC;gBAChD,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;aACnD;iBACI;gBACD,MAAM,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;aAC7D;YAED,GAAG,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACpD;QACD,OAAM,GAAG,EAAE;YACP,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
@@ -1,10 +1,8 @@
1
- import { sendError, sendUnauthorizedError } from '../shared/error.js';
1
+ import adminOnly from '../middleware/admin-only.js';
2
+ import { sendError } from '../shared/error.js';
2
3
  export const addRoute = (env) => {
3
- env.app.get(`/schema/${env.db.name}`, async (req, res) => {
4
+ env.app.get(`/schema/${env.db.name}`, adminOnly(env), async (req, res) => {
4
5
  // Get all defined schemas
5
- if (!req.user || req.user.username !== 'admin') {
6
- return sendUnauthorizedError(res, 'admin_only', 'only admin can perform schema operations');
7
- }
8
6
  try {
9
7
  const schemas = await env.db.schema.all();
10
8
  res.contentType('application/json').send(schemas.map(schema => ({
@@ -1 +1 @@
1
- {"version":3,"file":"data-schemas-list.js","sourceRoot":"","sources":["../../../src/routes/data-schemas-list.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AASnE,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,GAAY,EAAE,GAAG,EAAE,EAAE;QAC9D,0BAA0B;QAC1B,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,OAAO,EAAE;YAC5C,OAAO,qBAAqB,CAAC,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,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
1
+ {"version":3,"file":"data-schemas-list.js","sourceRoot":"","sources":["../../../src/routes/data-schemas-list.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,0BAA0B,CAAC;AAEjD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAS5C,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,GAAY,EAAE,GAAG,EAAE,EAAE;QAC9E,0BAA0B;QAC1B,IAAI;YACA,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;YAC1C,GAAG,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAC5D,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,MAAM,EAAE,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI;gBACvE,IAAI,EAAE,MAAM,CAAC,IAAI;aACpB,CAAC,CAAC,CAAC,CAAC;SACR;QACD,OAAM,GAAG,EAAE;YACP,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACvB;IACL,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
@@ -9,10 +9,12 @@ export class SetDataError extends Error {
9
9
  }
10
10
  export const addRoute = (env) => {
11
11
  env.app.put(`/data/${env.db.name}/*`, async (req, res) => {
12
- // Set data
13
12
  const path = req.path.slice(env.db.name.length + 7);
13
+ const LOG_ACTION = 'data.set';
14
+ const LOG_DETAILS = { ip: req.ip, uid: req.user?.uid ?? null, path };
14
15
  const access = env.rules.userHasAccess(req.user, path, true);
15
16
  if (!access.allow) {
17
+ env.log.error(LOG_ACTION, 'unauthorized', { ...LOG_DETAILS, rule_code: access.code, rule_path: access.rulePath ?? null, rule_error: access.details?.message ?? null });
16
18
  return sendUnauthorizedError(res, access.code, access.message);
17
19
  }
18
20
  try {
@@ -40,20 +42,19 @@ export const addRoute = (env) => {
40
42
  }
41
43
  catch (err) {
42
44
  if (err instanceof SchemaValidationError) {
43
- env.logRef?.push({ action: 'set_data', success: false, code: 'schema_validation_failed', path, error: err.reason, ip: req.ip, uid: req.user?.uid ?? null });
45
+ env.log.error(LOG_ACTION, 'schema_validation_failed', { ...LOG_DETAILS, reason: err.reason });
44
46
  res.status(422).send({ code: 'schema_validation_failed', message: err.message });
45
47
  }
46
48
  else if (err instanceof SetDataError) {
47
- env.logRef?.push({ action: 'set_data', success: false, code: err.code, path, ip: req.ip, uid: req.user?.uid ?? null });
49
+ env.log.error(LOG_ACTION, err.code, { ...LOG_DETAILS, message: err.message });
48
50
  sendBadRequestError(res, err);
49
51
  }
50
52
  else {
51
53
  env.debug.error(`failed to set "${path}":`, err);
52
- env.logRef?.push({ action: 'set_data', success: false, code: 'unknown_error', path, error: err.message, ip: req.ip, uid: req.user?.uid ?? null });
54
+ env.log.error(LOG_ACTION, 'unexpected', LOG_DETAILS, err);
53
55
  sendError(res, err);
54
56
  }
55
57
  }
56
- ;
57
58
  });
58
59
  };
59
60
  export default addRoute;
@@ -1 +1 @@
1
- {"version":3,"file":"data-set.js","sourceRoot":"","sources":["../../../src/routes/data-set.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"data-set.js","sourceRoot":"","sources":["../../../src/routes/data-set.ts"],"names":[],"mappings":"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"}
@@ -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.logRef?.push({ action: 'tx_start', success: false, code: err.code ?? 'unknown_error', path: tx.path, error: err.message, ip: req.ip, uid: req.user?.uid ?? null });
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,6 +73,7 @@ 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
@@ -98,16 +105,16 @@ export const addRoutes = (env) => {
98
105
  catch (err) {
99
106
  tx.finish(); // Finish without value cancels the transaction
100
107
  if (err instanceof SchemaValidationError) {
101
- env.logRef?.push({ action: 'tx_finish', success: false, code: 'schema_validation_failed', path: tx.path, error: err.reason, ip: req.ip, uid: req.user?.uid ?? null });
108
+ env.log.error(LOG_ACTION, 'schema_validation_failed', { ...LOG_DETAILS, reason: err.reason });
102
109
  res.status(422).send({ code: 'schema_validation_failed', message: err.message });
103
110
  }
104
111
  else if (err instanceof DataTransactionError) {
105
- env.logRef?.push({ action: 'tx_finish', success: false, code: err.code, path: tx.path, ip: req.ip, uid: req.user?.uid ?? null });
112
+ env.log.error(LOG_ACTION, err.code, { ...LOG_DETAILS, message: err.message });
106
113
  sendBadRequestError(res, err);
107
114
  }
108
115
  else {
109
- env.debug.error(`failed to finsih transaction on "${tx.path}":`, err);
110
- env.logRef?.push({ action: 'tx_finish', success: false, code: 'unknown_error', path: tx.path, error: err.message, ip: req.ip, uid: req.user?.uid ?? null });
116
+ env.debug.error(`failed to finish transaction on "${tx.path}":`, err);
117
+ env.log.error(LOG_ACTION, 'unexpected', LOG_DETAILS, err);
111
118
  sendError(res, err);
112
119
  }
113
120
  }
@@ -1 +1 @@
1
- {"version":3,"file":"data-transaction.js","sourceRoot":"","sources":["../../../src/routes/data-transaction.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"data-transaction.js","sourceRoot":"","sources":["../../../src/routes/data-transaction.ts"],"names":[],"mappings":"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"}
@@ -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 {
@@ -40,16 +42,16 @@ export const addRoute = (env) => {
40
42
  }
41
43
  catch (err) {
42
44
  if (err instanceof SchemaValidationError) {
43
- env.logRef?.push({ action: 'update_data', success: false, code: 'schema_validation_failed', path, error: err.reason, ip: req.ip, uid: req.user?.uid ?? null });
45
+ env.log.error(LOG_ACTION, 'schema_validation_failed', { ...LOG_DETAILS, reason: err.reason });
44
46
  res.status(422).send({ code: 'schema_validation_failed', message: err.message });
45
47
  }
46
48
  else if (err instanceof UpdateDataError) {
47
- env.logRef?.push({ action: 'update_data', success: false, code: err.code, path, ip: req.ip, uid: req.user?.uid ?? null });
49
+ env.log.error(LOG_ACTION, err.code, { ...LOG_DETAILS, message: err.message });
48
50
  sendBadRequestError(res, err);
49
51
  }
50
52
  else {
51
53
  env.debug.error(`failed to update "${path}":`, err);
52
- env.logRef?.push({ action: 'update_data', success: false, code: `unknown_error`, path, error: err.message, ip: req.ip, uid: req.user?.uid ?? null });
54
+ env.log.error(LOG_ACTION, 'unexpected', LOG_DETAILS, err);
53
55
  sendError(res, err);
54
56
  }
55
57
  }
@@ -1 +1 @@
1
- {"version":3,"file":"data-update.js","sourceRoot":"","sources":["../../../src/routes/data-update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAIzC,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAExF,MAAM,OAAO,eAAgB,SAAQ,KAAK;IACtC,YAAmB,IAAgC,EAAE,OAAe;QAChE,KAAK,CAAC,OAAO,CAAC,CAAC;QADA,SAAI,GAAJ,IAAI,CAA4B;IAEnD,CAAC;CACJ;AAYD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,EAAE,KAAK,EAAE,GAAY,EAAE,GAAG,EAAE,EAAE;QAC/D,cAAc;QACd,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACpD,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAC7D,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;YACf,OAAO,qBAAqB,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;SAClE;QAED,IAAI;YACA,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;YACtB,IAAI,OAAO,IAAI,EAAE,GAAG,KAAK,WAAW,IAAI,CAAC,CAAC,QAAQ,EAAC,QAAQ,EAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,OAAO,IAAI,EAAE,GAAG,CAAC,EAAE;gBACjG,MAAM,IAAI,eAAe,CAAC,0BAA0B,EAAE,2CAA2C,CAAC,CAAC;aACtG;YACD,MAAM,GAAG,GAAG,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAExC,IAAI,IAAI,KAAK,EAAE,IAAI,GAAG,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,IAAI,GAAG,KAAK,IAAI,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;gBACrF,uEAAuE;gBACvE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;aACxF;YAED,iGAAiG;YACjG,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;YAC9D,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE;gBAChB,MAAM,IAAI,qBAAqB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;aACtD;YAED,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC;iBACjB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;iBACpB,MAAM,CAAC,GAAG,CAAC,CAAC;YAEjB,oIAAoI;YACpI,MAAM,aAAa,GAAG,EAAE,cAAc,EAAE,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;YACrE,GAAG,CAAC,SAAS,CAAC,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAE,CAAC;YAEjE,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SAC/B;QACD,OAAM,GAAG,EAAE;YACP,IAAI,GAAG,YAAY,qBAAqB,EAAE;gBACtC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,0BAA0B,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC;gBAC/J,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,0BAA0B,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;aACpF;iBACI,IAAI,GAAG,YAAY,eAAe,EAAE;gBACrC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC;gBAC1H,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;aACjC;iBACI;gBACD,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,qBAAqB,IAAI,IAAI,EAAE,GAAG,CAAC,CAAC;gBACpD,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC;gBACrJ,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;aACvB;SACJ;IACL,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
1
+ {"version":3,"file":"data-update.js","sourceRoot":"","sources":["../../../src/routes/data-update.ts"],"names":[],"mappings":"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"}
@@ -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
@@ -0,0 +1 @@
1
+ {"version":3,"file":"meta-logs.js","sourceRoot":"","sources":["../../../src/routes/meta-logs.ts"],"names":[],"mappings":"AAEA,OAAO,SAAS,MAAM,0BAA0B,CAAC;AAcjD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,GAAY,EAAE,GAAG,EAAE,EAAE;QAC5E,oBAAoB;QAEpB,kCAAkC;QAClC,MAAM,EAAE,GAAI,GAAG,CAAC,GAAG,CAAC,GAAW,CAAC,EAAa,CAAC;QAC9C,MAAM,aAAa,GAAG;YAClB,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC;SAC9C,CAAC;QACF,IAAI,GAAG,CAAC,KAAK,CAAC,UAAU,KAAK,QAAQ,EAAE;YACnC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;SAC5F;QACD,IAAI,GAAG,CAAC,KAAK,CAAC,UAAU,KAAK,MAAM,EAAE;YACjC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;SAC1F;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAEjC,IAAI;YACA,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE;iBACxB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,CAAC;iBACvC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC;iBACrC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,MAAM,EAAE,KAAK,CAAC,CAAC;YAE3C,IAAI,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE;gBACtB,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;aACjF;YAED,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,CAAC;YAChC,MAAM,IAAI,GAAG,KAAK,CAAC,SAAS,EAAsB,CAAC;YACnD,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAClB;QACD,OAAO,GAAG,EAAE;YACR,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;YACrB,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;SACzB;IACL,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
@@ -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
@@ -1 +1 @@
1
- {"version":3,"file":"meta.js","sourceRoot":"","sources":["../../../src/routes/meta.ts"],"names":[],"mappings":"AACA,OAAO,YAAY,MAAM,aAAa,CAAC;AACvC,OAAO,YAAY,MAAM,aAAa,CAAC;AACvC,OAAO,aAAa,MAAM,cAAc,CAAC;AAEzC,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,GAAyB,EAAE,EAAE;IAEnD,oBAAoB;IACpB,YAAY,CAAC,GAAG,CAAC,CAAC;IAElB,oBAAoB;IACpB,YAAY,CAAC,GAAG,CAAC,CAAC;IAElB,8BAA8B;IAC9B,aAAa,CAAC,GAAG,CAAC,CAAC;AACvB,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}
1
+ {"version":3,"file":"meta.js","sourceRoot":"","sources":["../../../src/routes/meta.ts"],"names":[],"mappings":"AACA,OAAO,YAAY,MAAM,aAAa,CAAC;AACvC,OAAO,YAAY,MAAM,aAAa,CAAC;AACvC,OAAO,aAAa,MAAM,cAAc,CAAC;AACzC,OAAO,YAAY,MAAM,aAAa,CAAC;AAEvC,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,GAAyB,EAAE,EAAE;IAEnD,oBAAoB;IACpB,YAAY,CAAC,GAAG,CAAC,CAAC;IAElB,oBAAoB;IACpB,YAAY,CAAC,GAAG,CAAC,CAAC;IAElB,8BAA8B;IAC9B,aAAa,CAAC,GAAG,CAAC,CAAC;IAEnB,iCAAiC;IACjC,YAAY,CAAC,GAAG,CAAC,CAAC;AACtB,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}
@@ -7,6 +7,8 @@ const socketSignInFailed = `<html><script>window.close()</script><body>Failed to
7
7
  export const addRoute = (env) => {
8
8
  env.app.get(`/oauth2/${env.db.name}/signin`, async (req, res) => {
9
9
  // This is where the user is redirected to by the provider after signin or error
10
+ const LOG_ACTION = 'oauth2.signin';
11
+ const LOG_DETAILS = { ip: req.ip, provider: null };
10
12
  try {
11
13
  const state = parseSignedPublicToken(req.query.state, env.tokenSalt);
12
14
  if (req.query.error) {
@@ -23,6 +25,7 @@ export const addRoute = (env) => {
23
25
  // Got authorization code
24
26
  const authCode = req.query.code;
25
27
  const provider = env.authProviders[state.provider];
28
+ LOG_DETAILS.provider = state.provider;
26
29
  // Get access & refresh tokens
27
30
  const tokens = await provider.getAccessToken({ type: 'auth', auth_code: authCode, redirect_url: `${req.protocol}://${req.headers.host}/oauth2/${env.db.name}/signin` });
28
31
  let user_details;
@@ -129,7 +132,7 @@ export const addRoute = (env) => {
129
132
  // Add provider details
130
133
  await env.authRef.child(uid).child('settings').update(getProviderSettings());
131
134
  // Log success
132
- env.logRef.push({ action: 'oauth2_signin', success: true, ip: req.ip, date: new Date(), uid });
135
+ env.log.event(LOG_ACTION, { ...LOG_DETAILS, uid });
133
136
  // Cache the user
134
137
  env.authCache.set(user.uid, user);
135
138
  // Request signin e-mail to be sent
@@ -149,13 +152,13 @@ export const addRoute = (env) => {
149
152
  provider: state.provider
150
153
  };
151
154
  env.config.email?.send(request).catch(err => {
152
- env.logRef.push({ action: 'oauth2_login_email', success: false, code: 'unexpected', ip: req.ip, date: new Date(), error: err.message, request });
155
+ env.log.error(LOG_ACTION + '.email', 'unexpected', { ...LOG_DETAILS, uid, request }, err);
153
156
  });
154
157
  }
155
158
  else if (snaps.length === 0) {
156
159
  // User does not exist, create
157
160
  if (!env.config.auth.allowUserSignup) {
158
- env.logRef.push({ action: 'oauth2_signup', success: false, code: 'user_signup_disabled', provider: state.provider, email: user_details.email, date: new Date() });
161
+ env.log.error(LOG_ACTION, 'user_signup_disabled', { ...LOG_DETAILS, email: user_details.email });
159
162
  res.statusCode = 403; // Forbidden
160
163
  return res.send({ code: 'admin_only', message: 'Only admin is allowed to create users' });
161
164
  }
@@ -182,7 +185,7 @@ export const addRoute = (env) => {
182
185
  const uid = userRef.key;
183
186
  user.uid = uid;
184
187
  // Log success
185
- env.logRef.push({ action: 'oauth2_signup', success: true, ip: req.ip, date: new Date(), uid });
188
+ env.log.event(LOG_ACTION, { ...LOG_DETAILS, uid });
186
189
  // Cache the user
187
190
  env.authCache.set(user.uid, user);
188
191
  // Request welcome e-mail to be sent
@@ -202,7 +205,7 @@ export const addRoute = (env) => {
202
205
  provider: state.provider
203
206
  };
204
207
  env.config.email?.send(request).catch(err => {
205
- env.logRef.push({ action: 'oauth2_signup_email', success: false, code: 'unexpected', ip: req.ip, date: new Date(), error: err.message, request });
208
+ env.log.error(LOG_ACTION + '.email', 'unexpected', { ...LOG_DETAILS, uid, request }, err);
206
209
  });
207
210
  }
208
211
  else {