# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2017-07-27 16:13:25
# Node ID 339c39a809f3917a71c01afd50f6090e67e90827
# Parent  f55ac84b4e717fbd4a909e5fc2038350ede04d6b

db: use consistent order of auth-tokens and emails when fetching those from user.

diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -615,7 +615,10 @@ class User(Base, BaseModel):
 
     @property
     def emails(self):
-        other = UserEmailMap.query().filter(UserEmailMap.user == self).all()
+        other = UserEmailMap.query()\
+            .filter(UserEmailMap.user == self) \
+            .order_by(UserEmailMap.email_id.asc()) \
+            .all()
         return [self.email] + [x.email for x in other]
 
     @property
@@ -624,7 +627,10 @@ class User(Base, BaseModel):
         return [x.api_key for x in auth_tokens]
 
     def get_auth_tokens(self):
-        return UserApiKeys.query().filter(UserApiKeys.user == self).all()
+        return UserApiKeys.query()\
+            .filter(UserApiKeys.user == self)\
+            .order_by(UserApiKeys.user_api_key_id.asc())\
+            .all()
 
     @property
     def feed_token(self):