III-3528 Pass closure to error method to avoid early initialisation a…

…nd empty jwt
cultuurnet · Oct 9, 2020 · 7783096 · 7783096
1 parent e44c5a1
commit 7783096
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/app/ApiErrorHandler.php b/app/ApiErrorHandler.php
@@ -18,7 +18,7 @@ public function __construct(SentryErrorHandler $uncaughtErrorHandler)
         $this->uncaughtErrorHandler = $uncaughtErrorHandler;
     }
 
-    public function __invoke(Exception $exception): ApiProblemJsonResponse
+    public function handle(Exception $exception): ApiProblemJsonResponse
     {
         $this->uncaughtErrorHandler->handle($exception);
 

diff --git a/app/ErrorHandlerProvider.php b/app/ErrorHandlerProvider.php
@@ -2,6 +2,7 @@
 
 namespace CultuurNet\UDB3\UiTPASService;
 
+use Exception;
 use Sentry\State\HubInterface;
 use Silex\Application;
 use Silex\ServiceProviderInterface;
@@ -12,16 +13,16 @@ public function register(Application $app): void
     {
         $app[SentryErrorHandler::class] = $app->share(
             function ($app) {
-                return new SentryErrorHandler($app[HubInterface::class]);
+                return new SentryErrorHandler(
+                    $app[HubInterface::class],
+                    $app['jwt'] ?? null
+                );
             }
         );
 
-        $app[ApiErrorHandler::class] = $app->share(
-            function () use ($app) {
-                return new ApiErrorHandler($app[SentryErrorHandler::class]);
-            }
-        );
-        $app->error($app[ApiErrorHandler::class]);
+        $app->error(function (Exception $e) use ($app) {
+            return (new ApiErrorHandler($app[SentryErrorHandler::class]))->handle($e);
+        });
     }
 
     public function boot(Application $app): void