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

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

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

 $(document).ready(function () {
 $(document).ready(function () {

-  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
-    });
+  var application_data = $("head").data();

 
 

-    $.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, options.url, jqxhr.data);
+        options.headers.Authorization = "Bearer " + application_data.oauthToken;

       }
     });
   }
       }
     });
   }