doorkeeper 5.1.0.rc2 → 5.1.0

data/app/validators/redirect_uri_validator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'uri'
+require "uri"
 
 class RedirectUriValidator < ActiveModel::EachValidator
   def self.native_redirect_uri
@@ -9,11 +9,14 @@ class RedirectUriValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
     if value.blank?
+      return if Doorkeeper.configuration.allow_blank_redirect_uri?(record)
+
       record.errors.add(attribute, :blank)
     else
       value.split.each do |val|
         uri = ::URI.parse(val)
         next if native_redirect_uri?(uri)
+
         record.errors.add(attribute, :forbidden_uri) if forbidden_uri?(uri)
         record.errors.add(attribute, :fragment_present) unless uri.fragment.nil?
         record.errors.add(attribute, :relative_uri) if uri.scheme.nil? || uri.host.nil?
@@ -36,7 +39,7 @@ class RedirectUriValidator < ActiveModel::EachValidator
 
   def invalid_ssl_uri?(uri)
     forces_ssl = Doorkeeper.configuration.force_ssl_in_redirect_uri
-    non_https = uri.try(:scheme) == 'http'
+    non_https = uri.try(:scheme) == "http"
 
     if forces_ssl.respond_to?(:call)
       forces_ssl.call(uri) && non_https

data/app/views/doorkeeper/applications/_form.html.erb

@@ -25,6 +25,12 @@
             <%= raw t('doorkeeper.applications.help.native_redirect_uri', native_redirect_uri: content_tag(:code, class: 'bg-light') { Doorkeeper.configuration.native_redirect_uri }) %>
           </span>
       <% end %>
+
+      <% if Doorkeeper.configuration.allow_blank_redirect_uri?(application) %>
+        <span class="form-text text-secondary">
+          <%= t('doorkeeper.applications.help.blank_redirect_uri') %>
+        </span>
+      <% end %>
     </div>
   </div>
 

data/bin/console

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require 'bundler/setup'
-require 'rails/all'
-require 'doorkeeper'
+require "bundler/setup"
+require "rails/all"
+require "doorkeeper"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -11,5 +12,5 @@ require 'doorkeeper'
 # require "pry"
 # Pry.start
 
-require 'irb'
+require "irb"
 IRB.start(__FILE__)

data/config/locales/en.yml

@@ -32,6 +32,7 @@ en:
       help:
         confidential: 'Application will be used where the client secret can be kept confidential. Native mobile apps and Single Page Apps are considered non-confidential.'
         redirect_uri: 'Use one line per URI'
+        blank_redirect_uri: "Leave it blank if you configured your provider to use Client Credentials, Resource Owner Password Credentials or any other grant type that doesn't require redirect URI."
         native_redirect_uri: 'Use %{native_redirect_uri} if you want to add localhost URIs for development purposes'
         scopes: 'Separate scopes with spaces. Leave blank to use the default scopes.'
       edit:

data/doorkeeper.gemspec

@@ -1,32 +1,34 @@
-$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
 
-require 'doorkeeper/version'
+$LOAD_PATH.push File.expand_path("lib", __dir__)
+
+require "doorkeeper/version"
 
 Gem::Specification.new do |gem|
-  gem.name        = 'doorkeeper'
+  gem.name        = "doorkeeper"
   gem.version     = Doorkeeper.gem_version
