X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/77de5063128440bd88623f634c522b8933770f2e..93b8c47c8fa1aac86d2d9c730c327c076b578a84:/app/assets/javascripts/oauth.js?ds=inline diff --git a/app/assets/javascripts/oauth.js b/app/assets/javascripts/oauth.js index aac63f243..d688590b0 100644 --- a/app/assets/javascripts/oauth.js +++ b/app/assets/javascripts/oauth.js @@ -1,18 +1,26 @@ -//= require ohauth +//= require ohauth/ohauth $(document).ready(function () { - if (OSM.oauth_token) { + var application_data = $("head").data(); + + function makeAbsolute(url) { + var a = document.createElement("a"); + a.href = url; + return a.href; + } + + if (application_data.token) { var headerGenerator = window.ohauth.headerGenerator({ - consumer_key: OSM.oauth_consumer_key, - consumer_secret: OSM.oauth_consumer_secret, - token: OSM.oauth_token, - token_secret: OSM.oauth_token_secret + consumer_key: application_data.consumerKey, + consumer_secret: application_data.consumerSecret, + token: application_data.token, + token_secret: application_data.tokenSecret }); - $.ajaxPrefilter(function(options, jqxhr) { + $.ajaxPrefilter(function (options, jqxhr) { if (options.oauth) { options.headers = options.headers || {}; - options.headers.Authorization = headerGenerator(options.type, options.url, jqxhr.data); + options.headers.Authorization = headerGenerator(options.type, makeAbsolute(options.url), jqxhr.data); } }); }