From: Tom Hughes <tom@compton.nu>
Date: Thu, 28 Mar 2013 11:11:51 +0000 (+0000)
Subject: Tidy up javascript OAuth code
X-Git-Tag: live~5168^2~11
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/00a4d9fe49f2118cd0fa798edfcc41fab3388025?hp=15be6b3ffc8924a07022ec6c5f2a1da206423a3c

Tidy up javascript OAuth code
---

diff --git a/app/assets/javascripts/oauth.js b/app/assets/javascripts/oauth.js
index 73e1761f2..126d2d3eb 100644
--- a/app/assets/javascripts/oauth.js
+++ b/app/assets/javascripts/oauth.js
@@ -1,32 +1,25 @@
 //= require sha
 //= require ohauth
 
-$(document).ready(function () {
-  $.ajaxPrefilter(function(options, jqxhr) {
-    if (options.oauth) {
-      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()
-      };
+$.ajaxPrefilter(function(options, jqxhr) {
+  if (options.oauth) {
+    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()
+    };
 
-      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, $.extend({}, params, jqxhr.data))
+    );
 
-      params.oauth_signature = ohauth.signature(
-        OSM.oauth_consumer_secret,
-        OSM.oauth_token_secret,
-        ohauth.baseString(options.type, url, params)
-      );
-
-      options.headers = {
-        Authorization: "OAuth " + ohauth.authHeader(params)
-      };
-    }
-  });
+    options.headers = options.headers || {};
+    options.headers.Authorization = "OAuth " + ohauth.authHeader(params);
+  }
 });