diff options
| author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2010-02-15 23:18:02 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2010-02-15 23:18:02 -0600 |
| commit | 1e7bd132df5f56f397b555c7481a635c9d66a56a (patch) | |
| tree | 54aac7789eb445d3d01eaea36f2956e386bb0086 /fbconnect/fb.py | |
| parent | d276802efa5899ccb568de1b4c445d54ea72c42d (diff) | |
| parent | 89131389eb631456a0bdaa3a705488d43d0ced9b (diff) | |
| download | askbot-1e7bd132df5f56f397b555c7481a635c9d66a56a.tar.gz askbot-1e7bd132df5f56f397b555c7481a635c9d66a56a.tar.bz2 askbot-1e7bd132df5f56f397b555c7481a635c9d66a56a.zip | |
Merge commit 'osqa/master'
Conflicts:
forum/skins/default/media/js/wmd/wmd.js
forum/skins/default/templates/base.html
forum/skins/default/templates/base_content.html
forum/views.py
locale/en/LC_MESSAGES/django.mo
locale/en/LC_MESSAGES/django.po
settings_local.py.dist
Diffstat (limited to 'fbconnect/fb.py')
| -rwxr-xr-x | fbconnect/fb.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fbconnect/fb.py b/fbconnect/fb.py index 99bc0b79..afcd8210 100755 --- a/fbconnect/fb.py +++ b/fbconnect/fb.py @@ -73,17 +73,24 @@ STATES = { def get_user_state(request): API_KEY = settings.FB_API_KEY + logging.debug('') if API_KEY in request.COOKIES: + logging.debug('FB API key is in request cookies') if check_cookies_signature(request.COOKIES): + logging.debug('FB cookie signature is fine') if check_session_expiry(request.COOKIES): + logging.debug('FB session is not expired') try: uassoc = FBAssociation.objects.get(fbuid=request.COOKIES[API_KEY + '_user']) + logging.debug('found existing FB user association') return (STATES['RETURNINGUSER'], uassoc.user) except: + logging.debug('dont have FB association for this user') return (STATES['FIRSTTIMER'], get_user_data(request.COOKIES)) else: + logging.debug('FB session expired') return (STATES['SESSIONEXPIRED'], None) + logging.debug('FB state is INVALID') return (STATES['INVALIDSTATE'], None) - |