From cfe6c3ceebea9020c0ad4e5d3c4a897890469871 Mon Sep 17 00:00:00 2001
From: MoxAmber <amber.steele@overleaf.com>
Date: Wed, 29 Oct 2025 13:29:39 +0000
Subject: [PATCH] Merge pull request #29324 from
 overleaf/as-sso-ensure-email-confirmed

[web] Ensure email confirmedAt is always set for users created via Commons SSO

GitOrigin-RevId: c00ea58a0f9e2a1e93d7edc3836aa815d8ba16ac
---
 services/web/app/src/Features/User/UserCreator.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/web/app/src/Features/User/UserCreator.mjs b/services/web/app/src/Features/User/UserCreator.mjs
index 8734bf1321..62590e73a3 100644
--- a/services/web/app/src/Features/User/UserCreator.mjs
+++ b/services/web/app/src/Features/User/UserCreator.mjs
@@ -71,7 +71,7 @@ async function createNewUser(attributes, options = {}) {
     createdAt: new Date(),
     reversedHostname,
   }
-  if (Features.hasFeature('affiliations')) {
+  if (Features.hasFeature('affiliations') && !options.requireAffiliation) {
     emailData.affiliationUnchecked = true
   }
   if (