opendev/gerrit
Code Issues Proposed changes

Enable OAuth token setting when gitBasicAuthPolicy equals OAUTH

Browse Source 
The Git/HTTP OAuth setting section was erroneously exposed even though
the policy was set to HTTP.

Bug: Issue 6070
Change-Id: If76ee60aa325ba4cdaa4a7f48d853f110188278a
This commit is contained in:
David Ostrovsky 2017-04-25 11:32:51 +02:00
parent fe81d03010
commit d43ea2443a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SettingsScreen.java
View File

@ -21,6 +21,7 @@ import com.google.gerrit.client.api.ExtensionSettingsScreen;
import com.google.gerrit.client.rpc.Natives;
import com.google.gerrit.client.ui.MenuScreen;
import com.google.gerrit.common.PageLinks;
import com.google.gerrit.extensions.client.GitBasicAuthPolicy;
import java.util.HashSet;
import java.util.Set;
@ -46,7 +47,8 @@ public abstract class SettingsScreen extends MenuScreen {
if (Gerrit.info().auth().isHttpPasswordSettingsEnabled()) {
linkByGerrit(Util.C.tabHttpAccess(), PageLinks.SETTINGS_HTTP_PASSWORD);
}
if (Gerrit.info().auth().isOAuth()) {
if (Gerrit.info().auth().isOAuth()
&& Gerrit.info().auth().gitBasicAuthPolicy() == GitBasicAuthPolicy.OAUTH) {
linkByGerrit(Util.C.tabOAuthToken(), PageLinks.SETTINGS_OAUTH_TOKEN);
}
if (Gerrit.info().gerrit().editGpgKeys()) {