Fix the profile_name of admin users

0cb7d04c · Lukas Burgey · e1c7075f · 0cb7d04c
Commit 0cb7d04c authored Oct 22, 2018 by Lukas Burgey
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

feudal/backend/models/users.py feudal/backend/models/users.py +6 -2

No files found.
--- a/feudal/backend/models/users.py
+++ b/feudal/backend/models/users.py
@@ -65,10 +65,14 @@ class User(AbstractUser):
    def profile_name(self):
        if 'email' in self.userinfo:
            return self.userinfo['email']
-        elif 'name' in self.userinfo:
+
+        if 'name' in self.userinfo:
            return self.userinfo['name']

-        return self.id
+        if 'sub' in self.userinfo:
+            return self.userinfo['sub']
+
+        return self.username

    @property
    def deployment_state_items(self):