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

No longer throwing an error on a bad Google Reader import. Re-authorizing instead.

Browse source
This commit is contained in:
Samuel Clay 2010-11-04 19:26:50 -04:00
parent f774745535
commit b690bb9de3
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/feed_import/views.py
View file

@ -2,6 +2,7 @@ import urlparse
from utils import log as logging from utils import log as logging
import oauth2 as oauth import oauth2 as oauth
from django.contrib.sites.models import Site from django.contrib.sites.models import Site
from django.db import IntegrityError
from django.http import HttpResponse, HttpResponseRedirect from django.http import HttpResponse, HttpResponseRedirect
from django.conf import settings from django.conf import settings
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
@ -109,7 +110,11 @@ def reader_callback(request):
# logging.info(" ---> [%s] OAuth Reader Content: %s -- %s" % (request.user, token, access_token)) # logging.info(" ---> [%s] OAuth Reader Content: %s -- %s" % (request.user, token, access_token))
user_token.access_token = access_token.get('oauth_token') user_token.access_token = access_token.get('oauth_token')
user_token.access_token_secret = access_token.get('oauth_token_secret') user_token.access_token_secret = access_token.get('oauth_token_secret')
try:
user_token.save() user_token.save()
except IntegrityError:
logging.info(" ***> [%s] Bad token from Google Reader. Re-authenticating." % (request.user,))
return HttpResponseRedirect(reverse('google-reader-authorize'))
# Fetch imported feeds on next page load # Fetch imported feeds on next page load
request.session['import_from_google_reader'] = True request.session['import_from_google_reader'] = True