From e83f16422a2b6f6b7fda9a0014eea24448485f60 Mon Sep 17 00:00:00 2001 From: Miguel Serrano Date: Tue, 9 Feb 2021 16:56:59 +0100 Subject: [PATCH] Merge pull request #3631 from overleaf/jel-sso-link-set-reconfirmed Set reconfirmedAt when linking a confirmed email GitOrigin-RevId: 7b3fb0638d13a777900e1e0962712816277da4aa --- services/web/app/src/Features/User/SAMLIdentityManager.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/web/app/src/Features/User/SAMLIdentityManager.js b/services/web/app/src/Features/User/SAMLIdentityManager.js index 3bb7897a18..c13615e020 100644 --- a/services/web/app/src/Features/User/SAMLIdentityManager.js +++ b/services/web/app/src/Features/User/SAMLIdentityManager.js @@ -119,11 +119,9 @@ async function _addInstitutionEmail(userId, email, providerId, auditLog) { if (emailAlreadyAssociated && emailAlreadyAssociated.confirmedAt) { await UserUpdater.promises.updateUser(query, update) } else if (emailAlreadyAssociated) { - await UserUpdater.promises.confirmEmail(user._id, email) await UserUpdater.promises.updateUser(query, update) } else { await UserUpdater.promises.addEmailAddress(user._id, email, {}, auditLog) - await UserUpdater.promises.confirmEmail(user._id, email) await UserUpdater.promises.updateUser(query, update) } } @@ -212,6 +210,7 @@ async function linkAccounts( auditLog ) await _addInstitutionEmail(userId, institutionEmail, providerId, auditLog) + await UserUpdater.promises.confirmEmail(userId, institutionEmail) // will set confirmedAt if not set, and will always update reconfirmedAt await _sendLinkedEmail(userId, providerName, institutionEmail) // update v1 affiliations record if (hasEntitlement) {