[MERGE] forward port of branch saas-3 up to bf53aed

1 files changed, 2 insertions, 2 deletions

diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index 4fca426ffc0..e4d3e18792a 100644
--- a/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@ -70,7 +70,7 @@ class OAuthLogin(openerp.addons.web.controllers.main.Home):
         state = dict(
             d=request.session.db,
             p=provider['id'],
-            r=request.httprequest.full_path
+            r=werkzeug.url_quote_plus(request.httprequest.full_path)
         )
         token = request.params.get('token')
         if token:
@@ -139,7 +139,7 @@ class OAuthController(http.Controller):
                 cr.commit()
                 action = state.get('a')
                 menu = state.get('m')
-                redirect = state.get('r')
+                redirect = werkzeug.url_unquote_plus(state['r']) if state.get('r') else False
                 url = '/web'
                 if redirect and not redirect.startswith('/auth_oauth/signin') and \
                 (not redirect.startswith('/web/login') or 'redirect' in urlparse.urlsplit(redirect).query):