Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2855 from omnivore-app/fix/convert-email-login

Browse Source 
fix convert to email login does not change source field in user table
This commit is contained in:
Hongbo Wu
2023-10-04 16:52:42 +08:00
committed by GitHub
parent c41363b51c 418f27f586
commit e93ca3ee67
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/api/src/routers/auth/auth_router.ts
View File

@ -685,17 +685,14 @@ export function authRouter() {
)
}
// check if email needs to be updated
const updateEmail = claims.email && claims.email !== user.email
const hashedPassword = await hashPassword(password)
const updated = await AppDataSource.transaction(
async (entityManager) => {
await setClaims(entityManager, user.id)
return entityManager.getRepository(User).update(user.id, {
password: hashedPassword,
email: updateEmail ? claims.email : undefined,
source: updateEmail ? RegistrationType.Email : undefined,
email: claims.email ?? undefined, // update email address if it was provided
source: RegistrationType.Email, // reset password will always be email
})
}
)