Merge e1f24bc into d2c1258

fence/blueprints/login/base.py

@@ -1,5 +1,6 @@
 import flask
 from flask_restful import Resource
+from urllib.parse import urlparse, urljoin
 
 from fence.auth import login_user
 from fence.blueprints.login.redirect import validate_redirect
@@ -69,6 +70,15 @@ def __init__(self, idp_name, client, username_field="email"):
         self.username_field = username_field
 
     def get(self):
+
+        if flask.request.args.get("error"):
+            # Check if user granted access
+            url = flask.request.url
+            parsed_url = urlparse(url)            
+            location = flask.session.get("redirect") or config["BASE_URL"]
+            redirect_url = urljoin(location, parsed_url.path)
+            return flask.redirect(location=redirect_url)
+
         code = flask.request.args.get("code")
         result = self.client.get_user_id(code)
         username = result.get(self.username_field)