Browse Source

consistent naming

zod is a schema not a type
pull/1645/head
Bernd Storath 6 months ago
parent
commit
84904c09ee
  1. 4
      src/server/api/setup/4.post.ts
  2. 4
      src/server/api/setup/5.post.ts
  3. 2
      src/server/database/repositories/user/types.ts
  4. 2
      src/server/database/repositories/userConfig/types.ts

4
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 }) => { export default defineSetupEventHandler(async ({ event }) => {
const { username, password } = await readValidatedBody( const { username, password } = await readValidatedBody(
event, event,
validateZod(UserSetupType, event) validateZod(UserSetupSchema, event)
); );
await Database.users.create(username, password); await Database.users.create(username, password);

4
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 }) => { export default defineSetupEventHandler(async ({ event }) => {
const { host, port } = await readValidatedBody( const { host, port } = await readValidatedBody(
event, event,
validateZod(UserConfigSetupType, event) validateZod(UserConfigSetupSchema, event)
); );
await Database.userConfigs.updateHostPort('wg0', host, port); await Database.userConfigs.updateHostPort('wg0', host, port);
await Database.general.setSetupStep(0); await Database.general.setSetupStep(0);

2
src/server/database/repositories/user/types.ts

@ -45,7 +45,7 @@ const accept = z.boolean().refine((val) => val === true, {
message: 'zod.user.accept', message: 'zod.user.accept',
}); });
export const UserSetupType = z.object( export const UserSetupSchema = z.object(
{ {
username: username, username: username,
password: password, password: password,

2
src/server/database/repositories/userConfig/types.ts

@ -9,7 +9,7 @@ const host = z
.min(1, 'zod.userConfig.hostMin') .min(1, 'zod.userConfig.hostMin')
.pipe(safeStringRefine); .pipe(safeStringRefine);
export const UserConfigSetupType = z.object({ export const UserConfigSetupSchema = z.object({
host: host, host: host,
port: PortSchema, port: PortSchema,
}); });

Loading…
Cancel
Save