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
@@ -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"}
@@ -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":";;;;;;;;;;;;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;QAEvB,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;YACX,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,wBAAwB,EAAE,UAAU,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;YAC7I,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,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,qBAAqB,EAAE,QAAQ,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;YAClK,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,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,qBAAqB,EAAE,QAAQ,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;YAClK,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,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;YACpI,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SACxB;QACD,OAAO,GAAG,EAAE;YACR,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;YACzJ,IAAA,2BAAmB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACjC;IACL,CAAC,CAAA,CAAC,CAAC;AACP,CAAC,CAAC;AA9BW,QAAA,QAAQ,YA8BnB;AAEF,kBAAe,gBAAQ,CAAC"}
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":";;;;;;;;;;;;AAEA,6CAA2D;AAC3D,+CAAkC;AAElC,2CAA2E;AAE3E,MAAa,mBAAoB,SAAQ,KAAK;IAC1C,YAAmB,IAA6D,EAAE,OAAe;QAC7F,KAAK,CAAC,OAAO,CAAC,CAAC;QADA,SAAI,GAAJ,IAAI,CAAyD;IAEhF,CAAC;CACJ;AAJD,kDAIC;AAOM,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAElD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,IAAI,kBAAkB,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE;QAE7E,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC;QACzB,IAAI;YACA,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,OAAO,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE;gBAClE,MAAM,IAAI,mBAAmB,CAAC,qBAAqB,EAAE,gDAAgD,CAAC,CAAC;aAC1G;YACD,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,QAAQ,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;gBAChG,MAAM,IAAI,mBAAmB,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;aACvE;YACD,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC;YACnF,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;gBACpB,MAAM,IAAI,mBAAmB,CAAC,eAAe,EAAE,qDAAqD,CAAC,CAAC;aACzG;YACD,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACtB,MAAM,IAAI,GAAyB,IAAI,CAAC,GAAG,EAAE,CAAC;YAC9C,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAa,CAAC;YAC9B,IAAI,CAAC,mBAAmB,GAAG,iBAAE,CAAC,QAAQ,EAAE,CAAC;YAEzC,6CAA6C;YAC7C,MAAM,OAAO,GAAyC;gBAClD,IAAI,EAAE,qBAAqB;gBAC3B,IAAI,EAAE,IAAI,IAAI,EAAE;gBAChB,EAAE,EAAE,GAAG,CAAC,EAAE;gBACV,SAAS,EAAE,IAAA,gCAAuB,EAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,mBAAmB,EAAE,EAAE,GAAG,CAAC,SAAS,CAAC;gBACpG,IAAI,EAAE;oBACF,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,GAAG,EAAE,IAAI,CAAC,GAAG;oBACb,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,WAAW,EAAE,IAAI,CAAC,YAAY;iBACjC;aACJ,CAAC;YACF,MAAM,OAAO,CAAC,GAAG,CAAC;gBACd,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;gBAC9B,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,EAAE,CAAC;aACrE,CAAC,CAAA;YACF,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;YAClH,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAClB;QACD,OAAO,GAAG,EAAE;YACR,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,IAAI,YAAY,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;YAC3L,IAAI,GAAG,CAAC,IAAI,EAAE;gBACV,IAAA,2BAAmB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;aACjC;iBACI;gBACD,IAAA,2BAAmB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;aACjC;SACJ;IACL,CAAC,CAAA,CAAC,CAAC;AACP,CAAC,CAAC;AApDW,QAAA,QAAQ,YAoDnB;AAEF,kBAAe,gBAAQ,CAAC"}
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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"}
@@ -13,7 +13,9 @@ exports.addRoute = void 0;
13
13
  const error_1 = require("../shared/error");
