Skip to content

Commit e93ba52

Browse files
committed
chore: fix coding style
1 parent afcb446 commit e93ba52

File tree

2 files changed

+15
-27
lines changed

2 files changed

+15
-27
lines changed

src/lib/env/env.server.ts

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,19 @@
11
import * as v from "valibot";
22

3-
const TursoEnv = v.union([
4-
v.object({
5-
DATABASE_URL: v.pipe(v.string(), v.startsWith("file:")),
6-
DATABASE_AUTH_TOKEN: v.optional(v.string()),
7-
}),
8-
v.object({
9-
DATABASE_URL: v.pipe(v.string(), v.startsWith("libsql:")),
10-
DATABASE_AUTH_TOKEN: v.string(),
11-
}),
12-
]);
3+
const Env = v.object({
4+
DATABASE_URL: v.pipe(v.string()),
5+
DATABASE_AUTH_TOKEN: v.optional(v.string()),
6+
GITHUB_CLIENT_ID: v.string(),
7+
GITHUB_CLIENT_SECRET: v.string(),
8+
BETTER_AUTH_SECRET: v.string(),
9+
BETTER_AUTH_URL: v.string(),
1310

14-
const AuthEnv = v.object({
15-
GITHUB_CLIENT_ID: v.string(),
16-
GITHUB_CLIENT_SECRET: v.string(),
17-
BETTER_AUTH_SECRET: v.string(),
18-
BETTER_AUTH_URL: v.string(),
11+
S3_ENDPOINT: v.string(),
12+
S3_ACCESS_KEY: v.string(),
13+
S3_SECRET_KEY: v.string(),
14+
S3_BUCKET: v.string(),
15+
S3_PUBLIC_URL: v.string(),
16+
UNSAFE_DISABLE_AUTH: v.optional(v.picklist(["true"])),
1917
});
2018

21-
const S3Env = v.object({
22-
S3_ENDPOINT: v.string(),
23-
S3_ACCESS_KEY: v.string(),
24-
S3_SECRET_KEY: v.string(),
25-
S3_BUCKET: v.string(),
26-
S3_PUBLIC_URL: v.string(),
27-
});
28-
29-
const Env = v.intersect([TursoEnv, AuthEnv, S3Env]);
30-
3119
export const env = v.parse(Env, process.env);

src/lib/server/database/auth.server.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { eq } from "drizzle-orm";
22
import { getRequestEvent } from "$app/server";
3-
import { env } from "$env/dynamic/private";
3+
import { env } from "$lib/env/env.server";
44
import * as v from "valibot";
55
import { auth } from "$lib/server/drivers/auth";
66
import { db } from "$lib/server/drivers/db";
@@ -63,7 +63,7 @@ async function requireLogin(): Promise<Session> {
6363
export async function requireUtCodeMember(): Promise<Session> {
6464
const session = await requireLogin();
6565

66-
if (env.UNSAFE_DISABLE_AUTH) {
66+
if (env.UNSAFE_DISABLE_AUTH === "true") {
6767
return session;
6868
}
6969

0 commit comments

Comments
 (0)