Update Module.php

davidhirtz · Apr 5, 2024 · 5f2e3a5 · 5f2e3a5
1 parent 8d2f88c
commit 5f2e3a5
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/modules/admin/Module.php b/src/modules/admin/Module.php
@@ -60,17 +60,20 @@ public function beforeAction($action): bool
     {
         $request = Yii::$app->getRequest();
 
-        if (!$request->getIsConsoleRequest()) {
+        if (Yii::$app->has('user')) {
             Yii::$app->getUser()->loginUrl ??= ['/admin/account/login'];
 
             if (!YII_DEBUG) {
                 Yii::$app->getErrorHandler()->errorView = '@skeleton/modules/admin/views/dashboard/error.php';
             }
+        }
 
+        if (!$request->getIsConsoleRequest()) {
             //  Redirects draft URLs for the backend, but only if it's not an AJAX to prevent breaking frontend
             // implementations or REST APIs that use admin endpoints.
             if ($request->getIsDraft() && !$request->getIsAjax()) {
-                Yii::$app->getResponse()->redirect($request->getProductionHostInfo() . $request->getUrl())->send();
+                $url = $request->getProductionHostInfo() . $request->getUrl();
+                Yii::$app->getResponse()->redirect($url)->send();
             }
 
             if (count(Yii::$app->getI18n()->getLanguages()) > 1) {