From 039729ae0af30ecae0e97487fa987c247c6e0f5a Mon Sep 17 00:00:00 2001
From: Samuel Padgett <spadgett@redhat.com>
Date: Mon, 25 Mar 2019 18:02:27 -0400
Subject: [PATCH] Update console for identity provider API changes

---
 .../cluster-settings/htpasswd-idp-form.tsx    | 30 ++-----------------
 .../components/cluster-settings/oauth.tsx     |  6 ++--
 2 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/frontend/public/components/cluster-settings/htpasswd-idp-form.tsx b/frontend/public/components/cluster-settings/htpasswd-idp-form.tsx
index c6a6e2fe353..9d48d6eb726 100644
--- a/frontend/public/components/cluster-settings/htpasswd-idp-form.tsx
+++ b/frontend/public/components/cluster-settings/htpasswd-idp-form.tsx
@@ -23,8 +23,6 @@ const DroppableFileInput = (props) => <AsyncComponent loader={() => import('../u
 export class AddHTPasswdPage extends PromiseComponent {
   readonly state: AddHTPasswdPageState = {
     name: 'htpasswd',
-    challenge: true,
-    login: true,
     mappingMethod: 'claim',
     htpasswdFileContent: '',
     inProgress: false,
@@ -52,12 +50,10 @@ export class AddHTPasswdPage extends PromiseComponent {
   }
 
   addHTPasswdIDP(oauth: K8sResourceKind, secretName: string): Promise<K8sResourceKind> {
-    const { name, challenge, login, mappingMethod } = this.state;
+    const { name, mappingMethod } = this.state;
     const htpasswd = {
       name,
       type: 'HTPasswd',
-      challenge,
-      login,
       mappingMethod,
       htpasswd: {
         fileData: {
@@ -94,14 +90,6 @@ export class AddHTPasswdPage extends PromiseComponent {
     this.setState({name: e.currentTarget.value});
   };
 
-  loginChanged: React.ReactEventHandler<HTMLInputElement> = event => {
-    this.setState({login: event.currentTarget.checked});
-  }
-
-  challengeChanged: React.ReactEventHandler<HTMLInputElement> = event => {
-    this.setState({challenge: event.currentTarget.checked});
-  }
-
   mappingMethodChanged = (mappingMethod: string) => {
     this.setState({mappingMethod});
   }
@@ -111,7 +99,7 @@ export class AddHTPasswdPage extends PromiseComponent {
   };
 
   render() {
-    const { name, login, challenge, mappingMethod, htpasswdFileContent } = this.state;
+    const { name, mappingMethod, htpasswdFileContent } = this.state;
     const title = 'Add Identity Provider: HTPasswd';
     const mappingMethods = {
       'claim': 'Claim',
@@ -140,18 +128,6 @@ export class AddHTPasswdPage extends PromiseComponent {
             Unique name of the new identity provider. This cannot be changed later.
           </p>
         </div>
-        <div className="checkbox">
-          <label className="control-label">
-            <input type="checkbox" onChange={this.loginChanged} checked={login} />
-            Use this identity provider for browser login
-          </label>
-        </div>
-        <div className="checkbox">
-          <label className="control-label">
-            <input type="checkbox" onChange={this.challengeChanged} checked={challenge} />
-            Issue <code>WWW-Authenticate</code> challenges to non-browser clients
-          </label>
-        </div>
         <div className="form-group">
           <label className="control-label co-required" htmlFor="tag">Mapping Method</label>
           <Dropdown dropDownClassName="dropdown--full-width" items={mappingMethods} selectedKey={mappingMethod} title={mappingMethods[mappingMethod]} onChange={this.mappingMethodChanged} />
@@ -181,8 +157,6 @@ export class AddHTPasswdPage extends PromiseComponent {
 
 type AddHTPasswdPageState = {
   name: string;
-  login: boolean;
-  challenge: boolean;
   mappingMethod: string;
   htpasswdFileContent: string;
   inProgress: boolean;
diff --git a/frontend/public/components/cluster-settings/oauth.tsx b/frontend/public/components/cluster-settings/oauth.tsx
index 0e3ae64d0c7..fdcc3d4957a 100644
--- a/frontend/public/components/cluster-settings/oauth.tsx
+++ b/frontend/public/components/cluster-settings/oauth.tsx
@@ -33,8 +33,7 @@ const IdentityProviders: React.SFC<IdentityProvidersProps> = ({identityProviders
           <tr>
             <th>Name</th>
             <th>Type</th>
-            <th>Challenge</th>
-            <th>Login</th>
+            <th>Mapping Method</th>
           </tr>
         </thead>
         <tbody>
@@ -42,8 +41,7 @@ const IdentityProviders: React.SFC<IdentityProvidersProps> = ({identityProviders
             <tr key={idp.name}>
               <td>{idp.name}</td>
               <td>{idp.type}</td>
-              <td>{idp.challenge ? 'true' : 'false'}</td>
-              <td>{idp.login ? 'true' : 'false'}</td>
+              <td>{idp.mappingMethod || 'claim'}</td>
             </tr>
           ))}
         </tbody>