From b2ccfb276adafbdb26461dfb3660cf7dcffeea0f Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Wed, 1 Mar 2017 17:48:33 +0900
Subject: [PATCH] Remove references to isGitBasicAuth in GWT UI

Change-Id: I45c60597e636918eaecfa57bc4c9be11bf2110bf
---
 .../main/java/com/google/gerrit/client/info/AuthInfo.java  | 7 +------
 .../src/main/java/com/google/gerrit/client/Dispatcher.java | 4 +---
 .../com/google/gerrit/client/account/SettingsScreen.java   | 2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/AuthInfo.java b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/AuthInfo.java
index 9ae74aca81..2f6ef79b83 100644
--- a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/AuthInfo.java
+++ b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/AuthInfo.java
@@ -81,10 +81,7 @@ public class AuthInfo extends JavaScriptObject {
   }
 
   public final boolean isHttpPasswordSettingsEnabled() {
-    if (isGitBasicAuth() && gitBasicAuthPolicy() == GitBasicAuthPolicy.LDAP) {
-      return false;
-    }
-    return true;
+    return gitBasicAuthPolicy() != GitBasicAuthPolicy.LDAP;
   }
 
   public final GitBasicAuthPolicy gitBasicAuthPolicy() {
@@ -108,8 +105,6 @@ public class AuthInfo extends JavaScriptObject {
 
   public final native String httpPasswordUrl() /*-{ return this.http_password_url; }-*/;
 
-  public final native boolean isGitBasicAuth() /*-{ return this.is_git_basic_auth || false; }-*/;
-
   private native String gitBasicAuthPolicyRaw() /*-{ return this.git_basic_auth_policy; }-*/;
 
   private native String authTypeRaw() /*-{ return this.auth_type; }-*/;
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java
index f5f2bdefac..e4dc40d240 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java
@@ -592,9 +592,7 @@ public class Dispatcher {
               return new MyPasswordScreen();
             }
 
-            if (matchExact(SETTINGS_OAUTH_TOKEN, token)
-                && Gerrit.info().auth().isOAuth()
-                && Gerrit.info().auth().isGitBasicAuth()) {
+            if (matchExact(SETTINGS_OAUTH_TOKEN, token) && Gerrit.info().auth().isOAuth()) {
               return new MyOAuthTokenScreen();
             }
 
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SettingsScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SettingsScreen.java
index 49ce13e3e4..bbc192d405 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SettingsScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SettingsScreen.java
@@ -46,7 +46,7 @@ public abstract class SettingsScreen extends MenuScreen {
     if (Gerrit.info().auth().isHttpPasswordSettingsEnabled()) {
       linkByGerrit(Util.C.tabHttpAccess(), PageLinks.SETTINGS_HTTP_PASSWORD);
     }
-    if (Gerrit.info().auth().isOAuth() && Gerrit.info().auth().isGitBasicAuth()) {
+    if (Gerrit.info().auth().isOAuth()) {
       linkByGerrit(Util.C.tabOAuthToken(), PageLinks.SETTINGS_OAUTH_TOKEN);
     }
     if (Gerrit.info().gerrit().editGpgKeys()) {