@geekity/cms 0.50.1 → 0.52.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 (257) hide show
  1. package/admin/pages/account/forgot.njk +13 -7
  2. package/admin/pages/account/reset.njk +1 -1
  3. package/admin/pages/documents/editor.njk +40 -1
  4. package/admin/pages/users/edit.njk +36 -4
  5. package/admin/pages/users/new.njk +19 -1
  6. package/admin/static/admin.css +32 -25
  7. package/dist/admin/admin-bar.d.ts.map +1 -1
  8. package/dist/admin/admin-bar.js +11 -10
  9. package/dist/admin/admin-bar.js.map +1 -1
  10. package/dist/admin/autosave.d.ts.map +1 -1
  11. package/dist/admin/autosave.js +1 -2
  12. package/dist/admin/autosave.js.map +1 -1
  13. package/dist/admin/confirm-password.d.ts +19 -1
  14. package/dist/admin/confirm-password.d.ts.map +1 -1
  15. package/dist/admin/confirm-password.js +40 -8
  16. package/dist/admin/confirm-password.js.map +1 -1
  17. package/dist/admin/connected-apps.d.ts.map +1 -1
  18. package/dist/admin/connected-apps.js +1 -0
  19. package/dist/admin/connected-apps.js.map +1 -1
  20. package/dist/admin/credentials.d.ts +0 -1
  21. package/dist/admin/credentials.d.ts.map +1 -1
  22. package/dist/admin/credentials.js +1 -2
  23. package/dist/admin/credentials.js.map +1 -1
  24. package/dist/admin/documents.d.ts +0 -7
  25. package/dist/admin/documents.d.ts.map +1 -1
  26. package/dist/admin/documents.js +29 -19
  27. package/dist/admin/documents.js.map +1 -1
  28. package/dist/admin/editor-layout.js +2 -2
  29. package/dist/admin/editor-layout.js.map +1 -1
  30. package/dist/admin/export.d.ts +2 -0
  31. package/dist/admin/export.d.ts.map +1 -1
  32. package/dist/admin/export.js +5 -4
  33. package/dist/admin/export.js.map +1 -1
  34. package/dist/admin/headers.d.ts.map +1 -1
  35. package/dist/admin/headers.js +4 -0
  36. package/dist/admin/headers.js.map +1 -1
  37. package/dist/admin/index.d.ts +7 -7
  38. package/dist/admin/index.d.ts.map +1 -1
  39. package/dist/admin/index.js +5 -5
  40. package/dist/admin/index.js.map +1 -1
  41. package/dist/admin/indieauth-consent.d.ts.map +1 -1
  42. package/dist/admin/indieauth-consent.js +3 -2
  43. package/dist/admin/indieauth-consent.js.map +1 -1
  44. package/dist/admin/legacy-migrations.d.ts.map +1 -1
  45. package/dist/admin/legacy-migrations.js +6 -2
  46. package/dist/admin/legacy-migrations.js.map +1 -1
  47. package/dist/admin/plugins.d.ts +2 -0
  48. package/dist/admin/plugins.d.ts.map +1 -1
  49. package/dist/admin/plugins.js +15 -11
  50. package/dist/admin/plugins.js.map +1 -1
  51. package/dist/admin/recovery.d.ts +7 -4
  52. package/dist/admin/recovery.d.ts.map +1 -1
  53. package/dist/admin/recovery.js +68 -43
  54. package/dist/admin/recovery.js.map +1 -1
  55. package/dist/admin/routes.d.ts.map +1 -1
  56. package/dist/admin/routes.js +99 -76
  57. package/dist/admin/routes.js.map +1 -1
  58. package/dist/admin/uploads.d.ts +4 -13
  59. package/dist/admin/uploads.d.ts.map +1 -1
  60. package/dist/admin/uploads.js +9 -28
  61. package/dist/admin/uploads.js.map +1 -1
  62. package/dist/admin/users.d.ts +7 -0
  63. package/dist/admin/users.d.ts.map +1 -1
  64. package/dist/admin/users.js +156 -43
  65. package/dist/admin/users.js.map +1 -1
  66. package/dist/admin/wiki-mentions.d.ts +31 -0
  67. package/dist/admin/wiki-mentions.d.ts.map +1 -0
  68. package/dist/admin/wiki-mentions.js +129 -0
  69. package/dist/admin/wiki-mentions.js.map +1 -0
  70. package/dist/cli/commands.d.ts.map +1 -1
  71. package/dist/cli/commands.js +12 -1
  72. package/dist/cli/commands.js.map +1 -1
  73. package/dist/cli/help.d.ts.map +1 -1
  74. package/dist/cli/help.js +5 -4
  75. package/dist/cli/help.js.map +1 -1
  76. package/dist/cli/password.js +3 -3
  77. package/dist/cli/password.js.map +1 -1
  78. package/dist/cli/serve.d.ts.map +1 -1
  79. package/dist/cli/serve.js +17 -0
  80. package/dist/cli/serve.js.map +1 -1
  81. package/dist/cli/user.d.ts +1 -1
  82. package/dist/cli/user.d.ts.map +1 -1
  83. package/dist/cli/user.js +74 -11
  84. package/dist/cli/user.js.map +1 -1
  85. package/dist/cms/services.d.ts.map +1 -1
  86. package/dist/cms/services.js +10 -1
  87. package/dist/cms/services.js.map +1 -1
  88. package/dist/config.d.ts +8 -4
  89. package/dist/config.d.ts.map +1 -1
  90. package/dist/config.js +4 -1
  91. package/dist/config.js.map +1 -1
  92. package/dist/content/document-form.d.ts +2 -0
  93. package/dist/content/document-form.d.ts.map +1 -1
  94. package/dist/content/document-form.js +10 -0
  95. package/dist/content/document-form.js.map +1 -1
  96. package/dist/content/document-kind.d.ts +5 -0
  97. package/dist/content/document-kind.d.ts.map +1 -1
  98. package/dist/content/document-kind.js +3 -0
  99. package/dist/content/document-kind.js.map +1 -1
  100. package/dist/content/sqlite/backlinks.d.ts.map +1 -1
  101. package/dist/content/sqlite/backlinks.js +4 -3
  102. package/dist/content/sqlite/backlinks.js.map +1 -1
  103. package/dist/content/sqlite/lookups.d.ts.map +1 -1
  104. package/dist/content/sqlite/lookups.js +6 -2
  105. package/dist/content/sqlite/lookups.js.map +1 -1
  106. package/dist/content/sqlite/schema.d.ts.map +1 -1
  107. package/dist/content/sqlite/schema.js +18 -0
  108. package/dist/content/sqlite/schema.js.map +1 -1
  109. package/dist/content/sqlite/writes.d.ts.map +1 -1
  110. package/dist/content/sqlite/writes.js +6 -0
  111. package/dist/content/sqlite/writes.js.map +1 -1
  112. package/dist/content/store.d.ts +3 -3
  113. package/dist/content/wiki-aliases.d.ts +23 -0
  114. package/dist/content/wiki-aliases.d.ts.map +1 -0
  115. package/dist/content/wiki-aliases.js +45 -0
  116. package/dist/content/wiki-aliases.js.map +1 -0
  117. package/dist/content/wiki-mentions.d.ts +30 -0
  118. package/dist/content/wiki-mentions.d.ts.map +1 -0
  119. package/dist/content/wiki-mentions.js +120 -0
  120. package/dist/content/wiki-mentions.js.map +1 -0
  121. package/dist/content/write.d.ts +2 -2
  122. package/dist/content/write.d.ts.map +1 -1
  123. package/dist/content/write.js +26 -3
  124. package/dist/content/write.js.map +1 -1
  125. package/dist/federation/actor.d.ts.map +1 -1
  126. package/dist/federation/actor.js +9 -5
  127. package/dist/federation/actor.js.map +1 -1
  128. package/dist/federation/keys.d.ts.map +1 -1
  129. package/dist/federation/keys.js +6 -15
  130. package/dist/federation/keys.js.map +1 -1
  131. package/dist/files/atomic.d.ts +7 -1
  132. package/dist/files/atomic.d.ts.map +1 -1
  133. package/dist/files/atomic.js +75 -14
  134. package/dist/files/atomic.js.map +1 -1
  135. package/dist/files/data-files.d.ts +12 -0
  136. package/dist/files/data-files.d.ts.map +1 -1
  137. package/dist/files/data-files.js +24 -0
  138. package/dist/files/data-files.js.map +1 -1
  139. package/dist/files/lock-file.d.ts.map +1 -0
  140. package/dist/{jobs → files}/lock-file.js +1 -1
  141. package/dist/files/lock-file.js.map +1 -0
  142. package/dist/gemini/certificate.d.ts.map +1 -1
  143. package/dist/gemini/certificate.js +15 -12
  144. package/dist/gemini/certificate.js.map +1 -1
  145. package/dist/indieauth/grants.d.ts +1 -0
  146. package/dist/indieauth/grants.d.ts.map +1 -1
  147. package/dist/indieauth/grants.js.map +1 -1
  148. package/dist/indieauth/tokens.d.ts +4 -1
  149. package/dist/indieauth/tokens.d.ts.map +1 -1
  150. package/dist/indieauth/tokens.js +7 -3
  151. package/dist/indieauth/tokens.js.map +1 -1
  152. package/dist/jobs/file-records.js +1 -1
  153. package/dist/jobs/file-records.js.map +1 -1
  154. package/dist/jobs/processes.d.ts +0 -1
  155. package/dist/jobs/processes.d.ts.map +1 -1
  156. package/dist/jobs/processes.js +1 -9
  157. package/dist/jobs/processes.js.map +1 -1
  158. package/dist/mcp/authoring/wiki.d.ts.map +1 -1
  159. package/dist/mcp/authoring/wiki.js +20 -5
  160. package/dist/mcp/authoring/wiki.js.map +1 -1
  161. package/dist/notifications/mail-service.d.ts.map +1 -1
  162. package/dist/notifications/mail-service.js +16 -1
  163. package/dist/notifications/mail-service.js.map +1 -1
  164. package/dist/plugin.d.ts +3 -2
  165. package/dist/plugin.d.ts.map +1 -1
  166. package/dist/plugin.js.map +1 -1
  167. package/dist/plugins/site.d.ts.map +1 -1
  168. package/dist/plugins/site.js +1 -1
  169. package/dist/plugins/site.js.map +1 -1
  170. package/dist/site/admin-paths.d.ts +7 -0
  171. package/dist/site/admin-paths.d.ts.map +1 -1
  172. package/dist/site/admin-paths.js +18 -0
  173. package/dist/site/admin-paths.js.map +1 -1
  174. package/dist/site/passwords.d.ts +9 -2
  175. package/dist/site/passwords.d.ts.map +1 -1
  176. package/dist/site/passwords.js +45 -14
  177. package/dist/site/passwords.js.map +1 -1
  178. package/dist/site/users.d.ts +67 -11
  179. package/dist/site/users.d.ts.map +1 -1
  180. package/dist/site/users.js +207 -35
  181. package/dist/site/users.js.map +1 -1
  182. package/dist/store/schema.d.ts.map +1 -1
  183. package/dist/store/schema.js +11 -0
  184. package/dist/store/schema.js.map +1 -1
  185. package/dist/store/sessions.d.ts +3 -0
  186. package/dist/store/sessions.d.ts.map +1 -1
  187. package/dist/store/sessions.js +27 -18
  188. package/dist/store/sessions.js.map +1 -1
  189. package/dist/store/tokens.d.ts +4 -2
  190. package/dist/store/tokens.d.ts.map +1 -1
  191. package/dist/store/tokens.js +16 -10
  192. package/dist/store/tokens.js.map +1 -1
  193. package/dist/util/html-tree.d.ts +4 -0
  194. package/dist/util/html-tree.d.ts.map +1 -1
  195. package/dist/util/html-tree.js +34 -0
  196. package/dist/util/html-tree.js.map +1 -1
  197. package/dist/util/process-alive.d.ts +3 -0
  198. package/dist/util/process-alive.d.ts.map +1 -0
  199. package/dist/util/process-alive.js +11 -0
  200. package/dist/util/process-alive.js.map +1 -0
  201. package/dist/web/compression.js +2 -3
  202. package/dist/web/compression.js.map +1 -1
  203. package/dist/web/conversation-feed.d.ts +15 -4
  204. package/dist/web/conversation-feed.d.ts.map +1 -1
  205. package/dist/web/conversation-feed.js +31 -5
  206. package/dist/web/conversation-feed.js.map +1 -1
  207. package/dist/web/feed-item.d.ts +3 -1
  208. package/dist/web/feed-item.d.ts.map +1 -1
  209. package/dist/web/feed-item.js +5 -1
  210. package/dist/web/feed-item.js.map +1 -1
  211. package/dist/web/feed-routes.d.ts.map +1 -1
  212. package/dist/web/feed-routes.js +2 -0
  213. package/dist/web/feed-routes.js.map +1 -1
  214. package/dist/web/feed-rss.d.ts.map +1 -1
  215. package/dist/web/feed-rss.js +25 -2
  216. package/dist/web/feed-rss.js.map +1 -1
  217. package/dist/web/feed-source.d.ts +10 -3
  218. package/dist/web/feed-source.d.ts.map +1 -1
  219. package/dist/web/feed-source.js.map +1 -1
  220. package/dist/web/feeds.js +1 -1
  221. package/dist/web/feeds.js.map +1 -1
  222. package/dist/web/indieauth-bearer.js +2 -2
  223. package/dist/web/indieauth-bearer.js.map +1 -1
  224. package/dist/web/indieauth-token.js +3 -3
  225. package/dist/web/indieauth-token.js.map +1 -1
  226. package/dist/web/session.d.ts +6 -1
  227. package/dist/web/session.d.ts.map +1 -1
  228. package/dist/web/session.js +21 -3
  229. package/dist/web/session.js.map +1 -1
  230. package/dist/web/signed-in.d.ts.map +1 -1
  231. package/dist/web/signed-in.js +6 -2
  232. package/dist/web/signed-in.js.map +1 -1
  233. package/dist/web/throttle.d.ts +26 -18
  234. package/dist/web/throttle.d.ts.map +1 -1
  235. package/dist/web/throttle.js +130 -24
  236. package/dist/web/throttle.js.map +1 -1
  237. package/dist/webmention/reply-context/feed.d.ts +26 -0
  238. package/dist/webmention/reply-context/feed.d.ts.map +1 -0
  239. package/dist/webmention/reply-context/feed.js +107 -0
  240. package/dist/webmention/reply-context/feed.js.map +1 -0
  241. package/dist/webmention/reply-context.d.ts +5 -1
  242. package/dist/webmention/reply-context.d.ts.map +1 -1
  243. package/dist/webmention/reply-context.js +21 -10
  244. package/dist/webmention/reply-context.js.map +1 -1
  245. package/dist/webmention/reply-contexts.js +5 -0
  246. package/dist/webmention/reply-contexts.js.map +1 -1
  247. package/package.json +6 -4
  248. package/templates/site/gitignore +4 -0
  249. package/themes/default/mail/email-changed.html.njk +17 -0
  250. package/themes/default/mail/email-changed.subject.njk +1 -0
  251. package/themes/default/mail/email-changed.txt.njk +14 -0
  252. package/themes/default/mail/password-changed.html.njk +1 -1
  253. package/themes/default/mail/password-changed.txt.njk +2 -1
  254. package/themes/default/partials/jsonld.njk +1 -1
  255. package/dist/jobs/lock-file.d.ts.map +0 -1
  256. package/dist/jobs/lock-file.js.map +0 -1
  257. /package/dist/{jobs → files}/lock-file.d.ts +0 -0
