rack-oauth2 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/example/server/authorize.rb

@@ -7,7 +7,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '../../lib'))
 require 'rack/oauth2'
 
 get '/oauth/authorize' do
-  authorization_endpoint = Rack::OAuth2::Server::Authorization.new(self)
+  authorization_endpoint = Rack::OAuth2::Server::Authorize.new(self)
   response = authorization_endpoint.call(env)
   case response.first
   when 200
@@ -35,7 +35,7 @@ get '/oauth/authorize' do
 end
 
 post '/oauth/authorize' do
-  authorization_endpoint = Rack::OAuth2::Server::Authorization.new(self) do |request, response|
+  authorization_endpoint = Rack::OAuth2::Server::Authorize.new(self) do |request, response|
     # allow everything
     params = env['rack.request.form_hash']
     if params['approved']

data/lib/rack/oauth2/server.rb

@@ -1,5 +1,5 @@
 require 'rack/oauth2/server/util'
 require 'rack/oauth2/server/error'
 require 'rack/oauth2/server/abstract'
-require 'rack/oauth2/server/authorization'
+require 'rack/oauth2/server/authorize'
 require 'rack/oauth2/server/token'

data/lib/rack/oauth2/server/abstract/handler.rb

@@ -12,8 +12,6 @@ module Rack
 
           def call(env)
             @authenticator.call(@request, @response) if @authenticator
-            env['rack.oauth2.request'] = @request
-            env['rack.oauth2.response'] = @response
             @response
           end
         end

data/lib/rack/oauth2/server/{authorization.rb → authorize.rb}

@@ -1,7 +1,7 @@
 module Rack
   module OAuth2
     module Server
-      class Authorization < Abstract::Handler
+      class Authorize < Abstract::Handler
 
         def call(env)
           request = Request.new(env)
@@ -60,6 +60,6 @@ module Rack
   end
 end
 
-require 'rack/oauth2/server/authorization/code'
-require 'rack/oauth2/server/authorization/token'
-require 'rack/oauth2/server/authorization/code_and_token'
+require 'rack/oauth2/server/authorize/code'
+require 'rack/oauth2/server/authorize/token'
+require 'rack/oauth2/server/authorize/code_and_token'

data/lib/rack/oauth2/server/{authorization → authorize}/code.rb

@@ -1,7 +1,7 @@
 module Rack
   module OAuth2
     module Server
-      class Authorization
+      class Authorize
         class Code < Abstract::Handler
 
           def call(env)
@@ -10,14 +10,14 @@ module Rack
             super
           end
 
-          class Request < Authorization::Request
+          class Request < Authorize::Request
             def initialize(env)
               super
-              @response_type = 'code'
+              @response_type = :code
             end
           end
 
-          class Response < Authorization::Response
+          class Response < Authorize::Response
             attr_accessor :code
 
             def required_params

data/lib/rack/oauth2/server/{authorization → authorize}/code_and_token.rb

@@ -1,7 +1,7 @@
 module Rack
   module OAuth2
     module Server
-      class Authorization
+      class Authorize
         class CodeAndToken < Abstract::Handler
 
           def call(env)
@@ -10,14 +10,14 @@ module Rack
             super
           end
 
-          class Request < Authorization::Request
+          class Request < Authorize::Request
             def initialize(env)
               super
-              @response_type = 'code_and_token'
+              @response_type = :code_and_token
             end
           end
 
-          class Response < Authorization::Response
+          class Response < Authorize::Response
             attr_accessor :code, :access_token, :expires_in, :scope
 
             def required_params

data/lib/rack/oauth2/server/{authorization → authorize}/token.rb

@@ -1,7 +1,7 @@
 module Rack
   module OAuth2
     module Server
-      class Authorization
+      class Authorize
         class Token < Abstract::Handler
 
           def call(env)
@@ -10,14 +10,14 @@ module Rack
             super
           end
 
-          class Request < Authorization::Request
+          class Request < Authorize::Request
             def initialize(env)
               super
