feat: add new classes for PassageUser, CreateUserArgs, and UpdateUser…

…Args (#90)
passageidentity · Dec 11, 2024 · 7afac85 · 7afac85
1 parent e090c3f
commit 7afac85
Show file tree

Hide file tree

Showing 6 changed files with 95 additions and 11 deletions.
diff --git a/custom/lib/CreateUserArgs.php b/custom/lib/CreateUserArgs.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Passage\Client;
+
+use OpenAPI\Client\Model\CreateUserRequest;
+
+class CreateUserArgs extends CreateUserRequest
+{
+}
diff --git a/custom/lib/Passage.php b/custom/lib/Passage.php
@@ -232,7 +232,8 @@ public function createUser(
         trigger_error('Method ' . __METHOD__ . ' is deprecated', E_USER_DEPRECATED);
 
         try {
-            return $this->user->create($create_user_request);
+            $args = $this->cast($create_user_request, CreateUserArgs::class);
+            return $this->user->create($args);
         } catch (PassageError $e) {
             throw $e->getPrevious();
         }
@@ -299,9 +300,21 @@ public function updateUser(
         trigger_error('Method ' . __METHOD__ . ' is deprecated', E_USER_DEPRECATED);
 
         try {
-            return $this->user->update($user_id, $update_user_request);
+            $args = $this->cast($update_user_request, UpdateUserArgs::class);
+            return $this->user->update($user_id, $args);
         } catch (PassageError $e) {
             throw $e->getPrevious();
         }
     }
+
+    private function cast(object $object, string $class): mixed
+    {
+        return unserialize(
+            preg_replace(
+                '/^O:\d+:"[^"]++"/',
+                'O:' . strlen($class) . ':"' . $class . '"',
+                serialize($object)
+            )
+        );
+    }
 }
diff --git a/custom/lib/PassageUser.php b/custom/lib/PassageUser.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Passage\Client;
+
+use OpenAPI\Client\Model\UserInfo;
+
+class PassageUser extends UserInfo
+{
+}
diff --git a/custom/lib/UpdateUserArgs.php b/custom/lib/UpdateUserArgs.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Passage\Client;
+
+use OpenAPI\Client\Model\UpdateUserRequest;
+
+class UpdateUserArgs extends UpdateUserRequest
+{
+}
diff --git a/custom/lib/User.php b/custom/lib/User.php
@@ -7,9 +7,7 @@
 use OpenAPI\Client\Configuration;
 use OpenAPI\Client\Api\UsersApi;
 use OpenAPI\Client\Api\UserDevicesApi;
-use OpenAPI\Client\Model\UserInfo as PassageUser;
-use OpenAPI\Client\Model\UpdateUserRequest as UpdateUserArgs;
-use OpenAPI\Client\Model\CreateUserRequest as CreateUserArgs;
+use OpenAPI\Client\Model\UserInfo;
 use OpenAPI\Client\Model\WebAuthnDevices;
 use OpenAPI\Client\ApiException;
 
@@ -45,7 +43,8 @@ public function get(string $userId): PassageUser
         }
 
         try {
-            return $this->usersApi->getUser($this->appId, $userId)->getUser();
+            $user = $this->usersApi->getUser($this->appId, $userId)->getUser();
+            return $this->castUserInfoToPassageUser($user);
         } catch (ApiException $e) {
             throw PassageError::fromApiException($e);
         }
@@ -84,7 +83,8 @@ public function getByIdentifier(string $identifier): PassageUser
             }
 
             $userId = $users[0]->getId();
-            return $this->usersApi->getUser($this->appId, $userId)->getUser();
+            $user = $this->usersApi->getUser($this->appId, $userId)->getUser();
+            return $this->castUserInfoToPassageUser($user);
         } catch (ApiException $e) {
             throw PassageError::fromApiException($e);
         }
