rack-oauth2 0.14.7 → 0.14.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-oauth2 (0.14.6)
+    rack-oauth2 (0.14.7)
       activesupport (>= 2.3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.2.0.2)
@@ -12,7 +12,7 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.7)
+    activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.2.8)
@@ -31,7 +31,6 @@ GEM
     jruby-openssl (0.7.7)
       bouncy-castle-java (>= 1.5.0146.1)
     json (1.7.4)
-    json (1.7.4-java)
     multi_json (1.3.6)
     rack (1.4.1)
     rake (0.9.2.2)

data/VERSION

@@ -1 +1 @@
-0.14.7
+0.14.8

data/lib/rack/oauth2/server/authorize.rb

@@ -60,8 +60,8 @@ module Rack
               else
                 bad_request! 'Invalid redirect_uri is given'
               end
-            elsif pre_registered.present?
-              pre_registered
+            elsif pre_registered.present? && Array(pre_registered).size == 1
+              Array(pre_registered).first
             else
               bad_request! 'No redirect_uri is given'
             end

data/spec/rack/oauth2/server/authorize_spec.rb

@@ -108,10 +108,31 @@ describe Rack::OAuth2::Server::Authorize do
       end
 
       context 'when redirect_uri is missing' do
-        let(:pre_registered) { redirect_uri }
         let(:env) { Rack::MockRequest.env_for("/authorize?client_id=client") }
-        it 'should use pre-registered redirect_uri' do
-          request.verify_redirect_uri!(pre_registered).should == pre_registered
+
+        context 'when pre-registered redirect_uri is a String' do
+          let(:pre_registered) { redirect_uri }
+          it 'should use pre-registered redirect_uri' do
+            request.verify_redirect_uri!(pre_registered).should == pre_registered
+          end
+        end
+
+        context 'when pre-registered redirect_uri is an Array' do
+          context 'when only 1' do
+            let(:pre_registered) { [redirect_uri] }
+            it 'should use pre-registered redirect_uri' do
+              request.verify_redirect_uri!(pre_registered).should == pre_registered.first
+            end
+          end
+
+          context 'when more than 2' do
+            let(:pre_registered) { [redirect_uri, 'http://client.example.com/callback2'] }
+            it do
+              expect do
+                request.verify_redirect_uri!(pre_registered)
+              end.to raise_error Rack::OAuth2::Server::Authorize::BadRequest
+            end
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-oauth2
 version: !ruby/object:Gem::Version
-  version: 0.14.7
+  version: 0.14.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-09 00:00:00.000000000 Z
+date: 2012-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack