opendev/gerrit
Code Issues Proposed changes

CreateEmail: Trim new email

Browse Source 
This removes leading and trailing whitespace from the email.

Change-Id: Ia2e70925572a07d7d5ed170a774894f2a5bf4543
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2017-11-27 09:58:13 +01:00
parent 8cede05fef
commit 1cf8629107
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/EmailIT.java
View File

@@ -21,6 +21,7 @@ import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.extensions.api.accounts.EmailInput;
import com.google.gerrit.extensions.common.EmailInfo;
import com.google.gerrit.extensions.restapi.IdString;
import com.google.gson.reflect.TypeToken;
import java.util.List;
import java.util.Set;
@@ -46,6 +47,15 @@ public class EmailIT extends AbstractDaemonTest {
assertThat(getEmails()).contains(email);
}
@Test
public void addEmailWithLeadingAndTrailingWhitespace() throws Exception {
String email = "foo.bar3@example.com";
assertThat(getEmails()).doesNotContain(email);
createEmail(IdString.fromDecoded(" " + email + " ").encoded());
assertThat(getEmails()).contains(email);
}
@Test
public void deleteEmail() throws Exception {
String email = "foo.baz@example.com";

2
gerrit-server/src/main/java/com/google/gerrit/server/account/CreateEmail.java
View File

@@ -70,7 +70,7 @@ public class CreateEmail implements RestModifyView<AccountResource, EmailInput>
this.accountManager = accountManager;
this.registerNewEmailFactory = registerNewEmailFactory;
this.putPreferred = putPreferred;
this.email = email;
this.email = email != null ? email.trim() : null;
this.isDevMode = authConfig.getAuthType() == DEVELOPMENT_BECOME_ANY_ACCOUNT;
}