@@ -105,7 +105,8 @@ public function activate(string $userId): PassageUser
         }
 
         try {
-            return $this->usersApi->activateUser($this->appId, $userId)->getUser();
+            $user = $this->usersApi->activateUser($this->appId, $userId)->getUser();
+            return $this->castUserInfoToPassageUser($user);
         } catch (ApiException $e) {
             throw PassageError::fromApiException($e);
         }
@@ -126,7 +127,8 @@ public function deactivate(string $userId): PassageUser
         }
 
         try {
-            return $this->usersApi->deactivateUser($this->appId, $userId)->getUser();
+            $user = $this->usersApi->deactivateUser($this->appId, $userId)->getUser();
+            return $this->castUserInfoToPassageUser($user);
         } catch (ApiException $e) {
             throw PassageError::fromApiException($e);
         }
@@ -148,7 +150,8 @@ public function update(string $userId, UpdateUserArgs $options): PassageUser
         }
 
         try {
-            return $this->usersApi->updateUser($this->appId, $userId, $options)->getUser();
+            $user = $this->usersApi->updateUser($this->appId, $userId, $options)->getUser();
+            return $this->castUserInfoToPassageUser($user);
         } catch (ApiException $e) {
             throw PassageError::fromApiException($e);
         }
@@ -169,7 +172,8 @@ public function create(CreateUserArgs $args): PassageUser
         }
 
         try {
-            return $this->usersApi->createUser($this->appId, $args)->getUser();
+            $user = $this->usersApi->createUser($this->appId, $args)->getUser();
+            return $this->castUserInfoToPassageUser($user);
         } catch (ApiException $e) {
             throw PassageError::fromApiException($e);
         }
@@ -263,4 +267,15 @@ public function revokeRefreshTokens(string $userId): void
             throw PassageError::fromApiException($e);
         }
     }
+
+    private function castUserInfoToPassageUser(UserInfo $userInfo): PassageUser
+    {
+        return unserialize(
+            preg_replace(
+                '/^O:\d+:"[^"]++"/',
+                'O:' . strlen(PassageUser::class) . ':"' . PassageUser::class . '"',
+                serialize($userInfo)
+            )
+        );
+    }
 }
diff --git a/custom/test/UserTest.php b/custom/test/UserTest.php
@@ -3,6 +3,9 @@
 namespace Passage\Test;
 
 use Dotenv\Dotenv;
+use OpenAPI\Client\Model\UpdateUserRequest;
+use Passage\Client\CreateUserArgs;
+use Passage\Client\UpdateUserArgs;
 use PHPUnit\Framework\TestCase;
 use Passage\Client\Passage;
 use Passage\Client\PassageError;
@@ -11,6 +14,7 @@ class UserTest extends TestCase
 {
     private $appId;
     private $apiKey;
+    private $userId;
     private $passage;
 
     public function setUp(): void
@@ -22,6 +26,7 @@ public function setUp(): void
 
         $this->appId = getenv('APP_ID');
         $this->apiKey = getenv('API_KEY');
+        $this->userId = getenv('EXAMPLE_USER_ID');
 
         $this->passage = new Passage($this->appId, $this->apiKey);
     }
@@ -31,4 +36,28 @@ public function testGetByIdentifierThrowsPassageError()
         $this->expectException(PassageError::class);
         $this->passage->user->getByIdentifier('error@passage.id');
     }
+
+    public function testCreate()
+    {
+        $expectedEmail = 'php@test.com';
+        $args = new CreateUserArgs();
+        $args->setEmail($expectedEmail);
+
+        $actual = $this->passage->user->create($args);
+
+        $this->assertEquals($expectedEmail, $actual->getEmail());
+
+        $this->passage->user->delete($actual->getId());
+    }
+
+    public function testUpdate()
+    {
+        $expectedPhone = '+15125555555';
+        $options = new UpdateUserArgs();
+        $options->setPhone($expectedPhone);
+
+        $actual = $this->passage->user->update($this->userId, $options);
+
+        $this->assertEquals($expectedPhone, $actual->getPhone());
+    }
 }