Split host and path from Authenticator constructor (#3)

Closes #2

Author: Greg Bowler

src/Authenticator.php

@@ -9,15 +9,20 @@ class Authenticator {
 	const RESPONSE_QUERY_PARAMETER = "AUTHWAVE_RESPONSE_DATA";
 
 	private string $clientKey;
-	private string $currentUriPath;
+	private string $clientPath;
 	private string $authwaveHost;
 	private SessionContainer $session;
 	private SessionData $sessionData;
 	private RedirectHandler $redirectHandler;
+	/**
+	 * @var string
+	 */
+	private string $clientHost;
 
 	public function __construct(
 		string $clientKey,
-		string $currentUriPath,
+		string $clientHost,
+		string $clientPath,
 		string $authwaveHost = "login.authwave.com",
 		SessionContainer $session = null,
 		RedirectHandler $redirectHandler = null
@@ -33,7 +38,8 @@ public function __construct(
 		}
 
 		$this->clientKey = $clientKey;
-		$this->currentUriPath = $currentUriPath;
+		$this->clientHost = $clientHost;
+		$this->clientPath = $clientPath;
 		$this->authwaveHost = $authwaveHost;
 		$this->session = $session;
 		$this->sessionData = $session->get(self::SESSION_KEY);
@@ -69,7 +75,7 @@ public function login(Token $token = null):void {
 
 		$loginUri = new AuthUri(
 			$token,
-			$this->currentUriPath,
+			$this->clientPath,
 			$this->authwaveHost
 		);
 		$this->redirectHandler->redirect($loginUri);
@@ -105,14 +111,14 @@ private function completeAuth():void {
 		);
 
 		$this->redirectHandler->redirect(
-			(new Uri($this->currentUriPath))
+			(new Uri($this->clientPath))
 			->withoutQueryValue(self::RESPONSE_QUERY_PARAMETER)
 		);
 	}
 
 	private function getResponseCipher():?string {
 		$queryString = parse_url(
-			$this->currentUriPath,
+			$this->clientPath,
 			PHP_URL_QUERY
 		);
 		if(!$queryString) {

test/phpunit/AuthenticatorTest.php

@@ -16,12 +16,20 @@
 class AuthenticatorTest extends TestCase {
 	public function testConstructWithDefaultSessionNotStarted() {
 		self::expectException(SessionNotStartedException::class);
-		new Authenticator("test-key","/");
+		new Authenticator(
+			"test-key",
+			"example.com",
+			"/"
+		);
 	}
 
 	public function testConstructWithDefaultSession() {
 		$_SESSION = [];
-		new Authenticator("test-key", "/");
+		new Authenticator(
+			"test-key",
+			"example.com",
+			"/"
+		);
 		self::assertArrayHasKey(
 			Authenticator::SESSION_KEY,
 			$_SESSION
@@ -32,6 +40,7 @@ public function testIsLoggedInFalseByDefault() {
 		$_SESSION = [];
 		$sut = new Authenticator(
 			"test-key",
+			"example.com",
 			"/"
 		);
 		self::assertFalse($sut->isLoggedIn());
@@ -50,7 +59,8 @@ public function testIsLoggedInTrueWhenSessionDataSet() {
 
 		$sut = new Authenticator(
 			"test-key",
-			"/",
+			"example.com",
+			"/"
 		);
 		self::assertTrue($sut->isLoggedIn());
 	}
@@ -63,7 +73,8 @@ public function testLogoutClearsSession() {
 
 		$sut = new Authenticator(
 			"test-key",
-			"/",
+			"example.com",
+			"/"
 		);
 		$sut->logout();
 		self::assertEmpty($_SESSION);
@@ -81,6 +92,7 @@ public function testLoginRedirects() {
 
 		$sut = new Authenticator(
 			"test-key",
+			"example.com",
 			"/",
 			AuthUri::DEFAULT_BASE_URI,
 			null,
@@ -103,6 +115,7 @@ public function testLoginRedirectsLocalhost() {
 
 		$sut = new Authenticator(
 			"test-key",
+			"example.com",
 			"/",
 			"http://localhost:8081",
 			null,
@@ -146,6 +159,7 @@ public function testLoginRedirectsWithCorrectQueryString() {
 
 		$sut = new Authenticator(
 			$key,
+			"example.com",
 			$currentPath,
 			AuthUri::DEFAULT_BASE_URI,
 			null,
@@ -166,6 +180,7 @@ public function testLoginDoesNothingWhenAlreadyLoggedIn() {
 
 		$sut = new Authenticator(
 			"test-key",
+			"example.com",
 			"/",
 			AuthUri::DEFAULT_BASE_URI,
 			null,
@@ -179,6 +194,7 @@ public function testGetUuidThrowsExceptionWhenNotLoggedIn() {
 		$_SESSION = [];
 		$sut = new Authenticator(
 			"test-key",
+			"example.com",
 			"/"
 		);
 		self::expectException(NotLoggedInException::class);
@@ -200,6 +216,7 @@ public function testGetUuid() {
 		];
 		$sut = new Authenticator(
 			"test-key",
+			"example.com",
 			"/"
 		);
 		self::assertEquals($expectedUuid, $sut->getUuid());
@@ -209,6 +226,7 @@ public function testGetEmailThrowsExceptionWhenNotLoggedIn() {
 		$_SESSION = [];
 		$sut = new Authenticator(
 			"test-key",
+			"example.com",
 			"/"
 		);
 		self::expectException(NotLoggedInException::class);
@@ -230,6 +248,7 @@ public function testGetEmail() {
 		];
 		$sut = new Authenticator(
 			"test-key",
+			"example.com",
 			"/"
 		);
 		self::assertEquals($expectedEmail, $sut->getEmail());
@@ -244,6 +263,7 @@ public function testCompleteAuthNotLoggedIn() {
 		self::expectException(NotLoggedInException::class);
 		new Authenticator(
 			"test-key",
+			"example.com",
 			$currentUri
 		);
 	}
@@ -276,6 +296,7 @@ public function testCompleteAuth() {
 		];
 		new Authenticator(
 			"test-key",
+			"example.com",
 			$currentUri,
 			AuthUri::DEFAULT_BASE_URI,
 			null,
@@ -303,6 +324,7 @@ public function testCompleteAuthNotAffectedByQueryString() {
 
 		new Authenticator(
 			"test-key",
+			"example.com",
 			"/example-path?filter=something",
 			AuthUri::DEFAULT_BASE_URI,
 			null,