Merge remote-tracking branch 'upstream/pull/4740'

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

diff --git a/app/assets/javascripts/oauth.js b/app/assets/javascripts/oauth.js
index 40f685cc7f0f4b64f0ceadf76fbd063a5022e0f2..0c3538c511089ae087da3aafb678d37f9979b458 100644 (file)
--- 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;
+      }
+    });

   }
 });
   }
 });