Always return active, non-pending users first

Author: brandonkelly

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- User queries now always return active, non-pending users first, unless otherwise specified by `orderBy`. ([#18148](https://github.com/craftcms/cms/issues/18148))
 - Fixed a bug where all plugin settings were being saved to the project config, rather than just posted settings. ([craftcms/commerce#4006](https://github.com/craftcms/commerce/issues/4006))
 - Fixed a bug where Matrix fields’ Entry Types settings were partially interactive when admin changes were disallowed. ([#18145](https://github.com/craftcms/cms/pull/18145))
 - Fixed a bug where users could be unable to sign in if an inactive user account existed with the same email address. ([#18148](https://github.com/craftcms/cms/issues/18148))

src/elements/db/UserQuery.php

@@ -50,7 +50,11 @@ class UserQuery extends ElementQuery
     /**
      * @inheritdoc
      */
-    protected array $defaultOrderBy = ['users.username' => SORT_ASC];
+    protected array $defaultOrderBy = [
+        'users.username' => SORT_ASC,
+        'users.active' => SORT_DESC,
+        'users.pending' => SORT_DESC,
+    ];
 
     // General parameters
     // -------------------------------------------------------------------------
@@ -1103,6 +1107,21 @@ protected function beforePrepare(): bool
             ]);
         }
 
+        // If there's a custom orderBy, make sure we're showing active, non-pending accounts first
+        if (
+            is_array($this->orderBy) &&
+            empty($this->query->orderBy) &&
+            (
+                count($this->orderBy) !== 1 ||
+                !($this->orderBy[0] ?? null) instanceof OrderByPlaceholderExpression
+            )
+        ) {
+            $this->orderBy = array_merge($this->orderBy, [
+                'users.active' => SORT_DESC,
+                'users.pending' => SORT_DESC,
+            ]);
+        }
+
         return true;
     }
 

src/services/Users.php

@@ -294,9 +294,6 @@ public function getUserByUsernameOrEmail(string $usernameOrEmail): ?User
                 ]);
         }
 
-        // order by credentialed users first
-        $query->orderBy(['users.active' => SORT_DESC, 'users.pending' => SORT_DESC]);
-
         /** @var User|null */
         return $query->one();
     }