From bb6cd5b17a570821ed3c1c8726206a69219d2460 Mon Sep 17 00:00:00 2001
From: Steven Zou <szou@vmware.com>
Date: Tue, 25 Apr 2017 14:09:43 +0800
Subject: [PATCH] =?UTF-8?q?remove=20=E2=80=98required=E2=80=99=20flag=20fr?=
 =?UTF-8?q?om=20'searchDN=20and=20search=20password'=20of=20ldap?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                           | 12 ++++++++++++
 .../src/app/config/auth/config-auth.component.html   | 10 ++++------
 src/ui_ng/src/app/config/config.component.ts         |  8 ++++++++
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0b5c3fc19..fa0ac55ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,5 +27,17 @@ src/ui_ng/typings/
 **/node_modules
 **/ssl/
 **/proxy.config.json
+
+src/ui_ng/src/**/*.js
+src/ui_ng/src/**/*.js.map
+src/ui_ng/src/**/*.json
+
 **/npm*.log
 
+src/ui_ng/aot/**/*.js
+src/ui_ng/aot/**/*.js.map
+src/ui_ng/aot/**/*.json
+
+**/*ngsummary.json
+**/*ngfactory.ts
+**/aot
diff --git a/src/ui_ng/src/app/config/auth/config-auth.component.html b/src/ui_ng/src/app/config/auth/config-auth.component.html
index 8a9d81a36..1a7b135a3 100644
--- a/src/ui_ng/src/app/config/auth/config-auth.component.html
+++ b/src/ui_ng/src/app/config/auth/config-auth.component.html
@@ -29,10 +29,9 @@
                     </label>
         </div>
         <div class="form-group">
-            <label for="ldapSearchDN" class="required">{{'CONFIG.LDAP.SEARCH_DN' | translate}}</label>
-            <label for="ldapSearchDN" aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-top-right" [class.invalid]="ldapSearchDNInput.invalid && (ldapSearchDNInput.dirty || ldapSearchDNInput.touched)">
+            <label for="ldapSearchDN">{{'CONFIG.LDAP.SEARCH_DN' | translate}}</label>
+            <label for="ldapSearchDN" aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-top-right">
                       <input name="ldapSearchDN" type="text" #ldapSearchDNInput="ngModel" [(ngModel)]="currentConfig.ldap_search_dn.value" 
-                      required 
                       id="ldapSearchDN" 
                       size="40" [disabled]="disabled(currentConfig.ldap_search_dn)">
                       <span class="tooltip-content">
@@ -45,10 +44,9 @@
             </a>
         </div>
         <div class="form-group">
-            <label for="ldapSearchPwd" class="required">{{'CONFIG.LDAP.SEARCH_PWD' | translate}}</label>
-            <label for="ldapSearchPwd" aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-top-right" [class.invalid]="ldapSearchPwdInput.invalid && (ldapSearchPwdInput.dirty || ldapSearchPwdInput.touched)">
+            <label for="ldapSearchPwd">{{'CONFIG.LDAP.SEARCH_PWD' | translate}}</label>
+            <label for="ldapSearchPwd" aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-top-right">
                       <input name="ldapSearchPwd" type="password" #ldapSearchPwdInput="ngModel" [(ngModel)]="currentConfig.ldap_search_password.value" 
-                      required 
                       id="ldapSearchPwd" 
                       size="40" [disabled]="disabled(currentConfig.ldap_search_password)">
                       <span class="tooltip-content">
diff --git a/src/ui_ng/src/app/config/config.component.ts b/src/ui_ng/src/app/config/config.component.ts
index 091adfa30..c9e77853e 100644
--- a/src/ui_ng/src/app/config/config.component.ts
+++ b/src/ui_ng/src/app/config/config.component.ts
@@ -315,6 +315,9 @@ export class ConfigurationComponent implements OnInit, OnDestroy {
             delete ldapSettings['ldap_search_password'];
         }
 
+        //Fix: Confirm ldap scope is number
+        ldapSettings['ldap_scope'] = +ldapSettings['ldap_scope'];
+
         this.testingLDAPOnGoing = true;
         this.configService.testLDAPServer(ldapSettings)
             .then(respone => {
@@ -402,6 +405,11 @@ export class ConfigurationComponent implements OnInit, OnDestroy {
                     if (typeof field.value === "boolean") {
                         changes[prop] = changes[prop] ? "1" : "0";
                     }
+
+                    //Trim string value
+                    if(typeof field.value === "string") {
+                        changes[prop] = (''+changes[prop]).trim();
+                    }
                 }
             }
         }