public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-05 16:58:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing OAuth connect.

Browse source
This commit is contained in:
Samuel Clay 2020-06-26 08:44:13 -04:00
parent f88d9f7a43
commit 6b69cc0ebe
2 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
UPGRADING.md Normal file
View file

@ -0,0 +1,18 @@
# Upgrading from Django 1.5 to 3.0
## Django 1.7
pip install -r requirements.txt
pip uninstall south
./manage.py migrate
## Django 1.8
pip install -r requirements.txt
./manage.py migrate
## Django 1.9
pip install -r requirements.txt
./manage.py migrate oauth2_provider 0001 --fake
./manage.py migrate

14
apps/oauth/views.py
View file

@ -30,9 +30,9 @@ def twitter_connect(request):
twitter_consumer_key = settings.TWITTER_CONSUMER_KEY twitter_consumer_key = settings.TWITTER_CONSUMER_KEY
twitter_consumer_secret = settings.TWITTER_CONSUMER_SECRET twitter_consumer_secret = settings.TWITTER_CONSUMER_SECRET
oauth_token = request.POST.get('oauth_token') oauth_token = request.GET.get('oauth_token')
oauth_verifier = request.POST.get('oauth_verifier') oauth_verifier = request.GET.get('oauth_verifier')
denied = request.POST.get('denied') denied = request.GET.get('denied')
if denied: if denied:
logging.user(request, "~BB~FRDenied Twitter connect") logging.user(request, "~BB~FRDenied Twitter connect")
return {'error': 'Denied! Try connecting again.'} return {'error': 'Denied! Try connecting again.'}
@ -93,7 +93,7 @@ def facebook_connect(request):
"display": "popup", "display": "popup",
} }
verification_code = request.POST.get('code') verification_code = request.GET.get('code')
if verification_code: if verification_code:
args["client_secret"] = facebook_secret args["client_secret"] = facebook_secret
args["code"] = verification_code args["code"] = verification_code
@ -135,9 +135,9 @@ def facebook_connect(request):
logging.user(request, "~BB~FRFinishing Facebook connect") logging.user(request, "~BB~FRFinishing Facebook connect")
return {} return {}
elif request.POST.get('error'): elif request.GET.get('error'):
logging.user(request, "~BB~FRFailed Facebook connect, error: %s" % request.POST.get('error')) logging.user(request, "~BB~FRFailed Facebook connect, error: %s" % request.GET.get('error'))
return {'error': '%s... Try connecting again.' % request.POST.get('error')} return {'error': '%s... Try connecting again.' % request.GET.get('error')}
else: else:
# Start the OAuth process # Start the OAuth process
logging.user(request, "~BB~FRStarting Facebook connect") logging.user(request, "~BB~FRStarting Facebook connect")