rack-oauth2 0.3.0.alpha → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.3.0.alpha
+0.3.0

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

@@ -15,6 +15,8 @@ module Rack
 
           def initialize(env)
             super
+            # NOTE: Raise before redirect_uri is saved not to redirect back to unverified redirect_uri.
+            bad_request! if client_id.blank?
             @redirect_uri = Util.parse_uri(params['redirect_uri']) if params['redirect_uri']
             @state = params['state']
           end
@@ -28,9 +30,18 @@ module Rack
             when ''
               attr_missing!
             else
-              unsupported_response_type! "#{CGI.escape params['response_type']} isn't supported."
+              unsupported_response_type!
             end
           end
+
+          def varified_redirect_uri(pre_registered)
+            verified = if redirect_uri.present? && Util.verify_redirect_uri(pre_registered, redirect_uri)
+              redirect_uri
+            else
+              self.redirect_uri = pre_registered
+            end
+            verified.to_s
+          end
         end
 
         class Response < Abstract::Response

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

@@ -19,13 +19,13 @@ module Rack
 
           class Response < Authorize::Response
             attr_required :access_token, :token_type
-            attr_optional :refresh_token, :expires_in, :scope
+            attr_optional :expires_in, :scope
 
             def protocol_params
               super.merge(
                 :access_token => access_token,
+                :token_type => token_type,
                 :expires_in => expires_in,
-                :refresh_token => refresh_token,
                 :scope => Array(scope).join(' ')
               )
             end

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

@@ -44,12 +44,13 @@ module Rack
         end
 
         class Response < Abstract::Response
-          attr_required :access_token
+          attr_required :access_token, :token_type
           attr_optional :expires_in, :refresh_token, :scope
 
           def protocol_params
             {
               :access_token => access_token,
+              :token_type => token_type,
               :expires_in => expires_in,
               :scope => Array(scope).join(' ')
             }

data/spec/rack/oauth2/server/authorize/code_spec.rb

@@ -24,24 +24,14 @@ describe Rack::OAuth2::Server::Authorize::Code do
     end
 
     context 'when redirect_uri is missing' do
-      let :app do
-        Rack::OAuth2::Server::Authorize.new do |request, response|
-          response.code = authorization_code
-          response.approve!
-        end
-      end
+      let(:redirect_uri) { nil }
       it do
         expect { response }.should raise_error AttrRequired::AttrMissing
       end
     end
 
     context 'when code is missing' do
-      let :app do
-        Rack::OAuth2::Server::Authorize.new do |request, response|
-          response.redirect_uri = redirect_uri
-          response.approve!
-        end
-      end
+      let(:authorization_code) { nil }
       it do
         expect { response }.should raise_error AttrRequired::AttrMissing
       end

data/spec/rack/oauth2/server/authorize/token_spec.rb

@@ -19,7 +19,7 @@ describe Rack::OAuth2::Server::Authorize::Token do
 
     it 'should redirect with authorization code in fragment' do
       response.status.should == 302
-      response.location.should == "#{redirect_uri}#access_token=#{access_token}"
+      response.location.should == "#{redirect_uri}#access_token=#{access_token}&token_type=#{token_type}"
     end
 
     context 'when redirect_uri is missing' do

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

@@ -41,4 +41,32 @@ describe Rack::OAuth2::Server::Authorize do
       end
     end
   end
-end
+
+  describe Rack::OAuth2::Server::Authorize::Request do
+    let(:env)            { Rack::MockRequest.env_for("/authorize?client_id=client&redirect_uri=#{redirect_uri}") }
+    let(:request)        { Rack::OAuth2::Server::Authorize::Request.new env }
+    let(:pre_registered) { 'http://client.example.com' }
+
+    describe '#varified_redirect_uri' do
+      context 'when valid redirect_uri is given' do
+        it 'should use given redirect_uri' do
+          request.varified_redirect_uri(pre_registered).should == redirect_uri
+        end
+      end
+
+      context 'when invalid redirect_uri is given' do
+        let(:pre_registered) { 'http://client2.example.com' }
+        it 'should use pre-registered redirect_uri' do
+          request.varified_redirect_uri(pre_registered).should == pre_registered
+        end
+      end
+
+      context 'when redirect_uri is missing' do
+        let(:env) { Rack::MockRequest.env_for("/authorize?client_id=client") }
+        it 'should use pre-registered redirect_uri' do
+          request.varified_redirect_uri(pre_registered).should == pre_registered
+        end
+      end
+    end
+  end
+end

data/spec/rack/oauth2/server/token/authorization_code_spec.rb

@@ -5,6 +5,7 @@ describe Rack::OAuth2::Server::Token::AuthorizationCode do
   let(:app) do
     Rack::OAuth2::Server::Token.new do |request, response|
       response.access_token = 'access_token'
+      response.token_type = :bearer
     end
   end
   let(:params) do
@@ -19,7 +20,8 @@ describe Rack::OAuth2::Server::Token::AuthorizationCode do
 
   its(:status)       { should == 200 }
   its(:content_type) { should == 'application/json' }
-  its(:body)         { should == '{"access_token":"access_token"}' }
+  its(:body)         { should include '"access_token":"access_token"' }
+  its(:body)         { should include '"token_type":"bearer"' }
 
   [:code, :redirect_uri].each do |required|
     context "when #{required} is missing" do

data/spec/rack/oauth2/server/token/password_spec.rb

@@ -5,6 +5,7 @@ describe Rack::OAuth2::Server::Token::Password do
   let(:app) do
     Rack::OAuth2::Server::Token.new do |request, response|
       response.access_token = 'access_token'
+      response.token_type = :bearer
     end
   end
   let(:params) do
@@ -19,7 +20,8 @@ describe Rack::OAuth2::Server::Token::Password do
 
   its(:status)       { should == 200 }
   its(:content_type) { should == 'application/json' }
-  its(:body)         { should == '{"access_token":"access_token"}' }
+  its(:body)         { should include '"access_token":"access_token"' }
+  its(:body)         { should include '"token_type":"bearer"' }
 
   [:username, :password].each do |required|
     context "when #{required} is missing" do

data/spec/rack/oauth2/server/token/refresh_token_spec.rb

@@ -5,6 +5,7 @@ describe Rack::OAuth2::Server::Token::RefreshToken do
   let(:app) do
     Rack::OAuth2::Server::Token.new do |request, response|
       response.access_token = 'access_token'
+      response.token_type = :bearer
     end
   end
   let(:params) do
@@ -18,7 +19,8 @@ describe Rack::OAuth2::Server::Token::RefreshToken do
 
   its(:status)       { should == 200 }
   its(:content_type) { should == 'application/json' }
-  its(:body)         { should == '{"access_token":"access_token"}' }
+  its(:body)         { should include '"access_token":"access_token"' }
+  its(:body)         { should include '"token_type":"bearer"' }
 
   context 'when refresh_token is missing' do
     before do

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

@@ -6,6 +6,7 @@ describe Rack::OAuth2::Server::Token do
   let(:app) do
     Rack::OAuth2::Server::Token.new do |request, response|
       response.access_token = 'access_token'
+      response.token_type = :bearer
     end
   end
   let(:params) do

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-oauth2
 version: !ruby/object:Gem::Version 
-  hash: -1851332186
-  prerelease: 6
+  hash: 19
+  prerelease: 
   segments: 
   - 0
   - 3
   - 0
-  - alpha
-  version: 0.3.0.alpha
+  version: 0.3.0
 platform: ruby
 authors: 
 - nov matake
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-05 00:00:00 +09:00
+date: 2011-03-06 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency