Merge branch 'stable-3.3'
* stable-3.3:
Format build file using buildifier
Fix "Authentication required" in serviceuser plugin
Log internal errors when validating service user
Migrate UI to Polymer 3
Change-Id: Ib2e34f28abc514fe54b007c54e6005c48f15104b
diff --git a/gr-serviceuser/gr-serviceuser-detail.js b/gr-serviceuser/gr-serviceuser-detail.js
index fa8fd32..c757b0c 100644
--- a/gr-serviceuser/gr-serviceuser-detail.js
+++ b/gr-serviceuser/gr-serviceuser-detail.js
@@ -135,7 +135,7 @@
}
_getPermissions() {
- return this.plugin.restApi().getAccountCapabilities(['administrateServer'])
+ return this.plugin.restApi('/accounts/self/capabilities/').get('')
.then(capabilities => {
this._isAdmin = capabilities && capabilities.administrateServer;
});
diff --git a/gr-serviceuser/gr-serviceuser.js b/gr-serviceuser/gr-serviceuser.js
index c6624a6..81b7329 100644
--- a/gr-serviceuser/gr-serviceuser.js
+++ b/gr-serviceuser/gr-serviceuser.js
@@ -20,10 +20,7 @@
import {GrServiceUserCreate} from './gr-serviceuser-create.js';
Gerrit.install(plugin => {
- plugin.restApi()
- .getAccountCapabilities([
- 'administrateServer',
- 'serviceuser-createServiceUser'])
+ plugin.restApi('/accounts/self/capabilities/').get('')
.then(capabilities => {
if (capabilities
&& (capabilities.administrateServer
diff --git a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/GetConfig.java b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/GetConfig.java
index 3cca663..16e200a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/GetConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/GetConfig.java
@@ -16,6 +16,7 @@
import com.google.common.base.Strings;
import com.google.gerrit.entities.AccountGroup;
+import com.google.gerrit.entities.InternalGroup;
import com.google.gerrit.extensions.annotations.PluginName;
import com.google.gerrit.extensions.common.GroupInfo;
import com.google.gerrit.extensions.restapi.Response;
@@ -24,7 +25,6 @@
import com.google.gerrit.server.config.ConfigResource;
import com.google.gerrit.server.config.PluginConfig;
import com.google.gerrit.server.config.PluginConfigFactory;
-import com.google.gerrit.server.group.InternalGroup;
import com.google.gerrit.server.group.InternalGroupDescription;
import com.google.gerrit.server.permissions.PermissionBackendException;
import com.google.gerrit.server.restapi.group.GroupJson;
