Merge pull request #297 from glensc/token-status-code

Run/import: Add http status code on errors
perftools · Aug 21, 2020 · 98a7a21 · 98a7a21
2 parents 46e4e8d + 42449da
commit 98a7a21
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Xhgui/Controller/Import.php b/src/Xhgui/Controller/Import.php
@@ -28,8 +28,12 @@ public function import()
         try {
             $this->runImport($request);
             $result = ['ok' => true, 'size' => $request->getContentLength()];
+        } catch (InvalidArgumentException $e) {
+            $result = ['error' => true, 'message' => $e->getMessage()];
+            $response->setStatus(401);
         } catch (Exception $e) {
             $result = ['error' => true, 'message' => $e->getMessage()];
+            $response->setStatus(500);
         }
 
         $response['Content-Type'] = 'application/json';
@@ -40,7 +44,7 @@ private function runImport(Request $request)
     {
         if ($this->token) {
             if ($this->token !== $request->get('token')) {
-                throw new RuntimeException('Token validation failed');
+                throw new InvalidArgumentException('Token validation failed');
             }
         }