Use serialised stdClass object to represent user data

Author: Greg Bowler

src/Authenticator.php

@@ -80,6 +80,10 @@ public function logout():void {
 		$this->redirectHandler->redirect($this->getLogoutUri());
 	}
 
+	public function adminLogin():void {
+// TODO: Implement!
+	}
+
 	public function getUuid():string {
 		$userData = $this->sessionData->getUserData();
 		return $userData->getUuid();
@@ -99,7 +103,7 @@ public function getAuthUri(Token $token):AuthUri {
 	}
 
 	public function getAdminUri(
-		string $path = AdminUri::PATH_ACCOUNT
+		string $path = AdminUri::PATH_ADMIN
 	):UriInterface {
 		return new AdminUri(
 			$this->authwaveHost,

src/ProviderUri/AdminUri.php

@@ -2,7 +2,7 @@
 namespace Authwave\ProviderUri;
 
 class AdminUri extends AbstractProviderUri {
-	const PATH_ACCOUNT = "/account";
+	const PATH_ADMIN = "/admin";
 	const PATH_SETTINGS = "/settings";
 
 	public function __construct(

src/Token.php

@@ -55,13 +55,13 @@ public function decryptResponseCipher(string $cipher):UserData {
 			throw new ResponseCipherDecryptionException();
 		}
 
-		$data = unserialize(
+		$data = @unserialize(
 			$decrypted
 		);
 		if($data === false) {
 			throw new InvalidUserDataSerializationException();
 		}
 
-		return new UserData($data["uuid"], $data["email"]);
+		return new UserData($data->{"uuid"}, $data->{"email"});
 	}
 }

test/phpunit/AuthenticatorTest.php

@@ -355,7 +355,7 @@ public function testGetAdminUri() {
 		);
 		$sut = $auth->getAdminUri();
 		self::assertEquals(
-			AdminUri::PATH_ACCOUNT,
+			AdminUri::PATH_ADMIN,
 			$sut->getPath()
 		);
 	}

test/phpunit/ProviderUri/AdminUriTest.php

@@ -8,10 +8,10 @@ class AdminUriTest extends TestCase {
 	public function testPathAccount() {
 		$sut = new AdminUri(
 			"example.com",
-			AdminUri::PATH_ACCOUNT
+			AdminUri::PATH_ADMIN
 		);
 		self::assertEquals(
-			AdminUri::PATH_ACCOUNT,
+			AdminUri::PATH_ADMIN,
 			$sut->getPath()
 		);
 	}

test/phpunit/TokenTest.php

@@ -65,7 +65,8 @@ public function testDecryptResponseCipherBadJson() {
 	}
 
 	public function testDecryptResponseCipher() {
-		$key = uniqid("test-key-");
+		$clientKey = uniqid("test-key-");
+// SecretIv is stored in the client application's session only.
 		$secretIv = self::createMock(InitVector::class);
 		$secretIv->method("getBytes")
 			->willReturn(str_repeat("0", 16));
@@ -75,22 +76,20 @@ public function testDecryptResponseCipher() {
 
 		$uuid = "aabb-ccdd-eeff";
 		$email = "user@example.com";
-		$json = <<<JSON
-		{
-			"uuid": "$uuid",
-			"email": "$email"
-		}
-		JSON;
+		$serialized = serialize((object)[
+			"uuid" => $uuid,
+			"email" => $email,
+		]);
 
 		$cipher = openssl_encrypt(
-			$json,
+			$serialized,
 			Token::ENCRYPTION_METHOD,
-			implode("|", [$key, $secretIv->getBytes()]),
+			$clientKey,
 			0,
-			$iv->getBytes()
+			$secretIv->getBytes()
 		);
 		$cipher = base64_encode($cipher);
-		$sut = new Token($key, $secretIv, $iv);
+		$sut = new Token($clientKey, $secretIv, $iv);
 		$userData = $sut->decryptResponseCipher($cipher);
 		self::assertInstanceOf(UserData::class, $userData);
 		self::assertEquals($uuid, $userData->getUuid());