doorkeeper 5.0.3 → 5.1.0

data/app/controllers/doorkeeper/application_metal_controller.rb

@@ -1,19 +1,8 @@
 # frozen_string_literal: true
 
 module Doorkeeper
-  class ApplicationMetalController < ActionController::Metal
-    MODULES = [
-      ActionController::Instrumentation,
-      AbstractController::Rendering,
-      ActionController::Rendering,
-      ActionController::Renderers::All,
-      AbstractController::Callbacks,
-      Helpers::Controller
-    ].freeze
-
-    MODULES.each do |mod|
-      include mod
-    end
+  class ApplicationMetalController < ActionController::API
+    include Helpers::Controller
 
     before_action :enforce_content_type,
                   if: -> { Doorkeeper.configuration.enforce_content_type }

data/app/controllers/doorkeeper/applications_controller.rb

@@ -2,7 +2,7 @@
 
 module Doorkeeper
   class ApplicationsController < Doorkeeper::ApplicationController
-    layout 'doorkeeper/admin' unless Doorkeeper.configuration.api_only
+    layout "doorkeeper/admin" unless Doorkeeper.configuration.api_only
 
     before_action :authenticate_admin!
     before_action :set_application, only: %i[show edit update destroy]
@@ -19,7 +19,7 @@ module Doorkeeper
     def show
       respond_to do |format|
         format.html
-        format.json { render json: @application, as_owner: true }
+        format.json { render json: @application }
       end
     end
 
@@ -35,12 +35,16 @@ module Doorkeeper
 
         respond_to do |format|
           format.html { redirect_to oauth_application_url(@application) }
-          format.json { render json: @application, as_owner: true }
+          format.json { render json: @application }
         end
       else
         respond_to do |format|
           format.html { render :new }
-          format.json { render json: { errors: @application.errors.full_messages }, status: :unprocessable_entity }
+          format.json do
+            errors = @application.errors.full_messages
+
+            render json: { errors: errors }, status: :unprocessable_entity
+          end
         end
       end
     end
@@ -49,22 +53,26 @@ module Doorkeeper
 
     def update
       if @application.update(application_params)
-        flash[:notice] = I18n.t(:notice, scope: %i[doorkeeper flash applications update])
+        flash[:notice] = I18n.t(:notice, scope: i18n_scope(:update))
 
         respond_to do |format|
           format.html { redirect_to oauth_application_url(@application) }
-          format.json { render json: @application, as_owner: true }
+          format.json { render json: @application }
         end
       else
         respond_to do |format|
           format.html { render :edit }
-          format.json { render json: { errors: @application.errors.full_messages }, status: :unprocessable_entity }
+          format.json do
+            errors = @application.errors.full_messages
+
+            render json: { errors: errors }, status: :unprocessable_entity
+          end
         end
       end
     end
 
     def destroy
-      flash[:notice] = I18n.t(:notice, scope: %i[doorkeeper flash applications destroy]) if @application.destroy
+      flash[:notice] = I18n.t(:notice, scope: i18n_scope(:destroy)) if @application.destroy
 
       respond_to do |format|
         format.html { redirect_to oauth_applications_url }
@@ -82,5 +90,9 @@ module Doorkeeper
       params.require(:doorkeeper_application)
         .permit(:name, :redirect_uri, :scopes, :confidential)
     end
+
+    def i18n_scope(action)
+      %i[doorkeeper flash applications] << action
+    end
   end
 end

data/app/controllers/doorkeeper/authorized_applications_controller.rb

@@ -9,7 +9,7 @@ module Doorkeeper
 
       respond_to do |format|
         format.html
-        format.json { render json: @applications, current_resource_owner: current_resource_owner }
+        format.json { render json: @applications }
       end
     end
 

data/app/controllers/doorkeeper/token_info_controller.rb

@@ -3,10 +3,10 @@
 module Doorkeeper
   class TokenInfoController < Doorkeeper::ApplicationMetalController
     def show
-      if doorkeeper_token && doorkeeper_token.accessible?
+      if doorkeeper_token&.accessible?
         render json: doorkeeper_token, status: :ok
       else
-        error = OAuth::ErrorResponse.new(name: :invalid_request)
+        error = OAuth::InvalidTokenResponse.new
         response.headers.merge!(error.headers)
         render json: error.body, status: error.status
       end

data/app/controllers/doorkeeper/tokens_controller.rb

@@ -3,12 +3,11 @@
 module Doorkeeper
   class TokensController < Doorkeeper::ApplicationMetalController
     def create
-      response = authorize_response
-      headers.merge! response.headers
-      self.response_body = response.body.to_json
-      self.status = response.status
-    rescue Errors::DoorkeeperError => e
-      handle_token_exception e
+      headers.merge!(authorize_response.headers)
+      render json: authorize_response.body,
+             status: authorize_response.status
+    rescue Errors::DoorkeeperError => error
+      handle_token_exception(error)
     end
 
     # OAuth 2.0 Token Revocation - http://tools.ietf.org/html/rfc7009
@@ -33,8 +32,8 @@ module Doorkeeper
       if introspection.authorized?
         render json: introspection.to_json, status: 200
       else
