maronato/cal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hotfix/account provider should be lowercase (#7763) 

* Fix passThrough console error (passHref is not valid)

* Fix 'use-identity-login' error when logging in with idP

---------

Co-authored-by: Keith Williams <keithwillcode@gmail.com>
This commit is contained in:
Alex van Andel 2023-03-16 15:12:45 +00:00 committed by GitHub
parent 4308ea8d52
commit 2685e8154f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web/pages/auth/logout.tsx
View File

@ -43,7 +43,7 @@ export default function Logout(props: Props) {
</div>
</div>
</div>
<Button href="/auth/login" passHref className="flex w-full justify-center">
<Button href="/auth/login" className="flex w-full justify-center">
{t("go_back_login")}
</Button>
</AuthContainer>

39
packages/features/auth/lib/next-auth-options.ts
View File

@ -444,7 +444,7 @@ export const AUTH_OPTIONS: AuthOptions = {
identityProvider: idP,
},
{
identityProviderId: account.providerAccountId as string,
identityProviderId: account.providerAccountId,
},
],
},
@ -523,11 +523,11 @@ export const AUTH_OPTIONS: AuthOptions = {
return "/auth/error?error=unverified-email";
}
const existingUser = await prisma.user.findFirst({
let existingUser = await prisma.user.findFirst({
include: {
accounts: {
where: {
provider: idP,
provider: account.provider,
},
},
},
@ -537,6 +537,33 @@ export const AUTH_OPTIONS: AuthOptions = {
},
});
/* --- START FIX LEGACY ISSUE WHERE 'identityProviderId' was accidentally set to userId --- */
if (!existingUser) {
existingUser = await prisma.user.findFirst({
include: {
accounts: {
where: {
provider: account.provider,
},
},
},
where: {
identityProvider: idP,
identityProviderId: String(user.id),
},
});
if (existingUser) {
await prisma.user.update({
where: {
id: existingUser?.id,
},
data: {
identityProviderId: account.providerAccountId,
},
});
}
}
/* --- END FIXES LEGACY ISSUE WHERE 'identityProviderId' was accidentally set to userId --- */
if (existingUser) {
// In this case there's an existing user and their email address
// hasn't changed since they last logged in.
@ -617,7 +644,7 @@ export const AUTH_OPTIONS: AuthOptions = {
emailVerified: new Date(Date.now()),
name: user.name,
identityProvider: idP,
identityProviderId: String(user.id),
identityProviderId: account.providerAccountId,
},
});
@ -640,7 +667,7 @@ export const AUTH_OPTIONS: AuthOptions = {
password: null,
email: user.email,
identityProvider: idP,
identityProviderId: String(user.id),
identityProviderId: account.providerAccountId,
},
});
if (existingUserWithEmail.twoFactorEnabled) {
@ -664,7 +691,7 @@ export const AUTH_OPTIONS: AuthOptions = {
name: user.name,
email: user.email,
identityProvider: idP,
identityProviderId: String(user.id),
identityProviderId: account.providerAccountId,
},
});