cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tidy up javascript OAuth code

Browse source
This commit is contained in:
Tom Hughes 2013-03-28 11:11:51 +00:00
parent 15be6b3ffc
commit 00a4d9fe49
1 changed files with 19 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/assets/javascripts/oauth.js
View file

@ -1,8 +1,7 @@
//= require sha
//= require ohauth
$(document).ready(function () {
$.ajaxPrefilter(function(options, jqxhr) {
$.ajaxPrefilter(function(options, jqxhr) {
if (options.oauth) {
var ohauth = window.ohauth;
var url = options.url.replace(/\?$/, "");
@ -14,19 +13,13 @@ $(document).ready(function () {
oauth_nonce: ohauth.nonce()
};
for (var name in jqxhr.data) {
params[name] = jqxhr.data[name];
}
params.oauth_signature = ohauth.signature(
OSM.oauth_consumer_secret,
OSM.oauth_token_secret,
ohauth.baseString(options.type, url, params)
ohauth.baseString(options.type, url, $.extend({}, params, jqxhr.data))
);
options.headers = {
Authorization: "OAuth " + ohauth.authHeader(params)
};
options.headers = options.headers || {};
options.headers.Authorization = "OAuth " + ohauth.authHeader(params);
}
});
});