commit 1746cee4d0646f05e368f80f47071ecc6828fd74
author Changcheng Xiao <xchangcheng@google.com> Fri Jan 13 14:46:08 2017 +0100
committer Changcheng Xiao <xchangcheng@google.com> Mon Jan 16 09:04:53 2017 +0100
tree e5fb5137b3b1a2449e8ee6dd0ba3ccb41468e799
parent f2d9589fed02d01077401c795a260e292f8609d4

Account REST API: fix the key setting in RestApiServlet

The previous code creates a new PropertyKey both in RestApiServlet and
GetExternalIds. These two keys are actually different, which must be the
same to get the right external id.

Add a PropertyKey in CurrentUser to get the external id. It can't be added in
IdentifiedUser as the RestApiServlet will be called by anonymous users, too.

Change-Id: If1f4a31e3fc2c781c99aad786de4e741ee626e06

gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java

diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
index 94aa82e..7e6d0d6 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
@@ -1078,9 +1078,8 @@
     CurrentUser user = globals.currentUser.get();
     if (isRead(req)) {
       user.setAccessPath(AccessPath.REST_API);
-      CurrentUser.PropertyKey<AccountExternalId.Key> k =
-          CurrentUser.PropertyKey.create();
-      user.put(k, globals.webSession.get().getLastLoginExternalId());
+      user.setLastLoginExternalIdKey(
+          globals.webSession.get().getLastLoginExternalId());
     } else if (user instanceof AnonymousUser) {
       throw new AuthException("Authentication required");
     } else if (!globals.webSession.get().isAccessPathOk(AccessPath.REST_API)) {

gerrit-server/src/main/java/com/google/gerrit/server/CurrentUser.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/CurrentUser.java b/gerrit-server/src/main/java/com/google/gerrit/server/CurrentUser.java
index 668b344..b62283a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/CurrentUser.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/CurrentUser.java
@@ -16,6 +16,7 @@
 
 import com.google.gerrit.common.Nullable;
 import com.google.gerrit.reviewdb.client.Account;
+import com.google.gerrit.reviewdb.client.AccountExternalId;
 import com.google.gerrit.server.account.CapabilityControl;
 import com.google.gerrit.server.account.GroupMembership;
 import com.google.inject.servlet.RequestScoped;
@@ -45,6 +46,8 @@
   private AccessPath accessPath = AccessPath.UNKNOWN;
 
   private CapabilityControl capabilities;
+  private PropertyKey<AccountExternalId.Key> lastLoginExternalIdPropertyKey =
+      PropertyKey.create();
 
   protected CurrentUser(CapabilityControl.Factory capabilityControlFactory) {
     this.capabilityControlFactory = capabilityControlFactory;
@@ -150,4 +153,12 @@
    */
   public <T> void put(PropertyKey<T> key, @Nullable T value) {
   }
+
+  public void setLastLoginExternalIdKey(AccountExternalId.Key externalIdKey) {
+    put(lastLoginExternalIdPropertyKey, externalIdKey);
+  }
+
+  public AccountExternalId.Key getLastLoginExternalIdKey() {
+    return get(lastLoginExternalIdPropertyKey);
+  }
 }

gerrit-server/src/main/java/com/google/gerrit/server/account/GetExternalIds.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetExternalIds.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetExternalIds.java
index 1eae4cf..2aecf6c 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetExternalIds.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetExternalIds.java
@@ -72,9 +72,8 @@
       // establish this web session, and if only if an identity was
       // actually used to establish this web session.
       if (!id.isScheme(SCHEME_USERNAME)) {
-        CurrentUser.PropertyKey<AccountExternalId.Key> k =
-            CurrentUser.PropertyKey.create();
-        AccountExternalId.Key last = resource.getUser().get(k);
+        AccountExternalId.Key last = resource.getUser()
+            .getLastLoginExternalIdKey();
         info.canDelete =
             toBoolean(last != null && !last.get().equals(info.identity));
       }