From 87039fa784b2382a8710a167854cdee2f5bbf389 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Fri, 27 Apr 2018 22:35:32 -0400
Subject: [PATCH] conditional settings for ldap ad

---
 src/app/tabs/settings.component.html  | 112 ++++++++++++++------------
 src/app/tabs/settings.component.ts    |   8 ++
 src/locales/en/messages.json          |  13 ++-
 src/services/configuration.service.ts |   2 +-
 4 files changed, 74 insertions(+), 61 deletions(-)

diff --git a/src/app/tabs/settings.component.html b/src/app/tabs/settings.component.html
index c1262681..f925b6d6 100644
--- a/src/app/tabs/settings.component.html
+++ b/src/app/tabs/settings.component.html
@@ -100,42 +100,46 @@
                         <label for="interval">{{'interval' | i18n}}</label>
                         <input type="number" min="5" class="form-control" id="interval" name="Interval" [(ngModel)]="sync.interval" placeholder="{{'ex' | i18n}} 5">
                     </div>
-                    <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"
-                            placeholder="{{'ex' | i18n}} whenCreated">
-                    </div>
-                    <div class="form-group">
-                        <label for="revisionDateAttribute">{{'revisionDateAttribute' | i18n}}</label>
-                        <input type="text" class="form-control" id="revisionDateAttribute" name="RevisionDateAttribute" [(ngModel)]="sync.revisionDateAttribute"
-                            placeholder="{{'ex' | i18n}} whenChanged">
-                    </div>
                     <div class="form-group">
                         <div class="form-check">
                             <input class="form-check-input" type="checkbox" id="removeDisabled" [(ngModel)]="sync.removeDisabled" name="RemoveDisabled">
                             <label class="form-check-label" for="removeDisabled">{{'removeDisabled' | i18n}}</label>
                         </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="creationDateAttribute">{{'creationDateAttribute' | i18n}}</label>
+                                <input type="text" class="form-control" id="creationDateAttribute" name="CreationDateAttribute" [(ngModel)]="sync.creationDateAttribute"
+                                    placeholder="{{'ex' | i18n}} whenCreated">
+                            </div>
+                            <div class="form-group">
+                                <label for="revisionDateAttribute">{{'revisionDateAttribute' | i18n}}</label>
+                                <input type="text" class="form-control" id="revisionDateAttribute" name="RevisionDateAttribute" [(ngModel)]="sync.revisionDateAttribute"
+                                    placeholder="{{'ex' | i18n}} whenChanged">
+                            </div>
+                        </div>
 
-                    <div class="form-group">
-                        <div class="form-check">
-                            <input class="form-check-input" type="checkbox" id="useEmailPrefixSuffix" [(ngModel)]="sync.useEmailPrefixSuffix" name="UseEmailPrefixSuffix">
-                            <label class="form-check-label" for="useEmailPrefixSuffix">{{'useEmailPrefixSuffix' | i18n}}</label>
-                        </div>
-                    </div>
-                    <div [hidden]="!sync.useEmailPrefixSuffix">
                         <div class="form-group">
-                            <label for="emailPrefixAttribute">{{'emailPrefixAttribute' | i18n}}</label>
-                            <input type="text" class="form-control" id="emailPrefixAttribute" name="EmailPrefixAttribute" [(ngModel)]="sync.emailPrefixAttribute"
-                                placeholder="{{'ex' | i18n}} sAMAccountName">
+                            <div class="form-check">
+                                <input class="form-check-input" type="checkbox" id="useEmailPrefixSuffix" [(ngModel)]="sync.useEmailPrefixSuffix" name="UseEmailPrefixSuffix">
+                                <label class="form-check-label" for="useEmailPrefixSuffix">{{'useEmailPrefixSuffix' | i18n}}</label>
+                            </div>
                         </div>
-                        <div class="form-group">
-                            <label for="emailSuffix">{{'emailSuffix' | i18n}}</label>
-                            <input type="text" class="form-control" id="emailSuffix" name="EmailSuffix" [(ngModel)]="sync.emailSuffix" placeholder="{{'ex' | i18n}} @company.com">
+                        <div [hidden]="!sync.useEmailPrefixSuffix">
+                            <div class="form-group" [hidden]="ldap.ad">
+                                <label for="emailPrefixAttribute">{{'emailPrefixAttribute' | i18n}}</label>
+                                <input type="text" class="form-control" id="emailPrefixAttribute" name="EmailPrefixAttribute" [(ngModel)]="sync.emailPrefixAttribute"
+                                    placeholder="{{'ex' | i18n}} sAMAccountName">
+                            </div>
+                            <div class="form-group">
+                                <label for="emailSuffix">{{'emailSuffix' | i18n}}</label>
+                                <input type="text" class="form-control" id="emailSuffix" name="EmailSuffix" [(ngModel)]="sync.emailSuffix" placeholder="{{'ex' | i18n}} @company.com">
+                            </div>
                         </div>
                     </div>
 
@@ -150,18 +154,20 @@
                             <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 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">
