Skip to content

Open-source and local-first Slack and Notion alternative that puts you in control of your data

Improve config parsing (#37)

Ylber Gashi87e30a512c4e
diff --git a/apps/server/src/api/client/routes/workspaces/users/user-create.ts b/apps/server/src/api/client/routes/workspaces/users/user-create.ts
index c88d9e80..fbb3a94f 100644
--- a/apps/server/src/api/client/routes/workspaces/users/user-create.ts
+++ b/apps/server/src/api/client/routes/workspaces/users/user-create.ts
@@ -95,8 +95,8 @@ export const userCreateRoute: FastifyPluginCallbackZod = (
name: account.name,
email: account.email,
avatar: account.avatar,
- storage_limit: config.user.storageLimit.toString(),
- max_file_size: config.user.maxFileSize.toString(),
+ storage_limit: config.user.storageLimit,
+ max_file_size: config.user.maxFileSize,
created_at: new Date(),
created_by: request.account.id,
status: UserStatus.Active,
diff --git a/apps/server/src/lib/config/smtp.ts b/apps/server/src/lib/config/smtp.ts
index 52faa1eb..94cb92cf 100644
--- a/apps/server/src/lib/config/smtp.ts
+++ b/apps/server/src/lib/config/smtp.ts
@@ -7,7 +7,7 @@ export const smtpConfigSchema = z.discriminatedUnion('enabled', [
required_error: 'SMTP_HOST is required when SMTP is enabled',
}),
port: z.coerce.number().default(587),
- secure: z.preprocess((val) => val === 'true', z.boolean().default(false)),
+ secure: z.boolean().default(false),
user: z.string({
required_error: 'SMTP_USER is required when SMTP is enabled',
}),
diff --git a/apps/server/src/lib/config/user.ts b/apps/server/src/lib/config/user.ts
index eaf6c9bf..ffd4f602 100644
--- a/apps/server/src/lib/config/user.ts
+++ b/apps/server/src/lib/config/user.ts
@@ -1,14 +1,8 @@
import { z } from 'zod';
export const userConfigSchema = z.object({
- storageLimit: z.preprocess(
- (val) => val && BigInt(val as string),
- z.bigint().default(10737418240n)
- ),
- maxFileSize: z.preprocess(
- (val) => val && BigInt(val as string),
- z.bigint().default(104857600n)
- ),
+ storageLimit: z.string().default('10737418240'),
+ maxFileSize: z.string().default('104857600'),
});
export type UserConfig = z.infer<typeof userConfigSchema>;
diff --git a/apps/server/src/lib/workspaces.ts b/apps/server/src/lib/workspaces.ts
index 90c7c5f1..60174009 100644
--- a/apps/server/src/lib/workspaces.ts
+++ b/apps/server/src/lib/workspaces.ts
@@ -55,8 +55,8 @@ export const createWorkspace = async (
name: account.name,
email: account.email,
avatar: account.avatar,
- storage_limit: config.user.storageLimit.toString(),
- max_file_size: config.user.maxFileSize.toString(),
+ storage_limit: config.user.storageLimit,
+ max_file_size: config.user.maxFileSize,
created_at: date,
created_by: account.id,
status: UserStatus.Active,