Merge pull request #1295 from trycompai/claudio/fix-portal

[dev] [claudfuen] claudio/fix-portal

Author: claudfuen

apps/app/src/app/api/health/route.ts

@@ -17,7 +17,7 @@ export async function GET() {
         NODE_ENV: process.env.NODE_ENV,
         DATABASE_URL: process.env.DATABASE_URL ? 'set' : 'not set',
         AUTH_SECRET: process.env.AUTH_SECRET ? 'set' : 'not set',
-        BETTER_AUTH_URL: process.env.BETTER_AUTH_URL || 'not set',
+        NEXT_PUBLIC_BETTER_AUTH_URL: process.env.NEXT_PUBLIC_BETTER_AUTH_URL || 'not set',
       },
     });
   } catch (error) {

apps/app/src/env.mjs

@@ -9,7 +9,6 @@ export const env = createEnv({
     AUTH_GITHUB_SECRET: z.string().optional(),
     AUTH_SECRET: z.string(),
     DATABASE_URL: z.string().min(1),
-    BETTER_AUTH_URL: z.string(),
     OPENAI_API_KEY: z.string().optional(),
     RESEND_API_KEY: z.string(),
     UPSTASH_REDIS_REST_URL: z.string().optional(),
@@ -53,7 +52,7 @@ export const env = createEnv({
     NEXT_PUBLIC_LINKEDIN_CONVERSION_ID: z.string().optional(),
     NEXT_PUBLIC_GOOGLE_ADS_CONVERSION_LABEL: z.string().optional(),
     NEXT_PUBLIC_API_URL: z.string().optional(),
-    NEXT_PUBLIC_BETTER_AUTH_URL: z.string(),
+    NEXT_PUBLIC_BETTER_AUTH_URL: z.string().optional(),
   },
 
   runtimeEnv: {
@@ -63,7 +62,6 @@ export const env = createEnv({
     AUTH_GITHUB_SECRET: process.env.AUTH_GITHUB_SECRET,
     AUTH_SECRET: process.env.AUTH_SECRET,
     DATABASE_URL: process.env.DATABASE_URL,
-    BETTER_AUTH_URL: process.env.BETTER_AUTH_URL,
     OPENAI_API_KEY: process.env.OPENAI_API_KEY,
     RESEND_API_KEY: process.env.RESEND_API_KEY,
     UPSTASH_REDIS_REST_URL: process.env.UPSTASH_REDIS_REST_URL,

apps/app/src/jobs/tasks/onboarding/onboard-organization.ts

@@ -29,11 +29,11 @@ export const onboardOrganization = task({
     });
 
     try {
-      logger.info(`Revalidating path ${process.env.BETTER_AUTH_URL}/${organizationId}`);
+      logger.info(`Revalidating path ${process.env.NEXT_PUBLIC_BETTER_AUTH_URL}/${organizationId}`);
       const revalidateResponse = await axios.post(
-        `${process.env.BETTER_AUTH_URL}/api/revalidate/path`,
+        `${process.env.NEXT_PUBLIC_BETTER_AUTH_URL}/api/revalidate/path`,
         {
-          path: `${process.env.BETTER_AUTH_URL}/${organizationId}`,
+          path: `${process.env.NEXT_PUBLIC_BETTER_AUTH_URL}/${organizationId}`,
           secret: process.env.REVALIDATION_SECRET,
           type: 'layout',
         },

apps/app/src/test-utils/setup.ts

@@ -40,7 +40,7 @@ vi.mock('next/cache', () => ({
 // Set up environment variables for testing
 beforeAll(() => {
   process.env.AUTH_SECRET = 'test-auth-secret';
-  process.env.BETTER_AUTH_URL = 'http://localhost:3000';
+  process.env.NEXT_PUBLIC_BETTER_AUTH_URL = 'http://localhost:3000';
   // NODE_ENV is automatically set to 'test' by Vitest
 });
 

apps/app/src/utils/auth.ts

@@ -41,13 +41,11 @@ if (env.AUTH_GITHUB_ID && env.AUTH_GITHUB_SECRET) {
   };
 }
 
-console.log('process.env.BETTER_AUTH_URL', process.env.BETTER_AUTH_URL);
-
 export const auth = betterAuth({
   database: prismaAdapter(db, {
     provider: 'postgresql',
   }),
-  baseURL: process.env.BETTER_AUTH_URL,
+  baseURL: process.env.NEXT_PUBLIC_BETTER_AUTH_URL,
   trustedOrigins: ['http://localhost:3000', 'https://*.trycomp.ai'],
   emailAndPassword: {
     enabled: true,
@@ -140,7 +138,7 @@ export const auth = betterAuth({
         const isLocalhost = process.env.NODE_ENV === 'development';
         const protocol = isLocalhost ? 'http' : 'https';
 
-        const betterAuthUrl = process.env.BETTER_AUTH_URL;
+        const betterAuthUrl = process.env.NEXT_PUBLIC_BETTER_AUTH_URL;
         const isDevEnv = betterAuthUrl?.includes('dev.trycomp.ai');
         const isProdEnv = betterAuthUrl?.includes('app.trycomp.ai');