User._find_user() should return a user, not a list of emails

engineauth/models.py

@@ -341,7 +341,9 @@ def _find_user(cls, auth_id, emails=None):
             # TODO: email should only be trusted if it is verified.
             assert isinstance(emails, list), 'Emails must be a list'
             address = [e['value'] for e in emails]
-            user = cls.email_model.get_by_emails(address)
+            emails = cls.email_model.get_by_emails(address)
+            if emails:
+                user = cls.get_by_id(int(emails[0].user_id))
         return user
 
     @classmethod
@@ -481,4 +483,4 @@ def remove_inactive(cls, days_ago=30, now=None):
         now = now or datetime.datetime.now()
         dtd = now + datetime.timedelta(-days_ago)
         for s in cls.query(cls.updated < dtd).fetch():
-            s.key.delete()
+            s.key.delete()