From db7ffea24db0973533915b8d35b4d8e3f998daeb Mon Sep 17 00:00:00 2001 From: Pablo Lara Date: Mon, 17 Mar 2025 10:23:01 +0100 Subject: [PATCH] chore: add env var for social login (#7251) --- .env | 2 +- ui/app/api/auth/callback/github/route.ts | 5 +++-- ui/app/api/auth/callback/google/route.ts | 5 +++-- ui/lib/helper.ts | 2 ++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.env b/.env index 9403b39152..ef04a95338 100644 --- a/.env +++ b/.env @@ -4,7 +4,7 @@ #### Prowler UI Configuration #### PROWLER_UI_VERSION="stable" -SITE_URL=http://localhost:3000 +AUTH_URL=http://localhost:3000 API_BASE_URL=http://prowler-api:8080/api/v1 NEXT_PUBLIC_API_DOCS_URL=http://prowler-api:8080/api/v1/docs AUTH_TRUST_HOST=true diff --git a/ui/app/api/auth/callback/github/route.ts b/ui/app/api/auth/callback/github/route.ts index 8bef55f8a3..918d019360 100644 --- a/ui/app/api/auth/callback/github/route.ts +++ b/ui/app/api/auth/callback/github/route.ts @@ -3,6 +3,7 @@ import { NextResponse } from "next/server"; import { signIn } from "@/auth.config"; +import { baseUrl } from "@/lib/helper"; export async function GET(req: Request) { const { searchParams } = new URL(req.url); @@ -42,14 +43,14 @@ export async function GET(req: Request) { accessToken: access, refreshToken: refresh, redirect: false, - callbackUrl: "/", + callbackUrl: `${baseUrl}/`, }); if (result?.error) { throw new Error(result.error); } - return NextResponse.redirect(new URL("/", req.url)); + return NextResponse.redirect(new URL("/", baseUrl)); } catch (error) { // eslint-disable-next-line no-console console.error("SignIn error:", error); diff --git a/ui/app/api/auth/callback/google/route.ts b/ui/app/api/auth/callback/google/route.ts index d52b4eb222..521ed1c413 100644 --- a/ui/app/api/auth/callback/google/route.ts +++ b/ui/app/api/auth/callback/google/route.ts @@ -3,6 +3,7 @@ import { NextResponse } from "next/server"; import { signIn } from "@/auth.config"; +import { baseUrl } from "@/lib/helper"; export async function GET(req: Request) { const { searchParams } = new URL(req.url); @@ -42,14 +43,14 @@ export async function GET(req: Request) { accessToken: access, refreshToken: refresh, redirect: false, - callbackUrl: "/", + callbackUrl: `${baseUrl}/`, }); if (result?.error) { throw new Error(result.error); } - return NextResponse.redirect(new URL("/", req.url)); + return NextResponse.redirect(new URL("/", baseUrl)); } catch (error) { // eslint-disable-next-line no-console console.error("SignIn error:", error); diff --git a/ui/lib/helper.ts b/ui/lib/helper.ts index b7e67f03c9..428270ed2e 100644 --- a/ui/lib/helper.ts +++ b/ui/lib/helper.ts @@ -1,6 +1,8 @@ import { getTask } from "@/actions/task"; import { AuthSocialProvider, MetaDataProps, PermissionInfo } from "@/types"; +export const baseUrl = process.env.AUTH_URL || "http://localhost:3000"; + export const getAuthUrl = (provider: AuthSocialProvider) => { const config = { google: {