Skip to content

Commit

Permalink
Merge pull request #8236 from 2002Bishwajeet/fix-user-model
Browse files Browse the repository at this point in the history 
Fix: Don't set the target field if the existing target document is false
  • Loading branch information
@stnguyen90
stnguyen90 committed Jun 18, 2024
2 parents 2e18710 + eca2bbd commit 4b24848
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 28 deletions.
4 changes: 3 additions & 1 deletion app/controllers/api/account.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,9 @@
$existingTarget = $dbForProject->findOne('targets', [
Query::equal('identifier', [$email]),
]);
$user->setAttribute('targets', [...$user->getAttribute('targets', []), $existingTarget]);
if($existingTarget) {
$user->setAttribute('targets', $existingTarget, Document::SET_TYPE_APPEND);
}
}

$dbForProject->purgeCachedDocument('users', $user->getId());
Expand Down
8 changes: 6 additions & 2 deletions app/controllers/api/users.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,9 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e
$existingTarget = $dbForProject->findOne('targets', [
Query::equal('identifier', [$email]),
]);
$user->setAttribute('targets', [...$user->getAttribute('targets', []), $existingTarget]);
if($existingTarget) {
$user->setAttribute('targets', $existingTarget, Document::SET_TYPE_APPEND);
}
}
}

Expand All @@ -160,7 +162,9 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e
$existingTarget = $dbForProject->findOne('targets', [
Query::equal('identifier', [$phone]),
]);
$user->setAttribute('targets', [...$user->getAttribute('targets', []), $existingTarget]);
if($existingTarget) {
$user->setAttribute('targets', $existingTarget, Document::SET_TYPE_APPEND);
}
}
}

Expand Down
47 changes: 22 additions & 25 deletions tests/e2e/Services/Account/AccountCustomClientTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public function testGetAccount($data): array
$this->assertEquals(200, $response['headers']['status-code']);
$this->assertNotEmpty($response['body']);
$this->assertNotEmpty($response['body']['$id']);
$this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['registration']));
$this->assertTrue((new DatetimeValidator())->isValid($response['body']['registration']));
$this->assertEquals($response['body']['email'], $email);
$this->assertEquals($response['body']['name'], $name);
$this->assertArrayHasKey('accessedAt', $response['body']);
Expand Down Expand Up @@ -294,7 +294,7 @@ public function testGetAccountLogs($data): array
$this->assertIsNumeric($response['body']['total']);
$this->assertEquals("user.create", $response['body']['logs'][2]['event']);
$this->assertEquals(filter_var($response['body']['logs'][2]['ip'], FILTER_VALIDATE_IP), $response['body']['logs'][2]['ip']);
$this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['logs'][2]['time']));
$this->assertTrue((new DatetimeValidator())->isValid($response['body']['logs'][2]['time']));

$this->assertEquals('Windows', $response['body']['logs'][1]['osName']);
$this->assertEquals('WIN', $response['body']['logs'][1]['osCode']);
Expand Down Expand Up @@ -327,7 +327,6 @@ public function testGetAccountLogs($data): array
$this->assertEquals('desktop', $response['body']['logs'][2]['deviceName']);
$this->assertEquals('', $response['body']['logs'][2]['deviceBrand']);
$this->assertEquals('', $response['body']['logs'][2]['deviceModel']);
$this->assertEquals($response['body']['logs'][2]['ip'], filter_var($response['body']['logs'][2]['ip'], FILTER_VALIDATE_IP));

$this->assertEquals('--', $response['body']['logs'][2]['countryCode']);
$this->assertEquals('Unknown', $response['body']['logs'][2]['countryName']);
Expand All @@ -343,7 +342,7 @@ public function testGetAccountLogs($data): array
]
]);

$this->assertEquals($responseLimit['headers']['status-code'], 200);
$this->assertEquals(200, $responseLimit['headers']['status-code']);
$this->assertIsArray($responseLimit['body']['logs']);
$this->assertNotEmpty($responseLimit['body']['logs']);
$this->assertCount(1, $responseLimit['body']['logs']);
Expand Down Expand Up @@ -382,7 +381,7 @@ public function testGetAccountLogs($data): array
]
]);

