Test that current path is used for logout redirection

Author: Greg Bowler

src/Authenticator.php

@@ -111,8 +111,12 @@ public function getAdminUri(
 		);
 	}
 
-	public function getLogoutUri():UriInterface {
-		return new LogoutUri($this->authwaveHost);
+	public function getLogoutUri(string $returnToPath = null):UriInterface {
+		if(is_null($returnToPath)) {
+			$returnToPath = $this->currentUriPath;
+		}
+
+		return new LogoutUri($this->authwaveHost, $returnToPath);
 	}
 
 	private function completeAuth():void {

test/phpunit/AuthenticatorTest.php

@@ -67,31 +67,48 @@ public function testIsLoggedInTrueWhenSessionDataSet() {
 		self::assertTrue($sut->isLoggedIn());
 	}
 
-	public function testLogoutClearsSessionAndRedirects() {
+	public function testLogoutClearsSession() {
 		$sessionData = self::createMock(SessionData::class);
 		$_SESSION = [
 			Authenticator::SESSION_KEY => $sessionData
 		];
 
+		$redirectHandler = self::createMock(RedirectHandler::class);
+
+		$sut = new Authenticator(
+			"example-app-id",
+			"test-key",
+			"/",
+			AuthUri::DEFAULT_BASE_REMOTE_URI,
+			null,
+			$redirectHandler
+		);
+		$sut->logout();
+		self::assertEmpty($_SESSION);
+	}
+
+	public function testLogoutRedirectsToCurrentPath() {
+		$_SESSION = [];
+		$currentPath = "/current/example/path";
+
 		$redirectHandler = self::createMock(RedirectHandler::class);
 		$redirectHandler->expects(self::once())
 			->method("redirect")
 			->with(self::callback(fn(UriInterface $uri) =>
 				$uri->getHost() === AuthUri::DEFAULT_BASE_REMOTE_URI
 				&& $uri->getPath() === LogoutUri::PATH_LOGOUT
-				&& $uri->getQuery() === "returnTo=" . urlencode("/")
+				&& $uri->getQuery() === "returnTo=" . urlencode($currentPath)
 			));
 
 		$sut = new Authenticator(
 			"example-app-id",
 			"test-key",
-			"/",
+			$currentPath,
 			AuthUri::DEFAULT_BASE_REMOTE_URI,
 			null,
 			$redirectHandler
 		);
 		$sut->logout();
-		self::assertEmpty($_SESSION);
 	}
 
 	public function testLoginRedirects() {