-              @response_type = 'token'
+              @response_type = :token
             end
           end
 
-          class Response < Authorization::Response
+          class Response < Authorize::Response
             attr_accessor :access_token, :expires_in, :scope
 
             def required_params

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

@@ -40,7 +40,12 @@ module Rack
 
       class Unauthorized < Error
         def initialize(error, description = "", options = {})
-          super(401, error, description, options)
+          status = if options[:payload] == :header
+            401
+          else
+            400
+          end
+          super(status, error, description, options)
         end
       end
 

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

@@ -37,6 +37,7 @@ module Rack
               raise BadRequest.new(:unsupported_grant_type, "'#{params['grant_type']}' isn't supported.")
             end
           end
+
         end
 
         class Response < Abstract::Response
@@ -47,11 +48,14 @@ module Rack
           end
 
           def finish
-            response = {:access_token => access_token}
-            response[:expires_in] = expires_in if expires_in
-            response[:refresh_token] = refresh_token if refresh_token
-            response[:scope] = Array(scope).join(' ') if scope
-            write response.to_json
+            params = {
+              :access_token => access_token,
+              :expires_in => expires_in,
+              :scope => Array(scope).join(' ')
+            }.delete_if do |key, value|
+              value.blank?
+            end
+            write params.to_json
             header['Content-Type'] = "application/json"
             super
           end

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

@@ -15,7 +15,7 @@ module Rack
 
             def initialize(env)
               super
-              @grant_type = 'authorization_code'
+              @grant_type = :authorization_code
               @code       = params['code']
             end
 

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

@@ -15,7 +15,7 @@ module Rack
 
             def initialize(env)
               super
-              @grant_type = 'password'
+              @grant_type = :password
               @username   = params['username']
               @password   = params['password']
             end

data/rack-oauth2.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-oauth2}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["nov matake"]
@@ -32,10 +32,10 @@ Gem::Specification.new do |s|
      "lib/rack/oauth2/server/abstract/handler.rb",
      "lib/rack/oauth2/server/abstract/request.rb",
      "lib/rack/oauth2/server/abstract/response.rb",
-     "lib/rack/oauth2/server/authorization.rb",
-     "lib/rack/oauth2/server/authorization/code.rb",
-     "lib/rack/oauth2/server/authorization/code_and_token.rb",
-     "lib/rack/oauth2/server/authorization/token.rb",
+     "lib/rack/oauth2/server/authorize.rb",
+     "lib/rack/oauth2/server/authorize/code.rb",
+     "lib/rack/oauth2/server/authorize/code_and_token.rb",
+     "lib/rack/oauth2/server/authorize/token.rb",
      "lib/rack/oauth2/server/error.rb",
      "lib/rack/oauth2/server/token.rb",
      "lib/rack/oauth2/server/token/assertion.rb",
@@ -44,10 +44,10 @@ Gem::Specification.new do |s|
      "lib/rack/oauth2/server/token/refresh_token.rb",
      "lib/rack/oauth2/server/util.rb",
      "rack-oauth2.gemspec",
-     "spec/rack/oauth2/server/authorization/code_and_token_spec.rb",
-     "spec/rack/oauth2/server/authorization/code_spec.rb",
-     "spec/rack/oauth2/server/authorization/token_spec.rb",
-     "spec/rack/oauth2/server/authorization_spec.rb",
+     "spec/rack/oauth2/server/authorize/code_and_token_spec.rb",
+     "spec/rack/oauth2/server/authorize/code_spec.rb",
+     "spec/rack/oauth2/server/authorize/token_spec.rb",
+     "spec/rack/oauth2/server/authorize_spec.rb",
      "spec/rack/oauth2/server/error_spec.rb",
      "spec/rack/oauth2/server/token/assertion_spec.rb",
      "spec/rack/oauth2/server/token/authorization_code_spec.rb",