14
14
  const addRoute = (env) => {
15
15
  env.app.post(`/auth/${env.db.name}/signout`, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
16
- var _a;
16
+ var _a, _b, _c;
17
+ const LOG_ACTION = 'auth.signout';
18
+ const LOG_DETAILS = { ip: req.ip, uid: (_b = (_a = req.user) === null || _a === void 0 ? void 0 : _a.uid) !== null && _b !== void 0 ? _b : null };
17
19
  try {
18
20
  if (req.user) {
19
21
  const client = typeof req.body.client_id === 'string' ? env.clients.get(req.body.client_id) : null; // NEW in AceBaseClient v0.9.4
@@ -27,7 +29,7 @@ const addRoute = (env) => {
27
29
  env.authCache.remove(req.user.uid);
28
30
  // Remove user binding from all clients signed in with current user
29
31
  for (let client of env.clients.values()) {
30
- if (((_a = client.user) === null || _a === void 0 ? void 0 : _a.uid) === req.user.uid) {
32
+ if (((_c = client.user) === null || _c === void 0 ? void 0 : _c.uid) === req.user.uid) {
31
33
  client.user = null;
32
34
  }
33
35
  }
@@ -45,12 +47,12 @@ const addRoute = (env) => {
45
47
  user.last_signout_ip = req.ip;
46
48
  return user;
47
49
  });
48
- env.logRef.push({ action: 'signout', success: true, uid: req.user.uid, ip: req.ip, date: new Date() });
50
+ env.log.event(LOG_ACTION, LOG_DETAILS);
49
51
  }
50
52
  res.send('Bye!');
51
53
  }
52
54
  catch (err) {
53
- env.logRef.push({ action: 'signout', success: false, code: 'unexpected', message: err.message, uid: req.user.uid, ip: req.ip, date: new Date() });
55
+ env.log.error(LOG_ACTION, 'unexpected', Object.assign(Object.assign({}, LOG_DETAILS), { message: err instanceof Error ? err.message : err.toString() }));
54
56
  (0, error_1.sendUnexpectedError)(res, err);
55
57
  }
56
58
  }));
