X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/84f7d322d01639a9a4617ff2f3f635e2e1e2cfc6..ea0f128e9e5d5f42e41adc44e1fa6cd45f608bcb:/app/assets/javascripts/oauth.js?ds=sidebyside diff --git a/app/assets/javascripts/oauth.js b/app/assets/javascripts/oauth.js index 40f685cc7..0c3538c51 100644 --- a/app/assets/javascripts/oauth.js +++ b/app/assets/javascripts/oauth.js @@ -1,25 +1,12 @@ -//= require sha -//= require ohauth +$(document).ready(function () { + var application_data = $("head").data(); -$.ajaxPrefilter(function(options, jqxhr) { - if (options.oauth && OSM.oauth_token) { - var ohauth = window.ohauth; - var url = options.url.replace(/\?$/, ""); - var params = { - oauth_consumer_key: OSM.oauth_consumer_key, - oauth_token: OSM.oauth_token, - oauth_signature_method: "HMAC-SHA1", - oauth_timestamp: ohauth.timestamp(), - oauth_nonce: ohauth.nonce() - }; - - params.oauth_signature = ohauth.signature( - OSM.oauth_consumer_secret, - OSM.oauth_token_secret, - ohauth.baseString(options.type, url, $.extend({}, params, jqxhr.data)) - ); - - options.headers = options.headers || {}; - options.headers.Authorization = "OAuth " + ohauth.authHeader(params); + if (application_data.oauthToken) { + $.ajaxPrefilter(function (options) { + if (options.oauth) { + options.headers = options.headers || {}; + options.headers.Authorization = "Bearer " + application_data.oauthToken; + } + }); } });