@@ -43,7 +43,7 @@ async function customDomainMiddleware (request, domain, subName) {
43
43
// A: the user is trying to login or signup, redirect to the Auth Sync API
44
44
if ( pathname . startsWith ( '/login' ) || pathname . startsWith ( '/signup' ) ) {
45
45
const signup = pathname . startsWith ( '/signup' )
46
- return redirectToAuthSync ( searchParams , domain , csrfToken , signup , headers )
46
+ return redirectToAuthSync ( request , searchParams , domain , csrfToken , signup , headers )
47
47
}
48
48
// B: if we have a verification token, exchange it for a session token
49
49
if ( searchParams . has ( 'synctoken' ) ) return establishAuthSync ( request , searchParams , csrfToken , headers )
@@ -79,9 +79,9 @@ async function customDomainMiddleware (request, domain, subName) {
79
79
}
80
80
81
81
// redirect to the Auth Sync API
82
- async function redirectToAuthSync ( searchParams , domain , csrfToken , signup , headers ) {
82
+ async function redirectToAuthSync ( request , searchParams , domain , csrfToken , signup , headers ) {
83
83
// bail if we don't have a csrfToken
84
- if ( ! csrfToken ) return NextResponse . redirect ( '/error' , { headers } )
84
+ if ( ! csrfToken ) return NextResponse . redirect ( new URL ( '/error' , request . url ) , { headers } )
85
85
86
86
const syncUrl = new URL ( '/api/auth/sync' , SN_MAIN_DOMAIN )
87
87
syncUrl . searchParams . set ( 'domain' , domain )
@@ -109,7 +109,7 @@ async function redirectToAuthSync (searchParams, domain, csrfToken, signup, head
109
109
// Exchange verification token for JWT session cookie via POST to /api/auth/sync
110
110
async function establishAuthSync ( request , searchParams , csrfToken , headers ) {
111
111
// bail if we don't have a csrfToken
112
- if ( ! csrfToken ) return NextResponse . redirect ( '/error' , { headers } )
112
+ if ( ! csrfToken ) return NextResponse . redirect ( new URL ( '/error' , request . url ) , { headers } )
113
113
// get the verification token from the search params
114
114
const token = searchParams . get ( 'synctoken' )
115
115
// get the redirectUri from the search params
0 commit comments