Test login redirects to default Authwave host

Author: Greg Bowler

src/AuthUri.php

@@ -5,6 +5,8 @@
 use Psr\Http\Message\UriInterface;
 
 class AuthUri extends Uri {
+	const DEFAULT_BASE_URI = "login.authwave.com";
+
 	const QUERY_STRING_CIPHER = "cipher";
 	const QUERY_STRING_INIT_VECTOR = "iv";
 	const QUERY_STRING_RETURN_PATH = "return";
@@ -13,13 +15,14 @@ class AuthUri extends Uri {
 	 * @param Token $token This must be the same instance of the Token when
 	 * creating Authenticator for the first time as it is when checking the
 	 * response from the Authwave provider (store in a session).
+	 * @param string $returnPath
 	 * @param string $baseUri The base URI of the application. This is the
 	 * URI authority with optional scheme, as localhost allows http://
 	 */
 	public function __construct(
 		Token $token,
-		string $baseUri,
-		string $returnPath = "/"
+		string $returnPath = "/",
+		string $baseUri = self::DEFAULT_BASE_URI
 	) {
 		$baseUri = $this->normaliseBaseUri($baseUri);
 

src/Authenticator.php

@@ -9,6 +9,7 @@ class Authenticator {
 	private string $clientKey;
 	private string $clientSecret;
 	private string $redirectPath;
+	private string $authwaveHost;
 	private SessionContainer $session;
 	private SessionData $sessionData;
 	private RedirectHandler $redirectHandler;
@@ -17,6 +18,7 @@ public function __construct(
 		string $clientKey,
 		string $clientSecret,
 		string $redirectPath,
+		string $authwaveHost = "login.authwave.com",
 		SessionContainer $session = null,
 		RedirectHandler $redirectHandler = null
 	) {
@@ -31,6 +33,7 @@ public function __construct(
 		$this->clientKey = $clientKey;
 		$this->clientSecret = $clientSecret;
 		$this->redirectPath = $redirectPath;
+		$this->authwaveHost = $authwaveHost;
 		$this->session = $session;
 		$this->sessionData = $session->get(self::SESSION_KEY);
 		$this->redirectHandler = $redirectHandler ?? new RedirectHandler();
@@ -58,7 +61,9 @@ public function login():void {
 			return;
 		}
 
-
+		$token = new Token($this->clientKey, $this->clientSecret);
+		$loginUri = new AuthUri($token, $this->authwaveHost);
+		$this->redirectHandler->redirect($loginUri);
 	}
 
 	public function logout():void {

test/phpunit/AuthUriTest.php

@@ -15,7 +15,7 @@ public function testAuthUriHttps() {
 			->willReturn("https://example.com");
 		$token = self::createMock(Token::class);
 
-		$sut = new AuthUri($token, $baseUri, "");
+		$sut = new AuthUri($token, "", $baseUri);
 		self::assertEquals(
 			"https",
 			$sut->getScheme()
@@ -26,7 +26,7 @@ public function testAuthUriHttps() {
 // But it should still default to HTTPS on localhost.
 	public function testGetAuthUriHostnameLocalhostHttpsByDefault() {
 		$token = self::createMock(Token::class);
-		$sut = new AuthUri($token, "localhost");
+		$sut = new AuthUri($token, "/", "localhost");
 		self::assertStringStartsWith(
 			"https://localhost",
 			$sut
@@ -36,7 +36,7 @@ public function testGetAuthUriHostnameLocalhostHttpsByDefault() {
 // We should be able to set the scheme to HTTP for localhost hostname only.
 	public function testGetAuthUriHostnameLocalhostHttpAllowed() {
 		$token = self::createMock(Token::class);
-		$sut = new AuthUri($token, "http://localhost");
+		$sut = new AuthUri($token, "/", "http://localhost");
 		self::assertStringStartsWith(
 			"http://localhost",
 			$sut
@@ -47,7 +47,7 @@ public function testGetAuthUriHostnameLocalhostHttpAllowed() {
 	public function testGetAuthUriHostnameNotLocalhostHttpNotAllowed() {
 		$token = self::createMock(Token::class);
 		self::expectException(InsecureProtocolException::class);
-		new AuthUri($token, "http://localhost.com");
+		new AuthUri($token, "/", "http://localhost.com");
 	}
 
 	public function testAuthUriHttpsInferred() {
@@ -57,7 +57,7 @@ public function testAuthUriHttpsInferred() {
 // Note on the line above, no scheme is passed in - we must assume https.
 		$token = self::createMock(Token::class);
 
-		$sut = new AuthUri($token, $baseUri, "");
+		$sut = new AuthUri($token, "/", $baseUri);
 		self::assertEquals(
 			"https",
 			$sut->getScheme()
@@ -79,7 +79,7 @@ public function testQueryString() {
 			->willReturn($iv);
 
 		$returnPath = "/examplePage";
-		$sut = new AuthUri($token, $baseUri, $returnPath);
+		$sut = new AuthUri($token, $returnPath, $baseUri);
 		parse_str($sut->getQuery(), $queryParts);
 
 		self::assertEquals(

test/phpunit/AuthenticatorTest.php

@@ -2,30 +2,28 @@
 namespace Authwave\Test;
 
 use Authwave\Authenticator;
+use Authwave\AuthUri;
 use Authwave\GlobalSessionContainer;
 use Authwave\RedirectHandler;
 use Authwave\SessionData;
 use Authwave\SessionNotStartedException;
 use Authwave\Test\Helper\TestRedirectHandler;
 use Authwave\UserData;
 use PHPUnit\Framework\TestCase;
+use Psr\Http\Message\UriInterface;
 
 class AuthenticatorTest extends TestCase {
 	public function testConstructWithDefaultSessionNotStarted() {
 		self::expectException(SessionNotStartedException::class);
 		new Authenticator(
-			"test-key",
-			"test-secret",
-			"/"
+			"test-key", "test-secret", "/",
 		);
 	}
 
 	public function testConstructWithDefaultSession() {
 		$_SESSION = [];
 		new Authenticator(
-			"test-key",
-			"test-secret",
-			"/"
+			"test-key", "test-secret", "/",
 		);
 		self::assertArrayHasKey(
 			Authenticator::SESSION_KEY,
@@ -36,9 +34,7 @@ public function testConstructWithDefaultSession() {
 	public function testIsLoggedInFalseByDefault() {
 		$_SESSION = [];
 		$sut = new Authenticator(
-			"test-key",
-			"test-secret",
-			"/"
+			"test-key", "test-secret", "/",
 		);
 		self::assertFalse($sut->isLoggedIn());
 	}
@@ -55,9 +51,7 @@ public function testIsLoggedInTrueWhenSessionDataSet() {
 		];
 
 		$sut = new Authenticator(
-			"test-key",
-			"test-secret",
-			"/"
+			"test-key", "test-secret", "/",
 		);
 		self::assertTrue($sut->isLoggedIn());
 	}
@@ -69,28 +63,27 @@ public function testLogoutClearsSession() {
 		];
 
 		$sut = new Authenticator(
-			"test-key",
-			"test-secret",
-			"/"
+			"test-key", "test-secret", "/",
 		);
 		$sut->logout();
 		self::assertEmpty($_SESSION);
 	}
 
 	public function testLoginRedirects() {
+		$_SESSION = [];
+
 		$redirectHandler = self::createMock(RedirectHandler::class);
 		$redirectHandler->expects(self::once())
 			->method("redirect")
-			->with(
-				self::callback(function($uri) {
-					echo $uri;
-				})
-			);
+			->with(self::callback(fn(UriInterface $uri) =>
+				$uri->getHost() === AuthUri::DEFAULT_BASE_URI
+			));
 
 		$sut = new Authenticator(
 			"test-key",
 			"test-secret",
 			"/",
+			AuthUri::DEFAULT_BASE_URI,
 			null,
 			$redirectHandler
 		);