Merge branch 'snipeit_v7_laravel10' into develop

app/Http/Controllers/Api/UsersController.php

@@ -22,6 +22,7 @@ use Illuminate\Http\Request;
 use App\Http\Requests\ImageUploadRequest;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Facades\Log;
 
 class UsersController extends Controller
 {
@@ -199,7 +200,9 @@ class UsersController extends Controller
             $users->where('autoassign_licenses', '=', $request->input('autoassign_licenses'));
         }
 
-        if ($request->filled('search')) {
+        if ($request->filled('location_id') != '') {
+            $users = $users->UserLocation($request->input('location_id'), $request->input('search'));
+         } else {
             $users = $users->TextSearch($request->input('search'));
         }
 
@@ -533,8 +536,6 @@ class UsersController extends Controller
 
         if ($user) {
 
-            $this->authorize('delete', $user);
-            
             if (($user->assets) && ($user->assets->count() > 0)) {
                 return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.error.delete_has_assets')));
             }

app/Http/Controllers/ProfileController.php

@@ -87,11 +87,9 @@ class ProfileController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
-     * @return View
      */
-    public function api()
+    public function api(): \Illuminate\Contracts\View\View
     {
-
         // Make sure the self.api permission has been granted
         if (!Gate::allows('self.api')) {
             abort(403);

app/Http/Controllers/SettingsController.php

@@ -425,6 +425,7 @@ class SettingsController extends Controller
         // Because public demos make people act like dicks
 
         if (! config('app.lock_passwords')) {
+            $request->validate(['site_name' => 'required']);
             $setting->site_name = $request->input('site_name');
             $setting->custom_css = $request->input('custom_css');
             $setting = $request->handleImages($setting, 600, 'logo', '', 'logo');