From adc76c5797c2b456743edffc909feb3ac9405b26 Mon Sep 17 00:00:00 2001
From: prateek banga <prateekbanga12@gmail.com>
Date: Tue, 14 Nov 2023 22:46:20 +0530
Subject: [PATCH] adds target when account is created or email or phone is
 updated

---
 app/config/collections.php      |  4 +--
 app/controllers/api/account.php | 54 +++++++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/app/config/collections.php b/app/config/collections.php
index bfa8192b74..5571fd57d6 100644
--- a/app/config/collections.php
+++ b/app/config/collections.php
@@ -1926,9 +1926,9 @@ $commonCollections = [
                 'orders' => [],
             ],
             [
-                '$id' => ID::custom('_key_identifier_providerId'),
+                '$id' => ID::custom('_key_identifier_userInternalId'),
                 'type' => Database::INDEX_UNIQUE,
-                'attributes' => ['providerId', 'identifier'],
+                'attributes' => ['identifier', 'userInternalId'],
                 'lengths' => [],
                 'orders' => [],
             ]
diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index 77ff2a27e4..8a15432a25 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -147,8 +147,15 @@ App::post('/v1/account')
                 'search' => implode(' ', [$userId, $email, $name]),
                 'accessedAt' => DateTime::now(),
             ]);
+            $userInternalId = $user->getInternalId();
             $user->removeAttribute('$internalId');
             Authorization::skip(fn() => $dbForProject->createDocument('users', $user));
+            Authorization::skip(fn() => $dbForProject->createDocument('targets', new Document([
+                'userId' => $user->getId(),
+                'userInternalId' => $userInternalId,
+                'providerType' => 'email',
+                'identifier' => $email,
+            ])));
         } catch (Duplicate) {
             throw new Exception(Exception::USER_ALREADY_EXISTS);
         }
@@ -1329,10 +1336,10 @@ App::post('/v1/account/sessions/phone')
 
         $target = $dbForProject->findOne('targets', [
             Query::equal('identifier', [$phone]),
-            Query::equal('providerInternalId', [$provider->getInternalId()])
+            Query::equal('userInternalId', [$user->getInternalId()])
         ]);
 
-        if (!$target) {
+        if (!$target || $target->isEmpty()) {
             $target = $dbForProject->createDocument('targets', new Document([
                 'userId' => $user->getId(),
                 'userInternalId' => $user->getInternalId(),
@@ -1995,6 +2002,7 @@ App::patch('/v1/account/email')
             throw new Exception(Exception::USER_INVALID_CREDENTIALS);
         }
 
+        $oldEmail = $user->getAttribute('email');
         $email = \strtolower($email);
 
         // Makes sure this email is not already used in another identity
@@ -2019,8 +2027,23 @@ App::patch('/v1/account/email')
                 ->setAttribute('passwordUpdate', DateTime::now());
         }
 
+        $target = $dbForProject->findOne('targets', [
+            Query::equal('identifier', [$email]),
+            Query::equal('userInternalId', [$user->getInternalId()])
+        ]);
+
+        if ($target && !$target->isEmpty()) {
+            throw new Exception(Exception::USER_TARGET_ALREADY_EXISTS);
+        }
+
+        /**
+        * @var Document $oldTarget
+        */
+        $oldTarget = $user->find('identifier', $oldEmail, 'targets');
+
         try {
             $user = $dbForProject->withRequestTimestamp($requestTimestamp, fn () => $dbForProject->updateDocument('users', $user->getId(), $user));
+            $dbForProject->updateDocument('targets', $oldTarget->getId(), $oldTarget->setAttribute('identifier', $email));
         } catch (Duplicate) {
             throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
         }
@@ -2065,6 +2088,20 @@ App::patch('/v1/account/phone')
             throw new Exception(Exception::USER_INVALID_CREDENTIALS);
         }
 
+        $target = $dbForProject->findOne('targets', [
+            Query::equal('identifier', [$phone]),
+            Query::equal('userInternalId', [$user->getInternalId()])
+        ]);
+
+        if ($target && !$target->isEmpty()) {
+            throw new Exception(Exception::USER_TARGET_ALREADY_EXISTS);
+        }
+
+        /**
+        * @var Document $oldTarget
+        */
+        $oldTarget = $user->find('identifier', $user->getAttribute('phone'), 'targets');
+
         $user
             ->setAttribute('phone', $phone)
             ->setAttribute('phoneVerification', false) // After this user needs to confirm phone number again
@@ -2080,6 +2117,7 @@ App::patch('/v1/account/phone')
 
         try {
             $user = $dbForProject->withRequestTimestamp($requestTimestamp, fn () => $dbForProject->updateDocument('users', $user->getId(), $user));
+            $dbForProject->updateDocument('targets', $oldTarget->getId(), $oldTarget->setAttribute('identifier', $phone));
         } catch (Duplicate $th) {
             throw new Exception(Exception::USER_PHONE_ALREADY_EXISTS);
         }
@@ -2904,6 +2942,7 @@ App::post('/v1/account/verification/phone')
             Query::equal('internal', [true]),
             Query::equal('type', ['sms'])
         ]));
+
         if ($provider === false || $provider->isEmpty()) {
             throw new Exception(Exception::GENERAL_PHONE_DISABLED, 'Phone provider not configured');
         }
@@ -2952,18 +2991,9 @@ App::post('/v1/account/verification/phone')
 
         $target = $dbForProject->findOne('targets', [
             Query::equal('identifier', [$user->getAttribute('phone')]),
-            Query::equal('providerInternalId', [$provider->getInternalId()])
+            Query::equal('userInternalId', [$user->getInternalId()])
         ]);
 
-        if (!$target) {
-            $target = $dbForProject->createDocument('targets', new Document([
-                'userId' => $user->getId(),
-                'userInternalId' => $user->getInternalId(),
-                'providerType' => 'sms',
-                'identifier' => $user->getAttribute('phone'),
-            ]));
-        }
-
         $messageDoc = $dbForProject->createDocument('messages', new Document([
             '$id' => $verification->getId(),
             'targets' => [$target->getId()],