@@ -63,10 +63,10 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Rack Middleware for OAuth2 Client & Server}
   s.test_files = [
-    "spec/rack/oauth2/server/authorization/code_and_token_spec.rb",
-     "spec/rack/oauth2/server/authorization/code_spec.rb",
-     "spec/rack/oauth2/server/authorization/token_spec.rb",
-     "spec/rack/oauth2/server/authorization_spec.rb",
+    "spec/rack/oauth2/server/authorize/code_and_token_spec.rb",
+     "spec/rack/oauth2/server/authorize/code_spec.rb",
+     "spec/rack/oauth2/server/authorize/token_spec.rb",
+     "spec/rack/oauth2/server/authorize_spec.rb",
      "spec/rack/oauth2/server/error_spec.rb",
      "spec/rack/oauth2/server/token/assertion_spec.rb",
      "spec/rack/oauth2/server/token/authorization_code_spec.rb",

data/spec/rack/oauth2/server/{authorization → authorize}/code_and_token_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper.rb'
 
-describe Rack::OAuth2::Server::Authorization::CodeAndToken do
+describe Rack::OAuth2::Server::Authorize::CodeAndToken do
 
   context "when authorized" do
 
     before do
       # NOTE: for some reason, test fails when called Rack::OAuth2::Server::Authorization::CodeAndToken directly
-      @app = Rack::OAuth2::Server::Authorization.new(simple_app) do |request, response|
+      @app = Rack::OAuth2::Server::Authorize.new(simple_app) do |request, response|
         response.approve!
         response.code = "authorization_code"
         response.access_token = "access_token"
@@ -26,7 +26,7 @@ describe Rack::OAuth2::Server::Authorization::CodeAndToken do
 
     before do
       # NOTE: for some reason, test fails when called Rack::OAuth2::Server::Authorization::Code directly
-      @app = Rack::OAuth2::Server::Authorization.new(simple_app) do |request, response|
+      @app = Rack::OAuth2::Server::Authorize.new(simple_app) do |request, response|
         raise Rack::OAuth2::Server::Unauthorized.new(:access_denied, 'User rejected the requested access.', :redirect_uri => request.redirect_uri)
       end
       @request = Rack::MockRequest.new @app

data/spec/rack/oauth2/server/{authorization → authorize}/code_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper.rb'
 
-describe Rack::OAuth2::Server::Authorization::Code do
+describe Rack::OAuth2::Server::Authorize::Code do
 
   context "when authorized" do
 
     before do
       # NOTE: for some reason, test fails when called Rack::OAuth2::Server::Authorization::Code directly
-      @app = Rack::OAuth2::Server::Authorization.new(simple_app) do |request, response|
+      @app = Rack::OAuth2::Server::Authorize.new(simple_app) do |request, response|
         response.approve!
         response.code = "authorization_code"
       end
@@ -25,7 +25,7 @@ describe Rack::OAuth2::Server::Authorization::Code do
 
     before do
       # NOTE: for some reason, test fails when called Rack::OAuth2::Server::Authorization::Code directly
-      @app = Rack::OAuth2::Server::Authorization.new(simple_app) do |request, response|
+      @app = Rack::OAuth2::Server::Authorize.new(simple_app) do |request, response|
         raise Rack::OAuth2::Server::Unauthorized.new(:access_denied, 'User rejected the requested access.', :redirect_uri => request.redirect_uri)
       end
       @request = Rack::MockRequest.new @app

data/spec/rack/oauth2/server/{authorization → authorize}/token_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper.rb'
 
-describe Rack::OAuth2::Server::Authorization::Token do
+describe Rack::OAuth2::Server::Authorize::Token do
 
   context "when authorized" do
 
     before do
       # NOTE: for some reason, test fails when called Rack::OAuth2::Server::Authorization::Token directly
-      @app = Rack::OAuth2::Server::Authorization.new do |request, response|
+      @app = Rack::OAuth2::Server::Authorize.new do |request, response|
         response.approve!
         response.access_token = "access_token"
       end
@@ -25,7 +25,7 @@ describe Rack::OAuth2::Server::Authorization::Token do
 
     before do
       # NOTE: for some reason, test fails when called Rack::OAuth2::Server::Authorization::Code directly
-      @app = Rack::OAuth2::Server::Authorization.new do |request, response|
+      @app = Rack::OAuth2::Server::Authorize.new do |request, response|
         raise Rack::OAuth2::Server::Unauthorized.new(:access_denied, 'User rejected the requested access.', :redirect_uri => request.redirect_uri)
       end
       @request = Rack::MockRequest.new @app

data/spec/rack/oauth2/server/{authorization_spec.rb → authorize_spec.rb}

@@ -1,16 +1,16 @@
 require 'spec_helper.rb'
 
-describe Rack::OAuth2::Server::Authorization do
+describe Rack::OAuth2::Server::Authorize do
   it "should support realm" do
-    app = Rack::OAuth2::Server::Authorization.new("server.example.com")
+    app = Rack::OAuth2::Server::Authorize.new("server.example.com")
     app.realm.should == "server.example.com"
   end
 end
 
-describe Rack::OAuth2::Server::Authorization::Request do
+describe Rack::OAuth2::Server::Authorize::Request do
 
   before do
-    @app = Rack::OAuth2::Server::Authorization.new(simple_app) do |request, response|
+    @app = Rack::OAuth2::Server::Authorize.new(simple_app) do |request, response|
       response.code = "authorization_code"
     end
     @request = Rack::MockRequest.new @app
@@ -47,12 +47,12 @@ describe Rack::OAuth2::Server::Authorization::Request do
 
 end
 
-describe Rack::OAuth2::Server::Authorization::Response do
+describe Rack::OAuth2::Server::Authorize::Response do
 
   context "when required response params are missing" do
 
     before do
-      @app = Rack::OAuth2::Server::Authorization.new(simple_app) do |request, response|
+      @app = Rack::OAuth2::Server::Authorize.new(simple_app) do |request, response|
         response.approve!
         # code is missing
       end
@@ -70,7 +70,7 @@ describe Rack::OAuth2::Server::Authorization::Response do
   context "when required response params are given" do
 
     before do
-      @app = Rack::OAuth2::Server::Authorization.new(simple_app) do |request, response|
+      @app = Rack::OAuth2::Server::Authorize.new(simple_app) do |request, response|
         response.approve!
         response.code = "authorization_code"
       end

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

@@ -53,8 +53,17 @@ describe Rack::OAuth2::Server::BadRequest do
 end
 
 describe Rack::OAuth2::Server::Unauthorized do
-  it "should use 401 as status" do
-    error = Rack::OAuth2::Server::Unauthorized.new(:unauthorized_client)
-    error.code.should == 401
+  context "when payload is header" do
+    it "should use 401 as status" do
+      error = Rack::OAuth2::Server::Unauthorized.new(:invalid_client, '', :payload => :header)
+      error.code.should == 401
+    end
+  end
+
+  context "when payload isn't header" do
+    it "should use 400 as status" do
+      error = Rack::OAuth2::Server::Unauthorized.new(:invalid_request)
+      error.code.should == 400
+    end
   end
 end

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

@@ -13,7 +13,12 @@ describe Rack::OAuth2::Server::Token::Assertion do
     end
 
     it "should return access_token as json response body" do
-      response = @request.get("/?grant_type=assertion&client_id=valid_client&assertion=valid_assertion&assertion_type=something")
+      response = @request.post("/", :params => {
+        :grant_type => "assertion",
+        :client_id => "valid_client",
+        :assertion => "valid_assertion",
+        :assertion_type => "something"
+      })
       response.status.should == 200
       response.content_type.should == "application/json"
       response.body.should == "{\"access_token\":\"access_token\"}"
@@ -32,8 +37,13 @@ describe Rack::OAuth2::Server::Token::Assertion do
     end
 
     it "should return error message as json response body" do
-      response = @request.get("/?grant_type=assertion&client_id=valid_client&assertion=invalid_assertion&assertion_type=something")
-      response.status.should == 401
+      response = @request.post("/", :params => {
+        :grant_type => "assertion",
+        :client_id => "valid_client",
+        :assertion => "invalid_assertion",
+        :assertion_type => "something"
+      })
+      response.status.should == 400
       response.content_type.should == "application/json"
       response.body.should == "{\"error_description\":\"Invalid assertion.\",\"error\":\"invalid_grant\"}"
     end

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

@@ -13,7 +13,12 @@ describe Rack::OAuth2::Server::Token::AuthorizationCode do
     end
 
     it "should return access_token as json response body" do
-      response = @request.get("/?grant_type=authorization_code&client_id=valid_client&code=valid_authorization_code&redirect_uri=http://client.example.com/callback")
+      response = @request.post("/", :params => {
+        :grant_type => "authorization_code",
+        :client_id => "valid_client",
+        :code => "valid_authorization_code",
+        :redirect_uri => "http://client.example.com/callback"
+      })
       response.status.should == 200
       response.content_type.should == "application/json"
       response.body.should == "{\"access_token\":\"access_token\"}"
@@ -32,8 +37,13 @@ describe Rack::OAuth2::Server::Token::AuthorizationCode do
     end
 
     it "should return error message as json response body" do
-      response = @request.get("/?grant_type=authorization_code&client_id=valid_client&code=invalid_authorization_code&redirect_uri=http://client.example.com/callback")
-      response.status.should == 401
+      response = @request.post("/", :params => {
+        :grant_type => "authorization_code",
+        :client_id => "valid_client",
+        :code => "invalid_authorization_code",
+        :redirect_uri => "http://client.example.com/callback"
+      })
+      response.status.should == 400
       response.content_type.should == "application/json"
       response.body.should == "{\"error_description\":\"Invalid authorization code.\",\"error\":\"invalid_grant\"}"
     end
@@ -51,8 +61,13 @@ describe Rack::OAuth2::Server::Token::AuthorizationCode do
     end
 
     it "should return error message as json response body" do
-      response = @request.get("/?grant_type=authorization_code&client_id=invalid_client&code=valid_authorization_code&redirect_uri=http://client.example.com/callback")
-      response.status.should == 401
+      response = @request.post("/", :params => {
+        :grant_type => "authorization_code",
+        :client_id => "invalid_client",
+        :code => "valid_authorization_code",
+        :redirect_uri => "http://client.example.com/callback"
+      })
+      response.status.should == 400
       response.content_type.should == "application/json"
       response.body.should == "{\"error_description\":\"Invalid client identifier.\",\"error\":\"invalid_client\"}"
     end

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

@@ -13,7 +13,12 @@ describe Rack::OAuth2::Server::Token::Password do
     end
 
     it "should return access_token as json response body" do
-      response = @request.get("/?grant_type=password&client_id=valid_client&username=nov&password=valid_pass")
+      response = @request.post("/", :params => {
+        :grant_type => "password",
+        :client_id => "valid_client",
+        :username => "nov",
+        :password => "valid_pass"
+      })
       response.status.should == 200
       response.content_type.should == "application/json"
       response.body.should == "{\"access_token\":\"access_token\"}"
@@ -32,8 +37,13 @@ describe Rack::OAuth2::Server::Token::Password do
     end
 
     it "should return error message as json response body" do
-      response = @request.get("/?grant_type=password&client_id=valid_client&username=nov&password=invalid_pass")
-      response.status.should == 401
+      response = @request.post("/", :params => {
+        :grant_type => "password",
+        :client_id => "valid_client",
+        :username => "nov",
+        :password => "invalid_pass"
+      })
+      response.status.should == 400
       response.content_type.should == "application/json"
       response.body.should == "{\"error_description\":\"Invalid resource owner credentials.\",\"error\":\"invalid_grant\"}"
     end

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

@@ -13,7 +13,11 @@ describe Rack::OAuth2::Server::Token::RefreshToken do
     end
 
     it "should return access_token as json response body" do
-      response = @request.get("/?grant_type=refresh_token&client_id=valid_client&refresh_token=valid_refresh_token")
+      response = @request.post("/", :params => {
+        :grant_type => "refresh_token",
+        :client_id => "valid_client",
+        :refresh_token => "valid_refresh_token"
+      })
       response.status.should == 200
       response.content_type.should == "application/json"
       response.body.should == "{\"access_token\":\"access_token\"}"
@@ -32,8 +36,12 @@ describe Rack::OAuth2::Server::Token::RefreshToken do
     end
 
     it "should return error message as json response body" do
-      response = @request.get("/?grant_type=refresh_token&client_id=valid_client&refresh_token=invalid_refresh_token")
-      response.status.should == 401
+      response = @request.post("/", :params => {
+        :grant_type => "refresh_token",
+        :client_id => "valid_client",
+        :refresh_token => "invalid_refresh_token"
+      })
+      response.status.should == 400
       response.content_type.should == "application/json"
       response.body.should == "{\"error_description\":\"Invalid refresh_token.\",\"error\":\"invalid_grant\"}"
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-oauth2
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - nov matake
@@ -87,10 +87,10 @@ files:
 - lib/rack/oauth2/server/abstract/handler.rb
 - lib/rack/oauth2/server/abstract/request.rb
 - lib/rack/oauth2/server/abstract/response.rb
-- lib/rack/oauth2/server/authorization.rb
-- lib/rack/oauth2/server/authorization/code.rb
-- lib/rack/oauth2/server/authorization/code_and_token.rb
-- lib/rack/oauth2/server/authorization/token.rb
+- lib/rack/oauth2/server/authorize.rb
+- lib/rack/oauth2/server/authorize/code.rb
+- lib/rack/oauth2/server/authorize/code_and_token.rb
+- lib/rack/oauth2/server/authorize/token.rb
 - lib/rack/oauth2/server/error.rb
 - lib/rack/oauth2/server/token.rb
 - lib/rack/oauth2/server/token/assertion.rb
@@ -99,10 +99,10 @@ files:
 - lib/rack/oauth2/server/token/refresh_token.rb
 - lib/rack/oauth2/server/util.rb
 - rack-oauth2.gemspec
-- spec/rack/oauth2/server/authorization/code_and_token_spec.rb
-- spec/rack/oauth2/server/authorization/code_spec.rb
-- spec/rack/oauth2/server/authorization/token_spec.rb
-- spec/rack/oauth2/server/authorization_spec.rb
+- spec/rack/oauth2/server/authorize/code_and_token_spec.rb
+- spec/rack/oauth2/server/authorize/code_spec.rb
+- spec/rack/oauth2/server/authorize/token_spec.rb
+- spec/rack/oauth2/server/authorize_spec.rb
 - spec/rack/oauth2/server/error_spec.rb
 - spec/rack/oauth2/server/token/assertion_spec.rb
 - spec/rack/oauth2/server/token/authorization_code_spec.rb
@@ -146,10 +146,10 @@ signing_key:
 specification_version: 3
 summary: Rack Middleware for OAuth2 Client & Server
 test_files: 
-- spec/rack/oauth2/server/authorization/code_and_token_spec.rb
-- spec/rack/oauth2/server/authorization/code_spec.rb
-- spec/rack/oauth2/server/authorization/token_spec.rb
-- spec/rack/oauth2/server/authorization_spec.rb
+- spec/rack/oauth2/server/authorize/code_and_token_spec.rb
+- spec/rack/oauth2/server/authorize/code_spec.rb
+- spec/rack/oauth2/server/authorize/token_spec.rb
+- spec/rack/oauth2/server/authorize_spec.rb
 - spec/rack/oauth2/server/error_spec.rb
 - spec/rack/oauth2/server/token/assertion_spec.rb
 - spec/rack/oauth2/server/token/authorization_code_spec.rb