Skip to content

Added PUBLIC_URL alongside NEXTAUTH_URL #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
breadddevv merged 1 commit into from
Jun 22, 2026
Merged

Added PUBLIC_URL alongside NEXTAUTH_URL #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pages/api/auth/discord/callback.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}),
Expand Down
2 changes: 1 addition & 1 deletion pages/api/auth/discord/start.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions pages/api/auth/google/start.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ 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',
scope: scopes,
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)
Expand Down
2 changes: 1 addition & 1 deletion pages/api/auth/roblox/start.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions pages/api/workspace/[id]/policies/[docId]/link-info.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 6 additions & 6 deletions pages/api/workspace/[id]/policies/[docId]/links.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion pages/api/workspace/[id]/settings/integrations/board/download.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions proxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}`;
}

Expand Down
4 changes: 2 additions & 2 deletions utils/csrf.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions utils/logs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading