Skip to content

Commit e0a7d71

Browse files
committed
fix(providers): optionally check identifier
1 parent d66ee42 commit e0a7d71

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

packages/next-auth/src/core/routes/callback.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ export default async function callback(params: {
103103
} catch (error) {
104104
return {
105105
redirect: `${url}/error?error=${encodeURIComponent(
106-
(error as Error).message
106+
(error as Error).message,
107107
)}`,
108108
cookies,
109109
}
@@ -215,8 +215,10 @@ export default async function callback(params: {
215215

216216
const invalidInvite =
217217
!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)
220222
if (invalidInvite) {
221223
return { redirect: `${url}/error?error=Verification`, cookies }
222224
}
@@ -246,7 +248,7 @@ export default async function callback(params: {
246248
} catch (error) {
247249
return {
248250
redirect: `${url}/error?error=${encodeURIComponent(
249-
(error as Error).message
251+
(error as Error).message,
250252
)}`,
251253
cookies,
252254
}
@@ -346,7 +348,7 @@ export default async function callback(params: {
346348
return {
347349
status: 401,
348350
redirect: `${url}/error?error=${encodeURIComponent(
349-
(error as Error).message
351+
(error as Error).message,
350352
)}`,
351353
cookies,
352354
}
@@ -378,7 +380,7 @@ export default async function callback(params: {
378380
} catch (error) {
379381
return {
380382
redirect: `${url}/error?error=${encodeURIComponent(
381-
(error as Error).message
383+
(error as Error).message,
382384
)}`,
383385
cookies,
384386
}

0 commit comments

Comments
 (0)