@@ -103,7 +103,7 @@ export default async function callback(params: {
103
103
} catch ( error ) {
104
104
return {
105
105
redirect : `${ url } /error?error=${ encodeURIComponent (
106
- ( error as Error ) . message
106
+ ( error as Error ) . message ,
107
107
) } `,
108
108
cookies,
109
109
}
@@ -215,8 +215,10 @@ export default async function callback(params: {
215
215
216
216
const invalidInvite =
217
217
! invite ||
218
- invite . identifier !== paramIdentifier ||
219
- invite . expires . valueOf ( ) < Date . now ( )
218
+ invite . expires . valueOf ( ) < Date . now ( ) ||
219
+ // The user might have configured the link to not contain the identifier
220
+ // so we only compare if it exists
221
+ ( paramIdentifier && invite . identifier !== paramIdentifier )
220
222
if ( invalidInvite ) {
221
223
return { redirect : `${ url } /error?error=Verification` , cookies }
222
224
}
@@ -246,7 +248,7 @@ export default async function callback(params: {
246
248
} catch ( error ) {
247
249
return {
248
250
redirect : `${ url } /error?error=${ encodeURIComponent (
249
- ( error as Error ) . message
251
+ ( error as Error ) . message ,
250
252
) } `,
251
253
cookies,
252
254
}
@@ -346,7 +348,7 @@ export default async function callback(params: {
346
348
return {
347
349
status : 401 ,
348
350
redirect : `${ url } /error?error=${ encodeURIComponent (
349
- ( error as Error ) . message
351
+ ( error as Error ) . message ,
350
352
) } `,
351
353
cookies,
352
354
}
@@ -378,7 +380,7 @@ export default async function callback(params: {
378
380
} catch ( error ) {
379
381
return {
380
382
redirect : `${ url } /error?error=${ encodeURIComponent (
381
- ( error as Error ) . message
383
+ ( error as Error ) . message ,
382
384
) } `,
383
385
cookies,
384
386
}
0 commit comments