big refactoring before start working on draft v.11

still halfway

Author: nov

lib/rack/oauth2/server.rb

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

lib/rack/oauth2/server/abstract/request.rb

@@ -3,33 +3,25 @@ module OAuth2
     module Server
       module Abstract
         class Request < Rack::Request
-          attr_accessor :client_id, :scope
+          include RequiredParams
+          attr_required :client_id
+          attr_accessor :scope
 
           def initialize(env)
             super
-            missing_params = verify_required_params
             @client_id ||= params['client_id']
             @scope = Array(params['scope'].to_s.split(' '))
-            missing_params << :client_id if @client_id.blank?
-            unless missing_params.blank?
-              invalid_request!("'#{missing_params.join('\', \'')}' required.", :state => @state, :redirect_uri => @redirect_uri)
-            end
-            if params['client_id'].present? && @client_id != params['client_id']
-              invalid_client!("Multiple client credentials are provided.")
-            end
           end
 
-          def required_params
-            []
-          end
-
-          def verify_required_params
-            missing_params = []
-            required_params.each do |key|
-              missing_params << key unless params[key.to_s]
+          def verify_required_params_with_error_handling!
+            if params['client_id'].present? && @client_id != params['client_id']
+              invalid_client!("Multiple client credentials are provided.")
             end
-            missing_params
+            verify_required_params_without_error_handling!
+          rescue ParameterMissing => e
+            invalid_request!(e.message, :state => @state, :redirect_uri => @redirect_uri)
           end
+          alias_method_chain :verify_required_params!, :error_handling
 
         end
       end

lib/rack/oauth2/server/abstract/response.rb

@@ -3,24 +3,12 @@ module OAuth2
     module Server
       module Abstract
         class Response < Rack::Response
+          include RequiredParams
+
           def initialize(request)
             super([], 200, {})
           end
 
-          def required_params
-            []
-          end
-
-          def verify_required_params!
-            missing_params = []
-            required_params.each do |key|
-              missing_params << key unless self.send(key)
-            end
-            unless missing_params.blank?
-              raise "Setup '#{missing_params.join('\', \'')}' first!"
-            end
-          end
-
           def finish
             verify_required_params!
             super

lib/rack/oauth2/server/authorize.rb

@@ -12,26 +12,25 @@ def call(env)
 
         class Request < Abstract::Request
           include Error::Authorize
-          attr_accessor :response_type, :redirect_uri, :state
+          attr_required :response_type
+          attr_accessor :redirect_uri, :state
 
           def initialize(env)
             super
-            @state = params['state']
             @redirect_uri = Util.parse_uri(params['redirect_uri']) if params['redirect_uri']
-          end
-
-          def required_params
-            super + [:response_type]
+            @state = params['state']
           end
 
           def profile
-            case params['response_type']
+            case params['response_type'].to_s
             when 'code'
               Code
             when 'token'
               Token
             when 'code_and_token'
               CodeAndToken
+            when ''
+              verify_required_params!
             else
               unsupported_response_type!("'#{params['response_type']}' isn't supported.")
             end

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

@@ -14,15 +14,13 @@ class Request < Authorize::Request
             def initialize(env)
               super
               @response_type = :code
+              p self
+              verify_required_params!
             end
           end
 
           class Response < Authorize::Response
-            attr_accessor :code
-
-            def required_params
-              super + [:code]
-            end
+            attr_required :code
 
             def finish
               if approved?

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

@@ -14,15 +14,13 @@ class Request < Authorize::Request
             def initialize(env)
               super
               @response_type = :code_and_token
+              verify_required_params!
             end
           end
 
           class Response < Authorize::Response
-            attr_accessor :code, :access_token, :expires_in, :scope
-
-            def required_params
-              super + [:code, :access_token]
-            end
+            attr_required :code, :access_token
+            attr_accessor :expires_in, :scope
 
             def finish
               if approved?

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

