Updated BaseController->actionLogout(...) to always redirect to login…

…-status when $show_status_on_completion is truthy
rotexsoft · Mar 14, 2024 · 06588b6 · 06588b6
1 parent 880e936
commit 06588b6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/controllers/BaseController.php b/src/controllers/BaseController.php
@@ -875,7 +875,7 @@ public function actionLogout($show_status_on_completion = false): ResponseInterf
                  );
         }
 
-        if($redirect_path === '') {
+        if($redirect_path === '' || ((bool)$show_status_on_completion)) {
 
             // SMVC_APP_AUTO_PREPEND_ACTION_TO_ACTION_METHOD_NAMES === true
             // means that links generated in this action do not need to be prefixed

diff --git a/tests/BaseControllerTest.php b/tests/BaseControllerTest.php
@@ -1507,10 +1507,15 @@ public function testThat_actionLogout_WorksAsExpected() {
         self::assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $actionResult4);
         self::assertEquals(302, $actionResult4->getStatusCode());
         self::assertTrue($actionResult4->hasHeader('Location'));
-        self::assertEquals(
-            $_SESSION[BaseController::SESSN_PARAM_LOGIN_REDIRECT], 
-            $actionResult4->getHeaderLine('Location')
-        ); // the uri that the returned response object contains has the redirect url stored in session
+
+        if(SMVC_APP_AUTO_PREPEND_ACTION_TO_ACTION_METHOD_NAMES) {
+
+            self::assertEquals("{$controller4->getAppBasePath()}/da-shizzle-for-rizzle-controller/login-status", $actionResult4->getHeaderLine('Location'));
+
+        } else {
+
+            self::assertEquals("{$controller4->getAppBasePath()}/da-shizzle-for-rizzle-controller/action-login-status", $actionResult4->getHeaderLine('Location'));
+        }
 
         ////////////////////////////////////////////////////////////////////////