Merge remote-tracking branch 'origin/develop'

app/Exceptions/Handler.php

@@ -6,6 +6,7 @@ use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use App\Helpers\Helper;
 use Illuminate\Validation\ValidationException;
 use Illuminate\Auth\AuthenticationException;
+use ArieTimmerman\Laravel\SCIMServer\Exceptions\SCIMException;
 use Log;
 use Throwable;
 use JsonException;
@@ -28,6 +29,7 @@ class Handler extends ExceptionHandler
         \Intervention\Image\Exception\NotSupportedException::class,
         \League\OAuth2\Server\Exception\OAuthServerException::class,
         JsonException::class,
+        SCIMException::class, //these generally don't need to be reported
     ];
 
     /**
@@ -53,7 +55,7 @@ class Handler extends ExceptionHandler
      * 
      * @param  \Illuminate\Http\Request  $request
      * @param  \Exception  $e
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse|\Illuminate\Http\Response
      */
     public function render($request, Throwable $e)
     {
@@ -70,6 +72,9 @@ class Handler extends ExceptionHandler
             return response()->json(Helper::formatStandardApiResponse('error', null, 'invalid JSON'), 422);
         }
 
+        if ($e instanceof SCIMException) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, 'invalid SCIM Request'), 400);
+        }
 
         // Handle Ajax requests that fail because the model doesn't exist
         if ($request->ajax() || $request->wantsJson()) {
@@ -113,8 +118,8 @@ class Handler extends ExceptionHandler
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Illuminate\Auth\AuthenticationException  $exception
-     * @return \Illuminate\Http\Response
-     */
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
+  */
     protected function unauthenticated($request, AuthenticationException $exception)
     {
         if ($request->expectsJson()) {

app/Http/Controllers/Api/ImportController.php

@@ -126,7 +126,14 @@ class ImportController extends Controller
                 }
                 $file_name = date('Y-m-d-his').'-'.$fixed_filename;
                 $import->file_path = $file_name;
+                $import->filesize = null;
+
+                if (!file_exists($path.'/'.$file_name)) {
+                    return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_not_found')), 500);
+                }
+
                 $import->filesize = filesize($path.'/'.$file_name);
+                
                 $import->save();
                 $results[] = $import;
             }

app/Http/Controllers/Api/SettingsController.php

@@ -271,7 +271,7 @@ class SettingsController extends Controller
             $headers = ['ContentType' => 'application/zip'];
             return Storage::download($path.'/'.$file, $file, $headers);
         } else {
-            return response()->json(Helper::formatStandardApiResponse('error', null, 'File not found'));
+            return response()->json(Helper::formatStandardApiResponse('error', null,  trans('general.file_not_found')));
         }
 
     }

config/logging.php

@@ -117,6 +117,11 @@ $config = [
                     \Log::info("IGNORING E_WARNING in production mode: ".$args->getMessage());
                     return true; // "TRUE - you should ignore it!"
                 }
+                $needle = "ArieTimmerman\\Laravel\\SCIMServer\\Exceptions\\SCIMException";
+                if (App::environment('production') && is_string($args) && strncmp($args, $needle, strlen($needle) ) === 0 ) {
+                    \Log::info("String: '$args' looks like a SCIM Exception; ignoring error");
+                    return true; //yes, *do* ignore it
+                }
                 return false;
             },
         ],

database/factories/ActionlogFactory.php

@@ -55,7 +55,7 @@ class ActionlogFactory extends Factory
                     [
                         'assigned_to' => $target->id,
                         'assigned_type' => \App\Models\User::class,
-                        'assigned_to' => $target->location_id,
+                        'location_id' => $target->location_id,
                     ]
                 );
     
@@ -84,7 +84,7 @@ class ActionlogFactory extends Factory
                     [
                         'assigned_to' => $target->id,
                         'assigned_type' => \App\Models\Location::class,
-                        'assigned_to' => $target->id,
+                        'location_id' => $target->id,
                     ]
                 );
 

resources/lang/de/general.php

@@ -395,7 +395,7 @@ return [
     'end_date'            => 'Enddatum',
     'alt_uploaded_image_thumbnail' => 'Hochgeladene Miniaturansicht',
     'placeholder_kit'       => 'Kit auswählen',
-    'file_not_found'        => 'File not found',
+    'file_not_found'        => 'File not found on server',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',