fix #153 next arg for oauth redirect needs to be double quoted to handle special characters

Author: davidism

sopy/auth/views.py

@@ -1,4 +1,4 @@
-from urllib.parse import urlencode, parse_qs
+from urllib.parse import urlencode, parse_qs, quote
 from flask import url_for, redirect, request, session, current_app, render_template
 import requests
 from sopy import db
@@ -22,9 +22,10 @@ def login():
 
         return render_template('auth/login.html', form=form)
 
+    next = quote(quote(request.args['next'])) if 'next' in request.args else None
     qs = urlencode({
         'client_id': current_app.config['SE_CONSUMER_KEY'],
-        'redirect_uri': url_for('auth.authorized', next=request.args.get('next'), _external=True)
+        'redirect_uri': url_for('auth.authorized', next=next, _external=True)
     })
     url = 'https://stackexchange.com/oauth?{}'.format(qs)
 
@@ -33,11 +34,12 @@ def login():
 
 @bp.route('/login/authorized')
 def authorized():
+    next = quote(quote(request.args['next'])) if 'next' in request.args else None
     r = requests.post('https://stackexchange.com/oauth/access_token', {
         'client_id': current_app.config['SE_CONSUMER_KEY'],
         'client_secret': current_app.config['SE_CONSUMER_SECRET'],
         'code': request.args['code'],
-        'redirect_uri': url_for('auth.authorized', next=request.args.get('next'), _external=True)
+        'redirect_uri': url_for('auth.authorized', next=next, _external=True)
     })
 
     session['oauth_token'] = parse_qs(r.text)['access_token'][0]

sopy/templates/base.html

@@ -29,7 +29,7 @@
                     </ul>
                     <ul class="nav navbar-nav navbar-right">
                         {% if current_user.anonymous %}
-                            <li><a href="{{ url_for('auth.login', next=request.path) }}">Log In</a></li>
+                            <li><a href="{{ url_for('auth.login', next=request.full_path if request.query_string else request.path) }}">Log In</a></li>
                         {% else %}
                             <li class="{% block nav_user %}{% endblock %}"><a href="#">{{ current_user.display_name }}</a></li>
                             <li><a href="{{ url_for('auth.logout') }}">Log Out</a></li>