-  gem.authors     = ['Felipe Elias Philipp', 'Tute Costa', 'Jon Moss', 'Nikita Bulai']
-  gem.email       = %w(bulaj.nikita@gmail.com)
-  gem.homepage    = 'https://github.com/doorkeeper-gem/doorkeeper'
-  gem.summary     = 'OAuth 2 provider for Rails and Grape'
-  gem.description = 'Doorkeeper is an OAuth 2 provider for Rails and Grape.'
-  gem.license     = 'MIT'
+  gem.authors     = ["Felipe Elias Philipp", "Tute Costa", "Jon Moss", "Nikita Bulai"]
+  gem.email       = %w[bulaj.nikita@gmail.com]
+  gem.homepage    = "https://github.com/doorkeeper-gem/doorkeeper"
+  gem.summary     = "OAuth 2 provider for Rails and Grape"
+  gem.description = "Doorkeeper is an OAuth 2 provider for Rails and Grape."
+  gem.license     = "MIT"
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- spec/*`.split("\n")
-  gem.require_paths = ['lib']
+  gem.require_paths = ["lib"]
 
-  gem.add_dependency 'railties', '>= 4.2'
-  gem.required_ruby_version = '>= 2.1'
+  gem.add_dependency "railties", ">= 5"
+  gem.required_ruby_version = ">= 2.4"
 
-  gem.add_development_dependency 'appraisal'
-  gem.add_development_dependency 'capybara'
-  gem.add_development_dependency 'coveralls'
-  gem.add_development_dependency 'danger', '~> 5.0'
-  gem.add_development_dependency 'database_cleaner', '~> 1.6'
-  gem.add_development_dependency 'factory_bot', '~> 4.8'
-  gem.add_development_dependency 'generator_spec', '~> 0.9.3'
-  gem.add_development_dependency 'grape'
-  gem.add_development_dependency 'rake', '>= 11.3.0'
-  gem.add_development_dependency 'rspec-rails'
+  gem.add_development_dependency "appraisal"
+  gem.add_development_dependency "capybara"
+  gem.add_development_dependency "coveralls"
+  gem.add_development_dependency "danger", "~> 6.0"
+  gem.add_development_dependency "database_cleaner", "~> 1.6"
+  gem.add_development_dependency "factory_bot", "~> 5.0"
+  gem.add_development_dependency "generator_spec", "~> 0.9.3"
+  gem.add_development_dependency "grape"
+  gem.add_development_dependency "rake", ">= 11.3.0"
+  gem.add_development_dependency "rspec-rails"
 end

data/gemfiles/rails_5_0.gemfile

@@ -2,12 +2,13 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.0.0", ">= 5.0.7.2"
+gem "rails", "~> 5.0.0"
 gem "rspec-core", git: "https://github.com/rspec/rspec-core.git"
 gem "rspec-expectations", git: "https://github.com/rspec/rspec-expectations.git"
 gem "rspec-mocks", git: "https://github.com/rspec/rspec-mocks.git"
 gem "rspec-rails", branch: "4-0-dev", git: "https://github.com/rspec/rspec-rails.git"
 gem "rspec-support", git: "https://github.com/rspec/rspec-support.git"
+gem "rubocop", "~> 0.66"
 gem "bcrypt", "~> 3.1", require: false
 gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
 gem "sqlite3", "~> 1.3", "< 1.4", platform: [:ruby, :mswin, :mingw, :x64_mingw]

data/gemfiles/rails_5_1.gemfile

@@ -2,12 +2,13 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.1.0", ">= 5.1.6.2"
+gem "rails", "~> 5.1.0"
 gem "rspec-core", git: "https://github.com/rspec/rspec-core.git"
 gem "rspec-expectations", git: "https://github.com/rspec/rspec-expectations.git"
 gem "rspec-mocks", git: "https://github.com/rspec/rspec-mocks.git"
 gem "rspec-rails", branch: "4-0-dev", git: "https://github.com/rspec/rspec-rails.git"
 gem "rspec-support", git: "https://github.com/rspec/rspec-support.git"
+gem "rubocop", "~> 0.66"
 gem "bcrypt", "~> 3.1", require: false
 gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
 gem "sqlite3", "~> 1.3", "< 1.4", platform: [:ruby, :mswin, :mingw, :x64_mingw]

data/gemfiles/rails_5_2.gemfile

@@ -2,12 +2,13 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.2.2", ">= 5.2.2.1"
+gem "rails", "~> 5.2.0"
 gem "rspec-core", git: "https://github.com/rspec/rspec-core.git"
 gem "rspec-expectations", git: "https://github.com/rspec/rspec-expectations.git"
 gem "rspec-mocks", git: "https://github.com/rspec/rspec-mocks.git"
 gem "rspec-rails", branch: "4-0-dev", git: "https://github.com/rspec/rspec-rails.git"
 gem "rspec-support", git: "https://github.com/rspec/rspec-support.git"
+gem "rubocop", "~> 0.66"
 gem "bcrypt", "~> 3.1", require: false
 gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
 gem "sqlite3", "~> 1.3", "< 1.4", platform: [:ruby, :mswin, :mingw, :x64_mingw]

data/gemfiles/rails_6_0.gemfile

@@ -8,6 +8,7 @@ gem "rspec-expectations", git: "https://github.com/rspec/rspec-expectations.git"
 gem "rspec-mocks", git: "https://github.com/rspec/rspec-mocks.git"
 gem "rspec-rails", branch: "4-0-dev", git: "https://github.com/rspec/rspec-rails.git"
 gem "rspec-support", git: "https://github.com/rspec/rspec-support.git"
+gem "rubocop", "~> 0.66"
 gem "bcrypt", "~> 3.1", require: false
 gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
 gem "sqlite3", "~> 1.4", platform: [:ruby, :mswin, :mingw, :x64_mingw]

data/gemfiles/rails_master.gemfile

@@ -8,6 +8,7 @@ gem "rspec-expectations", git: "https://github.com/rspec/rspec-expectations.git"
 gem "rspec-mocks", git: "https://github.com/rspec/rspec-mocks.git"
 gem "rspec-rails", branch: "4-0-dev", git: "https://github.com/rspec/rspec-rails.git"
 gem "rspec-support", git: "https://github.com/rspec/rspec-support.git"
+gem "rubocop", "~> 0.66"
 gem "bcrypt", "~> 3.1", require: false
 gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
 gem "sqlite3", "~> 1.4", platform: [:ruby, :mswin, :mingw, :x64_mingw]

data/lib/doorkeeper.rb

@@ -1,82 +1,84 @@
-require 'doorkeeper/version'
-require 'doorkeeper/engine'
-require 'doorkeeper/config'
+# frozen_string_literal: true
 
-require 'doorkeeper/request/strategy'
-require 'doorkeeper/request/authorization_code'
-require 'doorkeeper/request/client_credentials'
-require 'doorkeeper/request/code'
-require 'doorkeeper/request/password'
-require 'doorkeeper/request/refresh_token'
-require 'doorkeeper/request/token'
+require "doorkeeper/version"
+require "doorkeeper/engine"
+require "doorkeeper/config"
 
-require 'doorkeeper/errors'
-require 'doorkeeper/server'
-require 'doorkeeper/request'
-require 'doorkeeper/validations'
+require "doorkeeper/request/strategy"
+require "doorkeeper/request/authorization_code"
+require "doorkeeper/request/client_credentials"
+require "doorkeeper/request/code"
+require "doorkeeper/request/password"
+require "doorkeeper/request/refresh_token"
+require "doorkeeper/request/token"
 
-require 'doorkeeper/oauth/authorization/code'
-require 'doorkeeper/oauth/authorization/context'
-require 'doorkeeper/oauth/authorization/token'
-require 'doorkeeper/oauth/authorization/uri_builder'
-require 'doorkeeper/oauth/helpers/scope_checker'
-require 'doorkeeper/oauth/helpers/uri_checker'
-require 'doorkeeper/oauth/helpers/unique_token'
+require "doorkeeper/errors"
+require "doorkeeper/server"
+require "doorkeeper/request"
+require "doorkeeper/validations"
 
-require 'doorkeeper/oauth'
-require 'doorkeeper/oauth/scopes'
-require 'doorkeeper/oauth/error'
-require 'doorkeeper/oauth/base_response'
-require 'doorkeeper/oauth/code_response'
-require 'doorkeeper/oauth/token_response'
-require 'doorkeeper/oauth/error_response'
-require 'doorkeeper/oauth/pre_authorization'
-require 'doorkeeper/oauth/base_request'
-require 'doorkeeper/oauth/authorization_code_request'
-require 'doorkeeper/oauth/refresh_token_request'
-require 'doorkeeper/oauth/password_access_token_request'
+require "doorkeeper/oauth/authorization/code"
+require "doorkeeper/oauth/authorization/context"
+require "doorkeeper/oauth/authorization/token"
+require "doorkeeper/oauth/authorization/uri_builder"
+require "doorkeeper/oauth/helpers/scope_checker"
+require "doorkeeper/oauth/helpers/uri_checker"
+require "doorkeeper/oauth/helpers/unique_token"
 
-require 'doorkeeper/oauth/client_credentials/validation'
-require 'doorkeeper/oauth/client_credentials/creator'
-require 'doorkeeper/oauth/client_credentials/issuer'
-require 'doorkeeper/oauth/client_credentials/validation'
-require 'doorkeeper/oauth/client/credentials'
+require "doorkeeper/oauth"
+require "doorkeeper/oauth/scopes"
+require "doorkeeper/oauth/error"
+require "doorkeeper/oauth/base_response"
+require "doorkeeper/oauth/code_response"
+require "doorkeeper/oauth/token_response"
+require "doorkeeper/oauth/error_response"
+require "doorkeeper/oauth/pre_authorization"
+require "doorkeeper/oauth/base_request"
+require "doorkeeper/oauth/authorization_code_request"
+require "doorkeeper/oauth/refresh_token_request"
+require "doorkeeper/oauth/password_access_token_request"
 
-require 'doorkeeper/oauth/client_credentials_request'
-require 'doorkeeper/oauth/code_request'
-require 'doorkeeper/oauth/token_request'
-require 'doorkeeper/oauth/client'
-require 'doorkeeper/oauth/token'
-require 'doorkeeper/oauth/token_introspection'
-require 'doorkeeper/oauth/invalid_token_response'
-require 'doorkeeper/oauth/forbidden_token_response'
+require "doorkeeper/oauth/client_credentials/validation"
+require "doorkeeper/oauth/client_credentials/creator"
+require "doorkeeper/oauth/client_credentials/issuer"
+require "doorkeeper/oauth/client_credentials/validation"
+require "doorkeeper/oauth/client/credentials"
 
-require 'doorkeeper/secret_storing/base'
-require 'doorkeeper/secret_storing/plain'
-require 'doorkeeper/secret_storing/sha256_hash'
-require 'doorkeeper/secret_storing/bcrypt'
+require "doorkeeper/oauth/client_credentials_request"
+require "doorkeeper/oauth/code_request"
+require "doorkeeper/oauth/token_request"
+require "doorkeeper/oauth/client"
+require "doorkeeper/oauth/token"
+require "doorkeeper/oauth/token_introspection"
+require "doorkeeper/oauth/invalid_token_response"
+require "doorkeeper/oauth/forbidden_token_response"
 
-require 'doorkeeper/models/concerns/orderable'
-require 'doorkeeper/models/concerns/scopes'
-require 'doorkeeper/models/concerns/expirable'
-require 'doorkeeper/models/concerns/reusable'
-require 'doorkeeper/models/concerns/revocable'
-require 'doorkeeper/models/concerns/accessible'
-require 'doorkeeper/models/concerns/secret_storable'
+require "doorkeeper/secret_storing/base"
+require "doorkeeper/secret_storing/plain"
+require "doorkeeper/secret_storing/sha256_hash"
+require "doorkeeper/secret_storing/bcrypt"
 
-require 'doorkeeper/models/access_grant_mixin'
-require 'doorkeeper/models/access_token_mixin'
-require 'doorkeeper/models/application_mixin'
+require "doorkeeper/models/concerns/orderable"
+require "doorkeeper/models/concerns/scopes"
+require "doorkeeper/models/concerns/expirable"
+require "doorkeeper/models/concerns/reusable"
+require "doorkeeper/models/concerns/revocable"
+require "doorkeeper/models/concerns/accessible"
+require "doorkeeper/models/concerns/secret_storable"
 
-require 'doorkeeper/helpers/controller'
+require "doorkeeper/models/access_grant_mixin"
+require "doorkeeper/models/access_token_mixin"
+require "doorkeeper/models/application_mixin"
 
-require 'doorkeeper/rails/routes'
-require 'doorkeeper/rails/helpers'
+require "doorkeeper/helpers/controller"
 
-require 'doorkeeper/rake'
-require 'doorkeeper/stale_records_cleaner'
+require "doorkeeper/rails/routes"
+require "doorkeeper/rails/helpers"
 
-require 'doorkeeper/orm/active_record'
+require "doorkeeper/rake"
+require "doorkeeper/stale_records_cleaner"
+
+require "doorkeeper/orm/active_record"
 
 module Doorkeeper
   def self.authenticate(request, methods = Doorkeeper.configuration.access_token_methods)

data/lib/doorkeeper/config.rb

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
+
+require "doorkeeper/config/option"
+
 module Doorkeeper
   class MissingConfiguration < StandardError
     # Defines a MissingConfiguration error for a missing Doorkeeper
     # configuration
     def initialize
-      super('Configuration for doorkeeper missing. Do you have doorkeeper initializer?')
+      super("Configuration for doorkeeper missing. Do you have doorkeeper initializer?")
     end
   end
 
@@ -12,6 +16,7 @@ module Doorkeeper
     setup_orm_adapter
     setup_orm_models
     setup_application_owner if @config.enable_application_owner?
+    @config
   end
 
   def self.configuration
@@ -163,7 +168,7 @@ module Doorkeeper
       #   Provide a fallback secret storage implementation class for tokens
       #   or use :plain to fallback to plain tokens
       def hash_token_secrets(using: nil, fallback: nil)
-        default = '::Doorkeeper::SecretStoring::Sha256Hash'
+        default = "::Doorkeeper::SecretStoring::Sha256Hash"
         configure_secrets_for :token,
                               using: using || default,
                               fallback: fallback
@@ -178,7 +183,7 @@ module Doorkeeper
       #   Provide a fallback secret storage implementation for applications
       #   or use :plain to fallback to plain application secrets
       def hash_application_secrets(using: nil, fallback: nil)
-        default = '::Doorkeeper::SecretStoring::Sha256Hash'
+        default = "::Doorkeeper::SecretStoring::Sha256Hash"
         configure_secrets_for :application,
                               using: using || default,
                               fallback: fallback
@@ -188,9 +193,7 @@ module Doorkeeper
 
       # Configure the secret storing functionality
       def configure_secrets_for(type, using:, fallback:)
-        unless %i[application token].include?(type)
-          raise ArgumentError, "Invalid type #{type}"
-        end
+        raise ArgumentError, "Invalid type #{type}" if %i[application token].exclude?(type)
 
         @config.instance_variable_set(:"@#{type}_secret_strategy",
                                       using.constantize)
@@ -198,7 +201,7 @@ module Doorkeeper
         if fallback.nil?
           return
         elsif fallback.to_sym == :plain
-          fallback = '::Doorkeeper::SecretStoring::Plain'
+          fallback = "::Doorkeeper::SecretStoring::Plain"
         end
 
         @config.instance_variable_set(:"@#{type}_secret_fallback_strategy",
@@ -206,71 +209,13 @@ module Doorkeeper
       end
     end
 
-    module Option
-      # Defines configuration option
-      #
-      # When you call option, it defines two methods. One method will take place
-      # in the +Config+ class and the other method will take place in the
-      # +Builder+ class.
-      #
-      # The +name+ parameter will set both builder method and config attribute.
-      # If the +:as+ option is defined, the builder method will be the specified
-      # option while the config attribute will be the +name+ parameter.
-      #
-      # If you want to introduce another level of config DSL you can
-      # define +builder_class+ parameter.
-      # Builder should take a block as the initializer parameter and respond to function +build+
-      # that returns the value of the config attribute.
-      #
-      # ==== Options
-      #
-      # * [:+as+] Set the builder method that goes inside +configure+ block
-      # * [+:default+] The default value in case no option was set
-      #
-      # ==== Examples
-      #
-      #    option :name
-      #    option :name, as: :set_name
-      #    option :name, default: 'My Name'
-      #    option :scopes builder_class: ScopesBuilder
-      #
-      def option(name, options = {})
-        attribute = options[:as] || name
-        attribute_builder = options[:builder_class]
-
-        Builder.instance_eval do
-          remove_method name if method_defined?(name)
-          define_method name do |*args, &block|
-            # TODO: is builder_class option being used?
-            value = if attribute_builder
-                      attribute_builder.new(&block).build
-                    else
-                      block || args.first
-                    end
-
-            @config.instance_variable_set(:"@#{attribute}", value)
-          end
-        end
-
-        define_method attribute do |*_args|
-          if instance_variable_defined?(:"@#{attribute}")
-            instance_variable_get(:"@#{attribute}")
-          else
-            options[:default]
-          end
-        end
-
-        public attribute
-      end
-    end
-
     extend Option
 
     option :resource_owner_authenticator,
            as: :authenticate_resource_owner,
            default: (lambda do |_routes|
              ::Rails.logger.warn(
-               I18n.t('doorkeeper.errors.messages.resource_owner_authenticator_not_configured')
+               I18n.t("doorkeeper.errors.messages.resource_owner_authenticator_not_configured")
              )
 
              nil
@@ -280,7 +225,7 @@ module Doorkeeper
            as: :authenticate_admin,
            default: (lambda do |_routes|
              ::Rails.logger.warn(
-               I18n.t('doorkeeper.errors.messages.admin_authenticator_not_configured')
+               I18n.t("doorkeeper.errors.messages.admin_authenticator_not_configured")
              )
 
              head :forbidden
@@ -289,7 +234,7 @@ module Doorkeeper
     option :resource_owner_from_credentials,
            default: (lambda do |_routes|
              ::Rails.logger.warn(
-               I18n.t('doorkeeper.errors.messages.credential_flow_not_configured')
+               I18n.t("doorkeeper.errors.messages.credential_flow_not_configured")
              )
 
              nil
@@ -309,7 +254,7 @@ module Doorkeeper
     option :custom_access_token_expires_in, default: ->(_context) { nil }
     option :authorization_code_expires_in,  default: 600
     option :orm,                            default: :active_record
-    option :native_redirect_uri,            default: 'urn:ietf:wg:oauth:2.0:oob'
+    option :native_redirect_uri,            default: "urn:ietf:wg:oauth:2.0:oob"
     option :active_record_options,          default: {}
     option :grant_flows,                    default: %w[authorization_code client_credentials]
     option :handle_auth_errors,             default: :render
@@ -325,7 +270,7 @@ module Doorkeeper
     #
     # @param realm [String] ("Doorkeeper") Authentication realm
     #
-    option :realm,                          default: 'Doorkeeper'
+    option :realm,                          default: "Doorkeeper"
 
     # Forces the usage of the HTTPS protocol in non-native redirect uris
     # (enabled by default in non-development environments). OAuth2
@@ -349,8 +294,7 @@ module Doorkeeper
     #   the name of the access token generator class
     #
     option :access_token_generator,
-           default: 'Doorkeeper::OAuth::Helpers::UniqueToken'
-
+           default: "Doorkeeper::OAuth::Helpers::UniqueToken"
 
     # Default access token generator is a SecureRandom class from Ruby stdlib.
     # This option defines which method will be used to generate a unique token value.
@@ -358,7 +302,7 @@ module Doorkeeper
     # @param access_token_generator [String]
     #   the name of the access token generator class
     #
-    option :default_generator_method,  default: :urlsafe_base64
+    option :default_generator_method, default: :urlsafe_base64
 
     # The controller Doorkeeper::ApplicationController inherits from.
     # Defaults to ActionController::Base.
@@ -366,11 +310,22 @@ module Doorkeeper
     #
     # @param base_controller [String] the name of the base controller
     option :base_controller,
-           default: 'ActionController::Base'
+           default: "ActionController::Base"
+
+    # Allows to set blank redirect URIs for Applications in case
+    # server configured to use URI-less grant flows.
+    #
+    option :allow_blank_redirect_uri,
+           default: (lambda do |grant_flows, _application|
+             grant_flows.exclude?("authorization_code") &&
+               grant_flows.exclude?("implicit")
+           end)
 
     attr_reader :api_only,
                 :enforce_content_type,
-                :reuse_access_token
+                :reuse_access_token,
+                :token_secret_fallback_strategy,
+                :application_secret_fallback_strategy
 
     # Return the valid subset of this configuration
     def validate
@@ -419,18 +374,10 @@ module Doorkeeper
       @token_secret_strategy ||= ::Doorkeeper::SecretStoring::Plain
     end
 
-    def token_secret_fallback_strategy
-      @token_secret_fallback_strategy
-    end
-
     def application_secret_strategy
       @application_secret_strategy ||= ::Doorkeeper::SecretStoring::Plain
     end
 
-    def application_secret_fallback_strategy
-      @application_secret_fallback_strategy
-    end
-
     def default_scopes
       @default_scopes ||= OAuth::Scopes.new
     end
@@ -452,7 +399,11 @@ module Doorkeeper
     end
 
     def access_token_methods
-      @access_token_methods ||= %i[from_bearer_authorization from_access_token_param from_bearer_param]
+      @access_token_methods ||= %i[
+        from_bearer_authorization
+        from_access_token_param
+        from_bearer_param
+      ]
     end
 
     def authorization_response_types
@@ -463,6 +414,18 @@ module Doorkeeper
       @token_grant_types ||= calculate_token_grant_types.freeze
     end
 
+    def allow_blank_redirect_uri?(application = nil)
+      if allow_blank_redirect_uri.respond_to?(:call)
+        allow_blank_redirect_uri.call(grant_flows, application)
+      else
+        allow_blank_redirect_uri
+      end
+    end
+
+    def option_defined?(name)
+      instance_variable_defined?("@#{name}")
+    end
+
     private
 
     # Helper to read boolearized configuration option
@@ -476,8 +439,8 @@ module Doorkeeper
     #
     def calculate_authorization_response_types
       types = []
-      types << 'code'  if grant_flows.include? 'authorization_code'
-      types << 'token' if grant_flows.include? 'implicit'
+      types << "code"  if grant_flows.include? "authorization_code"
+      types << "token" if grant_flows.include? "implicit"
       types
     end
 
@@ -485,8 +448,8 @@ module Doorkeeper
     # request endpoint, and return them in array.
     #
     def calculate_token_grant_types
-      types = grant_flows - ['implicit']
-      types << 'refresh_token' if refresh_token_enabled?
+      types = grant_flows - ["implicit"]
+      types << "refresh_token" if refresh_token_enabled?
       types
     end
 
@@ -518,8 +481,8 @@ module Doorkeeper
                 (token_reuse_limit > 0 && token_reuse_limit <= 100)
 
       ::Rails.logger.warn(
-        'You have configured an invalid value for token_reuse_limit option. ' \
-        'It will be set to default 100'
+        "You have configured an invalid value for token_reuse_limit option. " \
+        "It will be set to default 100"
       )
       @token_reuse_limit = 100
     end