Refactor scheme checking

Author: g105b

src/Authenticator.php

@@ -6,31 +6,29 @@
 
 class Authenticator {
 	private Cipher $cipher;
-	private string $httpsScheme = "https";
-	private string $httpHost;
+	private UriInterface $baseUri;
 
-	public function __construct(Token $token, string $hostname) {
+	public function __construct(Token $token, string $baseUri) {
 		$this->cipher = $token->generateCipher();
-		$this->httpHost = $hostname;
+		$this->baseUri = $this->normaliseBaseUri($baseUri);
 	}
 
-	public function useLocalhostHttps(bool $useHttps = true) {
-		if(!$useHttps) {
-			if($this->httpHost !== "localhost") {
-				throw new InsecureProtocolException();
-			}
-
-			$this->httpsScheme = "http";
-		}
+	public function getAuthUri():UriInterface {
+		return $this->baseUri;
 	}
 
-	public function getAuthUri():UriInterface {
+	private function normaliseBaseUri(string $baseUri):Uri {
+		$scheme = parse_url($baseUri, PHP_URL_SCHEME) ?? "https";
+		$host = parse_url($baseUri, PHP_URL_HOST) ??
+			parse_url($baseUri, PHP_URL_PATH);
+
 		$uri = (new Uri())
-			->withScheme("https")
-			->withHost($this->httpHost);
+			->withScheme($scheme)
+			->withHost($host);
 
-		if($this->httpHost === "localhost") {
-			$uri = $uri->withScheme($this->httpsScheme);
+		if($uri->getHost() !== "localhost"
+		&& $uri->getScheme() !== "https") {
+			throw new InsecureProtocolException($uri->getScheme());
 		}
 
 		return $uri;

test/phpunit/AuthenticatorTest.php

@@ -46,8 +46,7 @@ public function testGetAuthUriHostnameLocalhostHttpAllowed() {
 		$token->method("generateCipher")
 			->willReturn($cipher);
 
-		$sut = new Authenticator($token, "localhost");
-		$sut->useLocalhostHttps(false);
+		$sut = new Authenticator($token, "http://localhost");
 		$authUri = $sut->getAuthUri();
 		self::assertStringStartsWith(
 			"http://localhost",
@@ -62,8 +61,7 @@ public function testGetAuthUriHostnameNotLocalhostHttpNotAllowed() {
 		$token->method("generateCipher")
 			->willReturn($cipher);
 
-		$sut = new Authenticator($token, "localhost.com");
 		self::expectException(InsecureProtocolException::class);
-		$sut->useLocalhostHttps(false);
+		new Authenticator($token, "http://localhost.com");
 	}
 }