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

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

diff --git a/app/assets/javascripts/oauth.js b/app/assets/javascripts/oauth.js
index 037e1d730c7d65badd47205fa32c5ff20c24f9af..0c3538c511089ae087da3aafb678d37f9979b458 100644 (file)
--- a/app/assets/javascripts/oauth.js
+++ b/app/assets/javascripts/oauth.js
@@ -1,26 +1,11 @@
-//= require ohauth
-

 $(document).ready(function () {
   var application_data = $("head").data();
 
 $(document).ready(function () {
   var application_data = $("head").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
-    });
-
-    $.ajaxPrefilter(function(options, jqxhr) {
+  if (application_data.oauthToken) {
+    $.ajaxPrefilter(function (options) {

       if (options.oauth) {
         options.headers = options.headers || {};
       if (options.oauth) {
         options.headers = options.headers || {};

-        options.headers.Authorization = headerGenerator(options.type, makeAbsolute(options.url), jqxhr.data);
+        options.headers.Authorization = "Bearer " + application_data.oauthToken;

       }
     });
   }
       }
     });
   }