Introduce UserData class

Author: Greg Bowler

src/Authenticator.php

@@ -4,8 +4,12 @@
 use Gt\Session\SessionContainer;
 
 class Authenticator {
-	const SESSION_KEY_AUTH_FLOW = "authwave-authflow";
-	const SESSION_KEY_USER_DATA = "authwave-userdata";
+	const SESSION_KEY = "AUTHWAVE_SESSION";
+
+	private string $clientKey;
+	private string $clientSecret;
+	private string $redirectPath;
+	private SessionData $sessionData;
 
 	public function __construct(
 		string $clientKey,
@@ -17,11 +21,42 @@ public function __construct(
 			$session = new GlobalSessionContainer();
 		}
 
-		if(!$session->contains(GlobalSessionContainer::SESSION_KEY)) {
-			$session->set(
-				GlobalSessionContainer::SESSION_KEY,
-				new SessionData()
-			);
+		if(!$session->contains(self::SESSION_KEY)) {
+			$session->set(self::SESSION_KEY, new SessionData());
+		}
+
+		$this->clientKey = $clientKey;
+		$this->clientSecret = $clientSecret;
+		$this->redirectPath = $redirectPath;
+		$this->sessionData = $session->get(self::SESSION_KEY);
+
+		if($this->authInProgress()) {
+			$this->completeAuth();
+		}
+	}
+
+	public function isLoggedIn():bool {
+		$userData = null;
+
+		try {
+			$userData = $this->sessionData->getUserData();
+		}
+		catch(UserDataNotSetException $exception) {
+			return false;
 		}
+
+		return isset($userData);
+	}
+
+	private function authInProgress():bool {
+		return false;
+	}
+
+	private function beginAuth():void {
+
+	}
+
+	private function completeAuth():void {
+
 	}
 }

src/GlobalSessionContainer.php

@@ -4,8 +4,6 @@
 use Gt\Session\SessionArrayWrapper;
 
 class GlobalSessionContainer extends SessionArrayWrapper {
-	const SESSION_KEY = "AUTHWAVE_SESSION_DATA";
-
 	public function __construct() {
 		if(!isset($_SESSION)) {
 			throw new SessionNotStartedException();

src/InitVectorNotSetException.php

@@ -0,0 +1,4 @@
+<?php
+namespace Authwave;
+
+class InitVectorNotSetException extends AuthwaveException {}

src/SessionData.php

@@ -4,8 +4,6 @@
 class SessionData {
 	private InitVector $iv;
 
-	// TODO: Store User data here too.
-
 	public function getIv():InitVector {
 		if(!isset($this->iv)) {
 			throw new InitVectorNotSetException();
@@ -21,4 +19,10 @@ public function setIv(InitVector $iv):void {
 	public function removeIv():void {
 		unset($this->iv);
 	}
+
+	public function getUserData():UserData {
+		if(!isset($this->userData)) {
+			throw new UserDataNotSetException();
+		}
+	}
 }

src/UserData.php

@@ -0,0 +1,6 @@
+<?php
+namespace Authwave;
+
+class UserData {
+
+}

src/UserDataNotSetException.php

@@ -0,0 +1,4 @@
+<?php
+namespace Authwave;
+
+class UserDataNotSetException extends AuthwaveException {}

test/phpunit/AuthenticatorTest.php

@@ -3,7 +3,9 @@
 
 use Authwave\Authenticator;
 use Authwave\GlobalSessionContainer;
+use Authwave\SessionData;
 use Authwave\SessionNotStartedException;
+use Authwave\UserData;
 use PHPUnit\Framework\TestCase;
 
 class AuthenticatorTest extends TestCase {
@@ -18,14 +20,43 @@ public function testConstructWithDefaultSessionNotStarted() {
 
 	public function testConstructWithDefaultSession() {
 		$_SESSION = [];
-		$sut = new Authenticator(
+		new Authenticator(
 			"test-key",
 			"test-secret",
 			"/"
 		);
 		self::assertArrayHasKey(
-			GlobalSessionContainer::SESSION_KEY,
+			Authenticator::SESSION_KEY,
 			$_SESSION
 		);
 	}
+
+	public function testIsLoggedInFalseByDefault() {
+		$_SESSION = [];
+		$sut = new Authenticator(
+			"test-key",
+			"test-secret",
+			"/"
+		);
+		self::assertFalse($sut->isLoggedIn());
+	}
+
+	public function testIsLoggedInTrueWhenSessionDataSet() {
+		$userData = self::createMock(UserData::class);
+		$sessionData = self::createMock(SessionData::class);
+		$sessionData->expects(self::once())
+			->method("getUserData")
+			->willReturn($userData);
+
+		$_SESSION = [
+			Authenticator::SESSION_KEY => $sessionData
+		];
+
+		$sut = new Authenticator(
+			"test-key",
+			"test-secret",
+			"/"
+		);
+		self::assertTrue($sut->isLoggedIn());
+	}
 }