feat: cs fix run on the changed files and default order by last_login desc. Also...

Signed-off-by: yemkareems <yemkareems@gmail.com>

diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php
index 04bf3a94421f85234899c6f97d2ba9975070b0b4..fe8a17a66415badaa50ec0276a3fd55d080e2810 100644 (file)
--- a/apps/provisioning_api/lib/Controller/UsersController.php
+++ b/apps/provisioning_api/lib/Controller/UsersController.php
@@ -137,7 +137,7 @@ class UsersController extends AUserData {
         *
         * 200: Users details returned
         */
-       public function getUsersDetails(string $search = '', ?int $limit = null, int $offset = 0, string $orderBy = 'displayName', string $sort = 'ASC'): DataResponse {
+       public function getUsersDetails(string $search = '', ?int $limit = null, int $offset = 0, string $orderBy = 'last_login', string $sort = 'DESC'): DataResponse {
                $currentUser = $this->userSession->getUser();
                $users = [];
 

diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php
index 6b0c0dbd1d303590ff79935c7d2665378f94b1ca..87aa859408df43d24a8c963d39c6fef8b7389abc 100644 (file)
--- a/lib/private/User/Manager.php
+++ b/lib/private/User/Manager.php
@@ -280,12 +280,12 @@ class Manager extends PublicEmitter implements IUserManager {
                                break;
                        case 'last_login ASC':
                                uasort($users, function (IUser $a, IUser $b) {
-                                       return strcasecmp($a->getLastLogin(), $b->getLastLogin());
+                                       return $a->getLastLogin() - $b->getLastLogin();
                                });
                                break;
                        case 'last_login DESC':
                                uasort($users, function (IUser $a, IUser $b) {
-                                       return strcasecmp($b->getLastLogin(), $a->getLastLogin());
+                                       return $b->getLastLogin() - $a->getLastLogin();
                                });
                                break;
                        case 'displayName ASC':
@@ -316,7 +316,7 @@ class Manager extends PublicEmitter implements IUserManager {
         * @param int $offset
         * @return IUser[]
         */
-       public function searchDisplayName($pattern, $limit = null, $offset = null, $orderBy = 'displayName', $sort= 'ASC') {
+       public function searchDisplayName($pattern, $limit = null, $offset = null, $orderBy = 'displayName', $sort = 'ASC') {
                $users = [];
                foreach ($this->backends as $backend) {
                        $backendUsers = $backend->getDisplayNames($pattern, $limit, $offset);
@@ -340,12 +340,12 @@ class Manager extends PublicEmitter implements IUserManager {
                                break;
                        case 'last_login ASC':
                                uasort($users, function (IUser $a, IUser $b) {
-                                       return strcasecmp($a->getLastLogin(), $b->getLastLogin());
+                                       return $a->getLastLogin() - $b->getLastLogin();
                                });
                                break;
                        case 'last_login DESC':
                                uasort($users, function (IUser $a, IUser $b) {
-                                       return strcasecmp($b->getLastLogin(), $a->getLastLogin());
+                                       return $b->getLastLogin() - $a->getLastLogin();
                                });
                                break;
                        case 'displayName DESC':