Skip to content
This repository was archived by the owner on Nov 12, 2021. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/facegraph/canvas.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@
import signature


def b64url_decode(encoded):
"""Decode a string encoded in URL-safe base64 without padding."""

# The padding should round the length of the string up to a multiple of 4.
padding_fixed = encoded + (((4 - (len(encoded) % 4)) % 4) * '=')
return base64.urlsafe_b64decode(str(padding_fixed))
def b64url_encode(data):
return base64.urlsafe_b64encode(data).rstrip('=')

def b64url_decode(data):
data = data.encode(u'ascii')
data += '=' * (4 - (len(data) % 4))
return base64.urlsafe_b64decode(data)


def decode_signed_request(app_secret, signed_request):
Expand Down
2 changes: 1 addition & 1 deletion src/facegraph/django/middleware.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class FacebookCanvasMiddleware(object):

def process_request(self, request):
app_secret = self.app_secret(request)
raw_fbrequest = request.GET.get('signed_request', None)
raw_fbrequest = request.REQUEST.get('signed_request', None)
if not (app_secret and raw_fbrequest):
request.fbrequest = None
return
Expand Down
5 changes: 2 additions & 3 deletions src/facegraph/fql.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,8 @@ def multi(self, queries, **params):

return self.fetch_json(url)

@classmethod
def fetch_json(cls, url, data=None):
response = json.loads(cls.fetch(url, data=data))
def fetch_json(self, url, data=None):
response = json.loads(self.__class__.fetch(url, data=data))
if isinstance(response, dict):
if response.get("error_msg"):
code = response.get("error_code")
Expand Down
2 changes: 1 addition & 1 deletion src/facegraph/graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ class Node(bunch.Bunch):

def user_location(user_id):
user = graph[user_id]()
if 'location' in user:
if 'location' in user.keys():
return user.location
return False

Expand Down