Skip to content

armgit / papra

Public Imported from GitHub
0

The minimalistic document archiving platform.

refactor(server): migrate make-user-admin script to valibot (#1047)

Corentin Thomasseta574fb720614
diff --git a/apps/papra-server/src/modules/intake-emails/intake-emails.schemas.ts b/apps/papra-server/src/modules/intake-emails/intake-emails.schemas.ts
index 8e14ff7e..9823ee08 100644
--- a/apps/papra-server/src/modules/intake-emails/intake-emails.schemas.ts
+++ b/apps/papra-server/src/modules/intake-emails/intake-emails.schemas.ts
@@ -4,7 +4,7 @@ import { INTAKE_EMAIL_ID_REGEX, RFC_5322_EMAIL_ADDRESS_REGEX } from './intake-em
export const intakeEmailIdSchema = createRegexSchema(INTAKE_EMAIL_ID_REGEX);
-const permissiveEmailAddressSchema = createRegexSchema(RFC_5322_EMAIL_ADDRESS_REGEX);
+export const permissiveEmailAddressSchema = createRegexSchema(RFC_5322_EMAIL_ADDRESS_REGEX);
const emailInfoSchema = v.object({
address: permissiveEmailAddressSchema,
diff --git a/apps/papra-server/src/scripts/make-user-admin.script.ts b/apps/papra-server/src/scripts/make-user-admin.script.ts
index c8b1960e..8d9cba83 100644
--- a/apps/papra-server/src/scripts/make-user-admin.script.ts
+++ b/apps/papra-server/src/scripts/make-user-admin.script.ts
@@ -1,14 +1,14 @@
import type { UsersRepository } from '../modules/users/users.repository';
import process from 'node:process';
-import { z } from 'zod';
-import { permissiveEmailAddressSchema } from '../modules/intake-emails/intake-emails.schemas.legacy';
+import * as v from 'valibot';
+import { permissiveEmailAddressSchema } from '../modules/intake-emails/intake-emails.schemas';
import { createRolesRepository } from '../modules/roles/roles.repository';
import { isNil } from '../modules/shared/utils';
import { createUsersRepository } from '../modules/users/users.repository';
-import { userIdSchema } from '../modules/users/users.schemas.legacy';
+import { userIdSchema } from '../modules/users/users.schemas';
import { runScriptWithDb } from './commons/run-script';
-const userIdOrEmailSchema = z.union([
+const userIdOrEmailSchema = v.union([
permissiveEmailAddressSchema,
userIdSchema,
]);
@@ -39,8 +39,8 @@ await runScriptWithDb(
exitWithError('Please provide a user ID or email as an argument');
}
- if (!userIdOrEmailSchema.safeParse(userIdOrEmail).success) {
- exitWithError(`Invalid user ID or email: "${userIdOrEmail}"`);
+ if (!v.is(userIdOrEmailSchema, userIdOrEmail)) {
+ exitWithError(`Invalid user ID or email: "${userIdOrEmail as string}"`);
}
const { user } = await getUserByIdOrEmail({ usersRepository, userIdOrEmail });