From 3fe26da870f2c7b16545cdbb0d617244106b9e70 Mon Sep 17 00:00:00 2001 From: AdamVacha Date: Mon, 21 Apr 2025 17:41:25 -0400 Subject: [PATCH 1/2] prod-update12 --- src/auth.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/auth.ts b/src/auth.ts index 7e1cab6..9955459 100644 --- a/src/auth.ts +++ b/src/auth.ts @@ -66,6 +66,5 @@ export const { clientSecret: env.GOOGLE_SECRET }) ], - trustHost: env.AUTH_TRUST_HOST === 'true' || process.env.AUTH_TRUST_HOST === 'true', - secret: env.AUTH_SECRET + trustHost: true }); From 5707582259b587234c10ce0e19b5200faab2fb37 Mon Sep 17 00:00:00 2001 From: AdamVacha Date: Mon, 21 Apr 2025 17:54:38 -0400 Subject: [PATCH 2/2] prod-update12 --- src/auth.ts | 12 ++++++------ src/lib/server/db/index.ts | 15 ++++----------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/src/auth.ts b/src/auth.ts index 9955459..a2a74d3 100644 --- a/src/auth.ts +++ b/src/auth.ts @@ -1,7 +1,6 @@ import { SvelteKitAuth } from '@auth/sveltekit'; import GitHub from '@auth/sveltekit/providers/github'; import Google from '@auth/sveltekit/providers/google'; -import { env } from '$env/dynamic/private'; import { DrizzleAdapter } from '@auth/drizzle-adapter'; import { users, @@ -58,13 +57,14 @@ export const { }, providers: [ GitHub({ - clientId: env.GITHUB_ID, - clientSecret: env.GITHUB_SECRET + clientId: process.env.GITHUB_ID, + clientSecret: process.env.GITHUB_SECRET }), Google({ - clientId: env.GOOGLE_ID, - clientSecret: env.GOOGLE_SECRET + clientId: process.env.GOOGLE_ID, + clientSecret: process.env.GOOGLE_SECRET }) ], - trustHost: true + trustHost: true, + secret: process.env.AUTH_SECRET }); diff --git a/src/lib/server/db/index.ts b/src/lib/server/db/index.ts index aa05df6..4a9fdf3 100644 --- a/src/lib/server/db/index.ts +++ b/src/lib/server/db/index.ts @@ -1,15 +1,8 @@ -// for neon later - -// import { drizzle } from 'drizzle-orm/neon-http'; -// import { neon } from '@neondatabase/serverless'; -// import { env } from '$env/dynamic/private'; -// if (!env.DATABASE_URL) throw new Error('DATABASE_URL is not set'); -// const client = neon(env.DATABASE_URL); -// export const db = drizzle(client); - -import { DATABASE_URL } from '$env/static/private'; import { drizzle } from 'drizzle-orm/postgres-js'; import postgres from 'postgres'; -const client = postgres(DATABASE_URL); +const dburl = process.env.DATABASE_URL; +if (!dburl) throw new Error('DATABASE_URL is required (index.ts)'); + +const client = postgres(dburl); export const db = drizzle(client);