@@ -1 +1 @@
1
- {"version":3,"file":"auth-signout.js","sourceRoot":"","sources":["../../../src/routes/auth-signout.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,2CAAsD;AAS/C,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAClD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,IAAI,UAAU,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE;;QAErE,IAAI;YACA,IAAI,GAAG,CAAC,IAAI,EAAE;gBACV,MAAM,MAAM,GAAG,OAAO,GAAG,CAAC,IAAI,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,8BAA8B;gBAClI,IAAI,MAAM,EAAE;oBACR,yCAAyC;oBACzC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;iBACtB;gBAED,MAAM,iBAAiB,GAAG,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,KAAK,IAAI,CAAC,CAAC,+BAA+B;gBACvH,IAAI,iBAAiB,EAAE;oBACnB,0BAA0B;oBAC1B,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBAEnC,mEAAmE;oBACnE,KAAK,IAAI,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE;wBACrC,IAAI,CAAA,MAAA,MAAM,CAAC,IAAI,0CAAE,GAAG,MAAK,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE;4BACnC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;yBACtB;qBACJ;iBACJ;gBAED,qCAAqC;gBACrC,MAAM,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;oBACrD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE;wBAAE,OAAO;qBAAE;oBAE/B,MAAM,IAAI,GAAyB,IAAI,CAAC,GAAG,EAAE,CAAC;oBAC9C,IAAI,iBAAiB,EAAE;wBACnB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;qBAC5B;oBACD,IAAI,CAAC,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC;oBAC/B,IAAI,CAAC,eAAe,GAAG,GAAG,CAAC,EAAE,CAAC;oBAC9B,OAAO,IAAI,CAAC;gBAChB,CAAC,CAAC,CAAC;gBAEH,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;aAC1G;YACD,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACpB;QACD,OAAM,GAAG,EAAE;YACP,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;YAClJ,IAAA,2BAAmB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACjC;IAEL,CAAC,CAAA,CAAC,CAAC;AACP,CAAC,CAAC;AA/CW,QAAA,QAAQ,YA+CnB;AAEF,kBAAe,gBAAQ,CAAC"}
1
+ {"version":3,"file":"auth-signout.js","sourceRoot":"","sources":["../../../src/routes/auth-signout.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,2CAAsD;AAS/C,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,EAAE;IAClD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,IAAI,UAAU,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE;;QAErE,MAAM,UAAU,GAAG,cAAc,CAAC;QAClC,MAAM,WAAW,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,MAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,GAAG,mCAAI,IAAI,EAAE,CAAC;QAE/D,IAAI;YACA,IAAI,GAAG,CAAC,IAAI,EAAE;gBACV,MAAM,MAAM,GAAG,OAAO,GAAG,CAAC,IAAI,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,8BAA8B;gBAClI,IAAI,MAAM,EAAE;oBACR,yCAAyC;oBACzC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;iBACtB;gBAED,MAAM,iBAAiB,GAAG,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,KAAK,IAAI,CAAC,CAAC,+BAA+B;gBACvH,IAAI,iBAAiB,EAAE;oBACnB,0BAA0B;oBAC1B,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBAEnC,mEAAmE;oBACnE,KAAK,IAAI,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE;wBACrC,IAAI,CAAA,MAAA,MAAM,CAAC,IAAI,0CAAE,GAAG,MAAK,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE;4BACnC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;yBACtB;qBACJ;iBACJ;gBAED,qCAAqC;gBACrC,MAAM,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;oBACrD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE;wBAAE,OAAO;qBAAE;oBAE/B,MAAM,IAAI,GAAyB,IAAI,CAAC,GAAG,EAAE,CAAC;oBAC9C,IAAI,iBAAiB,EAAE;wBACnB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;qBAC5B;oBACD,IAAI,CAAC,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC;oBAC/B,IAAI,CAAC,eAAe,GAAG,GAAG,CAAC,EAAE,CAAC;oBAC9B,OAAO,IAAI,CAAC;gBAChB,CAAC,CAAC,CAAC;gBAEH,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;aAC1C;YACD,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACpB;QACD,OAAM,GAAG,EAAE;YACP,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,YAAY,kCAAO,WAAW,KAAE,OAAO,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAG,CAAC;YAC1H,IAAA,2BAAmB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACjC;IAEL,CAAC,CAAA,CAAC,CAAC;AACP,CAAC,CAAC;AAlDW,QAAA,QAAQ,YAkDnB;AAEF,kBAAe,gBAAQ,CAAC"}
@@ -25,11 +25,12 @@ class SignupError extends Error {
25
25
  exports.SignupError = SignupError;
26
26
  const addRoute = (env) => {
27
27
  env.app.post(`/auth/${env.db.name}/signup`, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
28
- var _a, _b, _c, _d, _e;
29
- if (!env.config.auth.allowUserSignup && (!req.user || req.user.username !== 'admin')) {
30
- env.logRef.push({ action: 'signup', success: false, code: 'user_signup_disabled', ip: req.ip, date: new Date() });
31
- res.statusCode = 403; // Forbidden
32
- return res.send({ code: 'admin_only', message: 'Only admin is allowed to create users' });
28
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j;
29
+ const LOG_ACTION = 'auth.signup';
30
+ const LOG_DETAILS = { ip: req.ip, uid: (_b = (_a = req.user) === null || _a === void 0 ? void 0 : _a.uid) !== null && _b !== void 0 ? _b : null };
31
+ if (!env.config.auth.allowUserSignup && ((_c = req.user) === null || _c === void 0 ? void 0 : _c.uid) !== 'admin') {
32
+ env.log.error(LOG_ACTION, 'user_signup_disabled', LOG_DETAILS);
33
+ return (0, error_1.sendUnauthorizedError)(res, 'admin_only', 'Only admin is allowed to create users');
33
34
  }
34
35
  // Create user if it doesn't exist yet.
35
36
  // TODO: Rate-limit nr of signups per IP to prevent abuse
@@ -68,13 +69,13 @@ const addRoute = (env) => {
68
69
  err = validate_1.invalidPictureError;
69
70
  }
70
71
  if (err === validate_1.emailExistsError || err === validate_1.usernameExistsError) {
71
- env.logRef.push({ action: 'signup', success: false, code: 'conflict', ip: req.ip, date: new Date(), username: details.username, email: details.email });
72
+ env.log.error(LOG_ACTION, 'conflict', Object.assign(Object.assign({}, LOG_DETAILS), { username: details.username, email: details.email }));
72
73
  res.statusCode = 409; // conflict
73
74
  return res.send(validate_1.emailOrUsernameExistsError);
74
75
  }
75
76
  else if (err) {
76
77
  // Log failure
77
- env.logRef.push({ action: 'signup', success: false, code: err.code, ip: req.ip, date: new Date() });
78
+ env.log.error(LOG_ACTION, (_d = err.code) !== null && _d !== void 0 ? _d : 'unexpected', LOG_DETAILS);
78
79
  res.statusCode = 422; // Unprocessable Entity
79
80
  return res.send(err);
80
81
  }
@@ -83,8 +84,8 @@ const addRoute = (env) => {
83
84
  let pwd = (0, password_1.createPasswordHash)(details.password);
84
85
  const user = {
85
86
  uid: null,
86
- username: (_a = details.username) !== null && _a !== void 0 ? _a : null,
87
- email: (_b = details.email) !== null && _b !== void 0 ? _b : null,
87
+ username: (_e = details.username) !== null && _e !== void 0 ? _e : null,
88
+ email: (_f = details.email) !== null && _f !== void 0 ? _f : null,
88
89
  email_verified: false,
89
90
  display_name: details.displayName,
90
91
  password: pwd.hash,
@@ -95,13 +96,14 @@ const addRoute = (env) => {
95
96
  access_token_created: new Date(),
96
97
  last_signin: new Date(),
97
98
  last_signin_ip: req.ip,
98
- picture: (_c = details.picture) !== null && _c !== void 0 ? _c : null,
99
- settings: (_d = details.settings) !== null && _d !== void 0 ? _d : {}
99
+ picture: (_g = details.picture) !== null && _g !== void 0 ? _g : null,
100
+ settings: (_h = details.settings) !== null && _h !== void 0 ? _h : {}
100
101
  };
101
102
  const userRef = yield env.authRef.push(user);
102
103
  user.uid = userRef.key;
104
+ LOG_DETAILS.uid = user.uid;
103
105
  // Log success
104
- env.logRef.push({ action: 'signup', success: true, ip: req.ip, date: new Date(), uid: user.uid });
106
+ env.log.event(LOG_ACTION, LOG_DETAILS);
105
107
  // Cache the user
106
108
  env.authCache.set(user.uid, user);
107
109
  // Request welcome e-mail to be sent
@@ -120,8 +122,8 @@ const addRoute = (env) => {
120
122
  activationCode: (0, tokens_1.createSignedPublicToken)({ uid: user.uid }, env.tokenSalt),
121
123
  emailVerified: false
122
124
  };
123
- (_e = env.config.email) === null || _e === void 0 ? void 0 : _e.send(request).catch(err => {
124
- env.logRef.push({ action: 'signup_email', success: false, code: 'unexpected', ip: req.ip, date: new Date(), error: err.message, request });
125
+ (_j = env.config.email) === null || _j === void 0 ? void 0 : _j.send(request).catch(err => {
126
+ env.log.error(LOG_ACTION + '.email', 'unexpected', Object.assign(Object.assign({}, LOG_DETAILS), { request }), err);
125
127
  });
126
128
  // Return the positive news
127
129
  const isAdmin = req.user && req.user.uid === 'admin';
@@ -131,7 +133,7 @@ const addRoute = (env) => {
131
133
  });
132
134
  }
133
135
  catch (err) {
134
- env.logRef.push({ action: 'signup', success: false, code: 'unexpected', ip: req.ip, date: new Date(), error: err.message, username: details.username, email: details.email });
136
+ env.log.error(LOG_ACTION, 'unexpected', Object.assign(Object.assign({}, LOG_DETAILS), { message: err instanceof Error ? err.message : err.toString(), username: details.username, email: details.email }));
135
137
  (0, error_1.sendUnexpectedError)(res, err);
136
138
  }
137
139
  }));
@@ -1 +1 @@
1
- {"version":3,"file":"auth-signup.js","sourceRoot":"","sources":["../../../src/routes/auth-signup.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"auth-signup.js","sourceRoot":"","sources":["../../../src/routes/auth-signup.ts"],"names":[],"mappings":"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"}
@@ -22,14 +22,17 @@ class UpdateError extends Error {
22
22
  exports.UpdateError = UpdateError;
23
23
  const addRoute = (env) => {
24
24
  env.app.post(`/auth/${env.db.name}/update`, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
25
+ var _a, _b, _c, _d;
25
26
  let details = req.body;
27
+ const LOG_ACTION = 'auth.update';
28
+ const LOG_DETAILS = { ip: req.ip, uid: (_b = (_a = req.user) === null || _a === void 0 ? void 0 : _a.uid) !== null && _b !== void 0 ? _b : null, update_uid: (_c = details.uid) !== null && _c !== void 0 ? _c : null };
26
29
  if (!req.user) {
27
- env.logRef.push({ action: 'update', success: false, code: 'unauthenticated_update', update_uid: details.uid, ip: req.ip, date: new Date() });
30
+ env.log.error(LOG_ACTION, 'unauthenticated_update', LOG_DETAILS);
28
31
  return (0, error_1.sendNotAuthenticatedError)(res, 'unauthenticated_update', 'Sign in to change details');
29
32
  }
30
33
  const uid = details.uid || req.user.uid;
31
34
  if (req.user.uid !== 'admin' && (uid !== req.user.uid || typeof details.is_disabled === 'boolean')) {
32
- env.logRef.push({ action: 'update', success: false, code: 'unauthorized_update', auth_uid: req.user.uid, update_uid: details.uid, ip: req.ip, date: new Date() });
35
+ env.log.error(LOG_ACTION, 'unauthorized_update', LOG_DETAILS);
33
36
  return (0, error_1.sendUnauthorizedError)(res, 'unauthorized_update', 'You are not authorized to perform this update. This attempt has been logged.');
34
37
  }
35
38
  if (typeof details.display_name === 'undefined' && typeof details.displayName === 'string') {
@@ -61,7 +64,7 @@ const addRoute = (env) => {
61
64
  }
62
65
  if (err) {
63
66
  // Log failure
64
- env.logRef.push({ action: 'update', success: false, code: err.code, auth_uid: req.user.uid, update_uid: uid, ip: req.ip, date: new Date() });
67
+ env.log.error(LOG_ACTION, err.code, LOG_DETAILS);
65
68
  res.status(422).send(err); // Unprocessable Entity
66
69
  return;
67
70
  }
@@ -94,7 +97,7 @@ const addRoute = (env) => {
94
97
  });
95
98
  if (!(0, validate_1.isValidSettings)(user.settings)) {
96
99
  err = validate_1.invalidSettingsError;
97
- env.logRef.push({ action: 'update', success: false, code: 'too_many_settings', auth_uid: req.user.uid, update_uid: details.uid, ip: req.ip, date: new Date() });
100
+ env.log.error(LOG_ACTION, 'too_many_settings', LOG_DETAILS);
98
101
  res.statusCode = 422; // Unprocessable Entity
99
102
  res.send(err);
100
103
  return;
@@ -113,13 +116,13 @@ const addRoute = (env) => {
113
116
  catch (err) {
114
117
  // All known errors except user_not_found will have been sent already
115
118
  if (err.code === 'user_not_found') {
116
- env.logRef.push({ action: 'update', success: false, code: err.code, auth_uid: req.user.uid, update_uid: details.uid, ip: req.ip, date: new Date() });
119
+ env.log.error(LOG_ACTION, err.code, LOG_DETAILS);
117
120
  res.statusCode = 404; // Not Found
118
121
  res.send(err);
119
122
  }
120
123
  else {
121
124
  // Unexpected
122
- env.logRef.push({ action: 'update', success: false, code: err.code || 'unexpected', message: err.message, auth_uid: req.user.uid, update_uid: details.uid, ip: req.ip, date: new Date() });
125
+ env.log.error(LOG_ACTION, (_d = err.code) !== null && _d !== void 0 ? _d : 'unexpected', LOG_DETAILS, err);
123
126
  (0, error_1.sendUnexpectedError)(res, err);
124
127
  }
125
128
  }