fix(auth): redirect to appUrl after invite callback
origin lacks /ims basePath; use NEXT_PUBLIC_APP_URL instead. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01BzvzV91UqHZKM9P58qtvrA
This commit is contained in:
@@ -3,6 +3,7 @@ export const dynamic = 'force-dynamic'
|
|||||||
import { notFound, redirect } from 'next/navigation'
|
import { notFound, redirect } from 'next/navigation'
|
||||||
import Link from 'next/link'
|
import Link from 'next/link'
|
||||||
import { createClient } from '@/lib/supabase/server'
|
import { createClient } from '@/lib/supabase/server'
|
||||||
|
import { createAdminClient } from '@/lib/supabase/admin'
|
||||||
import { CapaForm } from '@/components/capa/capa-form'
|
import { CapaForm } from '@/components/capa/capa-form'
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
@@ -23,7 +24,8 @@ export default async function NewCapaPage({ params }: Props) {
|
|||||||
.from('incidents').select('id, reference_no, status').eq('id', id).single()
|
.from('incidents').select('id, reference_no, status').eq('id', id).single()
|
||||||
if (!incident) notFound()
|
if (!incident) notFound()
|
||||||
|
|
||||||
const { data: users } = await supabase
|
const admin = createAdminClient()
|
||||||
|
const { data: users } = await admin
|
||||||
.from('users')
|
.from('users')
|
||||||
.select('id, name, department')
|
.select('id, name, department')
|
||||||
.eq('role', 'capa_owner')
|
.eq('role', 'capa_owner')
|
||||||
|
|||||||
@@ -3,18 +3,19 @@ import { createClient } from '@/lib/supabase/server'
|
|||||||
import { NextResponse } from 'next/server'
|
import { NextResponse } from 'next/server'
|
||||||
|
|
||||||
export async function GET(request: Request) {
|
export async function GET(request: Request) {
|
||||||
const { searchParams, origin } = new URL(request.url)
|
const { searchParams } = new URL(request.url)
|
||||||
const code = searchParams.get('code')
|
const code = searchParams.get('code')
|
||||||
const nextRaw = searchParams.get('next') ?? '/'
|
const nextRaw = searchParams.get('next') ?? '/'
|
||||||
const next = nextRaw.startsWith('/') && !nextRaw.startsWith('//') ? nextRaw : '/'
|
const next = nextRaw.startsWith('/') && !nextRaw.startsWith('//') ? nextRaw : '/'
|
||||||
|
const appUrl = (process.env.NEXT_PUBLIC_APP_URL ?? '').replace(/\/$/, '')
|
||||||
|
|
||||||
if (code) {
|
if (code) {
|
||||||
const supabase = await createClient()
|
const supabase = await createClient()
|
||||||
const { error } = await supabase.auth.exchangeCodeForSession(code)
|
const { error } = await supabase.auth.exchangeCodeForSession(code)
|
||||||
if (!error) {
|
if (!error) {
|
||||||
return NextResponse.redirect(`${origin}${next}`)
|
return NextResponse.redirect(`${appUrl}${next}`)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return NextResponse.redirect(`${origin}/login?error=auth_callback_failed`)
|
return NextResponse.redirect(`${appUrl}/login?error=auth_callback_failed`)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
VPS="root@64.176.82.100"
|
||||||
|
REMOTE_DIR="/var/www/ims"
|
||||||
|
PORT=3003
|
||||||
|
|
||||||
|
echo "==> Building..."
|
||||||
|
npm run build
|
||||||
|
|
||||||
|
echo "==> Copying static assets into standalone..."
|
||||||
|
cp -r .next/static .next/standalone/.next/static
|
||||||
|
cp -r public .next/standalone/public
|
||||||
|
|
||||||
|
echo "==> Syncing to VPS..."
|
||||||
|
rsync -az --delete --exclude='.env' .next/standalone/ "$VPS:$REMOTE_DIR/"
|
||||||
|
|
||||||
|
echo "==> Restarting service on VPS..."
|
||||||
|
ssh "$VPS" "systemctl restart ims"
|
||||||
|
|
||||||
|
echo "==> Done. http://64.176.82.100/ims/"
|
||||||
Reference in New Issue
Block a user