public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:samuelclay/NewsBlur

Browse source
This commit is contained in:
Samuel Clay 2010-07-07 16:22:56 -04:00
commit fa1d44ee95
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/feed_import/views.py
View file

@ -39,6 +39,7 @@ def opml_upload(request):
def reader_authorize(request): def reader_authorize(request):
print request.session.session_key
oauth_key = settings.OAUTH_KEY oauth_key = settings.OAUTH_KEY
oauth_secret = settings.OAUTH_SECRET oauth_secret = settings.OAUTH_SECRET
scope = "http://www.google.com/reader/api" scope = "http://www.google.com/reader/api"
@ -77,6 +78,7 @@ def reader_callback(request):
if request.user.is_authenticated(): if request.user.is_authenticated():
user_token = OAuthToken.objects.get(user=request.user) user_token = OAuthToken.objects.get(user=request.user)
else: else:
print request.session.session_key
user_token = OAuthToken.objects.get(session_id=request.session.session_key) user_token = OAuthToken.objects.get(session_id=request.session.session_key)
# Authenticated in Google, so verify and fetch access tokens # Authenticated in Google, so verify and fetch access tokens

2
settings.py
View file

@ -169,7 +169,7 @@ INTERNAL_IPS = ('127.0.0.1',)
LOGGING_LOG_SQL = True LOGGING_LOG_SQL = True
APPEND_SLASH = True APPEND_SLASH = True
SOUTH_TESTS_MIGRATE = False SOUTH_TESTS_MIGRATE = False
# SESSION_ENGINE = "django.contrib.sessions.backends.cache" SESSION_ENGINE = "django.contrib.sessions.backends.cached_db"
# =============== # ===============
# = Django Apps = # = Django Apps =