From 179687490c0e218aec70476fe14bea6613725f4a Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 1 May 2018 16:52:18 -0400
Subject: [PATCH] cleanup settings and set defautls for ldap ad

---
 src/app/tabs/settings.component.html | 18 +++++++++---------
 src/app/tabs/settings.component.ts   |  5 +++++
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/app/tabs/settings.component.html b/src/app/tabs/settings.component.html
index 2de04307..eed13971 100644
--- a/src/app/tabs/settings.component.html
+++ b/src/app/tabs/settings.component.html
@@ -34,7 +34,7 @@
                             <label class="form-check-label" for="ad">{{'ldapAd' | i18n}}</label>
                         </div>
                     </div>
-                    <div class="form-group">
+                    <div class="form-group" [hidden]="true">
                         <div class="form-check">
                             <input class="form-check-input" type="checkbox" id="currentUser" [(ngModel)]="ldap.currentUser" name="CurrentUser">
                             <label class="form-check-label" for="currentUser">{{'currentUser' | i18n}}</label>
@@ -106,11 +106,11 @@
                     </div>
                 </div>
                 <div [hidden]="directory != directoryType.Ldap">
-                    <div class="form-group">
-                        <label for="memberAttribute">{{'memberAttribute' | i18n}}</label>
-                        <input type="text" class="form-control" id="memberAttribute" name="MemberAttribute" [(ngModel)]="sync.memberAttribute" placeholder="{{'ex' | i18n}} member">
-                    </div>
                     <div [hidden]="ldap.ad">
+                        <div class="form-group">
+                            <label for="memberAttribute">{{'memberAttribute' | i18n}}</label>
+                            <input type="text" class="form-control" id="memberAttribute" name="MemberAttribute" [(ngModel)]="sync.memberAttribute" placeholder="{{'ex' | i18n}} member">
+                        </div>
                         <div class="form-group">
                             <label for="creationDateAttribute">{{'creationDateAttribute' | i18n}}</label>
                             <input type="text" class="form-control" id="creationDateAttribute" name="CreationDateAttribute" [(ngModel)]="sync.creationDateAttribute"
@@ -153,12 +153,12 @@
                         <label for="userFilter">{{'userFilter' | i18n}}</label>
                         <textarea class="form-control" id="userFilter" name="UserFilter" [(ngModel)]="sync.userFilter" placeholder="{{'ex' | i18n}} (&amp;(objectClass=user))"></textarea>
                     </div>
-                    <div [hidden]="directory != directoryType.Ldap">
+                    <div [hidden]="directory != directoryType.Ldap || ldap.ad">
                         <div class="form-group">
                             <label for="userObjectClass">{{'userObjectClass' | i18n}}</label>
                             <input type="text" class="form-control" id="userObjectClass" name="UserObjectClass" [(ngModel)]="sync.userObjectClass" placeholder="{{'ex' | i18n}} user">
                         </div>
-                        <div class="form-group" [hidden]="ldap.ad">
+                        <div class="form-group">
                             <label for="userPath">{{'userPath' | i18n}}</label>
                             <input type="text" class="form-control" id="userPath" name="UserPath" [(ngModel)]="sync.userPath" placeholder="{{'ex' | i18n}} CN=Users">
                         </div>
@@ -181,13 +181,13 @@
                         <label for="groupFilter">{{'groupFilter' | i18n}}</label>
                         <textarea class="form-control" id="groupFilter" name="GroupFilter" [(ngModel)]="sync.groupFilter" placeholder="{{'ex' | i18n}} (&amp;(objectClass=group))"></textarea>
                     </div>
-                    <div [hidden]="directory != directoryType.Ldap">
+                    <div [hidden]="directory != directoryType.Ldap || ldap.ad">
                         <div class="form-group">
                             <label for="groupObjectClass">{{'groupObjectClass' | i18n}}</label>
                             <input type="text" class="form-control" id="groupObjectClass" name="GroupObjectClass" [(ngModel)]="sync.groupObjectClass"
                                 placeholder="{{'ex' | i18n}} group">
                         </div>
-                        <div class="form-group" [hidden]="ldap.ad">
+                        <div class="form-group">
                             <label for="groupPath">{{'groupPath' | i18n}}</label>
                             <input type="text" class="form-control" id="groupPath" name="GroupPath" [(ngModel)]="sync.groupPath" placeholder="{{'ex' | i18n}} CN=Groups">
                         </div>
diff --git a/src/app/tabs/settings.component.ts b/src/app/tabs/settings.component.ts
index 8be06be2..90ce89c1 100644
--- a/src/app/tabs/settings.component.ts
+++ b/src/app/tabs/settings.component.ts
@@ -59,6 +59,11 @@ export class SettingsComponent implements OnInit, OnDestroy {
             this.sync.emailPrefixAttribute = 'sAMAccountName';
             this.sync.groupPath = 'CN=Users';
             this.sync.userPath = 'CN=Users';
+            this.sync.memberAttribute = 'member';
+            this.sync.userObjectClass = 'person';
+            this.sync.groupObjectClass = 'group';
+            this.sync.userEmailAttribute = 'mail';
+            this.sync.groupNameAttribute = 'name';
         }
 
         await this.configurationService.saveDirectoryType(this.directory);