UPDATE_EMAIL action invalidates old email

martin-kanis · web-flow · commit 4bbb16b1357b · 2025-11-19T20:41:31.000+01:00
Closes #43738 (cherry picked from commit a7c0207) Signed-off-by: Martin Kanis <mkanis@redhat.com>
diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateEmail.java b/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateEmail.java
@@ -355,7 +355,6 @@ public boolean isSupported(Config.Scope config) {
     private void setPendingEmailVerification(RequiredActionContext context, String email) {
         UserModel user = context.getUser();
         user.setSingleAttribute(UserModel.EMAIL_PENDING, email);
-        user.setEmailVerified(false);
     }
 
     private String getPendingEmailVerification(RequiredActionContext context) {
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateEmailTestWithVerificationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateEmailTestWithVerificationTest.java
@@ -115,7 +115,7 @@ protected void changeEmailUsingRequiredAction(String newEmail, boolean logoutOth
 		assertEquals("test-user@localhost", user.getEmail());
 		assertTrue(user.getRequiredActions().contains(UserModel.RequiredAction.UPDATE_EMAIL.name()));
         assertNotEquals(newEmail, user.getEmail());
-        assertFalse(user.isEmailVerified());
+        assertTrue(user.isEmailVerified());
         Map<String, List<String>> attributes = user.getAttributes();
         assertNotNull(attributes.get(UserModel.EMAIL_PENDING));
         assertEquals(1, attributes.get(UserModel.EMAIL_PENDING).size());

Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,6 @@ public boolean isSupported(Config.Scope config) {`
`355`	`355`	`private void setPendingEmailVerification(RequiredActionContext context, String email) {`
`356`	`356`	`UserModel user = context.getUser();`
`357`	`357`	`user.setSingleAttribute(UserModel.EMAIL_PENDING, email);`
`358`		`- user.setEmailVerified(false);`
`359`	`358`	`}`
`360`	`359`
`361`	`360`	`private String getPendingEmailVerification(RequiredActionContext context) {`