Browse Source

remove objectMessage

pull/1695/head
Bernd Storath 5 months ago
parent
commit
a119b05a20
  1. 2
      src/server/database/repositories/client/service.ts
  2. 9
      src/server/database/repositories/oneTimeLink/types.ts
  3. 48
      src/server/database/repositories/user/types.ts
  4. 12
      src/server/utils/types.ts

2
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,

9
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,
});

48
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'),
});

12
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>() =>

Loading…
Cancel
Save