upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-22 23:03:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 55

fix: Return timestamps in unix format rather than milliseconds

Browse source 
Co-authored-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com>
Signed-off-by: Côme Chilliet <91878298+come-nc@users.noreply.github.com>
This commit is contained in:
Côme Chilliet 2024-12-10 10:06:17 +01:00 committed by Côme Chilliet
parent 1d0962ab33
commit a8a2ca42a4
No known key found for this signature in database
GPG key ID: A3E2F658B28C760A
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/provisioning_api/lib/Controller/AUserDataOCSController.php
View file

@ -116,7 +116,8 @@ abstract class AUserDataOCSController extends OCSController {
// Find the data
$data['id'] = $targetUserObject->getUID();
$data['firstLogin'] = $targetUserObject->getFirstLogin() * 1000;
$data['firstLoginTimestamp'] = $targetUserObject->getFirstLogin();
$data['lastLoginTimestamp'] = $targetUserObject->getLastLogin();
$data['lastLogin'] = $targetUserObject->getLastLogin() * 1000;
$data['backend'] = $targetUserObject->getBackendClassName();
$data['subadmin'] = $this->getUserSubAdminGroupsData($targetUserObject->getUID());

3
apps/provisioning_api/lib/ResponseDefinitions.php
View file

@ -46,7 +46,8 @@ namespace OCA\Provisioning_API;
* headlineScope?: Provisioning_APIUserDetailsScope,
* id: string,
* language: string,
* firstLogin: int,
* firstLoginTimestamp: int,
* lastLoginTimestamp: int,
* lastLogin: int,
* locale: string,
* manager: string,

9
apps/provisioning_api/tests/Controller/UsersControllerTest.php
View file

@ -1173,7 +1173,8 @@ class UsersControllerTest extends TestCase {
'id' => 'UID',
'enabled' => true,
'storageLocation' => '/var/www/newtcloud/data/UID',
'firstLogin' => 1511191471000,
'firstLoginTimestamp' => 1511191471,
'lastLoginTimestamp' => 1521191471,
'lastLogin' => 1521191471000,
'backend' => 'Database',
'subadmin' => ['group3'],
@ -1317,7 +1318,8 @@ class UsersControllerTest extends TestCase {
$expected = [
'id' => 'UID',
'enabled' => true,
'firstLogin' => 1511191471000,
'firstLoginTimestamp' => 1511191471,
'lastLoginTimestamp' => 1521191471,
'lastLogin' => 1521191471000,
'backend' => 'Database',
'subadmin' => [],
@ -1499,7 +1501,8 @@ class UsersControllerTest extends TestCase {
$expected = [
'id' => 'UID',
'firstLogin' => 1511191471000,
'firstLoginTimestamp' => 1511191471,
'lastLoginTimestamp' => 1521191471,
'lastLogin' => 1521191471000,
'backend' => 'Database',
'subadmin' => [],