diff options
3 files changed, 10 insertions, 5 deletions
diff --git a/apps/provisioning_api/lib/Controller/AUserDataOCSController.php b/apps/provisioning_api/lib/Controller/AUserDataOCSController.php index 4f45a739823..4cded6c1137 100644 --- a/apps/provisioning_api/lib/Controller/AUserDataOCSController.php +++ b/apps/provisioning_api/lib/Controller/AUserDataOCSController.php @@ -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()); diff --git a/apps/provisioning_api/lib/ResponseDefinitions.php b/apps/provisioning_api/lib/ResponseDefinitions.php index 2a5d13746cd..d41a78746b5 100644 --- a/apps/provisioning_api/lib/ResponseDefinitions.php +++ b/apps/provisioning_api/lib/ResponseDefinitions.php @@ -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, diff --git a/apps/provisioning_api/tests/Controller/UsersControllerTest.php b/apps/provisioning_api/tests/Controller/UsersControllerTest.php index e4b42c04651..f75ec9192c3 100644 --- a/apps/provisioning_api/tests/Controller/UsersControllerTest.php +++ b/apps/provisioning_api/tests/Controller/UsersControllerTest.php @@ -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' => [], |