From ed89587cb906bf380c5ec9f466aa52861180580e Mon Sep 17 00:00:00 2001
From: Chaim Lev-Ari <chiptus@users.noreply.github.com>
Date: Fri, 8 Oct 2021 00:43:04 +0300
Subject: [PATCH] fix(ldap): enable user/group setting in custom ldap (#5855)

---
 .../ldap-custom-group-search.html             | 54 ++-----------------
 .../ldap-custom-user-search.html              | 54 ++-----------------
 2 files changed, 10 insertions(+), 98 deletions(-)

diff --git a/app/portainer/settings/authentication/ldap/ldap-custom-group-search/ldap-custom-group-search.html b/app/portainer/settings/authentication/ldap/ldap-custom-group-search/ldap-custom-group-search.html
index e7db2ed5b..66ec9b640 100644
--- a/app/portainer/settings/authentication/ldap/ldap-custom-group-search/ldap-custom-group-search.html
+++ b/app/portainer/settings/authentication/ldap/ldap-custom-group-search/ldap-custom-group-search.html
@@ -16,17 +16,7 @@
         <portainer-tooltip position="bottom" message="The distinguished name of the element from which the LDAP server will search for groups."></portainer-tooltip>
       </label>
       <div class="col-sm-8 col-md-4">
-        <input
-          type="text"
-          class="form-control"
-          id="ldap_group_basedn_{{ $index }}"
-          ng-model="config.GroupBaseDN"
-          placeholder="dc=ldap,dc=domain,dc=tld"
-          limited-feature-dir="{{ $ctrl.limitedFeatureId }}"
-          limited-feature-class="limited-be no-border"
-          limited-feature-disabled
-          limited-feature-tabindex="-1"
-        />
+        <input type="text" class="form-control" id="ldap_group_basedn_{{ $index }}" ng-model="config.GroupBaseDN" placeholder="dc=ldap,dc=domain,dc=tld" />
       </div>
 
       <label for="ldap_group_att_{{ $index }}" class="col-sm-4 col-md-2 control-label text-left">
@@ -34,17 +24,7 @@
         <portainer-tooltip position="bottom" message="LDAP attribute which denotes the group membership."></portainer-tooltip>
       </label>
       <div class="col-sm-8 col-md-4">
-        <input
-          type="text"
-          class="form-control"
-          id="ldap_group_att_{{ $index }}"
-          ng-model="config.GroupAttribute"
-          placeholder="member"
-          limited-feature-dir="{{ $ctrl.limitedFeatureId }}"
-          limited-feature-class="limited-be no-border"
-          limited-feature-disabled
-          limited-feature-tabindex="-1"
-        />
+        <input type="text" class="form-control" id="ldap_group_att_{{ $index }}" ng-model="config.GroupAttribute" placeholder="member" />
       </div>
     </div>
     <div class="form-group">
@@ -53,27 +33,10 @@
         <portainer-tooltip position="bottom" message="The LDAP search filter used to select group elements, optional."></portainer-tooltip>
       </label>
       <div ng-class="{ 'col-sm-7 col-md-9': $index, 'col-sm-8 col-md-10': !$index }">
-        <input
-          type="text"
-          class="form-control"
-          id="ldap_group_filter_{{ $index }}"
-          ng-model="config.GroupFilter"
-          placeholder="(objectClass=account)"
-          limited-feature-dir="{{ $ctrl.limitedFeatureId }}"
-          limited-feature-class="limited-be no-border"
-          limited-feature-disabled
-          limited-feature-tabindex="-1"
-        />
+        <input type="text" class="form-control" id="ldap_group_filter_{{ $index }}" ng-model="config.GroupFilter" placeholder="(objectClass=account)" />
       </div>
       <div class="col-sm-1" ng-if="$index > 0">
-        <button
-          class="btn btn-sm btn-danger"
-          type="button"
-          ng-click="$ctrl.onRemoveClick($index)"
-          limited-feature-dir="{{ $ctrl.limitedFeatureId }}"
-          limited-feature-disabled
-          limited-feature-tabindex="-1"
-        >
+        <button class="btn btn-sm btn-danger" type="button" ng-click="$ctrl.onRemoveClick($index)">
           <i class="fa fa-trash" aria-hidden="true"></i>
         </button>
       </div>
@@ -83,14 +46,7 @@
 
 <div class="form-group" style="margin-top: 10px;">
   <div class="col-sm-12">
-    <button
-      class="label label-default interactive"
-      style="border: 0;"
-      ng-click="$ctrl.onAddClick()"
-      limited-feature-dir="{{ $ctrl.limitedFeatureId }}"
-      limited-feature-tabindex="-1"
-      limited-feature-disabled
-    >
+    <button class="label label-default interactive" style="border: 0;" ng-click="$ctrl.onAddClick()">
       <i class="fa fa-plus-circle" aria-hidden="true"></i> add group search configuration
     </button>
   </div>
diff --git a/app/portainer/settings/authentication/ldap/ldap-custom-user-search/ldap-custom-user-search.html b/app/portainer/settings/authentication/ldap/ldap-custom-user-search/ldap-custom-user-search.html
index 331d8e8ab..fe41906ca 100644
--- a/app/portainer/settings/authentication/ldap/ldap-custom-user-search/ldap-custom-user-search.html
+++ b/app/portainer/settings/authentication/ldap/ldap-custom-user-search/ldap-custom-user-search.html
@@ -16,17 +16,7 @@
         <portainer-tooltip position="bottom" message="The distinguished name of the element from which the LDAP server will search for users."></portainer-tooltip>
       </label>
       <div class="col-sm-8 col-md-4">
-        <input
-          type="text"
-          class="form-control"
-          id="ldap_basedn_{{ $index }}"
-          ng-model="config.BaseDN"
-          placeholder="dc=ldap,dc=domain,dc=tld"
-          limited-feature-dir="{{ $ctrl.limitedFeatureId }}"
-          limited-feature-class="limited-be no-border"
-          limited-feature-tabindex="-1"
-          limited-feature-disabled
-        />
+        <input type="text" class="form-control" id="ldap_basedn_{{ $index }}" ng-model="config.BaseDN" placeholder="dc=ldap,dc=domain,dc=tld" />
       </div>
 
       <label for="ldap_username_att_{{ $index }}" class="col-sm-4 col-md-3 col-lg-2 control-label text-left">
@@ -34,17 +24,7 @@
         <portainer-tooltip position="bottom" message="LDAP attribute which denotes the username."></portainer-tooltip>
       </label>
       <div class="col-sm-8 col-md-3 col-lg-4">
-        <input
-          type="text"
-          class="form-control"
-          id="ldap_username_att_{{ $index }}"
-          ng-model="config.UserNameAttribute"
-          placeholder="uid"
-          limited-feature-dir="{{ $ctrl.limitedFeatureId }}"
-          limited-feature-class="limited-be no-border"
-          limited-feature-tabindex="-1"
-          limited-feature-disabled
-        />
+        <input type="text" class="form-control" id="ldap_username_att_{{ $index }}" ng-model="config.UserNameAttribute" placeholder="uid" />
       </div>
     </div>
     <div class="form-group">
@@ -53,27 +33,10 @@
         <portainer-tooltip position="bottom" message="The LDAP search filter used to select user elements, optional."></portainer-tooltip>
       </label>
       <div ng-class="{ 'col-sm-7 col-md-9': $index, 'col-sm-8 col-md-10': !$index }">
-        <input
-          type="text"
-          class="form-control"
-          id="ldap_filter_{{ $index }}"
-          ng-model="config.Filter"
-          placeholder="(objectClass=account)"
-          limited-feature-dir="{{ $ctrl.limitedFeatureId }}"
-          limited-feature-class="limited-be no-border"
-          limited-feature-tabindex="-1"
-          limited-feature-disabled
-        />
+        <input type="text" class="form-control" id="ldap_filter_{{ $index }}" ng-model="config.Filter" placeholder="(objectClass=account)" />
       </div>
       <div class="col-sm-1" ng-if="$index > 0">
-        <button
-          class="btn btn-sm btn-danger"
-          type="button"
-          ng-click="$ctrl.onRemoveClick($index)"
-          limited-feature-dir="{{ $ctrl.limitedFeatureId }}"
-          limited-feature-tabindex="-1"
-          limited-feature-disabled
-        >
+        <button class="btn btn-sm btn-danger" type="button" ng-click="$ctrl.onRemoveClick($index)">
           <i class="fa fa-trash" aria-hidden="true"></i>
         </button>
       </div>
@@ -83,14 +46,7 @@
 
 <div class="form-group" style="margin-top: 10px;">
   <div class="col-sm-12">
-    <button
-      class="label label-default interactive"
-      style="border: 0;"
-      ng-click="$ctrl.onAddClick()"
-      limited-feature-dir="{{ $ctrl.limitedFeatureId }}"
-      limited-feature-tabindex="-1"
-      limited-feature-disabled
-    >
+    <button class="label label-default interactive" style="border: 0;" ng-click="$ctrl.onAddClick()">
       <i class="fa fa-plus-circle" aria-hidden="true"></i> add user search configuration
     </button>
   </div>