Change oauth2 token processing.

piotrmurach · piotrmurach · commit fc6d3be2c602 · 2012-05-20T13:13:33.000+01:00
diff --git a/lib/github_api/request/oauth2.rb b/lib/github_api/request/oauth2.rb
@@ -5,29 +5,40 @@
 module Github
   module Request
     class OAuth2 < Faraday::Middleware
+      include Github::Utils::Url
+
+      ACCESS_TOKEN = 'access_token'.freeze
+      AUTH_HEADER  = 'Authorization'.freeze
+
       dependency 'oauth2'
 
       def call(env)
-#         puts "ENV: #{env.inspect}"
-#         puts "TOKEN : #{@token}"
-#         puts "APP: #{@app}"
-
         # Extract parameters from the query
-        params = env[:url].query_values || {}
-
-        env[:url].query_values = { 'access_token' => @token }.merge(params)
+        params = { ACCESS_TOKEN => @token }.update query_params(env[:url])
 
-        token = env[:url].query_values['access_token']
-
-        env[:request_headers].merge!('Authorization' => "Token token=\"#{token}\"")
+        if token = params[ACCESS_TOKEN] and !token.empty?
+          env[:url].query = build_query params
+          env[:request_headers].merge!(AUTH_HEADER => "Token token=\"#{token}\"")
+        end
 
         @app.call env
       end
 
       def initialize(app, *args)
+        super app
         @app = app
         @token = args.shift
       end
+
+      def query_params(url)
+        if url.query.nil? or url.query.empty?
+          {}
+        else
+          puts "QUERY BEFORE #{url.query}"
+          puts "QUERY AFTER #{parse_query url.query}"
+          parse_query url.query
+        end
+      end
     end # OAuth2
   end # Request
 end # Github
diff --git a/spec/github/request/oauth2_spec.rb b/spec/github/request/oauth2_spec.rb
@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+describe Github::Request::OAuth2 do
+  include Github::Utils::Url
+
+  def auth_header(env)
+    env[:request_headers]['Authorization']
+  end
+
+  def middleware
+    described_class.new(lambda { |env| env }, options)
+  end
+
+  def process(params={}, headers={})
+    env = {
+      :url => URI('http://example.com/?' + build_query(params)),
+      :request_headers => headers
+    }
+    middleware.call(env)
+  end
+
+  context 'no token configured' do
+    let(:options) { nil }
+
+    it "doesn't add params" do
+      result = process(:q => 'query')
+      result[:url].query.should eql 'q=query'
+    end
+
+    it "doesn't add headers" do
+      auth_header(process).should be_nil
+    end
+
+    it "allows for ad hoc access token" do
+      result = process(:q => 'query', :access_token => 'abc123')
+      result[:url].query.should eql 'access_token=abc123&q=query'
+    end
+
+    it "creates header for ad hoc access token" do
+      result = process(:q => 'query', :access_token => 'abc123')
+      auth_header(result).should eql 'Token token="abc123"'
+    end
+  end
+
+  context 'default token configured' do
+    let(:options) { 'ABC' }
+
+    it "adds access token to params" do
+      result = process(:q => 'query')
+      result[:url].query.should eql 'access_token=ABC&q=query'
+    end
+
+    it "creates header for access token" do
+      auth_header(process).should eql 'Token token="ABC"'
+    end
+
+    it "overrides default with explicit token" do
+      result = process(:q => 'query', :access_token => 'abc123')
+      result[:url].query.should eql 'access_token=abc123&q=query'
+      auth_header(result).should eql 'Token token="abc123"'
+    end
+
+    it "clears default token with explicit one" do
+      result = process(:q => 'query', :access_token => nil)
+      result[:url].query.should eql 'q=query&access_token'
+      auth_header(result).should be_nil
+    end
+  end
+
+end # Github::Request::OAuth2
