Adding Bearer Token support

lib/twitter/api/oauth.rb

@@ -5,7 +5,9 @@ module Twitter
   module API
     module OAuth
       include Twitter::API::Utils
-
+      def token
+        object_from_response(Twitter::Token, :bearer_request, "/oauth2/token", :grant_type => "client_credentials")
+      end
       # Allows a registered application to revoke an issued OAuth 2 Bearer Token by presenting its client credentials.
       #
       # @see https://dev.twitter.com/docs/api/1.1/post/oauth2/invalidate_token
@@ -19,6 +21,19 @@ module OAuth
       def invalidate_token(access_token)
         object_from_response(Twitter::Token, :post, "/oauth2/invalidate_token", :access_token => access_token)
       end
+
+    private
+      def bearer_request(path, params={})
+        connection.send(:post, path, params) do |request|
+          request.headers[:accept] = "*/*"
+          request.headers[:authorization] = "Basic #{encoded_bearer_token_credentials}"
+          request.headers[:content_type] = "application/x-www-form-urlencoded; charset=UTF-8"
+        end.env
+      rescue Faraday::Error::ClientError
+        raise Twitter::Error::ClientError
+      rescue MultiJson::DecodeError
+        raise Twitter::Error::DecodeError
+      end
     end
   end
 end

lib/twitter/client.rb

@@ -101,8 +101,12 @@ def connection
     end
 
     def auth_header(method, path, params={})
-      uri = URI(@endpoint + path)
-      SimpleOAuth::Header.new(method, uri, params, credentials)
+      if application_only_auth?
+        "Bearer #{@bearer_token}"
+      else
+        uri = URI(@endpoint + path)
+        SimpleOAuth::Header.new(method, uri, params, credentials)
+      end
     end
 
   end

lib/twitter/configurable.rb

@@ -1,10 +1,11 @@
 require 'forwardable'
 require 'twitter/error/configuration_error'
+require 'base64'
 
 module Twitter
   module Configurable
     extend Forwardable
-    attr_writer :consumer_key, :consumer_secret, :oauth_token, :oauth_token_secret
+    attr_writer :consumer_key, :consumer_secret, :oauth_token, :oauth_token_secret, :bearer_token
     attr_accessor :endpoint, :connection_options, :identity_map, :middleware
     def_delegator :options, :hash
 
@@ -16,6 +17,7 @@ def keys
           :consumer_secret,
           :oauth_token,
           :oauth_token_secret,
+          :bearer_token,
           :endpoint,
           :connection_options,
           :identity_map,
@@ -37,7 +39,7 @@ def configure
 
     # @return [Boolean]
     def credentials?
-      credentials.values.all?
+      credentials.values.all? || @bearer_token
     end
 
     def reset!
@@ -49,6 +51,13 @@ def reset!
     alias setup reset!
 
   private
+    def application_only_auth?
+      not @bearer_token.nil?
+    end
+
+    def encoded_bearer_token_credentials
+      Base64.strict_encode64("#{@consumer_key}:#{@consumer_secret}")
+    end
 
     # @return [Hash]
     def credentials

lib/twitter/default.rb

@@ -69,6 +69,11 @@ def oauth_token_secret
         ENV['TWITTER_OAUTH_TOKEN_SECRET']
       end
 
+      # @return [String]
+      def bearer_token
+        ENV['TWITTER_BEARER_TOKEN']
+      end
+
       # @note This is configurable in case you want to use a Twitter-compatible endpoint.
       # @see http://status.net/wiki/Twitter-compatible_API
       # @see http://en.blog.wordpress.com/2009/12/12/twitter-api/

spec/twitter/client_spec.rb

@@ -38,6 +38,7 @@
           :middleware => Proc.new{},
           :oauth_token => 'OT',
           :oauth_token_secret => 'OS',
+          :bearer_token => 'BT',
           :identity_map => ::Hash
         }
       end
@@ -152,4 +153,16 @@
     end
   end
 
+  describe "#auth_header" do
+    subject do
+      Twitter::Client.new(:bearer_token => "BT")
+    end
+
+    it "creates the correct auth headers with supplied bearer_token" do
+      uri = "/1.1/direct_messages.json"
+      authorization = subject.send(:auth_header, :get, uri)
+      expect(authorization).to eq "Bearer BT"
+    end
+  end
+
 end

spec/twitter_spec.rb

@@ -91,7 +91,13 @@
   end
 
   describe ".credentials?" do
-    it "returns true if all credentials are present" do
+    it "returns true if only bearer_token is supplied" do
+      Twitter.configure do |config|
+        config.bearer_token = 'BT'
+      end
+      expect(Twitter.credentials?).to be_true
+    end
+    it "returns true if all oauth credentials are present" do
       Twitter.configure do |config|
         config.consumer_key = 'CK'
         config.consumer_secret = 'CS'