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
package/dist/cjs/index.js CHANGED
@@ -1,4 +1,18 @@
1
1
  "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
+ for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
+ };
2
16
  Object.defineProperty(exports, "__esModule", { value: true });
3
17
  exports.AceBaseServerAuthenticationSettings = exports.AceBaseServerTransactionSettings = exports.AceBaseServer = void 0;
4
18
  var server_1 = require("./server");
@@ -6,4 +20,6 @@ Object.defineProperty(exports, "AceBaseServer", { enumerable: true, get: functio
6
20
  var settings_1 = require("./settings");
7
21
  Object.defineProperty(exports, "AceBaseServerTransactionSettings", { enumerable: true, get: function () { return settings_1.AceBaseServerTransactionSettings; } });
8
22
  Object.defineProperty(exports, "AceBaseServerAuthenticationSettings", { enumerable: true, get: function () { return settings_1.AceBaseServerAuthenticationSettings; } });
23
+ __exportStar(require("./shared/email"), exports);
24
+ __exportStar(require("./oauth-providers"), exports);
9
25
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,mCAAyC;AAAhC,uGAAA,aAAa,OAAA;AACtB,uCAAsJ;AAA1F,4HAAA,gCAAgC,OAAA;AAAE,+HAAA,mCAAmC,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,mCAAyC;AAAhC,uGAAA,aAAa,OAAA;AACtB,uCAAsJ;AAA1F,4HAAA,gCAAgC,OAAA;AAAE,+HAAA,mCAAmC,OAAA;AACjI,iDAA+B;AAC/B,oDAAkC"}
@@ -0,0 +1,74 @@
1
+ "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
11
+ Object.defineProperty(exports, "__esModule", { value: true });
12
+ exports.DatabaseLog = void 0;
13
+ class DatabaseLog {
14
+ constructor(logRef) {
15
+ this.logRef = logRef;
16
+ }
17
+ /**
18
+ * Logs an action initiated by a client/user with a positive or negative outcome. Used by `success` and `failure`
19
+ * @param action action identifier
20
+ * @param success whether the action was successful
21
+ * @param details any additional details to be logged
22
+ */
23
+ event(action, details) {
24
+ var _a;
25
+ return __awaiter(this, void 0, void 0, function* () {
26
+ yield ((_a = this.logRef) === null || _a === void 0 ? void 0 : _a.push(Object.assign({ type: 'event', action, date: new Date() }, details)));
27
+ });
28
+ }
29
+ /**
30
+ * Logs a system warning
31
+ * @param action action identifier
32
+ * @param code warning code
33
+ * @param details any additional details to be logged
34
+ */
35
+ warning(action, code, details) {
36
+ var _a;
37
+ return __awaiter(this, void 0, void 0, function* () {
38
+ yield ((_a = this.logRef) === null || _a === void 0 ? void 0 : _a.push(Object.assign({ type: 'warning', action, code, date: new Date() }, details)));
39
+ });
40
+ }
41
+ /**
42
+ * Logs a system or client/user error
43
+ * @param action action identifier
44
+ * @param code error code
45
+ * @param details any additional details to be logged
46
+ */
47
+ error(action, code, details, unexpectedError) {
48
+ var _a, _b, _c, _d;
49
+ return __awaiter(this, void 0, void 0, function* () {
50
+ const errorDetails = unexpectedError instanceof Error
51
+ ? { error: (_a = unexpectedError.stack) !== null && _a !== void 0 ? _a : unexpectedError.message }
52
+ : { error: (_c = (_b = unexpectedError === null || unexpectedError === void 0 ? void 0 : unexpectedError.message) !== null && _b !== void 0 ? _b : unexpectedError === null || unexpectedError === void 0 ? void 0 : unexpectedError.toString()) !== null && _c !== void 0 ? _c : null };
53
+ yield ((_d = this.logRef) === null || _d === void 0 ? void 0 : _d.push(Object.assign(Object.assign({ type: 'error', action, code, date: new Date() }, errorDetails), details)));
54
+ });
55
+ }
56
+ /**
57
+ * Query the logs
58
+ * @returns
59
+ */
60
+ query() {
61
+ if (!this.logRef) {
62
+ throw new Error('Logging is not enabled');
63
+ }
64
+ return this.logRef.query();
65
+ }
66
+ /**
67
+ * Reference to the logs database collection
68
+ */
69
+ get ref() {
70
+ return this === null || this === void 0 ? void 0 : this.logRef;
71
+ }
72
+ }
73
+ exports.DatabaseLog = DatabaseLog;
74
+ //# sourceMappingURL=logger.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,MAAa,WAAW;IACpB,YAAoB,MAAqB;QAArB,WAAM,GAAN,MAAM,CAAe;IAAG,CAAC;IAE7C;;;;;OAKG;IACG,KAAK,CAAC,MAAc,EAAE,OAAY;;;YACpC,MAAM,CAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,iBAAG,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,IAAK,OAAO,EAAG,CAAA,CAAC;;KACpF;IAED;;;;;OAKG;IACG,OAAO,CAAC,MAAc,EAAE,IAAY,EAAE,OAAY;;;YACpD,MAAM,CAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,iBAAG,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,IAAK,OAAO,EAAG,CAAA,CAAC;;KAC5F;IAED;;;;;OAKG;IACG,KAAK,CAAC,MAAc,EAAE,IAAY,EAAE,OAAY,EAAE,eAAqB;;;YACzE,MAAM,YAAY,GAAG,eAAe,YAAY,KAAK;gBACjD,CAAC,CAAC,EAAE,KAAK,EAAE,MAAA,eAAe,CAAC,KAAK,mCAAI,eAAe,CAAC,OAAO,EAAE;gBAC7D,CAAC,CAAC,EAAE,KAAK,EAAE,MAAA,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,OAAO,mCAAI,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,QAAQ,EAAE,mCAAI,IAAI,EAAE,CAAC;YACjF,MAAM,CAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,+BAAG,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,IAAK,YAAY,GAAK,OAAO,EAAG,CAAA,CAAC;;KAC3G;IAED;;;OAGG;IACH,KAAK;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;SAC7C;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IAC/B,CAAC;IAED;;OAEG;IACH,IAAI,GAAG;QACH,OAAO,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,CAAC;IACxB,CAAC;CACJ;AArDD,kCAqDC"}
@@ -0,0 +1,29 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.adminOnly = void 0;
4
+ const error_1 = require("../shared/error");
5
+ /**
6
+ * Middleware function that checks if the current user is `admin`. An 403 Forbidden error will be sent in the response if
7
+ * authentication is enabled on the server and the user is not signed in as admin.
8
+ *
9
+ * Can be applied to any route by adding it in the router chain.
10
+ * @example
11
+ * app.get('/endpoint', adminOnly(env), (req, res) => {
12
+ * // If we get here we are either an admin,
13
+ * // or the server doesn't have authentication enabled.
14
+ * })
15
+ * @param env Middle
16
+ * @param errorMessage
17
+ * @returns
18
+ */
19
+ const adminOnly = (env, errorMessage = 'only admin can perform this operation') => {
20
+ return (req, res, next) => {
21
+ if (env.config.auth.enabled && (!req.user || req.user.uid !== 'admin')) {
22
+ return (0, error_1.sendUnauthorizedError)(res, 'admin_only', errorMessage);
23
+ }
24
+ next();
25
+ };
26
+ };
27
+ exports.adminOnly = adminOnly;
28
+ exports.default = exports.adminOnly;
29
+ //# sourceMappingURL=admin-only.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"admin-only.js","sourceRoot":"","sources":["../../../src/middleware/admin-only.ts"],"names":[],"mappings":";;;AAEA,2CAAuD;AAGvD;;;;;;;;;;;;;GAaG;AACI,MAAM,SAAS,GAAG,CAAC,GAAyB,EAAE,eAAuB,uCAAuC,EAAE,EAAE;IACnH,OAAO,CAAC,GAAiB,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QAC5D,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,OAAO,CAAC,EAAE;YACpE,OAAO,IAAA,6BAAqB,EAAC,GAAG,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;SACjE;QACD,IAAI,EAAE,CAAC;IACX,CAAC,CAAA;AACL,CAAC,CAAA;AAPY,QAAA,SAAS,aAOrB;AAED,kBAAe,iBAAS,CAAC"}
@@ -18,9 +18,9 @@ const addMiddleware = (env) => {
18
18
  env.app.use((req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
19
19
  let authorization = req.get('Authorization');
20
20
  if (typeof authorization !== 'string' && 'auth_token' in req.query) {
21
- // Enables browser calls to be authenticated
22
- if (req.path.startsWith('/export/')) {
23
- // For now, only allow this if the intention is to call '/export' api call
21
+ // Enables browser calls to be authenticated by adding the access token as auth_token query parameter
22
+ if (req.path.startsWith('/export/') || req.path.startsWith('/logs')) {
23
+ // For now, only allow '/export' or '/logs' api calls
24
24
  // In the future, use these prerequisites:
25
25
  // - user must be currently authenticated (in cache)
26
26
  // - ip address must match the token
@@ -41,7 +41,7 @@ const addMiddleware = (env) => {
41
41
  if (!req.user) {
42
42
  // Query database to get user for this token
43
43
  try {
44
- yield (0, signin_1.signIn)({ method: 'private_token', access_token: tokenDetails.access_token }, env, req);
44
+ yield (0, signin_1.signIn)({ method: 'internal', access_token: tokenDetails.access_token }, env, req);
45
45
  }
46
46
  catch (err) {
47
47
  return (0, error_1.sendNotAuthenticatedError)(res, err.code, err.message);
@@ -1 +1 @@
1
- {"version":3,"file":"user.js","sourceRoot":"","sources":["../../../src/middleware/user.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2CAA4D;AAC5D,6CAA0C;AAC1C,6CAA2D;AAEpD,MAAM,aAAa,GAAG,CAAC,GAAyB,EAAE,EAAE;IAEvD,uCAAuC;IACvC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAO,GAAyD,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAEvF,IAAI,aAAa,GAAG,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAC7C,IAAI,OAAO,aAAa,KAAK,QAAQ,IAAI,YAAY,IAAI,GAAG,CAAC,KAAK,EAAE;YAChE,oEAAoE;YACpE,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;gBACjC,0EAA0E;gBAC1E,0CAA0C;gBAC1C,oDAAoD;gBACpD,oCAAoC;gBACpC,aAAa,GAAG,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC;aACpD;SACJ;QAED,IAAI,OAAO,aAAa,KAAK,QAAQ,IAAI,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;YAC1E,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACrC,IAAI,YAAwD,CAAC;YAC7D,IAAI;gBACA,YAAY,GAAG,IAAA,gCAAuB,EAAC,KAAK,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;aAChE;YACD,OAAO,GAAG,EAAE;gBACR,OAAO,IAAA,iCAAyB,EAAC,GAAG,EAAE,eAAe,EAAE,4CAA4C,CAAC,CAAC;aACxG;YAED,wBAAwB;YACxB,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YAC/C,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;gBACX,4CAA4C;gBAC5C,IAAI;oBACA,MAAM,IAAA,eAAM,EAAC,EAAE,MAAM,EAAE,eAAe,EAAE,YAAY,EAAE,YAAY,CAAC,YAAY,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;iBAChG;gBACD,OAAO,GAAG,EAAE;oBACR,OAAO,IAAA,iCAAyB,EAAC,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;iBAChE;aACJ;YAED,IAAI,GAAG,CAAC,IAAI,CAAC,WAAW,KAAK,IAAI,EAAE;gBAC/B,OAAO,IAAA,iCAAyB,EAAC,GAAG,EAAE,kBAAkB,EAAE,qEAAqE,CAAC,CAAC;aACpI;SACJ;QACD,IAAI,EAAE,CAAC;IACX,CAAC,CAAA,CAAC,CAAC;AACP,CAAC,CAAC;AA7CW,QAAA,aAAa,iBA6CxB"}
1
+ {"version":3,"file":"user.js","sourceRoot":"","sources":["../../../src/middleware/user.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2CAA4D;AAC5D,6CAA0C;AAC1C,6CAA2D;AAEpD,MAAM,aAAa,GAAG,CAAC,GAAyB,EAAE,EAAE;IAEvD,uCAAuC;IACvC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAO,GAAyD,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAEvF,IAAI,aAAa,GAAG,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAC7C,IAAI,OAAO,aAAa,KAAK,QAAQ,IAAI,YAAY,IAAI,GAAG,CAAC,KAAK,EAAE;YAChE,qGAAqG;YACrG,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;gBACjE,qDAAqD;gBACrD,0CAA0C;gBAC1C,oDAAoD;gBACpD,oCAAoC;gBACpC,aAAa,GAAG,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC;aACpD;SACJ;QAED,IAAI,OAAO,aAAa,KAAK,QAAQ,IAAI,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;YAC1E,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACrC,IAAI,YAAwD,CAAC;YAC7D,IAAI;gBACA,YAAY,GAAG,IAAA,gCAAuB,EAAC,KAAK,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;aAChE;YACD,OAAO,GAAG,EAAE;gBACR,OAAO,IAAA,iCAAyB,EAAC,GAAG,EAAE,eAAe,EAAE,4CAA4C,CAAC,CAAC;aACxG;YAED,wBAAwB;YACxB,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YAC/C,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;gBACX,4CAA4C;gBAC5C,IAAI;oBACA,MAAM,IAAA,eAAM,EAAC,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,YAAY,CAAC,YAAY,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;iBAC3F;gBACD,OAAO,GAAG,EAAE;oBACR,OAAO,IAAA,iCAAyB,EAAC,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;iBAChE;aACJ;YAED,IAAI,GAAG,CAAC,IAAI,CAAC,WAAW,KAAK,IAAI,EAAE;gBAC/B,OAAO,IAAA,iCAAyB,EAAC,GAAG,EAAE,kBAAkB,EAAE,qEAAqE,CAAC,CAAC;aACpI;SACJ;QACD,IAAI,EAAE,CAAC;IACX,CAAC,CAAA,CAAC,CAAC;AACP,CAAC,CAAC;AA7CW,QAAA,aAAa,iBA6CxB"}
@@ -10,10 +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.AuthProvider = exports.DropboxAuthProvider = void 0;
13
+ const oauth_provider_1 = require("./oauth-provider");
13
14
  const simple_fetch_1 = require("../shared/simple-fetch");
14
- class DropboxAuthProvider {
15
+ class DropboxAuthProvider extends oauth_provider_1.OAuth2Provider {
15
16
  constructor(settings) {
16
- this.settings = settings;
17
+ super(settings);
17
18
  if (!settings.scopes) {
18
19
  settings.scopes = [];
19
20
  }
@@ -1 +1 @@
1
- {"version":3,"file":"dropbox.js","sourceRoot":"","sources":["../../../src/oauth-providers/dropbox.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dropbox.js","sourceRoot":"","sources":["../../../src/oauth-providers/dropbox.ts"],"names":[],"mappings":"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"}
@@ -10,10 +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.AuthProvider = exports.FacebookAuthProvider = void 0;
13
+ const oauth_provider_1 = require("./oauth-provider");
13
14
  const simple_fetch_1 = require("../shared/simple-fetch");
14
- class FacebookAuthProvider {
15
+ class FacebookAuthProvider extends oauth_provider_1.OAuth2Provider {
15
16
  constructor(settings) {
16
- this.settings = settings;
17
+ super(settings);
17
18
  if (!settings.scopes) {
18
19
  settings.scopes = [];
19
20
  }
@@ -1 +1 @@
1
- {"version":3,"file":"facebook.js","sourceRoot":"","sources":["../../../src/oauth-providers/facebook.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"facebook.js","sourceRoot":"","sources":["../../../src/oauth-providers/facebook.ts"],"names":[],"mappings":"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"}
@@ -10,10 +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.AuthProvider = exports.GoogleAuthProvider = void 0;
13
+ const oauth_provider_1 = require("./oauth-provider");
13
14
  const simple_fetch_1 = require("../shared/simple-fetch");
14
- class GoogleAuthProvider {
15
+ class GoogleAuthProvider extends oauth_provider_1.OAuth2Provider {
15
16
  constructor(settings) {
16
- this.settings = settings;
17
+ super(settings);
17
18
  if (!settings.scopes) {
18
19
  settings.scopes = [];
19
20
  }
@@ -1 +1 @@
1
- {"version":3,"file":"google.js","sourceRoot":"","sources":["../../../src/oauth-providers/google.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"google.js","sourceRoot":"","sources":["../../../src/oauth-providers/google.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/oauth-providers/index.ts"],"names":[],"mappings":";;;AAAA,uCAAgD;AAChD,yCAAkD;AAClD,qCAA8C;AAC9C,2CAAoD;AACpD,uCAAgD;AAEhD,qCAAsE;AAA7D,8GAAA,mBAAmB,OAAA;AAC5B,uCAAyE;AAAhE,gHAAA,oBAAoB,OAAA;AAC7B,mCAAmE;AAA1D,4GAAA,kBAAkB,OAAA;AAC3B,yCAA4E;AAAnE,kHAAA,qBAAqB,OAAA;AAC9B,qCAAsE;AAA7D,8GAAA,mBAAmB,OAAA;AAE5B,MAAM,eAAe,GAAG;IACpB,OAAO,EAAE,6BAAmB;IAC5B,QAAQ,EAAE,+BAAoB;IAC9B,MAAM,EAAE,2BAAkB;IAC1B,SAAS,EAAE,iCAAqB;IAChC,OAAO,EAAE,6BAAmB;CAC/B,CAAA;AACD,kBAAe,eAAe,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/oauth-providers/index.ts"],"names":[],"mappings":";;;AAAA,uCAAgD;AAChD,yCAAkD;AAClD,qCAA8C;AAC9C,2CAAoD;AAEpD,uCAAgD;AAEhD,qCAAsE;AAA7D,8GAAA,mBAAmB,OAAA;AAC5B,uCAAyE;AAAhE,gHAAA,oBAAoB,OAAA;AAC7B,mCAAmE;AAA1D,4GAAA,kBAAkB,OAAA;AAC3B,yCAA4E;AAAnE,kHAAA,qBAAqB,OAAA;AAC9B,qCAAsE;AAA7D,8GAAA,mBAAmB,OAAA;AAE5B,MAAM,eAAe,GAA6C;IAC9D,OAAO,EAAE,6BAAmB;IAC5B,QAAQ,EAAE,+BAAoB;IAC9B,MAAM,EAAE,2BAAkB;IAC1B,SAAS,EAAE,iCAAqB;IAChC,OAAO,EAAE,6BAAmB;CAC/B,CAAA;AACD,kBAAe,eAAe,CAAC"}
@@ -10,10 +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.AuthProvider = exports.InstagramAuthProvider = void 0;
13
+ const oauth_provider_1 = require("./oauth-provider");
13
14
  const simple_fetch_1 = require("../shared/simple-fetch");
14
- class InstagramAuthProvider {
15
+ class InstagramAuthProvider extends oauth_provider_1.OAuth2Provider {
15
16
  constructor(settings) {
16
- this.settings = settings;
17
+ super(settings);
17
18
  if (!settings.scopes) {
18
19
  settings.scopes = [];
19
20
  }
@@ -1 +1 @@
1
- {"version":3,"file":"instagram.js","sourceRoot":"","sources":["../../../src/oauth-providers/instagram.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"instagram.js","sourceRoot":"","sources":["../../../src/oauth-providers/instagram.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,26 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.OAuth2Provider = void 0;
4
+ // export interface IOAuth2Provider {
5
+ // init(info: OAuth2ProviderInitInfo): Promise<string>;
6
+ // getAccessToken(param: OAuth2ProviderGetAccessTokenParams): Promise<IOAuth2TokenResult>;
7
+ // getUserInfo(access_token: string): Promise<OAuth2ProviderUserInfo>;
8
+ // }
9
+ class NotImplementedError extends Error {
10
+ constructor() { super('Not implemented'); }
11
+ }
12
+ class OAuth2Provider {
13
+ constructor(settings) {
14
+ this.settings = settings;
15
+ }
16
+ init(info) { throw new NotImplementedError(); }
17
+ ;
18
+ getAccessToken(param) { throw new NotImplementedError(); }
19
+ ;
20
+ ;
21
+ getUserInfo(access_token) { throw new NotImplementedError(); }
22
+ ;
23
+ ;
24
+ }
25
+ exports.OAuth2Provider = OAuth2Provider;
3
26
  //# sourceMappingURL=oauth-provider.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"oauth-provider.js","sourceRoot":"","sources":["../../../src/oauth-providers/oauth-provider.ts"],"names":[],"mappings":""}
1
+ {"version":3,"file":"oauth-provider.js","sourceRoot":"","sources":["../../../src/oauth-providers/oauth-provider.ts"],"names":[],"mappings":";;;AAuBA,qCAAqC;AACrC,2DAA2D;AAC3D,8FAA8F;AAC9F,0EAA0E;AAC1E,IAAI;AACJ,MAAM,mBAAoB,SAAQ,KAAK;IAAG,gBAAgB,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;CAAE;AACvF,MAAa,cAAc;IACvB,YAAsB,QAAiC;QAAjC,aAAQ,GAAR,QAAQ,CAAyB;IAAG,CAAC;IAC3D,IAAI,CAAC,IAA4B,IAAqB,MAAM,IAAI,mBAAmB,EAAE,CAAC,CAAC,CAAC;IAAA,CAAC;IACzF,cAAc,CAAC,KAAsD,IAAiC,MAAM,IAAI,mBAAmB,EAAE,CAAC,CAAC,CAAC;IAAA,CAAC;IAAA,CAAC;IAC1I,WAAW,CAAC,YAAoB,IAAqC,MAAM,IAAI,mBAAmB,EAAE,CAAC,CAAC,CAAC;IAAA,CAAC;IAAA,CAAC;CAC5G;AALD,wCAKC"}
@@ -10,10 +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.AuthProvider = exports.SpotifyAuthProvider = void 0;
13
+ const oauth_provider_1 = require("./oauth-provider");
13
14
  const simple_fetch_1 = require("../shared/simple-fetch");
14
- class SpotifyAuthProvider {
15
+ class SpotifyAuthProvider extends oauth_provider_1.OAuth2Provider {
15
16
  constructor(settings) {
16
- this.settings = settings;
17
+ super(settings);
17
18
  if (!settings.scopes) {
18
19
  settings.scopes = [];
19
20
  }
@@ -1 +1 @@
1
- {"version":3,"file":"spotify.js","sourceRoot":"","sources":["../../../src/oauth-providers/spotify.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"spotify.js","sourceRoot":"","sources":["../../../src/oauth-providers/spotify.ts"],"names":[],"mappings":"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"}
@@ -23,16 +23,18 @@ class ChangePasswordError extends Error {
23
23
  exports.ChangePasswordError = ChangePasswordError;
24
24
  const addRoute = (env) => {
25
25
  env.app.post(`/auth/${env.db.name}/change_password`, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
26
- var _a;
26
+ var _a, _b;
27
27
  let access_token = (_a = req.user) === null || _a === void 0 ? void 0 : _a.access_token;
28
28
  const details = req.body;
29
+ const LOG_ACTION = 'auth.change_password';
30
+ const LOG_DETAILS = { ip: req.ip, uid: (_b = details.uid) !== null && _b !== void 0 ? _b : null };
29
31
  if (typeof details !== 'object' || typeof details.uid !== 'string' || typeof details.password !== 'string' || typeof details.new_password !== 'string') {
30
- env.logRef.push({ action: 'change_password', success: false, code: 'invalid_details', ip: req.ip, date: new Date() });
32
+ env.log.error(LOG_ACTION, 'invalid_details', LOG_DETAILS);
31
33
  res.status(400).send('Bad Request'); // Bad Request
32
34
  return;
33
35
  }
34
36
  if (details.new_password.length < 8 || details.new_password.includes(' ') || !/[0-9]/.test(details.new_password) || !/[a-z]/.test(details.new_password) || !/[A-Z]/.test(details.new_password)) {
35
- env.logRef.push({ action: 'change_password', success: false, code: 'new_password_denied', ip: req.ip, date: new Date(), uid: details.uid });
37
+ env.log.error(LOG_ACTION, 'new_password_denied', LOG_DETAILS);
36
38
  const err = 'Invalid new password, must be at least 8 characters and contain a combination of numbers and letters (both lower and uppercase)';
37
39
  res.status(422).send(err); // Unprocessable Entity
38
40
  return;
@@ -67,10 +69,11 @@ const addRoute = (env) => {
67
69
  publicAccessToken = (0, tokens_1.createPublicAccessToken)(user.uid, req.ip, user.access_token, env.tokenSalt);
68
70
  return user; // Update db
69
71
  });
72
+ env.log.event(LOG_ACTION, LOG_DETAILS);
70
73
  res.send({ access_token: publicAccessToken }); // Client must use this new access token from now on
71
74
  }
72
75
  catch (err) {
73
- env.logRef.push({ action: 'change_pwd', success: false, code: err.code, ip: req.ip, date: new Date(), uid: details.uid });
76
+ env.log.error(LOG_ACTION, err.code, LOG_DETAILS);
74
77
  if (err.code) {
75
78
  (0, error_1.sendBadRequestError)(res, err);
76
79
  }
@@ -1 +1 @@
1
- {"version":3,"file":"auth-change-password.js","sourceRoot":"","sources":["../../../src/routes/auth-change-password.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"auth-change-password.js","sourceRoot":"","sources":["../../../src/routes/auth-change-password.ts"],"names":[],"mappings":"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"}
@@ -20,28 +20,30 @@ class DeleteError extends Error {
20
20
  exports.DeleteError = DeleteError;
21
21
  const addRoute = (env) => {
22
22
  env.app.post(`/auth/${env.db.name}/delete`, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
23
- var _a;
23
+ var _a, _b, _c, _d;
24
24
  let details = req.body;
25
+ const LOG_ACTION = 'auth.delete';
26
+ 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, delete_uid: details.uid };
25
27
  if (!req.user) {
26
- env.logRef.push({ action: 'delete', success: false, code: 'unauthenticated_delete', delete_uid: details.uid, ip: req.ip, date: new Date() });
28
+ env.log.error(LOG_ACTION, 'unauthenticated_delete', LOG_DETAILS);
27
29
  return (0, error_1.sendNotAuthenticatedError)(res, 'unauthenticated_delete', 'You are not authorized to perform this operation, your attempt has been logged');
28
30
  }
29
31
  if (req.user.uid !== 'admin' && details.uid !== req.user.uid) {
30
- env.logRef.push({ action: 'delete', success: false, code: 'unauthorized_delete', auth_uid: req.user.uid, delete_uid: details.uid, ip: req.ip, date: new Date() });
32
+ env.log.error(LOG_ACTION, 'unauthorized_delete', LOG_DETAILS);
31
33
  return (0, error_1.sendUnauthorizedError)(res, 'unauthorized_delete', 'You are not authorized to perform this operation, your attempt has been logged');
32
34
  }
33
- const uid = (_a = details.uid) !== null && _a !== void 0 ? _a : req.user.uid;
35
+ const uid = (_c = details.uid) !== null && _c !== void 0 ? _c : req.user.uid;
34
36
  if (uid === 'admin') {
35
- env.logRef.push({ action: 'delete', success: false, code: 'unauthorized_delete', auth_uid: req.user.uid, delete_uid: details.uid, ip: req.ip, date: new Date() });
37
+ env.log.error(LOG_ACTION, 'unauthorized_delete', LOG_DETAILS);
36
38
  return (0, error_1.sendUnauthorizedError)(res, 'unauthorized_delete', 'The admin account cannot be deleted, your attempt has been logged');
37
39
  }
38
40
  try {
39
41
  yield env.authRef.child(uid).remove();
40
- env.logRef.push({ action: 'delete', success: true, auth_uid: req.user.uid, delete_uid: details.uid, ip: req.ip, date: new Date() });
42
+ env.log.event(LOG_ACTION, LOG_DETAILS);
41
43
  res.send('Farewell');
42
44
  }
43
45
  catch (err) {
44
- env.logRef.push({ action: 'delete', success: false, code: 'unexpected', auth_uid: req.user.uid, delete_uid: details.uid, ip: req.ip, date: new Date() });
46
+ env.log.error(LOG_ACTION, 'unexpected', Object.assign(Object.assign({}, LOG_DETAILS), { message: (_d = (err instanceof Error && err.message)) !== null && _d !== void 0 ? _d : err.toString() }));
45
47
  (0, error_1.sendUnexpectedError)(res, err);
46
48
  }
47
49
  }));
@@ -1 +1 @@
1
- {"version":3,"file":"auth-delete.js","sourceRoot":"","sources":["../../../src/routes/auth-delete.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"auth-delete.js","sourceRoot":"","sources":["../../../src/routes/auth-delete.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2CAAwG;AAExG,MAAa,WAAY,SAAQ,KAAK;IAClC,YAAmB,IAAoD,EAAE,OAAe;QACpF,KAAK,CAAC,OAAO,CAAC,CAAC;QADA,SAAI,GAAJ,IAAI,CAAgD;IAEvE,CAAC;CACJ;AAJD,kCAIC;AAOM,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAClD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,IAAI,SAAS,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE;;QACpE,IAAI,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC;QACvB,MAAM,UAAU,GAAG,aAAa,CAAC;QACjC,MAAM,WAAW,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,MAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,GAAG,mCAAI,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;QAExF,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;YACX,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,wBAAwB,EAAE,WAAW,CAAC,CAAC;YACjE,OAAO,IAAA,iCAAyB,EAAC,GAAG,EAAE,wBAAwB,EAAE,gFAAgF,CAAC,CAAC;SACrJ;QAED,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,OAAO,IAAI,OAAO,CAAC,GAAG,KAAK,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE;YAC1D,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,qBAAqB,EAAE,WAAW,CAAC,CAAC;YAC9D,OAAO,IAAA,6BAAqB,EAAC,GAAG,EAAE,qBAAqB,EAAE,gFAAgF,CAAC,CAAC;SAC9I;QAED,MAAM,GAAG,GAAG,MAAA,OAAO,CAAC,GAAG,mCAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC;QACxC,IAAI,GAAG,KAAK,OAAO,EAAE;YACjB,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,qBAAqB,EAAE,WAAW,CAAC,CAAC;YAC9D,OAAO,IAAA,6BAAqB,EAAC,GAAG,EAAE,qBAAqB,EAAE,mEAAmE,CAAC,CAAC;SACjI;QAED,IAAI;YACA,MAAM,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;YACtC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;YACvC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SACxB;QACD,OAAO,GAAG,EAAE;YACR,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,YAAY,kCAAO,WAAW,KAAE,OAAO,EAAE,MAAA,CAAC,GAAG,YAAY,KAAK,IAAI,GAAG,CAAC,OAAO,CAAC,mCAAI,GAAG,CAAC,QAAQ,EAAE,IAAG,CAAC;YAC9H,IAAA,2BAAmB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACjC;IACL,CAAC,CAAA,CAAC,CAAC;AACP,CAAC,CAAC;AAhCW,QAAA,QAAQ,YAgCnB;AAEF,kBAAe,gBAAQ,CAAC"}
@@ -22,7 +22,10 @@ class ForgotPasswordError extends Error {
22
22
  exports.ForgotPasswordError = ForgotPasswordError;
23
23
  const addRoute = (env) => {
24
24
  env.app.post(`/auth/${env.db.name}/forgot_password`, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
25
+ var _a, _b, _c;
25
26
  const details = req.body;
27
+ const LOG_ACTION = 'auth.forgot_password';
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, email: details.email };
26
29
  try {
27
30
  if (!env.config.email || typeof env.config.email.send !== 'function') {
28
31
  throw new ForgotPasswordError('server_email_config', 'Server email settings have not been configured');
@@ -52,15 +55,15 @@ const addRoute = (env) => {
52
55
  displayName: user.display_name
53
56
  }
54
57
  };
55
- yield Promise.all([
56
- env.config.email.send(request),
57
- snap.ref.update({ password_reset_code: user.password_reset_code })
58
- ]);
59
- env.logRef.push({ action: 'forgot_password', success: true, email: details.email, ip: req.ip, date: new Date() });
58
+ yield snap.ref.update({ password_reset_code: user.password_reset_code });
59
+ yield env.config.email.send(request).catch(err => {
60
+ env.log.error(LOG_ACTION + '.email', 'unexpected', Object.assign(Object.assign({}, LOG_DETAILS), { request }), err);
61
+ });
62
+ env.log.event(LOG_ACTION, LOG_DETAILS);
60
63
  res.send('OK');
61
64
  }
62
65
  catch (err) {
63
- env.logRef.push({ action: 'forgot_password', success: false, code: err.code || 'unexpected', message: err.code ? null : err.message, email: details.email, ip: req.ip, date: new Date() });
66
+ env.log.error(LOG_ACTION, err.code || 'unexpected', Object.assign(Object.assign({}, LOG_DETAILS), { message: (_c = (err instanceof Error && err.message)) !== null && _c !== void 0 ? _c : err.toString() }));
64
67
  if (err.code) {
65
68
  (0, error_1.sendBadRequestError)(res, err);
66
69
  }
@@ -1 +1 @@
1
- {"version":3,"file":"auth-forgot-password.js","sourceRoot":"","sources":["../../../src/routes/auth-forgot-password.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"auth-forgot-password.js","sourceRoot":"","sources":["../../../src/routes/auth-forgot-password.ts"],"names":[],"mappings":"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"}
@@ -70,15 +70,17 @@ const addRoute = (env) => {
70
70
  return user;
71
71
  });
72
72
  env.app.post(`/auth/${env.db.name}/reset_password`, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
73
- var _b, _c;
73
+ var _b, _c, _d, _e;
74
74
  const details = req.body;
75
+ const LOG_ACTION = 'auth.reset_password';
76
+ const LOG_DETAILS = { ip: req.ip, uid: (_c = (_b = req.user) === null || _b === void 0 ? void 0 : _b.uid) !== null && _c !== void 0 ? _c : null };
75
77
  try {
76
78
  const user = yield resetPassword(req.ip, details.code, details.password);
77
- env.logRef.push({ action: 'reset_password', success: true, ip: req.ip, date: new Date(), uid: user.uid });
79
+ env.log.event(LOG_ACTION, Object.assign(Object.assign({}, LOG_DETAILS), { reset_uid: user.uid }));
78
80
  res.send('OK');
79
81
  }
80
82
  catch (err) {
81
- env.logRef.push({ action: 'reset_password', success: false, code: err.code, message: err.message, ip: req.ip, date: new Date(), uid: (_c = (_b = req.user) === null || _b === void 0 ? void 0 : _b.uid) !== null && _c !== void 0 ? _c : null });
83
+ env.log.error(LOG_ACTION, (_d = err.code) !== null && _d !== void 0 ? _d : 'unexpected', Object.assign(Object.assign({}, LOG_DETAILS), { message: (_e = (err instanceof Error && err.message)) !== null && _e !== void 0 ? _e : err.toString() }));
82
84
  if (err.code) {
83
85
  (0, error_1.sendBadRequestError)(res, err);
84
86
  }
@@ -1 +1 @@
1
- {"version":3,"file":"auth-reset-password.js","sourceRoot":"","sources":["../../../src/routes/auth-reset-password.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"auth-reset-password.js","sourceRoot":"","sources":["../../../src/routes/auth-reset-password.ts"],"names":[],"mappings":"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"}