From 84904c09ee612e5d66d2cdd4488362dcea415511 Mon Sep 17 00:00:00 2001 From: Bernd Storath <999999bst@gmail.com> Date: Fri, 7 Feb 2025 15:59:38 +0100 Subject: [PATCH] consistent naming zod is a schema not a type --- src/server/api/setup/4.post.ts | 4 ++-- src/server/api/setup/5.post.ts | 4 ++-- src/server/database/repositories/user/types.ts | 2 +- src/server/database/repositories/userConfig/types.ts | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/server/api/setup/4.post.ts b/src/server/api/setup/4.post.ts index 0dd73670..4c8eb82a 100644 --- a/src/server/api/setup/4.post.ts +++ b/src/server/api/setup/4.post.ts @@ -1,9 +1,9 @@ -import { UserSetupType } from '#db/repositories/user/types'; +import { UserSetupSchema } from '#db/repositories/user/types'; export default defineSetupEventHandler(async ({ event }) => { const { username, password } = await readValidatedBody( event, - validateZod(UserSetupType, event) + validateZod(UserSetupSchema, event) ); await Database.users.create(username, password); diff --git a/src/server/api/setup/5.post.ts b/src/server/api/setup/5.post.ts index 1e0b36d6..b62d42d9 100644 --- a/src/server/api/setup/5.post.ts +++ b/src/server/api/setup/5.post.ts @@ -1,9 +1,9 @@ -import { UserConfigSetupType } from '#db/repositories/userConfig/types'; +import { UserConfigSetupSchema } from '#db/repositories/userConfig/types'; export default defineSetupEventHandler(async ({ event }) => { const { host, port } = await readValidatedBody( event, - validateZod(UserConfigSetupType, event) + validateZod(UserConfigSetupSchema, event) ); await Database.userConfigs.updateHostPort('wg0', host, port); await Database.general.setSetupStep(0); diff --git a/src/server/database/repositories/user/types.ts b/src/server/database/repositories/user/types.ts index 46c23a1b..5837b19e 100644 --- a/src/server/database/repositories/user/types.ts +++ b/src/server/database/repositories/user/types.ts @@ -45,7 +45,7 @@ const accept = z.boolean().refine((val) => val === true, { message: 'zod.user.accept', }); -export const UserSetupType = z.object( +export const UserSetupSchema = z.object( { username: username, password: password, diff --git a/src/server/database/repositories/userConfig/types.ts b/src/server/database/repositories/userConfig/types.ts index 165f3f27..89e59ef2 100644 --- a/src/server/database/repositories/userConfig/types.ts +++ b/src/server/database/repositories/userConfig/types.ts @@ -9,7 +9,7 @@ const host = z .min(1, 'zod.userConfig.hostMin') .pipe(safeStringRefine); -export const UserConfigSetupType = z.object({ +export const UserConfigSetupSchema = z.object({ host: host, port: PortSchema, });