opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15' into stable-2.16

Browse Source 
* stable-2.15:
  Set version to 2.15.17-SNAPSHOT
  Set version to 2.15.16
  Revert "CreateAccount: Fail early when invalid SSH key is given"
  tools/eclipse/project.py: Fix typo of bazelisk
  Migrate from old-style legacy .java provider to the new JavaInfo.
  Support bazelisk or bazel in tools/eclipse/project.py
  Rework imports in project.py
  Update project.py to use argparse

Change-Id: If9388140c516f8ff2f5275eefe6cf65dad42449e
This commit is contained in:
David Pursehouse
2019-08-29 08:16:50 +09:00
parent 7002bed08f e9261c1084
commit ff43d4f05d
4 changed files with 92 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
java/com/google/gerrit/server/restapi/account/CreateAccount.java
View File

@@ -131,16 +131,6 @@ public class CreateAccount
}
extIds.add(ExternalId.createUsername(username, accountId, input.httpPassword));
if (input.sshKey != null) {
try {
authorizedKeys.addKey(accountId, input.sshKey);
sshKeyCache.evict(username);
} catch (InvalidSshKeyException e) {
throw new BadRequestException(e.getMessage());
}
}
for (AccountExternalIdCreator c : externalIdCreators) {
extIds.addAll(c.create(accountId, username, input.email));
}
@@ -173,6 +163,15 @@ public class CreateAccount
}
}
if (input.sshKey != null) {
try {
authorizedKeys.addKey(accountId, input.sshKey);
sshKeyCache.evict(username);
} catch (InvalidSshKeyException e) {
throw new BadRequestException(e.getMessage());
}
}
AccountLoader loader = infoLoader.create(true);
AccountInfo info = loader.get(accountId);
loader.fill();