Replace user-or-id resolution with new models module method

diff --git a/social_auth/backends/utils.py b/social_auth/backends/utils.py
index bd69bdc05e9b3b02af8f237260b0d61aa41b81fd..566036c429b8db59f6a0fd5b394aa524543c979c 100644 (file)
--- a/social_auth/backends/utils.py
+++ b/social_auth/backends/utils.py
@@ -4,17 +4,13 @@ from oauth2 import Consumer as OAuthConsumer, Token, Request as OAuthRequest, \
 
 from django.utils import simplejson
 
-from social_auth.models import User
+from social_auth.models import resolve_user_or_id
 
 
 def consumer_oauth_url_request(backend, url, user_or_id, redirect_uri='/',
                                json=True):
     """Builds and retrieves an OAuth signed response."""
-    if isinstance(user_or_id, User):
-        user = user_or_id
-    else:
-        user = User.objects.get(pk=user_or_id)
-
+    user = resolve_user_or_id(user_or_id)
     oauth_info = user.social_auth.filter(provider=backend.AUTH_BACKEND.name)[0]
     token = Token.from_string(oauth_info.tokens['access_token'])
     request = build_consumer_oauth_request(backend, token, url, redirect_uri)

diff --git a/social_auth/django_models.py b/social_auth/django_models.py
index c10ded84bf59c3de4126ff6652ff9e0aabbb43d9..f12a4f9f8a3d4cba9fa3889ae1fca45689bda9b7 100644 (file)
--- a/social_auth/django_models.py
+++ b/social_auth/django_models.py
@@ -51,6 +51,12 @@ def get_user_by_email(email):
     return User.objects.get(email=email)
 
 
+def resolve_user_or_id(user_or_id):
+    if isinstance(user_or_id, User):
+       return user_or_id
+    return User.objects.get(pk=user_or_id)
+
+
 def get_social_auth_for_user(user):
     return user.social_auth.all()
 

diff --git a/social_auth/mongoengine_models.py b/social_auth/mongoengine_models.py
index 7de80102bb74aaf072a89e1fa158e53ca9086b81..59fc42ed379bbefe377f44bb7f1158fcd0cb296f 100644 (file)
--- a/social_auth/mongoengine_models.py
+++ b/social_auth/mongoengine_models.py
@@ -59,6 +59,12 @@ def get_user_by_email(email):
     return User.objects.get(email=email)
 
 
+def resolve_user_or_id(user_or_id):
+    if isinstance(user_or_id, User):
+       return user_or_id
+    return User.objects.get(pk=user_or_id)
+
+
 def get_social_auth_for_user(user):
     return UserSocialAuth.objects(user=user)