$this->assertEquals($responseLimitOffset['headers']['status-code'], 200);
$this->assertEquals(200, $responseLimitOffset['headers']['status-code']);
$this->assertIsArray($responseLimitOffset['body']['logs']);
$this->assertNotEmpty($responseLimitOffset['body']['logs']);
$this->assertCount(1, $responseLimitOffset['body']['logs']);
Expand Down Expand Up @@ -430,7 +429,7 @@ public function testUpdateAccountName($data): array
$this->assertIsArray($response['body']);
$this->assertNotEmpty($response['body']);
$this->assertNotEmpty($response['body']['$id']);
$this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['registration']));
$this->assertTrue((new DatetimeValidator())->isValid($response['body']['registration']));
$this->assertEquals($response['body']['email'], $email);
$this->assertEquals($response['body']['name'], $newName);

Expand Down Expand Up @@ -497,7 +496,7 @@ public function testUpdateAccountPassword($data): array
$this->assertIsArray($response['body']);
$this->assertNotEmpty($response['body']);
$this->assertNotEmpty($response['body']['$id']);
$this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['registration']));
$this->assertTrue((new DatetimeValidator())->isValid($response['body']['registration']));
$this->assertEquals($response['body']['email'], $email);

$response = $this->client->call(Client::METHOD_POST, '/account/sessions/email', array_merge([
Expand Down Expand Up @@ -587,7 +586,7 @@ public function testUpdateAccountEmail($data): array
$this->assertIsArray($response['body']);
$this->assertNotEmpty($response['body']);
$this->assertNotEmpty($response['body']['$id']);
$this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['registration']));
$this->assertTrue((new DatetimeValidator())->isValid($response['body']['registration']));
$this->assertEquals($response['body']['email'], $newEmail);

/**
Expand Down Expand Up @@ -629,7 +628,7 @@ public function testUpdateAccountEmail($data): array
$this->assertEquals(201, $response['headers']['status-code']);
$this->assertNotEmpty($response['body']);
$this->assertNotEmpty($response['body']['$id']);
$this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['registration']));
$this->assertTrue((new DatetimeValidator())->isValid($response['body']['registration']));
$this->assertEquals($response['body']['email'], $data['email']);
$this->assertEquals($response['body']['name'], $data['name']);

Expand Down Expand Up @@ -771,7 +770,7 @@ public function testCreateAccountVerification($data): array
$this->assertEquals(201, $response['headers']['status-code']);
$this->assertNotEmpty($response['body']['$id']);
$this->assertEmpty($response['body']['secret']);
$this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['expire']));
$this->assertTrue((new DatetimeValidator())->isValid($response['body']['expire']));

$lastEmail = $this->getLastEmail();

Expand Down Expand Up @@ -1073,7 +1072,7 @@ public function testCreateAccountRecovery($data): array
$this->assertEquals(201, $response['headers']['status-code']);
$this->assertNotEmpty($response['body']['$id']);
$this->assertEmpty($response['body']['secret']);
$this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['expire']));
$this->assertTrue((new DatetimeValidator())->isValid($response['body']['expire']));

$lastEmail = $this->getLastEmail();

Expand Down Expand Up @@ -1668,7 +1667,7 @@ public function testConvertAnonymousAccount()
$this->assertIsArray($response['body']);
$this->assertNotEmpty($response['body']);
$this->assertNotEmpty($response['body']['$id']);
$this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['registration']));
$this->assertTrue((new DatetimeValidator())->isValid($response['body']['registration']));
$this->assertEquals($response['body']['email'], $email);

$response = $this->client->call(Client::METHOD_POST, '/account/sessions/email', array_merge([
Expand Down Expand Up @@ -1756,13 +1755,11 @@ public function testConvertAnonymousAccountOAuth2()

$this->assertEquals(200, $response['headers']['status-code']);
$this->assertEquals($response['body']['$id'], $userId);
$this->assertEquals($response['body']['name'], 'User Name');
$this->assertEquals($response['body']['email'], '[email protected]');
$this->assertEquals('User Name', $response['body']['name']);
$this->assertEquals('[email protected]', $response['body']['email']);

// Since we only support one oauth user, let's also check updateSession here

$this->assertEquals(200, $response['headers']['status-code']);

$response = $this->client->call(Client::METHOD_GET, '/account/sessions/current', array_merge([
'origin' => 'http:https://localhost',
'content-type' => 'application/json',
Expand Down Expand Up @@ -1808,7 +1805,7 @@ public function testGetSessionByID()

$this->assertEquals(200, $response['headers']['status-code']);
$this->assertEmpty($response['body']['secret']);
$this->assertEquals($response['body']['provider'], 'anonymous');
$this->assertEquals('anonymous', $response['body']['provider']);

$sessionID = $response['body']['$id'];

Expand All @@ -1821,7 +1818,7 @@ public function testGetSessionByID()

$this->assertEquals(200, $response['headers']['status-code']);
$this->assertEmpty($response['body']['secret']);
$this->assertEquals($response['body']['provider'], 'anonymous');
$this->assertEquals('anonymous', $response['body']['provider']);

$response = $this->client->call(Client::METHOD_GET, '/account/sessions/97823askjdkasd80921371980', array_merge([
'origin' => 'http:https://localhost',
Expand Down Expand Up @@ -1934,7 +1931,7 @@ public function testCreatePhone(): array
$this->assertEquals(201, $response['headers']['status-code']);
$this->assertNotEmpty($response['body']['$id']);
$this->assertEmpty($response['body']['secret']);
$this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['expire']));
$this->assertTrue((new DatetimeValidator())->isValid($response['body']['expire']));

$userId = $response['body']['userId'];

Expand Down Expand Up @@ -2085,7 +2082,7 @@ public function testConvertPhoneToPassword(array $data): array
$this->assertIsArray($response['body']);
$this->assertNotEmpty($response['body']);
$this->assertNotEmpty($response['body']['$id']);
$this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['registration']));
$this->assertTrue((new DatetimeValidator())->isValid($response['body']['registration']));
$this->assertEquals($response['body']['email'], $email);

$response = $this->client->call(Client::METHOD_POST, '/account/sessions/email', array_merge([
Expand Down Expand Up @@ -2127,7 +2124,7 @@ public function testUpdatePhone(array $data): array
$this->assertIsArray($response['body']);
$this->assertNotEmpty($response['body']);
$this->assertNotEmpty($response['body']['$id']);
$this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['registration']));
$this->assertTrue((new DatetimeValidator())->isValid($response['body']['registration']));
$this->assertEquals($response['body']['phone'], $newPhone);

/**
Expand Down Expand Up @@ -2240,7 +2237,7 @@ public function testPhoneVerification(array $data): array
$this->assertEquals(201, $response['headers']['status-code']);
$this->assertNotEmpty($response['body']['$id']);
$this->assertEmpty($response['body']['secret']);
$this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['expire']));
$this->assertTrue((new DatetimeValidator())->isValid($response['body']['expire']));

$smsRequest = $this->getLastRequest();

Expand Down Expand Up @@ -2327,7 +2324,7 @@ public function testCreateMagicUrl(): array
$this->assertNotEmpty($response['body']['$id']);
$this->assertEmpty($response['body']['secret']);
$this->assertEmpty($response['body']['phrase']);
$this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['expire']));
$this->assertTrue((new DatetimeValidator())->isValid($response['body']['expire']));

$userId = $response['body']['userId'];

Expand Down Expand Up @@ -2452,7 +2449,7 @@ public function testCreateSessionWithMagicUrl($data): array
$this->assertEquals(200, $response['headers']['status-code']);
$this->assertNotEmpty($response['body']);
$this->assertNotEmpty($response['body']['$id']);
$this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['registration']));
$this->assertTrue((new DatetimeValidator())->isValid($response['body']['registration']));
$this->assertEquals($response['body']['email'], $email);
$this->assertTrue($response['body']['emailVerification']);

Expand Down Expand Up @@ -2512,7 +2509,7 @@ public function testUpdateAccountPasswordWithMagicUrl($data): array
$this->assertIsArray($response['body']);
$this->assertNotEmpty($response['body']);
$this->assertNotEmpty($response['body']['$id']);
$this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['registration']));
$this->assertTrue((new DatetimeValidator())->isValid($response['body']['registration']));
$this->assertEquals($response['body']['email'], $email);

$response = $this->client->call(Client::METHOD_POST, '/account/sessions/email', array_merge([
Expand Down

0 comments on commit 4b24848

Please sign in to comment.