yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-08-31 20:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MINOR] Fix Email Updates (#17620)

Browse Source 
* Fix Email

* Fix Test

(cherry picked from commit a9a1a2036b55fb2cf03c6535733059d364ef6310)
This commit is contained in:
Mohit Yadav 2024-08-29 11:59:00 +05:30 committed by mohitdeuex
parent aff2adbb98
commit c23fdc88b4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/UserRepository.java
View File

@ -578,7 +578,7 @@ public class UserRepository extends EntityRepository<User> {
@Override @Override
public void entitySpecificUpdate() { public void entitySpecificUpdate() {
// LowerCase Email // LowerCase Email
updated.setEmail(updated.getEmail().toLowerCase()); updated.setEmail(original.getEmail().toLowerCase());
// Updates // Updates
updateRoles(original, updated); updateRoles(original, updated);
@ -590,7 +590,6 @@ public class UserRepository extends EntityRepository<User> {
recordChange("timezone", original.getTimezone(), updated.getTimezone()); recordChange("timezone", original.getTimezone(), updated.getTimezone());
recordChange("isBot", original.getIsBot(), updated.getIsBot()); recordChange("isBot", original.getIsBot(), updated.getIsBot());
recordChange("isAdmin", original.getIsAdmin(), updated.getIsAdmin()); recordChange("isAdmin", original.getIsAdmin(), updated.getIsAdmin());
recordChange("email", original.getEmail(), updated.getEmail().toLowerCase());
recordChange("isEmailVerified", original.getIsEmailVerified(), updated.getIsEmailVerified()); recordChange("isEmailVerified", original.getIsEmailVerified(), updated.getIsEmailVerified());
updateAuthenticationMechanism(original, updated); updateAuthenticationMechanism(original, updated);
} }

4
openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/UserResourceTest.java
View File

@ -305,13 +305,13 @@ public class UserResourceTest extends EntityResourceTest<User, CreateUser> {
// Update the user information using PUT // Update the user information using PUT
String oldEmail = create.getEmail(); String oldEmail = create.getEmail();
// Even with new field being updated, this shouuld not take effect
CreateUser update = create.withEmail("user.xyz@email.com").withDisplayName("displayName1"); CreateUser update = create.withEmail("user.xyz@email.com").withDisplayName("displayName1");
ChangeDescription change = getChangeDescription(user, MINOR_UPDATE); ChangeDescription change = getChangeDescription(user, MINOR_UPDATE);
fieldAdded(change, "displayName", "displayName1"); fieldAdded(change, "displayName", "displayName1");
fieldUpdated(change, "email", oldEmail, "user.xyz@email.com");
user = updateAndCheckEntity(update, OK, ADMIN_AUTH_HEADERS, MINOR_UPDATE, change); user = updateAndCheckEntity(update, OK, ADMIN_AUTH_HEADERS, MINOR_UPDATE, change);
assertEquals(oldEmail, user.getEmail());
// Update the user information using PUT as the logged-in user // Update the user information using PUT as the logged-in user
update = create.withDisplayName("displayName2"); update = create.withDisplayName("displayName2");
change = getChangeDescription(user, MINOR_UPDATE); change = getChangeDescription(user, MINOR_UPDATE);