CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-10-01 17:58:02 +13:00
Code Issues Projects Releases Wiki Activity

Add missing accessedAt values when creating users

Browse source
This commit is contained in:
Jake Barnby 2023-08-22 21:34:23 -04:00
parent 24fcc360e2
commit a84e669a1f
No known key found for this signature in database
GPG key ID: C437A8CC85B96E9C
3 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/controllers/api/account.php
View file

@ -128,9 +128,10 @@ App::post('/v1/account/invite')
'sessions' => null, 'sessions' => null,
'tokens' => null, 'tokens' => null,
'memberships' => null, 'memberships' => null,
'search' => implode(' ', [$userId, $email, $name]) 'search' => implode(' ', [$userId, $email, $name]),
'accessedAt' => DateTime::now(),
]))); ])));
} catch (Duplicate $th) { } catch (Duplicate) {
throw new Exception(Exception::USER_ALREADY_EXISTS); throw new Exception(Exception::USER_ALREADY_EXISTS);
} }
@ -240,10 +241,10 @@ App::post('/v1/account')
'tokens' => null, 'tokens' => null,
'memberships' => null, 'memberships' => null,
'search' => implode(' ', [$userId, $email, $name]), 'search' => implode(' ', [$userId, $email, $name]),
'accessedAt' => DateTime::now(), // Add this here to make sure it's returned in the response 'accessedAt' => DateTime::now(),
]); ]);
Authorization::skip(fn() => $dbForProject->createDocument('users', $user)); Authorization::skip(fn() => $dbForProject->createDocument('users', $user));
} catch (Duplicate $th) { } catch (Duplicate) {
throw new Exception(Exception::USER_ALREADY_EXISTS); throw new Exception(Exception::USER_ALREADY_EXISTS);
} }
@ -746,10 +747,11 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
'sessions' => null, 'sessions' => null,
'tokens' => null, 'tokens' => null,
'memberships' => null, 'memberships' => null,
'search' => implode(' ', [$userId, $email, $name]) 'search' => implode(' ', [$userId, $email, $name]),
'accessedAt' => DateTime::now(),
]); ]);
Authorization::skip(fn() => $dbForProject->createDocument('users', $user)); Authorization::skip(fn() => $dbForProject->createDocument('users', $user));
} catch (Duplicate $th) { } catch (Duplicate) {
$failureRedirect(Exception::USER_ALREADY_EXISTS); $failureRedirect(Exception::USER_ALREADY_EXISTS);
} }
} }
@ -1046,7 +1048,8 @@ App::post('/v1/account/sessions/magic-url')
'sessions' => null, 'sessions' => null,
'tokens' => null, 'tokens' => null,
'memberships' => null, 'memberships' => null,
'search' => implode(' ', [$userId, $email]) 'search' => implode(' ', [$userId, $email]),
'accessedAt' => DateTime::now(),
]); ]);
Authorization::skip(fn () => $dbForProject->createDocument('users', $user)); Authorization::skip(fn () => $dbForProject->createDocument('users', $user));
@ -1335,7 +1338,8 @@ App::post('/v1/account/sessions/phone')
'sessions' => null, 'sessions' => null,
'tokens' => null, 'tokens' => null,
'memberships' => null, 'memberships' => null,
'search' => implode(' ', [$userId, $phone]) 'search' => implode(' ', [$userId, $phone]),
'accessedAt' => DateTime::now(),
]); ]);
Authorization::skip(fn () => $dbForProject->createDocument('users', $user)); Authorization::skip(fn () => $dbForProject->createDocument('users', $user));
@ -1586,6 +1590,7 @@ App::post('/v1/account/sessions/anonymous')
'tokens' => null, 'tokens' => null,
'memberships' => null, 'memberships' => null,
'search' => $userId, 'search' => $userId,
'accessedAt' => DateTime::now(),
]); ]);
Authorization::skip(fn() => $dbForProject->createDocument('users', $user)); Authorization::skip(fn() => $dbForProject->createDocument('users', $user));

3
app/controllers/api/users.php
View file

@ -96,7 +96,8 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e
'sessions' => null, 'sessions' => null,
'tokens' => null, 'tokens' => null,
'memberships' => null, 'memberships' => null,
'search' => implode(' ', [$userId, $email, $phone, $name]) 'search' => implode(' ', [$userId, $email, $phone, $name]),
'accessedAt' => DateTime::now(),
])); ]));
} catch (Duplicate $th) { } catch (Duplicate $th) {
throw new Exception(Exception::USER_ALREADY_EXISTS); throw new Exception(Exception::USER_ALREADY_EXISTS);

1
tests/e2e/Services/Account/AccountCustomClientTest.php
View file

@ -408,6 +408,7 @@ class AccountCustomClientTest extends Scope
])); ]));
$this->assertEquals($response['headers']['status-code'], 200); $this->assertEquals($response['headers']['status-code'], 200);
$this->assertArrayHasKey('accessedAt', $response['body']); $this->assertArrayHasKey('accessedAt', $response['body']);
$this->assertNotEmpty($response['body']['accessedAt']); $this->assertNotEmpty($response['body']['accessedAt']);
/** /**