Merge pull request #53 from AdamVacha/prod-update2

prod-update14

Author: AdamVacha

.github/workflows/build.yml

@@ -24,6 +24,7 @@ jobs:
           --health-retries 5
 
     env:
+      AUTH_SECRET: ${{ secrets.AUTH_SECRET }}
       GITHUB_ID: ${{ secrets.GITHUB_ID }}
       GITHUB_SECRET: ${{ secrets.GITHUB_SECRET }}
       GOOGLE_ID: ${{ secrets.GOOGLE_ID }}

src/auth.ts

@@ -1,6 +1,13 @@
 import { SvelteKitAuth } from '@auth/sveltekit';
 import GitHub from '@auth/sveltekit/providers/github';
 import Google from '@auth/sveltekit/providers/google';
+import {
+	AUTH_SECRET,
+	GITHUB_ID,
+	GITHUB_SECRET,
+	GOOGLE_ID,
+	GOOGLE_SECRET
+} from '$env/static/private';
 import { DrizzleAdapter } from '@auth/drizzle-adapter';
 import {
 	users,
@@ -57,14 +64,14 @@ export const {
 	},
 	providers: [
 		GitHub({
-			clientId: process.env.GITHUB_ID,
-			clientSecret: process.env.GITHUB_SECRET
+			clientId: GITHUB_ID,
+			clientSecret: GITHUB_SECRET
 		}),
 		Google({
-			clientId: process.env.GOOGLE_ID,
-			clientSecret: process.env.GOOGLE_SECRET
+			clientId: GOOGLE_ID,
+			clientSecret: GOOGLE_SECRET
 		})
 	],
 	trustHost: true,
-	secret: process.env.AUTH_SECRET
+	secret: AUTH_SECRET
 });

src/lib/server/db.ts

@@ -1,8 +1,9 @@
 import { drizzle } from 'drizzle-orm/postgres-js';
 import postgres from 'postgres';
 import * as schema from '$lib/server/db/schema';
+import { DATABASE_URL } from '$env/static/private';
 
-const dbUrl = process.env.DATABASE_URL;
+const dbUrl = DATABASE_URL;
 
 if (!dbUrl) throw new Error('DATABASE_URL is required (db-ts)');
 

src/lib/server/db/index.ts

@@ -1,8 +1,8 @@
 import { drizzle } from 'drizzle-orm/postgres-js';
 import postgres from 'postgres';
+import { DATABASE_URL } from '$env/static/private';
 
-const dburl = process.env.DATABASE_URL;
-if (!dburl) throw new Error('DATABASE_URL is required (index.ts)');
+if (!DATABASE_URL) throw new Error('DATABASE_URL is required (index.ts)');
 
-const client = postgres(dburl);
+const client = postgres(DATABASE_URL);
 export const db = drizzle(client);