fix a bug with user profile screen

Author: Arlen22

ARCHITECTURE.md

@@ -1,5 +1,7 @@
 # MWS Server Architecture Explained
 
+https://deepwiki.com/TiddlyWiki/MultiWikiServer
+
 ## Overview
 
 The system treats a public wiki as a named, database-backed resource addressed by a slug. Internally that wiki is backed by a recipe, but for most developer-facing purposes it is simplest to think in terms of a wiki assembled from three things: a template, a set of bags, and a plugin set.

packages/admin-vanilla/src/FomController.tsx

@@ -122,13 +122,23 @@ export class FomController<T extends AdminRecord> {
   // #region common
   // Keep the shared card structure in one place so each form mode only supplies its
   // mode-specific title, copy, fields, extra content, and actions.
-  renderCommon({ title, copy, submitDisabled, submitAction, submitLabel, isStart: isStart, handleBackClick }: {
+  renderCommon({
+    title,
+    copy,
+    submitDisabled,
+    submitAction,
+    submitLabel,
+    isStart: isStart,
+    backAction: handleBackClick,
+    backLabel = "Cancel",
+  }: {
     title: string;
     copy: string;
     submitDisabled: boolean;
     submitLabel: string;
     submitAction: () => Promise<void>;
-    handleBackClick: () => Promise<void>;
+    backAction: () => Promise<void>;
+    backLabel?: string;
     isStart?: boolean;
   }, content: JSX.Node): JSX.Node {
     return (
@@ -165,7 +175,7 @@ export class FomController<T extends AdminRecord> {
                     type="button"
                     disabled={this.isSubmitting}
                     onclick={handleBackClick}
-                  >Cancel</button>}
+                  >{backLabel}</button>}
                   <button
                     class="primary-button login-submit"
                     type="button"

packages/admin-vanilla/src/app-login.tsx

@@ -232,7 +232,7 @@ export class LoginForm extends JSXElement {
           submitDisabled: isLoginPageBusy,
           submitLabel: this.isSubmitting ? "Logging in…" : "Log in",
           isStart: true,
-          handleBackClick: this.handleBackClick,
+          backAction: this.handleBackClick,
         }, <>
           <div class="login-fields">{this.fields.map((field) => this.control.renderField(field))}</div>
           <div class="login-options" aria-label="Login options">
@@ -275,7 +275,7 @@ export class LoginForm extends JSXElement {
           submitAction: this.handleForgotPasswordSubmit,
           submitDisabled: isSubmitDisabled,
           submitLabel: isForgotPasswordEmailEnabled ? "Send Email" : "Enter Code",
-          handleBackClick: this.handleBackClick,
+          backAction: this.handleBackClick,
         }, this.isResolvingServerState ? (
           <div class="modal-loading-shell">
             <div class="modal-loading-bar" aria-hidden="true"><span></span></div>
@@ -301,7 +301,7 @@ export class LoginForm extends JSXElement {
           submitAction: this.handleResetCodeSubmit,
           submitDisabled: resetCodeActionDisabled,
           submitLabel: "Verify code",
-          handleBackClick: this.handleBackClick,
+          backAction: this.handleBackClick,
         }, <>
           <div class="login-fields">
             {!this.serverState?.emailEnabled &&
@@ -326,7 +326,7 @@ export class LoginForm extends JSXElement {
           submitAction: this.handleUpdatePasswordSubmit,
           submitDisabled: updatePasswordActionDisabled,
           submitLabel: "Update password",
-          handleBackClick: this.handleBackClick,
+          backAction: this.handleBackClick,
         }, <>
           <div class="login-fields">
             {renderCallout("Username: " + this.draft.username)}

packages/admin-vanilla/src/app-profile.tsx

@@ -110,7 +110,8 @@ export class ProfileForm extends JSXElement {
           submitAction: this.handleProfileSubmit,
           submitDisabled: false,
           submitLabel: "Update Password",
-          handleBackClick: this.onCancel,
+          backAction: this.onCancel,
+          backLabel: "Close",
         }, <>
           <div class="login-fields">
             {profileFields.map((field) => this.control.renderField(field))}
@@ -133,7 +134,7 @@ export class ProfileForm extends JSXElement {
           submitAction: this.handleUpdatePasswordSubmit,
           submitDisabled: updatePasswordActionDisabled,
           submitLabel: "Update password",
-          handleBackClick: async () => { this.mode = "profile"; },
+          backAction: async () => { this.mode = "profile"; },
         }, <>
           <div class="login-fields">
             {updatePasswordFields.map((field) => this.control.renderField(field))}

packages/admin-vanilla/src/passwords.ts

@@ -8,7 +8,8 @@ const sessionRequest: SessionManagerMap = {
   login2: sessionManager("login2", "/login/2"),
   logout: sessionManager("logout", "/logout"),
   forgotPassword: sessionManager("forgotPassword", "/login/forgot-password"),
-  resetPassword: sessionManager("resetPassword", "/login/reset-password")
+  resetPassword: sessionManager("resetPassword", "/login/reset-password"),
+  user_update_password: sessionManager("user_update_password", "/login/user_update_password"),
 }
 
 function sessionManager<K extends keyof SessionManagerMap>(key: K, path: SessionManagerMap[K]["path"]) {
@@ -29,32 +30,6 @@ function sessionManager<K extends keyof SessionManagerMap>(key: K, path: Session
   return t;
 }
 
-const user_update_password_body = (z: Z2<"JSON">) => z.object({
-  user_id: z.prismaField("Users", "user_id", "string"),
-  registrationRequest: z.string().optional(),
-  registrationRecord: z.string().optional(),
-  session_id: z.string().optional(),
-  signature: z.string().optional(),
-});
-
-async function user_update_password(data: zod.infer<ART<typeof user_update_password_body>>): Promise<string | null | undefined> {
-  const result = await fetch("/admin/user_update_password", {
-    headers: {
-      "X-Requested-With": "TiddlyWiki",
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify(data)
-  });
-
-  if (result.ok) {
-    return (result.status === 200) ? await result.json() : undefined;
-  } else {
-    throw new Error(await result.text());
-  }
-
-}
-
-
 function arrayBufferToBase64_viaBlob(buffer: ArrayBuffer) {
   return new Promise<string>((resolve, reject) => {
     const blob = new Blob([buffer], { type: "application/octet-stream" });
@@ -89,7 +64,7 @@ export async function createNewPassword({ user_id, password }: { user_id: string
     password
   });
 
-  const registrationResponse = await user_update_password({
+  const registrationResponse = await sessionRequest.user_update_password({
     user_id, registrationRequest
   });
 
@@ -99,7 +74,7 @@ export async function createNewPassword({ user_id, password }: { user_id: string
     clientRegistrationState, registrationResponse, password
   });
 
-  await user_update_password({
+  await sessionRequest.user_update_password({
     user_id, registrationRecord
   });
 
@@ -112,7 +87,7 @@ export async function changeExistingPasswordAdmin({ user_id, newPassword }: { us
 
   const { clientRegistrationState, registrationRequest } = opaque.client.startRegistration({ password: newPassword });
 
-  const registrationResponse = await user_update_password({
+  const registrationResponse = await sessionRequest.user_update_password({
     user_id, registrationRequest
   });
 
@@ -122,7 +97,7 @@ export async function changeExistingPasswordAdmin({ user_id, newPassword }: { us
     clientRegistrationState, registrationResponse, password: newPassword,
   });
 
-  await user_update_password({ user_id, registrationRecord });
+  await sessionRequest.user_update_password({ user_id, registrationRecord });
 
 }
 
@@ -139,7 +114,7 @@ export async function changeExistingPasswordWithPassword({ username, password, n
 
   const signature = await generateSessionSignature(sessionKey, session_id);
 
-  const registrationResponse = await user_update_password({
+  const registrationResponse = await sessionRequest.user_update_password({
     user_id, registrationRequest, session_id, signature
   });
 
@@ -149,7 +124,7 @@ export async function changeExistingPasswordWithPassword({ username, password, n
     clientRegistrationState, registrationResponse, password: newPassword,
   });
 
-  await user_update_password({ user_id, registrationRecord, session_id, signature });
+  await sessionRequest.user_update_password({ user_id, registrationRecord, session_id, signature });
 
   // this closes the login session we opened for the password change
   await sessionRequest.logout({ session_id, signature, skipCookie: true });