@@ -1 +1 @@
1
- {"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/admin/routes.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/admin/routes.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,5 @@
1
- import type { Hono, MiddlewareHandler } from 'hono';
1
+ import type { Context, Hono } from 'hono';
2
+ import type { ResolvedConfig } from '../config.ts';
2
3
  import type { GeekityEnv } from '../web/env.ts';
3
4
  /** Where the editor, and every upload control in the admin, posts a file it wants stored. */
4
5
  export declare const UPLOADS_PATH = "/admin/uploads";
@@ -10,18 +11,8 @@ export interface UploadResult {
10
11
  /** Markdown to paste at the cursor: an embed for an image, a link otherwise. */
11
12
  markdown: string;
12
13
  }
13
- /**
14
- * Refuse an oversized upload by its headers, before anything reads it.
15
- *
16
- * This is registered in front of the admin guard on purpose. The guard finds
17
- * the CSRF token by parsing the form, and parsing a multipart form pulls the
18
- * whole file into the process — so by the time the request has been
19
- * authenticated, a gigabyte has already been read. Checking the declared
20
- * length first is the only place a body can be turned away before that
21
- * happens. It gives nothing away: that `/admin/uploads` exists is in the
22
- * package's own source.
23
- */
24
- export declare const refuseOversizedUpload: MiddlewareHandler<GeekityEnv>;
14
+ export declare function uploadBodyLimit(config: ResolvedConfig): number;
15
+ export declare function uploadTooLarge(c: Context<GeekityEnv>): Response;
25
16
  /**
26
17
  * Register the editor's upload endpoint.
27
18
  *
@@ -1 +1 @@
1
- {"version":3,"file":"uploads.d.ts","sourceRoot":"","sources":["../../src/admin/uploads.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAEpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAYhD,6FAA6F;AAC7F,eAAO,MAAM,YAAY,mBAA4B,CAAC;AAEtD,eAAO,MAAM,iBAAiB,WAAW,CAAC;AAE1C,wDAAwD;AACxD,MAAM,WAAW,YAAY;IAC3B,uEAAuE;IACvE,GAAG,EAAE,MAAM,CAAC;IACZ,gFAAgF;IAChF,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,qBAAqB,EAAE,iBAAiB,CAAC,UAAU,CAiB/D,CAAC;AAOF;;;;;;;;;;;GAWG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAqBxD"}
1
+ {"version":3,"file":"uploads.d.ts","sourceRoot":"","sources":["../../src/admin/uploads.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAYhD,6FAA6F;AAC7F,eAAO,MAAM,YAAY,mBAA4B,CAAC;AAEtD,eAAO,MAAM,iBAAiB,WAAW,CAAC;AAE1C,wDAAwD;AACxD,MAAM,WAAW,YAAY;IAC3B,uEAAuE;IACvE,GAAG,EAAE,MAAM,CAAC;IACZ,gFAAgF;IAChF,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAE9D;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,QAAQ,CAK/D;AAOD;;;;;;;;;;;GAWG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAqBxD"}
@@ -3,34 +3,15 @@ import { ADMIN_PREFIX } from '../site/admin-paths.js';
3
3
  /** Where the editor, and every upload control in the admin, posts a file it wants stored. */
4
4
  export const UPLOADS_PATH = `${ADMIN_PREFIX}/uploads`;
5
5
  export const IMAGES_ONLY_FIELD = 'images';
6
- /**
7
- * Refuse an oversized upload by its headers, before anything reads it.
8
- *
9
- * This is registered in front of the admin guard on purpose. The guard finds
10
- * the CSRF token by parsing the form, and parsing a multipart form pulls the
11
- * whole file into the process — so by the time the request has been
12
- * authenticated, a gigabyte has already been read. Checking the declared
13
- * length first is the only place a body can be turned away before that
14
- * happens. It gives nothing away: that `/admin/uploads` exists is in the
15
- * package's own source.
16
- */
17
- export const refuseOversizedUpload = async (c, next) => {
18
- if (c.req.method !== 'POST')
19
- return next();
20
- const declared = Number(c.req.header('content-length') ?? '');
21
- const limit = largestUploadLimit(c.var.config);
22
- if (Number.isFinite(declared) && declared > limit + UPLOAD_ENVELOPE_BYTES) {
23
- // JSON for the editor's control, which reads it, and plain text for the
24
- // media screen's form, which is a navigation: a browser that has just
25
- // submitted a form and been shown a JSON object has been told nothing.
26
- // There is no session yet — the guard has not run — so a flash and a
27
- // redirect are not available here.
28
- return submittedFromABrowser(c.req.header('accept'))
29
- ? c.text(tooLargeMessage(limit), 413)
30
- : c.json({ error: tooLargeMessage(limit) }, 413);
31
- }
32
- await next();
33
- };
6
+ export function uploadBodyLimit(config) {
7
+ return largestUploadLimit(config) + UPLOAD_ENVELOPE_BYTES;
8
+ }
9
+ export function uploadTooLarge(c) {
10
+ const message = tooLargeMessage(largestUploadLimit(c.var.config));
11
+ return submittedFromABrowser(c.req.header('accept'))
12
+ ? c.text(message, 413)
13
+ : c.json({ error: message }, 413);
14
+ }
34
15
  /** Whether a request wants a page back rather than the editor's JSON. */
35
16
  function submittedFromABrowser(accept) {
36
17
  return (accept ?? '').includes('text/html');
@@ -1 +1 @@
1
- {"version":3,"file":"uploads.js","sourceRoot":"","sources":["../../src/admin/uploads.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,kBAAkB,EAClB,aAAa,EACb,WAAW,EACX,eAAe,EACf,qBAAqB,EACrB,YAAY,EACZ,cAAc,GACf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,6FAA6F;AAC7F,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,YAAY,UAAU,CAAC;AAEtD,MAAM,CAAC,MAAM,iBAAiB,GAAG,QAAQ,CAAC;AAU1C;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAkC,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE;IACpF,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,KAAK,MAAM;QAAE,OAAO,IAAI,EAAE,CAAC;IAE3C,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,kBAAkB,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/C,IAAI,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,QAAQ,GAAG,KAAK,GAAG,qBAAqB,EAAE,CAAC;QAC1E,wEAAwE;QACxE,sEAAsE;QACtE,uEAAuE;QACvE,qEAAqE;QACrE,mCAAmC;QACnC,OAAO,qBAAqB,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAClD,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC;YACrC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IACrD,CAAC;IAED,MAAM,IAAI,EAAE,CAAC;AACf,CAAC,CAAC;AAEF,yEAAyE;AACzE,SAAS,qBAAqB,CAAC,MAA0B;IACvD,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AAC9C,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,YAAY,CAAC,GAAqB;IAChD,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QACjC,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE;YAClE,UAAU,EAAE,IAAI,CAAC,iBAAiB,CAAC,KAAK,GAAG;SAC5C,CAAC,CAAC;QAEH,IAAI,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAC1D,CAAC;QAED,MAAM,MAAM,GAAiB;YAC3B,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,QAAQ,EAAE,cAAc,CAAC;gBACvB,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO;aACtC,CAAC;SACH,CAAC;QACF,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"uploads.js","sourceRoot":"","sources":["../../src/admin/uploads.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,kBAAkB,EAClB,aAAa,EACb,WAAW,EACX,eAAe,EACf,qBAAqB,EACrB,YAAY,EACZ,cAAc,GACf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,6FAA6F;AAC7F,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,YAAY,UAAU,CAAC;AAEtD,MAAM,CAAC,MAAM,iBAAiB,GAAG,QAAQ,CAAC;AAU1C,MAAM,UAAU,eAAe,CAAC,MAAsB;IACpD,OAAO,kBAAkB,CAAC,MAAM,CAAC,GAAG,qBAAqB,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,CAAsB;IACnD,MAAM,OAAO,GAAG,eAAe,CAAC,kBAAkB,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAClE,OAAO,qBAAqB,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC;QACtB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,GAAG,CAAC,CAAC;AACtC,CAAC;AAED,yEAAyE;AACzE,SAAS,qBAAqB,CAAC,MAA0B;IACvD,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AAC9C,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,YAAY,CAAC,GAAqB;IAChD,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QACjC,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE;YAClE,UAAU,EAAE,IAAI,CAAC,iBAAiB,CAAC,KAAK,GAAG;SAC5C,CAAC,CAAC;QAEH,IAAI,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAC1D,CAAC;QAED,MAAM,MAAM,GAAiB;YAC3B,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,QAAQ,EAAE,cAAc,CAAC;gBACvB,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO;aACtC,CAAC;SACH,CAAC;QACF,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;AACL,CAAC"}
@@ -1,6 +1,7 @@
1
1
  import type { Hono } from 'hono';
2
2
  import type { GeekityEnv } from '../web/env.ts';
3
3
  import type { ProfileLink, User } from '../site/users.ts';
4
+ import type { ConfirmPassword } from './confirm-password.ts';
4
5
  import type { AdminRender } from './documents.ts';
5
6
  export declare const ADD_USER_PATH = "/admin/users/new";
6
7
  export declare const CONNECTED_APPS_PATH = "/admin/users/apps";
@@ -33,15 +34,20 @@ export declare const USER_FIELDS: {
33
34
  readonly location: 'location';
34
35
  readonly links: 'links';
35
36
  readonly adminTheme: 'admin_theme';
37
+ readonly profileHash: 'profile_hash';
38
+ readonly emailHash: 'email_hash';
36
39
  };
37
40
  export interface MountUsersOptions {
38
41
  render: AdminRender;
42
+ confirmPassword: ConfirmPassword;
39
43
  }
40
44
  export declare function mountUsers(app: Hono<GeekityEnv>, options: MountUsersOptions): void;
41
45
  export declare function deleteUser(input: {
42
46
  dataDir: string;
43
47
  userId: number;
48
+ signedInAs?: number | null | undefined;
44
49
  now: Date;
50
+ endSessions?: ((userId: number) => void) | undefined;
45
51
  }): Promise<boolean>;
46
52
  export declare function deleteUserRefusal(input: {
47
53
  target: User | undefined;
@@ -61,6 +67,7 @@ export type AddUserProblems = {
61
67
  username?: string;
62
68
  password?: string;
63
69
  email?: string;
70
+ currentPassword?: string;
64
71
  };
65
72
  export declare function addUserProblems(username: string, password: string, generate?: boolean, email?: string): AddUserProblems;
66
73
  export declare const GENERATED_PASSWORD_ALPHABET = "ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz23456789";
@@ -1 +1 @@
1
- {"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../src/admin/users.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../src/admin/users.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
- import { randomInt } from 'node:crypto';
2
- import { countUsers, createUser, removeUserRecord, DuplicateUsernameError, findUserById, listUsers, setUserAdminTheme, setUserEmail, setUserNotification, setUserNotificationMode, setUserPassword, setUserProfile, verifyUserPassword, } from '../site/users.js';
1
+ import { createHash, randomInt } from 'node:crypto';
2
+ import { countUsers, createUser, removeUserRecord, DuplicateUsernameError, findUserById, isAvatarUrl, listUsers, setUserAdminTheme, setUserEmail, setUserNotification, setUserNotificationMode, setUserPassword, cleanProfile, setUserProfile, UserRemovalRefusedError, } from '../site/users.js';
3
3
  import { authorHref } from '../content/authors.js';
4
4
  import { isLinkUrl, LINK_REL_RULE, LINK_URL_RULE, splitLinkRel } from '../site/navigation.js';
5
5
  import { DEFAULT_DELIVERY_MODE, deliveryMode, notificationEvent, notificationSwitches, } from '../site/notification-preferences.js';
@@ -7,9 +7,12 @@ import { revokeTokensForUser } from '../indieauth/tokens.js';
7
7
  import { autosaveCopies } from '../autosave/index.js';
8
8
  import { discardWritingLedger } from '../writing/ledger.js';
9
9
  import { stringOrEmpty } from '../util/forms.js';
10
+ import { startSession } from '../web/session.js';
10
11
  import { ADMIN_THEMES, adminTheme } from '../site/admin-theme.js';
12
+ import { lockedMessage, answerLockedOut } from './confirm-password.js';
11
13
  import { emailProblem, passwordProblem, usernameProblem } from './credentials.js';
12
14
  import { flashAndRedirect } from './flash.js';
15
+ import { appsDisconnectedPhrase } from './recovery.js';
13
16
  import { editUserPath, USERS_PATH } from '../site/admin-paths.js';
14
17
  import { toldFollowers } from './settings-page.js';
15
18
  import { ADMIN_TEMPLATES } from './templates.js';
@@ -30,6 +33,8 @@ export const USER_PROFILE_PATH = `${USERS_PATH}/profile`;
30
33
  export const USER_NOTIFICATIONS_PATH = `${USERS_PATH}/notifications`;
31
34
  export const USER_NOTIFICATION_MODE_PATH = `${USER_NOTIFICATIONS_PATH}/mode`;
32
35
  export const USER_THEME_PATH = `${USERS_PATH}/theme`;
36
+ const EMAIL_CHANGED_TEMPLATE = 'email-changed';
37
+ const WRONG_PASSWORD = 'Your password was not right, so';
33
38
  export const USER_FIELDS = {
34
39
  username: 'username',
35
40
  password: 'password',
@@ -51,14 +56,16 @@ export const USER_FIELDS = {
51
56
  location: 'location',
52
57
  links: 'links',
53
58
  adminTheme: 'admin_theme',
59
+ profileHash: 'profile_hash',
60
+ emailHash: 'email_hash',
54
61
  };
55
62
  export function mountUsers(app, options) {
56
63
  const { render } = options;
57
64
  app.get(USERS_PATH, (c) => showUsers(c, render));
58
65
  app.get(ADD_USER_PATH, (c) => showAddUser(c, render));
59
- app.post(ADD_USER_PATH, (c) => addUser(c, render));
60
- app.post(CHANGE_PASSWORD_PATH, (c) => changePassword(c, render));
61
- app.post(USER_EMAIL_PATH, saveEmail);
66
+ app.post(ADD_USER_PATH, (c) => addUser(c, options));
67
+ app.post(CHANGE_PASSWORD_PATH, (c) => changePassword(c, options));
68
+ app.post(USER_EMAIL_PATH, (c) => saveEmail(c, options));
62
69
  app.post(USER_PROFILE_PATH, (c) => saveProfile(c, render));
63
70
  app.post(USER_NOTIFICATIONS_PATH, saveNotification);
64
71
  app.post(USER_NOTIFICATION_MODE_PATH, saveNotificationMode);
@@ -72,7 +79,7 @@ function showUsers(c, render) {
72
79
  function showAddUser(c, render) {
73
80
  return render(c, ADMIN_TEMPLATES.usersNew, addScreen(c));
74
81
  }
75
- async function addUser(c, render) {
82
+ async function addUser(c, { render, confirmPassword }) {
76
83
  const body = await c.req.parseBody();
77
84
  const username = stringOrEmpty(body[USER_FIELDS.username]).trim();
78
85
  const supplied = stringOrEmpty(body[USER_FIELDS.password]);
@@ -80,6 +87,10 @@ async function addUser(c, render) {
80
87
  const generate = stringOrEmpty(body[USER_FIELDS.generate]) !== '';
81
88
  const password = generate ? generatePassword() : supplied;
82
89
  const problems = addUserProblems(username, password, generate, email);
90
+ const confirmation = await confirmPassword(c, stringOrEmpty(body[USER_FIELDS.currentPassword]));
91
+ if (confirmation.kind !== 'confirmed') {
92
+ problems.currentPassword = `${WRONG_PASSWORD} nobody was added.`;
93
+ }
83
94
  if (Object.keys(problems).length === 0) {
84
95
  try {
85
96
  await createUser({
@@ -98,13 +109,17 @@ async function addUser(c, render) {
98
109
  }
99
110
  if (Object.keys(problems).length > 0) {
100
111
  c.status(400);
112
+ if (confirmation.kind === 'locked')
113
+ problems.currentPassword = answerLockedOut(c, confirmation.wait);
101
114
  return render(c, ADMIN_TEMPLATES.usersNew, addScreen(c, { addForm: { username, email, generate }, addProblems: problems }));
102
115
  }
103
- return flashAndRedirect(c, 'notice', generate
104
- ? `Added ${username}. Their password is ${password} — copy it now, it is not shown again.`
105
- : `Added ${username}.`, USERS_PATH);
116
+ if (generate) {
117
+ c.header('cache-control', 'no-store');
118
+ return render(c, ADMIN_TEMPLATES.usersNew, addScreen(c, { added: { username, password } }));
119
+ }
120
+ return flashAndRedirect(c, 'notice', `Added ${username}.`, USERS_PATH);
106
121
  }
107
- async function changePassword(c, render) {
122
+ async function changePassword(c, { render, confirmPassword }) {
108
123
  const session = c.var.session;
109
124
  const user = signedInUser(c);
110
125
  if (session === undefined || user === undefined)
@@ -113,31 +128,69 @@ async function changePassword(c, render) {
113
128
  const current = stringOrEmpty(body[USER_FIELDS.currentPassword]);
114
129
  const next = stringOrEmpty(body[USER_FIELDS.newPassword]);
115
130
  const confirmation = stringOrEmpty(body[USER_FIELDS.newPasswordConfirmation]);
131
+ const confirmed = await confirmPassword(c, current);
116
132
  const problems = changePasswordProblems({
117
- correct: verifyUserPassword(c.var.config.dataDir, user.username, current) !== undefined,
133
+ correct: confirmed.kind === 'confirmed',
118
134
  next,
119
135
  confirmation,
120
136
  });
121
137
  if (Object.keys(problems).length > 0) {
122
138
  c.status(400);
139
+ if (confirmed.kind === 'locked')
140
+ problems.currentPassword = answerLockedOut(c, confirmed.wait);
123
141
  return render(c, ADMIN_TEMPLATES.usersEdit, userScreen(c, user, { passwordProblems: problems }));
124
142
  }
125
- await setUserPassword({ dataDir: c.var.config.dataDir, userId: user.id, password: next });
143
+ await setUserPassword({
144
+ dataDir: c.var.config.dataDir,
145
+ userId: user.id,
146
+ password: next,
147
+ now: c.var.config.now(),
148
+ });
126
149
  const ended = c.var.admin.deleteSessionsForUser(user.id, { except: session.id });
127
- return backToUser(c, 'notice', ended === 0
150
+ c.var.admin.deleteSession(session.id);
151
+ startSession(c, user);
152
+ c.var.admin.deletePasswordResetsForUser(user.id);
153
+ const disconnected = await revokeTokensForUser(c.var.config.dataDir, user.id, c.var.config.now());
154
+ const closed = [
155
+ ...(ended === 0 ? [] : [`${signedOut(ended)} signed out`]),
156
+ ...(disconnected === 0 ? [] : [appsDisconnectedPhrase(disconnected)]),
157
+ ];
158
+ return backToUser(c, 'notice', closed.length === 0
128
159
  ? 'Your password was changed.'
129
- : `Your password was changed, and ${signedOut(ended)} signed out.`, user);
160
+ : `Your password was changed, and ${closed.join(' and ')}.`, user);
130
161
  }
131
- async function saveEmail(c) {
162
+ async function saveEmail(c, { render, confirmPassword }) {
132
163
  const named = await namedUser(c);
133
164
  if (named instanceof Response)
134
165
  return named;
135
166
  const { dataDir, body, target } = named;
136
167
  const email = stringOrEmpty(body[USER_FIELDS.email]).trim();
168
+ const confirmation = await confirmPassword(c, stringOrEmpty(body[USER_FIELDS.currentPassword]));
169
+ if (confirmation.kind !== 'confirmed') {
170
+ const message = confirmation.kind === 'locked'
171
+ ? lockedMessage(confirmation.wait)
172
+ : `${WRONG_PASSWORD} the address was not changed.`;
173
+ return backToUser(c, 'error', message, target);
174
+ }
137
175
  const problem = emailProblem(email);
138
176
  if (problem !== undefined)
139
177
  return backToUser(c, 'error', problem, target);
178
+ const previous = target.email;
179
+ if (staleForm(body[USER_FIELDS.emailHash], previous) && email !== (previous ?? '')) {
180
+ c.status(409);
181
+ return render(c, ADMIN_TEMPLATES.usersEdit, userScreen(c, target, { emailConflict: { submitted: email, current: previous ?? '' } }));
182
+ }
140
183
  await setUserEmail({ dataDir, userId: target.id, email });
184
+ if (previous !== email) {
185
+ c.var.admin.deletePasswordResetsForUser(target.id);
186
+ if (previous !== undefined && c.var.mailConfigured) {
187
+ void c.var.mail.send({
188
+ to: previous,
189
+ template: EMAIL_CHANGED_TEMPLATE,
190
+ data: { username: target.username, email },
191
+ });
192
+ }
193
+ }
141
194
  return backToUser(c, 'notice', email === ''
142
195
  ? `${target.username} has no email address any more.`
143
196
  : `${target.username} will be emailed at ${email}.`, target);
@@ -148,22 +201,54 @@ async function saveProfile(c, render) {
148
201
  return named;
149
202
  const { dataDir, body, target } = named;
150
203
  const typed = typedProfile(body);
151
- const problem = profileLinkLineProblem(typed.links);
152
- if (problem !== undefined) {
204
+ const profile = { ...typed, links: parseProfileLinks(typed.links) };
205
+ if (staleForm(body[USER_FIELDS.profileHash], target.profile) && !sameProfile(profile, target)) {
206
+ c.status(409);
207
+ return render(c, ADMIN_TEMPLATES.usersEdit, userScreen(c, target, {
208
+ profileConflict: {
209
+ submitted: profileText(cleanProfile(profile)),
210
+ current: profileText(target.profile),
211
+ },
212
+ }, typed));
213
+ }
214
+ const problems = profileProblems(typed);
215
+ if (Object.keys(problems).length > 0) {
153
216
  c.status(400);
154
- return render(c, ADMIN_TEMPLATES.usersEdit, userScreen(c, target, { profileProblems: { links: problem } }, typed));
217
+ return render(c, ADMIN_TEMPLATES.usersEdit, userScreen(c, target, { profileProblems: problems }, typed));
155
218
  }
156
- const changed = await setUserProfile({
157
- dataDir,
158
- userId: target.id,
159
- profile: { ...typed, links: parseProfileLinks(typed.links) },
160
- });
219
+ const changed = await setUserProfile({ dataDir, userId: target.id, profile });
161
220
  // A follower's copy of somebody's name, bio and picture is only as fresh as
162
221
  // the last `Update` they were sent.
163
222
  const saved = changed ? findUserById(dataDir, target.id) : undefined;
164
223
  const told = saved === undefined ? undefined : await c.var.delivery.updateActor(saved);
165
224
  return backToUser(c, 'notice', `Saved ${target.username}’s profile.${toldFollowers(told)}`, target);
166
225
  }
226
+ function staleForm(posted, stored) {
227
+ const formVersion = stringOrEmpty(posted);
228
+ const unversionedForm = formVersion === '';
229
+ if (unversionedForm)
230
+ return false;
231
+ return formVersion !== storedVersion(stored);
232
+ }
233
+ function storedVersion(stored) {
234
+ return createHash('sha256')
235
+ .update(JSON.stringify(stored ?? null))
236
+ .digest('hex');
237
+ }
238
+ function sameProfile(submitted, target) {
239
+ return storedVersion(cleanProfile(submitted)) === storedVersion(target.profile);
240
+ }
241
+ function profileText(profile) {
242
+ return [
243
+ `Display name: ${profile?.displayName ?? ''}`,
244
+ `Bio: ${profile?.bio ?? ''}`,
245
+ `Avatar: ${profile?.avatar ?? ''}`,
246
+ `Job title: ${profile?.jobTitle ?? ''}`,
247
+ `Location: ${profile?.location ?? ''}`,
248
+ `Links:`,
249
+ formatProfileLinks(profile?.links),
250
+ ].join('\n');
251
+ }
167
252
  function typedProfile(body) {
168
253
  return {
169
254
  displayName: stringOrEmpty(body[USER_FIELDS.displayName]),
@@ -229,16 +314,25 @@ async function saveTheme(c) {
229
314
  async function removeUser(c) {
230
315
  const dataDir = c.var.config.dataDir;
231
316
  const target = userInForm(dataDir, await c.req.parseBody());
232
- const refusal = deleteUserRefusal({
233
- target,
234
- signedInAs: c.var.session?.userId ?? null,
235
- total: countUsers(dataDir),
236
- });
237
- if (refusal !== undefined || target === undefined) {
238
- return flashAndRedirect(c, 'error', refusal ?? GONE_USER, USERS_PATH);
317
+ if (target === undefined)
318
+ return flashAndRedirect(c, 'error', GONE_USER, USERS_PATH);
319
+ let deleted;
320
+ try {
321
+ deleted = await deleteUser({
322
+ dataDir,
323
+ userId: target.id,
324
+ signedInAs: c.var.session?.userId ?? null,
325
+ now: c.var.config.now(),
326
+ endSessions: (userId) => c.var.admin.deleteSessionsForUser(userId),
327
+ });
328
+ }
329
+ catch (error) {
330
+ if (!(error instanceof UserRemovalRefusedError))
331
+ throw error;
332
+ return flashAndRedirect(c, 'error', removalRefusal(error.reason, target), USERS_PATH);
239
333
  }
240
- await deleteUser({ dataDir, userId: target.id, now: c.var.config.now() });
241
- c.var.admin.deleteSessionsForUser(target.id);
334
+ if (!deleted)
335
+ return flashAndRedirect(c, 'error', GONE_USER, USERS_PATH);
242
336
  return flashAndRedirect(c, 'notice', `Deleted ${target.username}.`, USERS_PATH);
243
337
  }
244
338
  function showUser(c, render) {
@@ -269,23 +363,30 @@ async function namedUser(c) {
269
363
  }
270
364
  const GONE_USER = 'That user is already gone.';
271
365
  export async function deleteUser(input) {
272
- const deleted = await removeUserRecord(input);
273
- await revokeTokensForUser(input.dataDir, input.userId, input.now);
274
- autosaveCopies(input.dataDir).discardUser(input.userId);
275
- discardWritingLedger(input.dataDir, input.userId);
276
- return deleted;
366
+ return await removeUserRecord({
367
+ ...input,
368
+ beforeRemoval: async (userId) => {
369
+ input.endSessions?.(userId);
370
+ await revokeTokensForUser(input.dataDir, userId, input.now);
371
+ autosaveCopies(input.dataDir).discardUser(userId);
372
+ discardWritingLedger(input.dataDir, userId);
373
+ },
374
+ });
277
375
  }
278
376
  export function deleteUserRefusal(input) {
279
377
  if (input.target === undefined)
280
378
  return GONE_USER;
281
- if (input.total <= 1) {
282
- return `${input.target.username} is the only user. Add another before deleting this one.`;
283
- }
284
- if (input.target.id === input.signedInAs) {
285
- return 'You cannot delete your own account. Another admin can do it for you.';
286
- }
379
+ if (input.total <= 1)
380
+ return removalRefusal('only-user', input.target);
381
+ if (input.target.id === input.signedInAs)
382
+ return removalRefusal('own-account', input.target);
287
383
  return undefined;
288
384
  }
385
+ function removalRefusal(reason, target) {
386
+ return reason === 'only-user'
387
+ ? `${target.username} is the only user. Add another before deleting this one.`
388
+ : 'You cannot delete your own account. Another admin can do it for you.';
389
+ }
289
390
  export function changePasswordProblems(input) {
290
391
  const problems = {};
291
392
  if (!input.correct)
@@ -385,6 +486,16 @@ function themeChoices(user) {
385
486
  export function parseProfileLinks(value) {
386
487
  return profileLinkLines(value).map(profileLinkFields);
387
488
  }
489
+ function profileProblems(typed) {
490
+ const avatar = typed.avatar.trim();
491
+ const links = profileLinkLineProblem(typed.links);
492
+ return {
493
+ ...(avatar === '' || isAvatarUrl(avatar)
494
+ ? {}
495
+ : { avatar: `An avatar is ${LINK_URL_RULE}. "${avatar}" is not one.` }),
496
+ ...(links === undefined ? {} : { links }),
497
+ };
498
+ }
388
499
  export function profileLinkLineProblem(value) {
389
500
  const bad = profileLinkLines(value).find((line) => !isProfileLink(profileLinkFields(line)));
390
501
  if (bad === undefined)
@@ -433,6 +544,8 @@ function row(user, context) {
433
544
  location: user.profile?.location ?? '',
434
545
  links: formatProfileLinks(user.profile?.links),
435
546
  },
547
+ profileHash: storedVersion(user.profile),
548
+ emailHash: storedVersion(user.email),
436
549
  archiveUrl: authorHref(user.username),
437
550
  storedActorId: user.actorId ?? '',
438
551
  notifications: notificationSwitches(user),