Fix for other code that was broken under setTerminal

LitusProject · Oct 30, 2024 · bae4ece · bae4ece
1 parent c17523d
commit bae4ece
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/module/ApiBundle/Component/Controller/ActionController/ApiController.php b/module/ApiBundle/Component/Controller/ActionController/ApiController.php
@@ -85,7 +85,7 @@ public function onDispatch(MvcEvent $e)
                 ->addHeaderLine('X-Served-By', getenv('SERVED_BY'));
         }
 
-        $result = parent::onDispatch($e);
+        $$result = parent::onDispatch($e);
         if ($result instanceof \Laminas\View\Model\ViewModel) {
             $result->setTerminal(true);
         }
@@ -98,17 +98,20 @@ public function onDispatch(MvcEvent $e)
             if (!$this->hasAccess()->toResourceAction(
                 $this->getParam('controller'),
                 $this->getParam('action')
-            )
-            ) {
+            )) {
                 $error = $this->error(401, 'You do not have sufficient permissions to access this resource');
-                $error->setOptions($result->getOptions());
+                if ($result instanceof \Laminas\View\Model\ViewModel) {
+                    $error->setOptions($result->getOptions());
+                }
                 $e->setResult($error);
 
                 return $error;
             }
         } else {
             $error = $this->error(401, 'No key or OAuth token was provided or the token was invalid');
-            $error->setOptions($result->getOptions());
+            if ($result instanceof \Laminas\View\Model\ViewModel) {
+                $error->setOptions($result->getOptions());
+            }
             $e->setResult($error);
 
             return $error;