refactor: make UserUpsertError extend ControllerError

Since we already have this base error we can keep it DRY.

Author: pheuberger

src/controllers/UserController.ts

@@ -15,7 +15,7 @@ import type {
   BaseResponse,
   UserResponse,
 } from "../types/api.js";
-import { UserUpsertError } from "../lib/users/errors.js";
+import { isUserUpsertError } from "../lib/users/errors.js";
 import { USER_UPDATE_REQUEST_SCHEMA } from "../lib/users/schemas.js";
 import { createStrategy } from "../lib/users/UserUpsertStrategy.js";
 import { ParseError } from "../lib/errors/request-parsing.js";
@@ -69,8 +69,8 @@ export class UserController extends Controller {
   }
 
   errorResponse(error: unknown) {
-    if (error instanceof UserUpsertError) {
-      this.setStatus(error.code);
+    if (isUserUpsertError(error)) {
+      this.setStatus(error.statusCode);
       return {
         success: false,
         message: error.message,

src/lib/users/MultisigUpsertStrategy.ts

@@ -60,7 +60,14 @@ export default class MultisigUpdateStrategy implements UserUpsertStrategy {
     if (!parseResult.success) {
       throw new UserUpsertError(
         400,
-        parseResult.error.errors.map((e) => e.message).join("; "),
+        "Couldn't parse user update message",
+        parseResult.error.errors.reduce((acc, err) => {
+          const path = err.path.join(".");
+          return {
+            ...acc,
+            [path]: err.message,
+          };
+        }, {}),
       );
     }
     console.log("Creating signature request for", parseResult);

src/lib/users/errors.ts

@@ -1,11 +1,12 @@
-import { UserResponse } from "../../types/api.js";
+import { ControllerError } from "../errors/controller.js";
 
-export class UserUpsertError extends Error {
-  code: number;
-  public errors: UserResponse["errors"];
-  constructor(code: number, message: string) {
-    super(message);
+export class UserUpsertError extends ControllerError {
+  constructor(code: number, message: string, errors?: Record<string, unknown>) {
+    super(message, code, errors);
     this.name = "UserUpdateError";
-    this.code = code;
   }
 }
+
+export function isUserUpsertError(error: unknown): error is UserUpsertError {
+  return error !== null && error instanceof UserUpsertError;
+}