Handle user data fields

Author: Greg Bowler

src/Authenticator.php

@@ -1,16 +1,18 @@
 <?php
 namespace Authwave;
 
+use Authwave\ProviderUri\AbstractProviderUri;
 use Authwave\ProviderUri\AdminUri;
 use Authwave\ProviderUri\AuthUri;
-use Authwave\ProviderUri\LogoutUri;
 use Gt\Http\Uri;
 use Gt\Session\SessionContainer;
 use Psr\Http\Message\UriInterface;
 
 class Authenticator {
 	const SESSION_KEY = "AUTHWAVE_SESSION";
 	const RESPONSE_QUERY_PARAMETER = "AUTHWAVE_RESPONSE_DATA";
+	const LOGIN_TYPE_DEFAULT = "login-default";
+	const LOGIN_TYPE_ADMIN = "login-admin";
 
 	private string $clientKey;
 	private string $currentUriPath;
@@ -59,7 +61,10 @@ public function isLoggedIn():bool {
 		return isset($userData);
 	}
 
-	public function login(Token $token = null):void {
+	public function login(
+		Token $token = null,
+		string $loginType = self::LOGIN_TYPE_DEFAULT
+	):void {
 		if($this->isLoggedIn()) {
 			return;
 		}
@@ -71,17 +76,18 @@ public function login(Token $token = null):void {
 		$this->sessionData = new SessionData($token);
 		$this->session->set(self::SESSION_KEY, $this->sessionData);
 
-		$this->redirectHandler->redirect($this->getAuthUri($token));
+		$this->redirectHandler->redirect(
+			$this->getAuthUri($token, $loginType)
+		);
 	}
 
 	public function logout():void {
 // TODO: Should the logout redirect the user agent to the redirectPath?
 		$this->session->remove(self::SESSION_KEY);
-		$this->redirectHandler->redirect($this->getLogoutUri());
 	}
 
-	public function adminLogin():void {
-// TODO: Implement!
+	public function adminLogin(Token $token = null):void {
+		$this->login($token, self::LOGIN_TYPE_ADMIN);
 	}
 
 	public function getUuid():string {
@@ -94,7 +100,22 @@ public function getEmail():string {
 		return $userData->getEmail();
 	}
 
-	public function getAuthUri(Token $token):AuthUri {
+	public function getField(string $name):?string {
+		$userData = $this->sessionData->getUserData();
+		return $userData->getField($name);
+	}
+
+	public function getAuthUri(
+		Token $token,
+		string $loginType = self::LOGIN_TYPE_DEFAULT
+	):AbstractProviderUri {
+		if($loginType === self::LOGIN_TYPE_ADMIN) {
+			return new AdminUri(
+				$this->currentUriPath,
+				$this->authwaveHost
+			);
+		}
+
 		return new AuthUri(
 			$token,
 			$this->currentUriPath,
@@ -111,12 +132,13 @@ public function getAdminUri(
 		);
 	}
 
-	public function getLogoutUri(string $returnToPath = null):UriInterface {
-		if(is_null($returnToPath)) {
-			$returnToPath = (new Uri($this->currentUriPath))->getPath();
-		}
-
-		return new LogoutUri($this->authwaveHost, $returnToPath);
+	public function getProfileUri(
+		string $path = ProfileUri::PATH_PROFILE
+	):UriInterface {
+		return new ProfileUri(
+			$this->authwaveHost,
+			$path
+		);
 	}
 
 	private function completeAuth():void {

src/ProviderUri/LogoutUri.php

@@ -0,0 +1,6 @@
+<?php
+namespace Authwave\ProviderUri;
+
+class ProfileUri extends AbstractProviderUri {
+
+}

src/ProviderUri/ProfileUri.php

@@ -62,6 +62,10 @@ public function decryptResponseCipher(string $cipher):UserData {
 			throw new InvalidUserDataSerializationException();
 		}
 
-		return new UserData($data->{"uuid"}, $data->{"email"});
+		return new UserData(
+			$data->{"uuid"},
+			$data->{"email"},
+			$data->{"fields"}
+		);
 	}
 }

src/Token.php

@@ -4,10 +4,16 @@
 class UserData {
 	private string $uuid;
 	private string $email;
+	private object $fields;
 
-	public function __construct(string $uuid, string $email) {
+	public function __construct(
+		string $uuid,
+		string $email,
+		object $fields
+	) {
 		$this->uuid = $uuid;
 		$this->email = $email;
+		$this->fields = $fields;
 	}
 
 	public function getUuid():string {
@@ -17,4 +23,8 @@ public function getUuid():string {
 	public function getEmail():string {
 		return $this->email;
 	}
+
+	public function getField(string $name):?string {
+		return $this->fields->{$name} ?? null;
+	}
 }

src/UserData.php

@@ -82,29 +82,6 @@ public function testLogoutClearsSession() {
 		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($currentPath)
-			));
-
-		$sut = new Authenticator(
-			"test-key",
-			$currentPath,
-			AuthUri::DEFAULT_BASE_REMOTE_URI,
-			null,
-			$redirectHandler
-		);
-		$sut->logout();
-	}
-
 	public function testLoginRedirects() {
 		$_SESSION = [];
 

test/phpunit/AuthenticatorTest.php

@@ -79,6 +79,9 @@ public function testDecryptResponseCipher() {
 		$serialized = serialize((object)[
 			"uuid" => $uuid,
 			"email" => $email,
+			"fields" => (object)[
+				"example1" => "value1",
+			]
 		]);
 
 		$cipher = openssl_encrypt(