rack-oauth2_utils 0.0.4 → 0.0.5

data/lib/rack-oauth2_utils/middleware.rb

@@ -3,11 +3,14 @@ module Rack
     
     class Middleware
       
+      INVALID_HEADERS_AND_BODY = [{'Content-Type' => 'text/plain'}, ['The access token is invalid.']].freeze
+      
       def initialize(app, options = {}, &resolver)
         @app = app
         @realm = options[:realm]
         @logger = options[:logger]
         @resolver = resolver
+        @invalid_token_response = options[:invalid_token_response] || INVALID_HEADERS_AND_BODY.dup
       end
       
       def call(env)
@@ -34,7 +37,9 @@ module Rack
       def unauthorized(request)
         challenge = 'OAuth realm="%s"' % (@realm || request.host)
         challenge << ', error="invalid_token", error_description="The access token is invalid."'
-        return [401, { "WWW-Authenticate" => challenge, 'Content-Type' => 'text/plain' }, ['The access token is invalid.']]
+        headers = @invalid_token_response.first.merge("WWW-Authenticate" => challenge)
+        body = @invalid_token_response.last
+        return [401, headers, body]
       end
       
     end

data/lib/rack-oauth2_utils/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module OAuth2Utils
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/test/middleware_test.rb

@@ -80,6 +80,14 @@ describe Rack::OAuth2Utils::Middleware do
       it 'should return WWW-Authenticate header with realm and error info' do
         last_response.headers['WWW-Authenticate'].must_equal "OAuth realm=\"example.org\", error=\"invalid_token\", error_description=\"The access token is invalid.\""
       end
+      
+      it 'should have default content type' do
+        last_response.headers['Content-Type'].must_equal 'text/plain'
+      end
+      
+      it 'should have default error explanation in the body' do
+        last_response.body.must_equal 'The access token is invalid.'
+      end
     end
     
     describe 'private resource' do
@@ -95,6 +103,47 @@ describe Rack::OAuth2Utils::Middleware do
     end
   end
   
+  describe ':invalid_token_response' do
+    def app
+      invalid = [{'Content-Type' => 'application/json'}, ['{"error": "Invalid token"}']]
+      Rack::Builder.new do
+        # Simple token / identity store
+        use Rack::OAuth2Utils::Middleware, :invalid_token_response => invalid do |access_token|
+          IDENTITIES[access_token]
+        end
+        
+        # Private, or auth protected
+        map('/private'){
+          run lambda {|env| 
+           OK_RESPONSE   
+          } 
+        }
+      end
+    end
+    
+    before {
+      header "Authorization", "OAuth invalidtoken"
+      get '/private'
+    }
+    
+    it 'should return 401 Unauthorized' do
+      last_response.status.must_equal 401
+    end
+    
+    it 'should return WWW-Authenticate header with realm and error info' do
+      last_response.headers['WWW-Authenticate'].must_equal "OAuth realm=\"example.org\", error=\"invalid_token\", error_description=\"The access token is invalid.\""
+    end
+    
+    it 'should have set content type' do
+      last_response.headers['Content-Type'].must_equal 'application/json'
+    end
+    
+    it 'should have default error explanation in the body' do
+      last_response.body.must_equal '{"error": "Invalid token"}'
+    end
+    
+  end
+  
   describe 'with valid token' do
     
     before {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-oauth2_utils
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-28 00:00:00.000000000Z
+date: 2012-03-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2152549680 !ruby/object:Gem::Requirement
+  requirement: &2151857500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152549680
+  version_requirements: *2151857500
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152549020 !ruby/object:Gem::Requirement
+  requirement: &2151854660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152549020
+  version_requirements: *2151854660
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2152548460 !ruby/object:Gem::Requirement
+  requirement: &2151841280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152548460
+  version_requirements: *2151841280
 description: Simple Rack middleware that catches OAuth2 access tokens and validates
   identity
 email: