From d52896727b30848100776b9ca0db06e815f5ca37 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 24 Sep 2012 10:17:02 +0200 Subject: [PATCH] [IMP] Use $.param for url search building bzr revid: fme@openerp.com-20120924081702-c3oxj1uf2i2ehgv8 --- .../static/src/js/oauth_provider.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/addons/auth_oauth_provider/static/src/js/oauth_provider.js b/addons/auth_oauth_provider/static/src/js/oauth_provider.js index 2551c82cd2a..593c013d21a 100644 --- a/addons/auth_oauth_provider/static/src/js/oauth_provider.js +++ b/addons/auth_oauth_provider/static/src/js/oauth_provider.js @@ -32,15 +32,17 @@ instance.auth_oauth_provider.ProviderAction = instance.web.Widget.extend({ var params = $.deparam($.param.querystring()); var a = document.createElement('a'); a.href = params.redirect_uri; - var search = (a.search ? '&' : '?') + 'access_token=' + result.access_token; + var new_params = { + access_token: result.access_token, + token_type: 'Bearer', + }; if (params.state) { - search += "&state=" + params.state; + new_params.state = params.state; } - if (params.expires_in) { - search += "&expires_in=" + expires_in; + if (result.expires_in) { + new_params.expires_in = result.expires_in; } - search += '&token_type=Bearer'; - var redirect = a.protocol + '//' + a.host + a.pathname + search + a.hash; + var redirect = a.protocol + '//' + a.host + a.pathname + '?' + $.param(new_params) + a.hash; //window.location = redirect; console.log("redirect to", redirect); },