diff --git a/server/src/resolvers/User.js b/server/src/resolvers/User.js
index 254c32d..fd86ab8 100755
--- a/server/src/resolvers/User.js
+++ b/server/src/resolvers/User.js
@@ -7,10 +7,15 @@ const User = {
displayName: parent =>
parent.displayName ? parent.displayName.capitalize() : '',
- groups: async (parent, args, { ad }) =>
- parent.groups
+ groups: async (parent, args, { ad }) => {
+ const groups = parent.groups
? parent.groups
- : ad.getGroupMembershipForUser(parent.sAMAccountName),
+ : ad.getGroupMembershipForUser(parent.sAMAccountName)
+
+ const sortedGroups = groups.sort((a, b) => a.cn.localeCompare(b.cn))
+
+ return sortedGroups
+ },
lastLogin: parent => parent.lastLogin?.toISOString(),
diff --git a/web/src/components/ui/GroupBadge.vue b/web/src/components/ui/GroupBadge.vue
index 59b7676..6d872f0 100644
--- a/web/src/components/ui/GroupBadge.vue
+++ b/web/src/components/ui/GroupBadge.vue
@@ -1,17 +1,62 @@
-
- mdi-account-group
+
+ {{ groupIcon }}
{{ group }}