Fix #2402

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

diff --git a/app/assets/javascripts/oauth.js b/app/assets/javascripts/oauth.js
index 126d2d3eb470b1e44be07d4737cbbcc86215941c..411f7fc349194a599b39f6579559ef25a3b73841 100644 (file)
--- a/app/assets/javascripts/oauth.js
+++ b/app/assets/javascripts/oauth.js
@@ -1,25 +1,27 @@
-//= require sha
 //= require ohauth
 
-$.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()
-    };
+$(document).ready(function () {
+  var application_data = $("head").data();
 
-    params.oauth_signature = ohauth.signature(
-      OSM.oauth_consumer_secret,
-      OSM.oauth_token_secret,
-      ohauth.baseString(options.type, url, $.extend({}, params, jqxhr.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: application_data.consumerKey,
+      consumer_secret: application_data.consumerSecret,
+      token: application_data.token,
+      token_secret: application_data.tokenSecret
+    });
 
-    options.headers = options.headers || {};
-    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);
+      }
+    });
   }
 });