GitHub App installation failed. Maybe try re-install it?
+ + ) +} \ No newline at end of file diff --git a/src/app/(dynamic-pages)/(authenticated-pages)/github_app/success/page.tsx b/src/app/(dynamic-pages)/(authenticated-pages)/github_app/success/page.tsx new file mode 100644 index 00000000..54b49cd3 --- /dev/null +++ b/src/app/(dynamic-pages)/(authenticated-pages)/github_app/success/page.tsx @@ -0,0 +1,10 @@ +import Link from "next/link"; + +export default function GithubAppError() { + return ( + <> +GitHub App installed successfully. You can now close this tab or go to dashboard
+ + ) +} \ No newline at end of file diff --git a/src/app/(dynamic-pages)/(login-pages)/auth/callback/route.ts b/src/app/(dynamic-pages)/(login-pages)/auth/callback/route.ts index 9c698a2f..5a23953a 100644 --- a/src/app/(dynamic-pages)/(login-pages)/auth/callback/route.ts +++ b/src/app/(dynamic-pages)/(login-pages)/auth/callback/route.ts @@ -22,28 +22,6 @@ export async function GET(request: Request) { } } - // HACK_ALERT!!! - // cookie is probably set on 'next.digger.dev' we have to change it to `.digger.dev` - const cookieKey = `sb-${process.env.SUPABASE_PROJECT_REF}-auth-token`; - const cookieStore = cookies(); - const currentCookieValue = cookieStore.get(cookieKey)?.value; - // get domain of current reques - const domain = new URL(request.url).hostname; - if ( - domain.includes('next.digger.dev') && - currentCookieValue && - !isDevelopment - ) { - // set cookie to .digger.dev - cookieStore.set(cookieKey, currentCookieValue, { - domain: '.digger.dev', - secure: true, - path: '/', - sameSite: 'lax', - httpOnly: true, - }); - } - let redirectTo = new URL('/dashboard', requestUrl.origin); if (next) { diff --git a/src/app/api/github-callback/route.ts b/src/app/api/github-callback/route.ts new file mode 100644 index 00000000..9fff7c2d --- /dev/null +++ b/src/app/api/github-callback/route.ts @@ -0,0 +1,73 @@ +import { createSupabaseUserRouteHandlerClient } from '@/supabase-clients/user/createSupabaseUserRouteHandlerClient'; +import { toSiteURL } from '@/utils/helpers'; +import { NextRequest, NextResponse } from 'next/server'; + +// Use the environment variable for the callback URL +const AUTH_SERVICE_URL = process.env.GITHUB_CALLBACK_URL; +const DIGGER_WEBHOOK_SECRET = process.env.DIGGER_WEBHOOK_SECRET; + +if (!AUTH_SERVICE_URL) { + throw new Error('GITHUB_CALLBACK_URL environment variable is not set'); +} + +export async function GET(request: NextRequest) { + const searchParams = request.nextUrl.searchParams; + const installationId = searchParams.get('installation_id'); + + if (!installationId) { + return NextResponse.json( + { error: 'Missing installation_id' }, + { status: 400 }, + ); + } + + try { + console.log( + 'Trying to get org id for the following installation ID:', + installationId, + ); + const organizationId = await getOrganizationId(); + const response = await fetch( + `${AUTH_SERVICE_URL}?${searchParams.toString()}`, + { + method: 'GET', + headers: { + 'Content-Type': 'application/json', + 'X-Digger-Org-ID': organizationId, + Authorization: `Bearer ${DIGGER_WEBHOOK_SECRET}`, + }, + }, + ); + + if (!response.ok) { + throw new Error(`Auth service responded with status: ${response.status}`); + } + return NextResponse.redirect(toSiteURL('/github_app/success')); + } catch (error) { + console.error('Error handling GitHub App installation callback:', error); + return NextResponse.redirect(toSiteURL('/github_app/error')); + } +} + +async function getOrganizationId(): Promise