Carry headers when rethrowing errors to REST

app/Exceptions/Converters/GenericException.php

@@ -39,13 +39,16 @@ class GenericException extends HttpException
      */
     public function getErrorMetadata(): array
     {
+        $metadata = [];
+        $metadata['error'] = [
+            'original_exception' => get_class($this->exception),
+        ];
+
         // Only add trace if in dev
         if (config('app.env') === 'dev') {
-            return [
-                'trace' => $this->exception->getTrace()[0],
-            ];
+            $metadata['trace'] = $this->exception->getTrace()[0];
         }
 
-        return [];
+        return $metadata;
     }
 }

app/Exceptions/Converters/SymfonyException.php

@@ -14,7 +14,9 @@ class SymfonyException extends HttpException
         $this->exception = $exception;
         parent::__construct(
             $exception->getStatusCode(),
-            $exception->getMessage()
+            $exception->getMessage(),
+            null,
+            $exception->getHeaders()
         );
     }
 
@@ -23,7 +25,7 @@ class SymfonyException extends HttpException
      */
     public function getErrorType(): string
     {
-        return 'internal-error';
+        return 'http-exception';
     }
 
     /**