Add user's UUID to the response of relevant login API handlers

remp/dn-mofa#538
remp2020 · May 23, 2024 · 2ed79c9 · 2ed79c9
1 parent bd84afb
commit 2ed79c9
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -301,6 +301,7 @@ Response:
     "status": "ok",
     "user": {
         "id": 1,
+        "uuid": "35e6b53c-340c-4dc3-ad36-f81b2b1f00a8",
         "email": "[email protected]",
         "confirmed_at": "2021-01-01T10:00:00+01:00", // RFC3339 date or NULL; user confirmation date
         "first_name": "Test",
@@ -359,6 +360,7 @@ Success response:
     "status": "ok",
     "user": {
         "id": 9,
+        "uuid": "35e6b53c-340c-4dc3-ad36-f81b2b1f00a8",
         "email": "[email protected]",
         "confirmed_at": "2021-01-01T10:00:00+01:00", // RFC3339 date or NULL; user confirmation date
         "first_name": "Test",
@@ -605,6 +607,7 @@ Success response:
     "status": "ok",
     "user": {
         "id": 101,
+        "uuid": "35e6b53c-340c-4dc3-ad36-f81b2b1f00a8",
         "email": "[email protected]",
         "confirmed_at": "2021-01-01T10:00:00+01:00", // RFC3339 date or NULL; user confirmation date
         "first_name": null,
@@ -1300,6 +1303,7 @@ Success response:
     "status": "ok",
     "user": {
         "id": 9,
+        "uuid": "35e6b53c-340c-4dc3-ad36-f81b2b1f00a8",
         "email": "[email protected]",
         "confirmed_at": "2021-01-01T10:00:00+01:00", // RFC3339 date or NULL; user confirmation date
         "public_name": "[email protected]",
@@ -1541,6 +1545,7 @@ Success response:
     "status": "ok",
     "user": {
         "id": 101,
+        "uuid": "35e6b53c-340c-4dc3-ad36-f81b2b1f00a8",
         "email": "[email protected]",
         "created_at": "2021-01-01T10:00:00+01:00", // RFC3339 date; user creation date
         "confirmed_at": "2021-01-01T10:00:00+01:00", // RFC3339 date or NULL; user confirmation date
@@ -1584,6 +1589,7 @@ Success response:
     "status": "ok",
     "user": {
         "id": 101,
+        "uuid": "35e6b53c-340c-4dc3-ad36-f81b2b1f00a8",
         "email": "[email protected]",
         "created_at": "2021-01-01T10:00:00+01:00", // RFC3339 date; user creation date
         "confirmed_at": "2021-01-01T10:00:00+01:00", // RFC3339 date or NULL; user confirmation date

diff --git a/src/Api/AppleTokenSignInHandler.php b/src/Api/AppleTokenSignInHandler.php
@@ -105,6 +105,7 @@ private function formatResponse(ActiveRow $user, ?ActiveRow $accessToken): array
             'status' => 'ok',
             'user' => [
                 'id' => $user->id,
+                'uuid' => $user->uuid,
                 'email' => $user->email,
                 'created_at' => $user->created_at->format(\DateTimeInterface::RFC3339),
                 'confirmed_at' => $user->confirmed_at?->format(\DateTimeInterface::RFC3339),

diff --git a/src/Api/AutoLoginTokenLoginApiHandler.php b/src/Api/AutoLoginTokenLoginApiHandler.php
@@ -76,6 +76,7 @@ public function handle(array $params): ResponseInterface
             'status' => 'ok',
             'user' => [
                 'id' => $identity->id,
+                'uuid' => $identity->uuid,
                 'email' => $identity->data['email'],
                 'confirmed_at' => $identity->data['confirmed_at'] ? $identity->data['confirmed_at']->format(DATE_RFC3339) : null,
                 'public_name' => $identity->data['public_name'],

diff --git a/src/Api/GoogleTokenSignInHandler.php b/src/Api/GoogleTokenSignInHandler.php
@@ -143,6 +143,7 @@ private function formatResponse(ActiveRow $user, ?ActiveRow $accessToken): array
             'status' => 'ok',
             'user' => [
                 'id' => $user->id,
+                'uuid' => $user->uuid,
                 'email' => $user->email,
                 'created_at' => $user->created_at->format(\DateTimeInterface::RFC3339),
                 'confirmed_at' => $user->confirmed_at?->format(\DateTimeInterface::RFC3339),

diff --git a/src/Api/UserInfoHandler.php b/src/Api/UserInfoHandler.php
@@ -30,6 +30,7 @@ public function handle(array $params): ResponseInterface
             'status' => 'ok',
             'user' => [
                 'id' => $user->id,
+                'uuid' => $user->uuid,
                 'email' => $user->email,
                 'first_name' => $user->first_name,
                 'last_name' => $user->last_name,

diff --git a/src/Api/UsersCreateHandler.php b/src/Api/UsersCreateHandler.php
@@ -180,6 +180,7 @@ private function formatResponse(ActiveRow $user, ?ActiveRow $lastToken): array
             'status' => 'ok',
             'user' => [
                 'id' => $user->id,
+                'uuid' => $user->uuid,
                 'email' => $user->email,
                 'first_name' => $user->first_name,
                 'last_name' => $user->last_name,

diff --git a/src/Api/UsersLoginHandler.php b/src/Api/UsersLoginHandler.php
@@ -108,6 +108,7 @@ public function handle(array $params): ResponseInterface
             'status' => 'ok',
             'user' => [
                 'id' => $user->id,
+                'uuid' => $user->uuid,
                 'email' => $user->email,
                 'first_name' => $user->first_name,
                 'last_name' => $user->last_name,