Disable map key on non-default layers

[rails.git] / app / assets / javascripts / oauth.js

diff --git a/app/assets/javascripts/oauth.js b/app/assets/javascripts/oauth.js
index 73e1761f2aaa59af11f045c10aedd9b5e83b1973..98ce302e105925de575198d60624de4ce2013443 100644 (file)
--- 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()
-      };
+  function makeAbsolute(url) {
+    var a = document.createElement('a');
+    a.href = url;
+    return a.href;
+  }
 
-      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)
-      );
+  if (OSM.oauth_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
+    });
 
-      options.headers = {
-        Authorization: "OAuth " + ohauth.authHeader(params)
-      };
-    }
-  });
+    $.ajaxPrefilter(function(options, jqxhr) {
+      if (options.oauth) {
+        options.headers = options.headers || {};
+        options.headers.Authorization = headerGenerator(options.type, makeAbsolute(options.url), jqxhr.data);
+      }
+    });
+  }
 });