commit 8c8a3922e76194d409e43b57e7b0b09f844abcdd
author Patrick Hiesel <hiesel@google.com> Tue Jan 05 14:10:58 2021 +0100
committer Patrick Hiesel <hiesel@google.com> Tue Jan 05 13:19:15 2021 +0000
tree 6eedd6db2c47dfe0652e3a66584e3ab857e5e211
parent c6f5fdd8e28e56efac3155b89ff3d6c79e377dab

ExternalUser: Allow specifying a PropertyMap

PropertyMap is a concept of CurrentUser to store or cache per-user
state. This state is immutable for the lifetime of the object.

With this commit, we allow specifying this state for ExternalUser.

Change-Id: I41fc3d148d3cf3a0870f1bde1de5dd37ae0ebea5

java/com/google/gerrit/server/ExternalUser.java

diff --git a/java/com/google/gerrit/server/ExternalUser.java b/java/com/google/gerrit/server/ExternalUser.java
index cb7d559..9680f3e 100644
--- a/java/com/google/gerrit/server/ExternalUser.java
+++ b/java/com/google/gerrit/server/ExternalUser.java
@@ -38,7 +38,9 @@
 
   public interface Factory {
     ExternalUser create(
-        Collection<String> emailAddresses, Collection<ExternalId.Key> externalIdKeys);
+        Collection<String> emailAddresses,
+        Collection<ExternalId.Key> externalIdKeys,
+        PropertyMap propertyMap);
   }
 
   private final GroupBackend groupBackend;
@@ -51,7 +53,9 @@
   public ExternalUser(
       GroupBackend groupBackend,
       @Assisted Collection<String> emailAddresses,
-      @Assisted Collection<ExternalId.Key> externalIdKeys) {
+      @Assisted Collection<ExternalId.Key> externalIdKeys,
+      @Assisted PropertyMap propertyMap) {
+    super(propertyMap);
     this.groupBackend = groupBackend;
     this.emailAddresses = ImmutableSet.copyOf(emailAddresses);
     this.externalIdKeys = ImmutableSet.copyOf(externalIdKeys);

javatests/com/google/gerrit/acceptance/server/permissions/ExternalUserPermissionIT.java

diff --git a/javatests/com/google/gerrit/acceptance/server/permissions/ExternalUserPermissionIT.java b/javatests/com/google/gerrit/acceptance/server/permissions/ExternalUserPermissionIT.java
index f05d338..9e4907c 100644
--- a/javatests/com/google/gerrit/acceptance/server/permissions/ExternalUserPermissionIT.java
+++ b/javatests/com/google/gerrit/acceptance/server/permissions/ExternalUserPermissionIT.java
@@ -41,6 +41,7 @@
 import com.google.gerrit.extensions.restapi.AuthException;
 import com.google.gerrit.server.CurrentUser;
 import com.google.gerrit.server.ExternalUser;
+import com.google.gerrit.server.PropertyMap;
 import com.google.gerrit.server.account.GroupBackend;
 import com.google.gerrit.server.account.GroupMembership;
 import com.google.gerrit.server.account.externalids.ExternalId;
@@ -294,6 +295,7 @@
   ExternalUser createUserInGroup(String userId, String groupId) {
     return externalUserFactory.create(
         ImmutableSet.of(),
-        ImmutableSet.of(ExternalId.Key.parse("company-auth:" + groupId + "-" + userId)));
+        ImmutableSet.of(ExternalId.Key.parse("company-auth:" + groupId + "-" + userId)),
+        PropertyMap.EMPTY);
   }
 }