Use more consistent ordering on realm selection and lists pages (#632)

pkg/database/realm.go

@@ -516,7 +516,7 @@ func (r *Realm) FindAuthorizedApp(db *Database, id interface{}) (*AuthorizedApp,
 	if err := db.db.
 		Unscoped().
 		Model(AuthorizedApp{}).
-		Order("LOWER(name)").
+		Order("LOWER(name) ASC").
 		Where("id = ? AND realm_id = ?", id, r.ID).
 		First(&app).
 		Error; err != nil {
@@ -615,7 +615,10 @@ func (db *Database) FindRealm(id interface{}) (*Realm, error) {
 
 func (db *Database) GetRealms() ([]*Realm, error) {
 	var realms []*Realm
-	if err := db.db.Find(&realms).Error; err != nil {
+	if err := db.db.
+		Order("name ASC").
+		Find(&realms).
+		Error; err != nil {
 		return nil, err
 	}
 	return realms, nil

pkg/database/user.go

@@ -17,6 +17,7 @@ package database
 import (
 	"context"
 	"fmt"
+	"sort"
 	"strings"
 	"time"
 
@@ -40,6 +41,20 @@ type User struct {
 	LastPasswordChange time.Time
 }
 
+// AfterFind runs after the record is found.
+func (u *User) AfterFind(tx *gorm.DB) error {
+	// Sort Realms and Admin realms. Unfortunately gorm provides no way to do this
+	// via sql hooks or default scopes.
+	sort.Slice(u.Realms, func(i, j int) bool {
+		return strings.ToLower(u.Realms[i].Name) < strings.ToLower(u.Realms[j].Name)
+	})
+	sort.Slice(u.AdminRealms, func(i, j int) bool {
+		return strings.ToLower(u.AdminRealms[i].Name) < strings.ToLower(u.AdminRealms[j].Name)
+	})
+
+	return nil
+}
+
 // PasswordAgeString displays the age of the password in friendly text.
 func (u *User) PasswordAgeString() string {
 	ago := time.Since(u.LastPasswordChange)
@@ -196,7 +211,7 @@ func (db *Database) ListSystemAdmins() ([]*User, error) {
 	if err := db.db.
 		Model(&User{}).
 		Where("admin IS TRUE").
-		Order("name DESC").
+		Order("LOWER(name) ASC").
 		Find(&users).
 		Error; err != nil {
 		if IsNotFound(err) {