From: Stas Kravets <krvss@mail.ru>
Date: Tue, 20 Sep 2011 16:31:21 +0000 (+0400)
Subject: Adding support of OAuth app login.
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d1514c6b4feb27808acafa0162b68a8764f24c9e;p=django-social-auth.git

Adding support of OAuth app login.
---

diff --git a/social_auth/backends/facebook.py b/social_auth/backends/facebook.py
index c9104e9..249fc47 100644
--- a/social_auth/backends/facebook.py
+++ b/social_auth/backends/facebook.py
@@ -83,10 +83,11 @@ class FacebookAuth(BaseOAuth):
 
         if 'signed_request' in self.data:
             response = load_signed_request(self.data.get('signed_request'))
-            
+
             if response is not None:
-                access_token = response.get('access_token') or response.get('oauth_token')
-            
+                access_token = response.get('access_token') or response.get('oauth_token') \
+                               or self.data.get('access_token')
+
                 if 'expires' in response:
                     expires = response['expires']
 
@@ -96,7 +97,7 @@ class FacebookAuth(BaseOAuth):
 
             sorted = params_dict.items()
             sorted.sort(key=lambda x:x[0])
-            
+
             check_str = ''.join(["%s=%s"%(x[0], x[1]) for x in sorted]) + settings.FACEBOOK_API_SECRET
             expected_sig = hashlib.md5(check_str).hexdigest()
             sig = self.data['sig']