From d6f362a0d969d6c99b203476393e863c7239e549 Mon Sep 17 00:00:00 2001
From: breadddevv <tiagu.1789@gmail.com>
Date: Mon, 22 Jun 2026 20:27:55 +0100
Subject: [PATCH] Added  alongside

---
 pages/api/auth/discord/callback.ts                   |  2 +-
 pages/api/auth/discord/start.ts                      |  2 +-
 pages/api/auth/google/start.ts                       |  4 ++--
 pages/api/auth/roblox/start.ts                       |  2 +-
 .../api/workspace/[id]/policies/[docId]/link-info.ts |  4 ++--
 pages/api/workspace/[id]/policies/[docId]/links.ts   | 12 ++++++------
 .../[id]/settings/integrations/board/download.ts     |  2 +-
 proxy.ts                                             |  4 ++--
 utils/csrf.ts                                        |  4 ++--
 utils/logs.ts                                        |  4 ++--
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/pages/api/auth/discord/callback.ts b/pages/api/auth/discord/callback.ts
index 07f3a7e0..44c066cc 100644
--- a/pages/api/auth/discord/callback.ts
+++ b/pages/api/auth/discord/callback.ts
@@ -84,7 +84,7 @@ export default async function handler(
       new URLSearchParams({
         grant_type: "authorization_code",
         code: code as string,
-        redirect_uri: `${process.env.NEXTAUTH_URL}/api/auth/discord/callback`,
+        redirect_uri: `${process.env.NEXTAUTH_URL || process.env.PUBLIC_URL}/api/auth/discord/callback`,
         client_id: clientId,
         client_secret: clientSecret,
       }),
diff --git a/pages/api/auth/discord/start.ts b/pages/api/auth/discord/start.ts
index 65e0c74a..2b8aa0bc 100644
--- a/pages/api/auth/discord/start.ts
+++ b/pages/api/auth/discord/start.ts
@@ -43,7 +43,7 @@ export default async function handler(req: AuthenticatedRequest, res: NextApiRes
 
 	const authUrl = new URL('https://discord.com/oauth2/authorize');
 	authUrl.searchParams.set('client_id', clientId);
-	authUrl.searchParams.set('redirect_uri', `${process.env.NEXTAUTH_URL}/api/auth/discord/callback`);
+	authUrl.searchParams.set('redirect_uri', `${process.env.NEXTAUTH_URL || process.env.PUBLIC_URL}/api/auth/discord/callback`);
 	authUrl.searchParams.set('scope', 'identify');
 	authUrl.searchParams.set('response_type', 'code');
 	authUrl.searchParams.set('state', state);
diff --git a/pages/api/auth/google/start.ts b/pages/api/auth/google/start.ts
index 0e923282..204c8908 100644
--- a/pages/api/auth/google/start.ts
+++ b/pages/api/auth/google/start.ts
@@ -56,7 +56,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
 
   const scopes = ['email','openid','profile'];
 
-  const oauth2 = new google.auth.OAuth2(clientId, secret, `${process.env.NEXTAUTH_URL}/api/auth/google/callback`);
+  const oauth2 = new google.auth.OAuth2(clientId, secret, `${process.env.NEXTAUTH_URL || process.env.PUBLIC_URL}/api/auth/google/callback`);
 
   const authUrl = oauth2.generateAuthUrl({
     access_type: 'online',
@@ -64,7 +64,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     include_granted_scopes: true,
     state: state,
     client_id: clientId,
-    redirect_uri: `${process.env.NEXTAUTH_URL}/api/auth/google/callback`
+    redirect_uri: `${process.env.NEXTAUTH_URL || process.env.PUBLIC_URL}/api/auth/google/callback`
   });
 
   res.redirect(authUrl)
diff --git a/pages/api/auth/roblox/start.ts b/pages/api/auth/roblox/start.ts
index 141e627c..bf09b682 100644
--- a/pages/api/auth/roblox/start.ts
+++ b/pages/api/auth/roblox/start.ts
@@ -50,7 +50,7 @@ export default async function handler(req: AuthenticatedRequest, res: NextApiRes
 
 	const authUrl = new URL('https://apis.roblox.com/oauth/v1/authorize');
 	authUrl.searchParams.set('client_id', clientId);
-	authUrl.searchParams.set('redirect_uri', redirectUri);
+	authUrl.searchParams.set('redirect_uri', redirectUri || process.env.PUBLIC_URL!);
 	authUrl.searchParams.set('scope', 'openid profile');
 	authUrl.searchParams.set('response_type', 'code');
 	authUrl.searchParams.set('state', state);
diff --git a/pages/api/workspace/[id]/policies/[docId]/link-info.ts b/pages/api/workspace/[id]/policies/[docId]/link-info.ts
index d121c493..2259abf9 100644
--- a/pages/api/workspace/[id]/policies/[docId]/link-info.ts
+++ b/pages/api/workspace/[id]/policies/[docId]/link-info.ts
@@ -54,8 +54,8 @@ export async function handler(req: NextApiRequest, res: NextApiResponse<Data>) {
 
   // Generate the direct link with proper protocol detection
   let baseUrl: string;
-  if (process.env.NEXTAUTH_URL) {
-    baseUrl = process.env.NEXTAUTH_URL;
+  if (process.env.NEXTAUTH_URL || process.env.PUBLIC_URL) {
+    baseUrl = process.env.NEXTAUTH_URL! || process.env.PUBLIC_URL!;
   } else {
     const forwardedProto = req.headers["x-forwarded-proto"];
     const protocol = Array.isArray(forwardedProto)
diff --git a/pages/api/workspace/[id]/policies/[docId]/links.ts b/pages/api/workspace/[id]/policies/[docId]/links.ts
index 76843bfe..37f030d5 100644
--- a/pages/api/workspace/[id]/policies/[docId]/links.ts
+++ b/pages/api/workspace/[id]/policies/[docId]/links.ts
@@ -54,8 +54,8 @@ export async function handler(req: AuthenticatedRequest, res: NextApiResponse<Da
     });
 
     let baseUrl: string;
-    if (process.env.NEXTAUTH_URL) {
-      baseUrl = process.env.NEXTAUTH_URL;
+    if (process.env.NEXTAUTH_URL || process.env.PUBLIC_URL) {
+      baseUrl = process.env.NEXTAUTH_URL! || process.env.PUBLIC_URL!;
     } else {
       const forwardedProto = req.headers["x-forwarded-proto"];
       let protocol = Array.isArray(forwardedProto)
@@ -118,8 +118,8 @@ export async function handler(req: AuthenticatedRequest, res: NextApiResponse<Da
     });
 
     let baseUrl: string;
-    if (process.env.NEXTAUTH_URL) {
-      baseUrl = process.env.NEXTAUTH_URL;
+    if (process.env.NEXTAUTH_URL || process.env.PUBLIC_URL) {
+      baseUrl = process.env.NEXTAUTH_URL! || process.env.PUBLIC_URL!;
     } else {
       const forwardedProto = req.headers["x-forwarded-proto"];
       let protocol = Array.isArray(forwardedProto)
@@ -272,8 +272,8 @@ export async function handler(req: AuthenticatedRequest, res: NextApiResponse<Da
     }
 
     let baseUrl: string;
-    if (process.env.NEXTAUTH_URL) {
-      baseUrl = process.env.NEXTAUTH_URL;
+    if (process.env.NEXTAUTH_URL || process.env.PUBLIC_URL) {
+      baseUrl = process.env.NEXTAUTH_URL! || process.env.PUBLIC_URL!;
     } else {
       const forwardedProto = req.headers["x-forwarded-proto"];
       let protocol = Array.isArray(forwardedProto)
diff --git a/pages/api/workspace/[id]/settings/integrations/board/download.ts b/pages/api/workspace/[id]/settings/integrations/board/download.ts
index 2e31b0c7..4d20e7f8 100644
--- a/pages/api/workspace/[id]/settings/integrations/board/download.ts
+++ b/pages/api/workspace/[id]/settings/integrations/board/download.ts
@@ -75,7 +75,7 @@ export async function handler(req: NextApiRequest, res: NextApiResponse) {
   }
 
   const host =
-    process.env.PLANETARY_CLOUD_URL || process.env.NEXTAUTH_URL ||
+    process.env.PLANETARY_CLOUD_URL || process.env.NEXTAUTH_URL || process.env.PUBLIC_URL
     process.env.VERCEL_URL ||
     req.headers.host;
 
diff --git a/proxy.ts b/proxy.ts
index 2d963ff4..71592407 100644
--- a/proxy.ts
+++ b/proxy.ts
@@ -18,8 +18,8 @@ function internalUrl(request: NextRequest, path: string): string {
     return `${base}${path}`;
   }
   
-  if (process.env.NEXTAUTH_URL) {
-    const base = process.env.NEXTAUTH_URL.replace(/\/$/, "");
+  if (process.env.NEXTAUTH_URL || process.env.PUBLIC_URL) {
+    const base = process.env.NEXTAUTH_URL ? process.env.NEXTAUTH_URL.replace(/\/$/, "") : process.env.PUBLIC_URL!.replace(/\/$/, "");
     return `${base}${path}`;
   }
   
diff --git a/utils/csrf.ts b/utils/csrf.ts
index 876995bd..75f8642e 100644
--- a/utils/csrf.ts
+++ b/utils/csrf.ts
@@ -3,8 +3,8 @@ import crypto from "crypto";
 
 function getAllowedOrigins(): string[] {
   const origins: string[] = [];
-  if (process.env.NEXTAUTH_URL) {
-    origins.push(process.env.NEXTAUTH_URL);
+  if (process.env.NEXTAUTH_URL || process.env.PUBLIC_URL!) {
+    origins.push(process.env.NEXTAUTH_URL || process.env.PUBLIC_URL!);
   }
 
   if (process.env.ALLOWED_ORIGINS) {
diff --git a/utils/logs.ts b/utils/logs.ts
index c2a1fdff..9bcaa2c7 100644
--- a/utils/logs.ts
+++ b/utils/logs.ts
@@ -250,8 +250,8 @@ export async function logAudit(workspaceGroupId: number, userId: number | bigint
 					const userAction = getAction(action)
 
 					const avatarUrl =
-						userId && process.env.NEXTAUTH_URL
-							? `${process.env.NEXTAUTH_URL}/avatars/${userId}_180.png`
+						userId && process.env.NEXTAUTH_URL || process.env.PUBLIC_URL!
+							? `${process.env.NEXTAUTH_URL || process.env.PUBLIC_URL!}/avatars/${userId}_180.png`
 							: "https://cdn.planetaryapp.us/brand/planetary.png"
 
 					let jsonDetails: AuditDetails | null = null;