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. 7
      src/server/database/repositories/oneTimeLink/types.ts
  3. 28
      src/server/database/repositories/user/types.ts
  4. 10
      src/server/utils/types.ts

2
src/server/database/repositories/client/service.ts

@ -115,7 +115,7 @@ export class ClientService {
.insert(client) .insert(client)
.values({ .values({
name, name,
// TODO: fix // TODO: properly assign user id
userId: 1, userId: 1,
expiresAt: parsedExpiresAt, expiresAt: parsedExpiresAt,
privateKey, privateKey,

7
src/server/database/repositories/oneTimeLink/types.ts

@ -9,9 +9,6 @@ const oneTimeLinkType = z
.min(1, t('zod.otl')) .min(1, t('zod.otl'))
.pipe(safeStringRefine); .pipe(safeStringRefine);
export const OneTimeLinkGetSchema = z.object( export const OneTimeLinkGetSchema = z.object({
{
oneTimeLink: oneTimeLinkType, oneTimeLink: oneTimeLinkType,
}, });
{ message: objectMessage }
);

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

@ -20,22 +20,16 @@ const password = z
const remember = z.boolean({ message: t('zod.user.remember') }); const remember = z.boolean({ message: t('zod.user.remember') });
export const UserLoginSchema = z.object( export const UserLoginSchema = z.object({
{
username: username, username: username,
password: password, password: password,
remember: remember, remember: remember,
}, });
{ message: objectMessage }
);
export const UserSetupSchema = z.object( export const UserSetupSchema = z.object({
{
username: username, username: username,
password: password, password: password,
}, });
{ message: objectMessage }
);
const name = z const name = z
.string({ message: t('zod.user.name') }) .string({ message: t('zod.user.name') })
@ -49,23 +43,17 @@ const email = z
.pipe(safeStringRefine) .pipe(safeStringRefine)
.nullable(); .nullable();
export const UserUpdateSchema = z.object( export const UserUpdateSchema = z.object({
{
name: name, name: name,
email: email, email: email,
}, });
{ message: objectMessage }
);
export const UserUpdatePasswordSchema = z export const UserUpdatePasswordSchema = z
.object( .object({
{
currentPassword: password, currentPassword: password,
newPassword: password, newPassword: password,
confirmPassword: password, confirmPassword: password,
}, })
{ message: objectMessage }
)
.refine((val) => val.newPassword === val.confirmPassword, { .refine((val) => val.newPassword === val.confirmPassword, {
message: t('zod.user.passwordMatch'), message: t('zod.user.passwordMatch'),
}); });

10
src/server/utils/types.ts

@ -11,9 +11,6 @@ export type ID = number;
*/ */
export const t = (v: string) => v; export const t = (v: string) => v;
// TODO: use everywhere or remove
export const objectMessage = t('zod.body');
export const safeStringRefine = z export const safeStringRefine = z
.string() .string()
.refine( .refine(
@ -51,12 +48,9 @@ export const AllowedIpsSchema = z
.array(AddressSchema, { message: t('zod.allowedIps') }) .array(AddressSchema, { message: t('zod.allowedIps') })
.min(1, { message: t('zod.allowedIps') }); .min(1, { message: t('zod.allowedIps') });
export const FileSchema = z.object( export const FileSchema = z.object({
{
file: z.string({ message: t('zod.file') }), file: z.string({ message: t('zod.file') }),
}, });
{ message: objectMessage }
);
export const schemaForType = export const schemaForType =
<T>() => <T>() =>

Loading…
Cancel
Save