From a119b05a20cf24834c7a431857d0947996c23327 Mon Sep 17 00:00:00 2001
From: Bernd Storath <999999bst@gmail.com>
Date: Mon, 3 Mar 2025 12:45:37 +0100
Subject: [PATCH] remove objectMessage

---
 .../database/repositories/client/service.ts   |  2 +-
 .../repositories/oneTimeLink/types.ts         |  9 ++--
 .../database/repositories/user/types.ts       | 48 +++++++------------
 src/server/utils/types.ts                     | 12 ++---
 4 files changed, 25 insertions(+), 46 deletions(-)

diff --git a/src/server/database/repositories/client/service.ts b/src/server/database/repositories/client/service.ts
index 98e033a8..ebf6d866 100644
--- a/src/server/database/repositories/client/service.ts
+++ b/src/server/database/repositories/client/service.ts
@@ -115,7 +115,7 @@ export class ClientService {
         .insert(client)
         .values({
           name,
-          // TODO: fix
+          // TODO: properly assign user id
           userId: 1,
           expiresAt: parsedExpiresAt,
           privateKey,
diff --git a/src/server/database/repositories/oneTimeLink/types.ts b/src/server/database/repositories/oneTimeLink/types.ts
index c1020d46..ce7943e0 100644
--- a/src/server/database/repositories/oneTimeLink/types.ts
+++ b/src/server/database/repositories/oneTimeLink/types.ts
@@ -9,9 +9,6 @@ const oneTimeLinkType = z
   .min(1, t('zod.otl'))
   .pipe(safeStringRefine);
 
-export const OneTimeLinkGetSchema = z.object(
-  {
-    oneTimeLink: oneTimeLinkType,
-  },
-  { message: objectMessage }
-);
+export const OneTimeLinkGetSchema = z.object({
+  oneTimeLink: oneTimeLinkType,
+});
diff --git a/src/server/database/repositories/user/types.ts b/src/server/database/repositories/user/types.ts
index 51eac4e5..58200e3a 100644
--- a/src/server/database/repositories/user/types.ts
+++ b/src/server/database/repositories/user/types.ts
@@ -20,22 +20,16 @@ const password = z
 
 const remember = z.boolean({ message: t('zod.user.remember') });
 
-export const UserLoginSchema = z.object(
-  {
-    username: username,
-    password: password,
-    remember: remember,
-  },
-  { message: objectMessage }
-);
+export const UserLoginSchema = z.object({
+  username: username,
+  password: password,
+  remember: remember,
+});
 
-export const UserSetupSchema = z.object(
-  {
-    username: username,
-    password: password,
-  },
-  { message: objectMessage }
-);
+export const UserSetupSchema = z.object({
+  username: username,
+  password: password,
+});
 
 const name = z
   .string({ message: t('zod.user.name') })
@@ -49,23 +43,17 @@ const email = z
   .pipe(safeStringRefine)
   .nullable();
 
-export const UserUpdateSchema = z.object(
-  {
-    name: name,
-    email: email,
-  },
-  { message: objectMessage }
-);
+export const UserUpdateSchema = z.object({
+  name: name,
+  email: email,
+});
 
 export const UserUpdatePasswordSchema = z
-  .object(
-    {
-      currentPassword: password,
-      newPassword: password,
-      confirmPassword: password,
-    },
-    { message: objectMessage }
-  )
+  .object({
+    currentPassword: password,
+    newPassword: password,
+    confirmPassword: password,
+  })
   .refine((val) => val.newPassword === val.confirmPassword, {
     message: t('zod.user.passwordMatch'),
   });
diff --git a/src/server/utils/types.ts b/src/server/utils/types.ts
index 28c257e1..14157549 100644
--- a/src/server/utils/types.ts
+++ b/src/server/utils/types.ts
@@ -11,9 +11,6 @@ export type ID = number;
  */
 export const t = (v: string) => v;
 
-// TODO: use everywhere or remove
-export const objectMessage = t('zod.body');
-
 export const safeStringRefine = z
   .string()
   .refine(
@@ -51,12 +48,9 @@ export const AllowedIpsSchema = z
   .array(AddressSchema, { message: t('zod.allowedIps') })
   .min(1, { message: t('zod.allowedIps') });
 
-export const FileSchema = z.object(
-  {
-    file: z.string({ message: t('zod.file') }),
-  },
-  { message: objectMessage }
-);
+export const FileSchema = z.object({
+  file: z.string({ message: t('zod.file') }),
+});
 
 export const schemaForType =
   <T>() =>