Fix mis-merges from rebasing this up from develop

Author: uberbrady

app/Http/Controllers/Api/UsersController.php

@@ -475,11 +475,7 @@ public function update(SaveUserRequest $request, User $user): JsonResponse
                 $user->password = bcrypt($request->input('password'));
             }
 
-        app('App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'image', 'avatars', 'avatar');
-
-        $user->customFill($request,Auth::user());
-
-        if ($user->save()) {
+            $user->customFill($request, Auth::user());
 
             // We need to use has()  instead of filled()
             // here because we need to overwrite permissions

app/Providers/AuthServiceProvider.php

@@ -87,6 +87,7 @@ public function boot()
         ]);
 
         $this->registerPolicies();
+        //Passport::routes(); //this is no longer required in newer passport versions
         Passport::tokensExpireIn(Carbon::now()->addYears(config('passport.expiration_years')));
         Passport::refreshTokensExpireIn(Carbon::now()->addYears(config('passport.expiration_years')));
         Passport::personalAccessTokensExpireIn(Carbon::now()->addYears(config('passport.expiration_years')));

config/trustedproxy.php

@@ -1,7 +1,5 @@
 <?php
 
-use Illuminate\Http\Request;
-
 /*
  |--------------------------------------------------------------------------
  | DO NOT EDIT THIS FILE DIRECTLY.
@@ -59,9 +57,6 @@
      *
      * @link https://symfony.com/doc/current/deployment/proxies.html
      */
-    'headers' => Request::HEADER_X_FORWARDED_FOR |
-                 Request::HEADER_X_FORWARDED_HOST |
-                 Request::HEADER_X_FORWARDED_PORT |
-                 Request::HEADER_X_FORWARDED_PROTO |
-                 Request::HEADER_X_FORWARDED_AWS_ELB,
+//    'headers' => Illuminate\Http\Request::HEADER_X_FORWARDED_ALL, //this is mostly handled already
+
 ];