Merge pull request #13831 from Godmartinz/multi-sync-ldap-locations

Added multi location sync for ldap
snipe · Nov 13, 2023 · 4ecce51 · 4ecce51
2 parents 000a28d + 3b6a0d6
commit 4ecce51
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 20 deletions.
diff --git a/app/Console/Commands/LdapSync.php b/app/Console/Commands/LdapSync.php
@@ -18,7 +18,7 @@ class LdapSync extends Command
      *
      * @var string
      */
-    protected $signature = 'snipeit:ldap-sync {--location=} {--location_id=} {--base_dn=} {--filter=} {--summary} {--json_summary}';
+    protected $signature = 'snipeit:ldap-sync {--location=} {--location_id=*} {--base_dn=} {--filter=} {--summary} {--json_summary}';
 
     /**
      * The console command description.
@@ -84,10 +84,13 @@ public function handle()
 
         try {
             if ( $this->option('location_id') != '') {
-                $location_ou= Location::where('id', '=', $this->option('location_id'))->value('ldap_ou');
-                $search_base = $location_ou;
-                Log::debug('Importing users from specified location OU: \"'.$search_base.'\".');
-             }
+
+                foreach($this->option('location_id') as $location_id){
+                    $location_ou= Location::where('id', '=', $location_id)->value('ldap_ou');
+                    $search_base = $location_ou;
+                    Log::debug('Importing users from specified location OU: \"'.$search_base.'\".');
+                 }
+            }
             else if ($this->option('base_dn') != '') {
                 $search_base = $this->option('base_dn');
                 Log::debug('Importing users from specified base DN: \"'.$search_base.'\".');
@@ -111,21 +114,21 @@ public function handle()
 
         /* Determine which location to assign users to by default. */
         $location = null; // TODO - this would be better called "$default_location", which is more explicit about its purpose
+            if ($this->option('location') != '') {
+                if ($location = Location::where('name', '=', $this->option('location'))->first()) {
+                    Log::debug('Location name ' . $this->option('location') . ' passed');
+                    Log::debug('Importing to ' . $location->name . ' (' . $location->id . ')');
+                }
 
-        if ($this->option('location') != '') {
-            if ($location = Location::where('name', '=', $this->option('location'))->first()) {
-                Log::debug('Location name '.$this->option('location').' passed');
-                Log::debug('Importing to '.$location->name.' ('.$location->id.')');
-            }
+            } elseif ($this->option('location_id') != '') {
+                foreach($this->option('location_id') as $location_id) {
+                if ($location = Location::where('id', '=', $location_id)->first()) {
+                    Log::debug('Location ID ' . $location_id . ' passed');
+                    Log::debug('Importing to ' . $location->name . ' (' . $location->id . ')');
+                }
 
-        } elseif ($this->option('location_id') != '') {
-            if ($location = Location::where('id', '=', $this->option('location_id'))->first()) {
-                Log::debug('Location ID '.$this->option('location_id').' passed');
-                Log::debug('Importing to '.$location->name.' ('.$location->id.')');
             }
-
         }
-
         if (! isset($location)) {
             Log::debug('That location is invalid or a location was not provided, so no location will be assigned by default.');
         }

diff --git a/app/Http/Controllers/Users/LDAPImportController.php b/app/Http/Controllers/Users/LDAPImportController.php
@@ -49,19 +49,19 @@ public function store(Request $request)
     {
         $this->authorize('update', User::class);
         // Call Artisan LDAP import command.
-        $location_id = $request->input('location_id');
-        Artisan::call('snipeit:ldap-sync', ['--location_id' => $location_id, '--json_summary' => true]);
+
+        Artisan::call('snipeit:ldap-sync', ['--location_id' => $request->input('location_id'), '--json_summary' => true]);
 
         // Collect and parse JSON summary.
         $ldap_results_json = Artisan::output();
         $ldap_results = json_decode($ldap_results_json, true);
-
         if (!$ldap_results) {
             return redirect()->back()->withInput()->with('error', trans('general.no_results'));
         }
 
         // Direct user to appropriate status page.
         if ($ldap_results['error']) {
+
             return redirect()->back()->withInput()->with('error', $ldap_results['error_message']);
         }
 

diff --git a/resources/views/users/ldap.blade.php b/resources/views/users/ldap.blade.php
@@ -29,7 +29,7 @@
 
             <div class="col-md-12">
                <!-- Location -->
-              @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
+              @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id[]', 'multiple' => true])
             </div>
           </div>