-                            <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>
-                        <div class="form-group">
-                            <label for="userEmailAttribute">{{'userEmailAttribute' | i18n}}</label>
-                            <input type="text" class="form-control" id="userEmailAttribute" name="UserEmailAttribute" [(ngModel)]="sync.userEmailAttribute"
-                                placeholder="{{'ex' | i18n}} mail">
+                        <div [hidden]="directory != directoryType.Ldap">
+                            <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">
+                                <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>
+                            <div class="form-group">
+                                <label for="userEmailAttribute">{{'userEmailAttribute' | i18n}}</label>
+                                <input type="text" class="form-control" id="userEmailAttribute" name="UserEmailAttribute" [(ngModel)]="sync.userEmailAttribute"
+                                    placeholder="{{'ex' | i18n}} mail">
+                            </div>
                         </div>
                     </div>
 
@@ -176,19 +182,21 @@
                             <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 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">
-                            <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>
-                        <div class="form-group">
-                            <label for="groupNameAttribute">{{'groupNameAttribute' | i18n}}</label>
-                            <input type="text" class="form-control" id="groupNameAttribute" name="GroupNameAttribute" [(ngModel)]="sync.groupNameAttribute"
-                                placeholder="{{'ex' | i18n}} name">
+                        <div [hidden]="directory != directoryType.Ldap">
+                            <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">
+                                <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>
+                            <div class="form-group">
+                                <label for="groupNameAttribute">{{'groupNameAttribute' | i18n}}</label>
+                                <input type="text" class="form-control" id="groupNameAttribute" name="GroupNameAttribute" [(ngModel)]="sync.groupNameAttribute"
+                                    placeholder="{{'ex' | i18n}} name">
+                            </div>
                         </div>
                     </div>
                 </div>
diff --git a/src/app/tabs/settings.component.ts b/src/app/tabs/settings.component.ts
index d158f97e..9364dd7c 100644
--- a/src/app/tabs/settings.component.ts
+++ b/src/app/tabs/settings.component.ts
@@ -56,6 +56,14 @@ export class SettingsComponent implements OnInit {
     }
 
     async submit() {
+        if (this.ldap.ad) {
+            this.sync.creationDateAttribute = 'whenCreated';
+            this.sync.revisionDateAttribute = 'whenChanged';
+            this.sync.emailPrefixAttribute = 'sAMAccountName';
+            this.sync.groupPath = 'CN=Users';
+            this.sync.userPath = 'CN=Users';
+        }
+
         await this.configurationService.saveDirectoryType(this.directory);
         await this.configurationService.saveDirectory(DirectoryType.Ldap, this.ldap);
         await this.configurationService.saveDirectory(DirectoryType.GSuite, this.gsuite);
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 761af30f..980c76c6 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -321,9 +321,6 @@
     "password": {
         "message": "Password"
     },
-    "thisIsActiveDirectory": {
-        "message": "This is an Active Directory LDAP server."
-    },
     "type": {
         "message": "Type"
     },
@@ -331,7 +328,7 @@
         "message": "Directory"
     },
     "currentUser": {
-        "message": "Authenticate as current user"
+        "message": "Authenticate as current system user"
     },
     "rootPath": {
         "message": "Root Path"
@@ -364,7 +361,7 @@
         "message": "Interval (in minutes)"
     },
     "removeDisabled": {
-        "message": "Remove disabled users"
+        "message": "Remove disabled users during sync"
     },
     "memberAttribute": {
         "message": "Member Attribute"
@@ -376,7 +373,7 @@
         "message": "Revision Date Attribute"
     },
     "useEmailPrefixSuffix": {
-        "message": "Use email prefix/suffix"
+        "message": "If a user has no email address, combine a username prefix with a suffix value to form an email"
     },
     "emailPrefixAttribute": {
         "message": "Email Prefix Attribute"
@@ -418,10 +415,10 @@
         "message": "Sync"
     },
     "ldapSsl": {
-        "message": "This connection uses SSL (LDAPS)"
+        "message": "This server uses SSL (LDAPS)"
     },
     "ldapAd": {
-        "message": "This LDAP server is Active Directory"
+        "message": "This server uses Active Directory"
     },
     "select": {
         "message": "Select"
diff --git a/src/services/configuration.service.ts b/src/services/configuration.service.ts
index 80e93db4..b100d0c7 100644
--- a/src/services/configuration.service.ts
+++ b/src/services/configuration.service.ts
@@ -63,7 +63,7 @@ export class ConfigurationService {
                 if (savedConfig.privateKey == null) {
                     await this.secureStorageService.remove(Keys.gsuite);
                 } else {
-                    (config as any).privateKey = savedConfig.privateKey =
+                    (config as GSuiteConfiguration).privateKey = savedConfig.privateKey =
                         savedConfig.privateKey.replace(/\\n/g, '\n');
                     await this.secureStorageService.save(Keys.gsuite, savedConfig.privateKey);
                     savedConfig.privateKey = StoredSecurely;