-        error = OAuth::ErrorResponse.new(name: introspection.error)
-        response.headers.merge!(error.headers)
+        error = introspection.error_response
+        headers.merge!(error.headers)
         render json: error.body, status: error.status
       end
     end
@@ -59,6 +58,7 @@ module Doorkeeper
     # https://tools.ietf.org/html/rfc7009
     def authorized?
       return unless token.present?
+
       # Client is confidential, therefore client authentication & authorization
       # is required
       if token.application_id? && token.application.confidential?
@@ -75,12 +75,12 @@ module Doorkeeper
     end
 
     def token
-      @token ||= AccessToken.by_token(request.POST['token']) ||
-        AccessToken.by_refresh_token(request.POST['token'])
+      @token ||= AccessToken.by_token(params["token"]) ||
+                 AccessToken.by_refresh_token(params["token"])
     end
 
     def strategy
-      @strategy ||= server.token_request params[:grant_type]
+      @strategy ||= server.token_request(params[:grant_type])
     end
 
     def authorize_response

data/app/helpers/doorkeeper/dashboard_helper.rb

@@ -6,7 +6,7 @@ module Doorkeeper
       return if object.errors[method].blank?
 
       output = object.errors[method].map do |msg|
-        content_tag(:span, class: 'form-text') do
+        content_tag(:span, class: "form-text") do
           msg.capitalize
         end
       end

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/app/views/doorkeeper/applications/show.html.erb

@@ -8,7 +8,7 @@
     <p><code class="bg-light" id="application_id"><%= @application.uid %></code></p>
 
     <h4><%= t('.secret') %>:</h4>
-    <p><code class="bg-light" id="secret"><%= @application.secret %></code></p>
+    <p><code class="bg-light" id="secret"><%= @application.plaintext_secret %></code></p>
 
     <h4><%= t('.scopes') %>:</h4>
     <p><code class="bg-light" id="scopes"><%= @application.scopes.presence || raw('&nbsp;') %></code></p>

data/app/views/layouts/doorkeeper/admin.html.erb

@@ -17,9 +17,11 @@
       <li class="nav-item <%= 'active' if request.path == oauth_applications_path %>">
         <%= link_to t('doorkeeper.layouts.admin.nav.applications'), oauth_applications_path, class: 'nav-link' %>
       </li>
-      <li class="nav-item">
-        <%= link_to t('doorkeeper.layouts.admin.nav.home'), root_path, class: 'nav-link' %>
-      </li>
+      <% if respond_to?(:root_path) %>
+        <li class="nav-item">
+          <%= link_to t('doorkeeper.layouts.admin.nav.home'), root_path, class: 'nav-link' %>
+        </li>
+      <% end %>
     </ul>
   </div>
 </nav>

data/bin/console

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+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.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+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,31 +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 'capybara', '~> 2.18'
-  gem.add_development_dependency 'coveralls'
-  gem.add_development_dependency 'danger', '~> 5.0'
-  gem.add_development_dependency 'grape'
-  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 '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

@@ -3,10 +3,15 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 5.0.0"
-gem "appraisal"
-gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
-gem "sqlite3", platforms: [:ruby, :mswin, :mingw, :x64_mingw]
+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]
 gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw]
-gem "rspec-rails", "~> 3.5"
 
 gemspec path: "../"

data/gemfiles/rails_5_1.gemfile

@@ -3,10 +3,15 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 5.1.0"
-gem "appraisal"
-gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
-gem "sqlite3", platforms: [:ruby, :mswin, :mingw, :x64_mingw]
+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]
 gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw]
-gem "rspec-rails", "~> 3.7"
 
 gemspec path: "../"

data/gemfiles/rails_5_2.gemfile

@@ -2,11 +2,16 @@
 
 source "https://rubygems.org"
 
-gem "rails", "5.2.0"
-gem "appraisal"
-gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
-gem "sqlite3", platforms: [:ruby, :mswin, :mingw, :x64_mingw]
+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]
 gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw]
-gem "rspec-rails", "~> 3.7"
 
 gemspec path: "../"

data/gemfiles/rails_6_0.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.0.beta3"
+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.4", platform: [:ruby, :mswin, :mingw, :x64_mingw]
+gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw]
+
+gemspec path: "../"

data/gemfiles/rails_master.gemfile

@@ -2,16 +2,16 @@
 
 source "https://rubygems.org"
 
-gem "rails", git: 'https://github.com/rails/rails'
-gem "arel", git: 'https://github.com/rails/arel'
-
-gem "appraisal"
+gem "rails", git: "https://github.com/rails/rails"
+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", platform: [:ruby, :mswin, :mingw, :x64_mingw]
+gem "sqlite3", "~> 1.4", platform: [:ruby, :mswin, :mingw, :x64_mingw]
 gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw]
 
-%w[rspec-core rspec-expectations rspec-mocks rspec-rails rspec-support].each do |lib|
-  gem lib, git: "https://github.com/rspec/#{lib}.git", branch: 'master'
-end
-
 gemspec path: "../"

data/lib/doorkeeper/config/option.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Doorkeeper
+  class Config
+    # Doorkeeper configuration option DSL
+    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
+      # * [+:builder_class+] Configuration option builder class
+      #
+      # ==== 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|
+            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
+  end
+end