Added usage of getModuleName() and getHandlersNamespace() in Dispatch…

…erListener Event
phlexus · Aug 18, 2019 · 9befeb9 · 9befeb9
1 parent d5b5813
commit 9befeb9
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/Events/Listeners/DispatcherListener.php b/src/Events/Listeners/DispatcherListener.php
@@ -4,13 +4,14 @@
 
 use Exception;
 use Phalcon\Di\Exception as DiException;
-use Phalcon\Plugin;
 use Phalcon\Events\Event;
 use Phalcon\Mvc\Dispatcher;
+use Phalcon\Mvc\Dispatcher\Exception as MvcDispatcherException;
+use Phalcon\Plugin;
 use Phlexus\Libraries\Auth\AuthException;
 use Phlexus\Module\ModuleException;
 use Phlexus\Module\ModuleInterface;
-use Phalcon\Mvc\Dispatcher\Exception as MvcDispatcherException;
+use Phlexus\Modules\BaseAdmin\Module as AdminModule;
 
 final class DispatcherListener extends Plugin
 {
@@ -62,11 +63,14 @@ public function beforeForward(Event $event, Dispatcher $dispatcher, array $forwa
      */
     public function beforeException(Event $event, Dispatcher $dispatcher, Exception $exception): bool
     {
+        $moduleName = AdminModule::getModuleName();
+        $namespace = AdminModule::getHandlersNamespace() . '\\Controllers';
+
         if ($exception instanceof MvcDispatcherException) {
             $this->response->setStatusCode(404);
             $dispatcher->forward([
-                'module' => 'Admin',
-                'namespace' => 'Phlexus\Modules\Admin\Controllers',
+                'module' => $moduleName,
+                'namespace' => $namespace,
                 'controller' => 'errors',
                 'action' => 'show404',
             ]);
@@ -77,8 +81,8 @@ public function beforeException(Event $event, Dispatcher $dispatcher, Exception
         if ($exception instanceof AuthException) {
             $this->response->setStatusCode(402);
             $dispatcher->forward([
-                'module' => 'Admin',
-                'namespace' => 'Phlexus\Modules\Admin\Controllers',
+                'module' => $moduleName,
+                'namespace' => $namespace,
                 'controller' => 'auth',
                 'action' => 'login',
             ]);