@@ -14,15 +14,13 @@ class Request < Authorize::Request
             def initialize(env)
               super
               @response_type = :token
+              verify_required_params!
             end
           end
 
           class Response < Authorize::Response
-            attr_accessor :access_token, :expires_in, :scope
-
-            def required_params
-              super + [:access_token]
-            end
+            attr_required :access_token
+            attr_accessor :expires_in, :scope
 
             def finish
               if approved?

lib/rack/oauth2/server/required_params.rb

@@ -0,0 +1,39 @@
+module Rack
+  module OAuth2
+    module Server
+      module RequiredParams
+        class ParameterMissing < StandardError; end
+
+        def self.included(klass)
+          class << klass
+
+            def attr_required(*keys)
+              @required_params = if superclass.respond_to?(:"#{type}_params")
+                superclass.send(:"#{type}_params")
+              else
+                []
+              end
+              @required_params += Array(keys)
+              attr_accessor *keys
+            end
+
+            def required_params
+              @required_params || []
+            end
+
+          end
+        end
+
+        def missing_params
+          self.class.required_params.select do |key|
+            self.send(key).blank?
+          end
+        end
+
+        def verify_required_params!
+          raise ParameterMissing.new("'#{missing_params.join('\', \'')}' required.") if missing_params.present?
+        end
+      end
+    end
+  end
+end

lib/rack/oauth2/server/token.rb

@@ -15,7 +15,8 @@ def call(env)
         class Request < Abstract::Request
           include Error::Token
 
-          attr_accessor :grant_type, :client_secret, :via_authorization_header
+          attr_required :grant_type
+          attr_accessor :client_secret, :via_authorization_header
 
           def initialize(env)
             auth = Rack::Auth::Basic::Request.new(env)
@@ -30,10 +31,6 @@ def initialize(env)
             @grant_type = params['grant_type']
           end
 
-          def required_params
-            super + [:grant_type]
-          end
-
           def profile(allow_no_profile = false)
             case params['grant_type']
             when 'authorization_code'
@@ -52,11 +49,8 @@ def profile(allow_no_profile = false)
         end
 
         class Response < Abstract::Response
-          attr_accessor :access_token, :expires_in, :refresh_token, :scope
-
-          def required_params
-            super + [:access_token]
-          end
+          attr_required :access_token
+          attr_accessor :expires_in, :refresh_token, :scope
 
           def finish
             params = {

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

@@ -11,18 +11,14 @@ def call(env)
           end
 
           class Request < Token::Request
-            attr_accessor :assertion_type, :assertion
+            attr_required :assertion_type, :assertion
 
             def initialize(env)
               super
               @grant_type     = 'assertion'
               @assertion_type = params['assertion_type']
               @assertion      = params['assertion']
             end
-
-            def required_params
-              super + [:assertion_type, :assertion]
-            end
           end
 
         end

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

@@ -11,17 +11,13 @@ def call(env)
           end
 
           class Request < Token::Request
-            attr_accessor :code
+            attr_required :code
 
             def initialize(env)
               super
               @grant_type = :authorization_code
               @code       = params['code']
             end
-
-            def required_params
-              super + [:code]
-            end
           end
 
         end

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

@@ -11,18 +11,14 @@ def call(env)
           end
 
           class Request < Token::Request
-            attr_reader :username, :password
+            attr_required :username, :password
 
             def initialize(env)
               super
               @grant_type = :password
               @username   = params['username']
               @password   = params['password']
             end
-
-            def required_params
-              super + [:username, :password]
-            end
           end
 
         end

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

@@ -11,17 +11,13 @@ def call(env)
           end
 
           class Request < Token::Request
-            attr_reader :refresh_token
+            attr_required :refresh_token
 
             def initialize(env)
               super
               @grant_type    = 'refresh_token'
               @refresh_token = params['refresh_token']
             end
-
-            def required_params
-              super + [:refresh_token]
-            end
           end
 
         end