opendev/gerrit
Code Issues Proposed changes

Merge "Fix removal of email/password on external ID update" into stable-2.15

Browse Source
This commit is contained in:
David Pursehouse
2018-03-29 08:14:30 +00:00
committed by Gerrit Code Review
parent e81db106ef c00e12670f
commit 1d5a733e97
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/ExternalIdIT.java
View File

@@ -873,6 +873,29 @@ public class ExternalIdIT extends AbstractDaemonTest {
assertThat(externalIds.byAccount(admin.id)).containsExactlyElementsIn(expectedExternalIds);
}
@Test
public void unsetEmail() throws Exception {
ExternalId extId = ExternalId.createWithEmail("x", "1", user.id, "x@example.com");
extIdsUpdate.create().insert(extId);
ExternalId extIdWithoutEmail = ExternalId.create("x", "1", user.id);
extIdsUpdate.create().upsert(extIdWithoutEmail);
assertThat(externalIds.get(extId.key())).isEqualTo(extIdWithoutEmail);
}
@Test
public void unsetHttpPassword() throws Exception {
ExternalId extId =
ExternalId.createWithPassword(ExternalId.Key.create("y", "1"), user.id, null, "secret");
extIdsUpdate.create().insert(extId);
ExternalId extIdWithoutPassword = ExternalId.create("y", "1", user.id);
extIdsUpdate.create().upsert(extIdWithoutPassword);
assertThat(externalIds.get(extId.key())).isEqualTo(extIdWithoutPassword);
}
private void insertExtIdBehindGerritsBack(ExternalId extId) throws Exception {
try (Repository repo = repoManager.openRepository(allUsers);
RevWalk rw = new RevWalk(repo);

6
gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/ExternalId.java
View File

@@ -366,11 +366,17 @@ public abstract class ExternalId implements Serializable {
// c.setString(...) ensures that account IDs are human readable.
c.setString(
EXTERNAL_ID_SECTION, externalIdKey, ACCOUNT_ID_KEY, Integer.toString(accountId().get()));
if (email() != null) {
c.setString(EXTERNAL_ID_SECTION, externalIdKey, EMAIL_KEY, email());
} else {
c.unset(EXTERNAL_ID_SECTION, externalIdKey, EMAIL_KEY);
}
if (password() != null) {
c.setString(EXTERNAL_ID_SECTION, externalIdKey, PASSWORD_KEY, password());
} else {
c.unset(EXTERNAL_ID_SECTION, externalIdKey, PASSWORD_KEY);
}
}
}