From 85609db2b97840a360bc83940f51f4360c96e05c Mon Sep 17 00:00:00 2001
From: Nancy Butler <42977925+mantis-toboggan-md@users.noreply.github.com>
Date: Mon, 1 Mar 2021 10:55:16 -0700
Subject: [PATCH] ldap component issues

show github info on edit

google oauth inputs
---
 config/product/auth.js    | 1 +
 edit/auth/github.vue      | 2 +-
 edit/auth/ldap/config.vue | 7 +++++--
 mixins/auth-config.js     | 6 +++---
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/config/product/auth.js b/config/product/auth.js
index 976783d5d9..3b73145898 100644
--- a/config/product/auth.js
+++ b/config/product/auth.js
@@ -35,6 +35,7 @@ export function init(store) {
     name:        'config',
     weight:      100,
     route:       { name: 'c-cluster-auth-config' },
+    ifHaveType: MANAGEMENT.AUTH_CONFIG
   });
 
   spoofedType({
diff --git a/edit/auth/github.vue b/edit/auth/github.vue
index e1276634a2..24be307e9e 100644
--- a/edit/auth/github.vue
+++ b/edit/auth/github.vue
@@ -194,7 +194,7 @@ export default {
           </div>
         </div>
 
-        <InfoBox v-if="!model.enabled" class="mt-20 mb-20 p-10">
+        <InfoBox class="mt-20 mb-20 p-10">
           <ul v-html="t(`authConfig.${NAME}.form.prefix`, tArgs, true)" />
           <ul>
             <li>
diff --git a/edit/auth/ldap/config.vue b/edit/auth/ldap/config.vue
index 761b81c107..7b99ca53c3 100644
--- a/edit/auth/ldap/config.vue
+++ b/edit/auth/ldap/config.vue
@@ -74,7 +74,8 @@ export default {
         this.value.port = newDefault;
       }
     }
-  }
+  },
+
 };
 </script>
 
@@ -90,9 +91,11 @@ export default {
             :value="model.port"
             type="number"
             required
+            :min="0"
+            :step="1"
             :mode="mode"
             :label="t('authConfig.ldap.port')"
-            @input="e=>model.port = e.replace(/[^0-9]/g, '')"
+            @input="e=>$set(model, 'port', e.replace(/[^0-9]*/g, ''))"
           />
         </div>
 
diff --git a/mixins/auth-config.js b/mixins/auth-config.js
index 1a0141c151..25886cfd9b 100644
--- a/mixins/auth-config.js
+++ b/mixins/auth-config.js
@@ -231,7 +231,7 @@ export default {
         set(this.model, 'accessMode', 'unrestricted');
         set(this.model, 'starttls', false);
         if (this.model.id === 'activedirectory') {
-          set(this.model, 'disabledStatusBitmask', 1);
+          set(this.model, 'disabledStatusBitmask', 2);
         } else {
           set(this.model, 'disabledStatusBitmask', 0);
         }
@@ -241,10 +241,10 @@ export default {
           const { oauthCredential, serviceAccountCredential } = this.originalValue;
 
           if (!this.model.oauthCredential) {
-            this.model.oauthCredential = oauthCredential;
+            set(this.model, 'oauthCredential', oauthCredential);
           }
           if (!this.model.serviceAccountCredential) {
-            this.model.serviceAccountCredential = serviceAccountCredential;
+            set(this.model, 'serviceAccountCredential', serviceAccountCredential);
           }
         }
         break;