Moving strip domains loop to run before the connections loop.

orware · Mar 14, 2021 · 6bf7e8b · 6bf7e8b
1 parent 9009b31
commit 6bf7e8b
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/functions.php b/functions.php
@@ -32,6 +32,15 @@ function authenticateUser() {
         try {
             global $connections, $domains_to_strip_automatically;
 
+            // Strip specific organization email domains if provided:
+            if (isset($domains_to_strip_automatically)) {
+                foreach($domains_to_strip_automatically as $domain) {
+                    $domain = '@'.str_replace('@', '', $domain);
+                    logMessage('Attempting to strip ' . $domain . ' from provided username.');
+                    $data['username'] = str_replace($domain, '', $data['username']);
+                }
+            }
+
             foreach($connections as $connectionName => $connection) {
 
                 logMessage('Before connection attempt to ' . $connectionName);
@@ -43,15 +52,6 @@ function authenticateUser() {
 
                 $organizationalUnit = $baseDn;
 
-                // Strip specific organization email domains if provided:
-                if (isset($domains_to_strip_automatically)) {
-                    foreach($domains_to_strip_automatically as $domain) {
-                        $domain = '@'.str_replace('@', '', $domain);
-                        logMessage('Attempting to strip ' . $domain . ' from provided username.');
-                        $data['username'] = str_replace($domain, '', $data['username']);
-                    }
-                }
-
                 $user = $connection->query()
                     ->in($organizationalUnit)
                     ->where('samaccountname', '=', $data['username'])