Fix freebuff oauth

Author: jahooma

.env.example

@@ -14,6 +14,8 @@ PORT=4242
 # Authentication
 CODEBUFF_GITHUB_ID=dummy_github_id
 CODEBUFF_GITHUB_SECRET=dummy_github_secret
+FREEBUFF_GITHUB_ID=dummy_freebuff_github_id
+FREEBUFF_GITHUB_SECRET=dummy_freebuff_github_secret
 NEXTAUTH_SECRET=dummy_nextauth_secret_at_least_32_chars_long
 
 # Payment (Stripe)

freebuff/web/next.config.mjs

@@ -9,7 +9,10 @@ const nextConfig = {
     // In development, override the app URL to point to the Freebuff dev server port.
     // In production, NEXT_PUBLIC_CODEBUFF_APP_URL is set via deployment env vars.
     ...(process.env.NODE_ENV === 'development'
-      ? { NEXT_PUBLIC_CODEBUFF_APP_URL: `http://localhost:${FREEBUFF_PORT}` }
+      ? {
+          NEXT_PUBLIC_CODEBUFF_APP_URL: `http://localhost:${FREEBUFF_PORT}`,
+          NEXTAUTH_URL: `http://localhost:${FREEBUFF_PORT}`,
+        }
       : {}),
   },
   eslint: {

freebuff/web/src/app/api/auth/[...nextauth]/auth-options.ts

@@ -134,8 +134,8 @@ export const authOptions: NextAuthOptions = {
   }) as Adapter,
   providers: [
     GitHubProvider({
-      clientId: env.CODEBUFF_GITHUB_ID,
-      clientSecret: env.CODEBUFF_GITHUB_SECRET,
+      clientId: env.FREEBUFF_GITHUB_ID ?? env.CODEBUFF_GITHUB_ID,
+      clientSecret: env.FREEBUFF_GITHUB_SECRET ?? env.CODEBUFF_GITHUB_SECRET,
     }),
   ],
   session: {

packages/internal/src/env-schema.ts

@@ -18,6 +18,8 @@ export const serverEnvSchema = clientEnvSchema.extend({
   DATABASE_URL: z.string().min(1),
   CODEBUFF_GITHUB_ID: z.string().min(1),
   CODEBUFF_GITHUB_SECRET: z.string().min(1),
+  FREEBUFF_GITHUB_ID: z.string().min(1).optional(),
+  FREEBUFF_GITHUB_SECRET: z.string().min(1).optional(),
   NEXTAUTH_URL: z.url().optional(),
   NEXTAUTH_SECRET: z.string().min(1),
   STRIPE_SECRET_KEY: z.string().min(1),
@@ -63,6 +65,8 @@ export const serverProcessEnv: ServerInput = {
   DATABASE_URL: process.env.DATABASE_URL,
   CODEBUFF_GITHUB_ID: process.env.CODEBUFF_GITHUB_ID,
   CODEBUFF_GITHUB_SECRET: process.env.CODEBUFF_GITHUB_SECRET,
+  FREEBUFF_GITHUB_ID: process.env.FREEBUFF_GITHUB_ID,
+  FREEBUFF_GITHUB_SECRET: process.env.FREEBUFF_GITHUB_SECRET,
   NEXTAUTH_URL: process.env.NEXTAUTH_URL,
   NEXTAUTH_SECRET: process.env.NEXTAUTH_SECRET,
   STRIPE_SECRET_KEY: process.env.STRIPE_SECRET_KEY,

packages/internal/src/env.ts

@@ -20,6 +20,8 @@ if (isCI) {
   ensureEnvDefault('DATABASE_URL', 'postgres://user:pass@localhost:5432/db')
   ensureEnvDefault('CODEBUFF_GITHUB_ID', 'test-id')
   ensureEnvDefault('CODEBUFF_GITHUB_SECRET', 'test-secret')
+  ensureEnvDefault('FREEBUFF_GITHUB_ID', 'test-id')
+  ensureEnvDefault('FREEBUFF_GITHUB_SECRET', 'test-secret')
   ensureEnvDefault('NEXTAUTH_SECRET', 'test-secret')
   ensureEnvDefault('STRIPE_SECRET_KEY', 'sk_test_dummy')
   ensureEnvDefault('STRIPE_WEBHOOK_SECRET_KEY', 'whsec_dummy')