doorkeeper 5.1.0.rc2 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4933a46b121732bd9b6cc44f53947863ab243f448224e444e6106890bb8d78ca
-  data.tar.gz: d2dd4869d2c08ab587908ab79edec49e307e8c2e73b7c54af4706620bc8fcb83
+  metadata.gz: d8ea67fd14f902f63a276aed1f57a134c39fa02322d4b1f114571e2a90310ead
+  data.tar.gz: 44f9f0b886117c6dabe6a09c236107ba6b8c3469b40526a4f6c10f2e4b3e8eac
 SHA512:
-  metadata.gz: dcd3f3b72d7d3cfdd783dd89eb61be9e21cfd4460a48cea0919a398e10a6aad8e6472a325c338988ad6b888167b2d5037c2e41631e9d43a4fd24532d52dd69a9
-  data.tar.gz: 6dd4f697b11faa4f3702482071fba8383c196bccc448fde8b3a1fb6ef0bf10e687a8dbc8bc3385c857a071c57816cdfc82061061029ef9acaa9ac96fea0ce193
+  metadata.gz: 2aa8f4fbe445a84f98035e8ebeb99e715860fb7d29637d8e6cca994bf18a9ba7c051d38fda66829a5dd260f93ee74ff9f6f6d863e610203fa690da7b698b7da1
+  data.tar.gz: 5d474565c95e341b7b4773a7c1e2a782fa1bc27c4f22874428db52ceb4df10ccbb342420ba5266ba0d779380d42df3576f56449d390ecbf795e4deee50bdaff4

data/.hound.yml

@@ -1,2 +1,3 @@
-ruby:
+rubocop:
   config_file: .rubocop.yml
+  version: 0.64.0

data/.rubocop.yml

@@ -1,17 +1,50 @@
 AllCops:
+  TargetRubyVersion: 2.4
   Exclude:
     - "spec/dummy/db/*"
+    - "spec/dummy/config/*"
+    - "Dangerfile"
+    - "gemfiles/*.gemfile"
 
 Metrics/BlockLength:
   Exclude:
     - spec/**/*
+    - lib/doorkeeper/rake/*
 
-LineLength:
+Metrics/LineLength:
   Exclude:
     - spec/**/*
+  Max: 100
 
-StringLiterals:
-  Enabled: false
+Metrics/MethodLength:
+  Exclude:
+    - spec/dummy/db/*
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+Style/StringLiteralsInInterpolation:
+  EnforcedStyle: double_quotes
+
+Style/FrozenStringLiteralComment:
+  Enabled: true
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+
+Style/SymbolArray:
+  MinSize: 3
+Style/WordArray:
+  MinSize: 3
+
+Style/ClassAndModuleChildren:
+  Exclude:
+    - spec/**/*
 
-TrailingBlankLines:
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+Layout/TrailingBlankLines:
   Enabled: true
+Layout/DotPosition:
+  EnforcedStyle: leading

data/.travis.yml

@@ -2,21 +2,16 @@ language: ruby
 cache: bundler
 
 rvm:
-  - 2.1
-  - 2.2
-  - 2.3
   - 2.4
   - 2.5
-  - 2.6.1
+  - 2.6
   - ruby-head
 
-before_install:
-  - "find /home/travis/.rvm/rubies -wholename '*default/bundler-*.gemspec' -delete"
-  - rvm @global do gem uninstall bundler -a -x -I || true
-  - gem install bundler -v '~> 1.10'
+#before_install:
+#  - gem update --system
+#  - gem install bundler
 
 gemfile:
-  - gemfiles/rails_4_2.gemfile
   - gemfiles/rails_5_0.gemfile
   - gemfiles/rails_5_1.gemfile
   - gemfiles/rails_5_2.gemfile
@@ -31,26 +26,8 @@ matrix:
       gemfile: gemfiles/rails_5_2.gemfile
       script: bundle exec danger
   exclude:
-    - gemfile: gemfiles/rails_5_0.gemfile
-      rvm: 2.1
-    - gemfile: gemfiles/rails_5_1.gemfile
-      rvm: 2.1
-    - gemfile: gemfiles/rails_5_2.gemfile
-      rvm: 2.1
-    - gemfile: gemfiles/rails_6_0.gemfile
-      rvm: 2.1
-    - gemfile: gemfiles/rails_6_0.gemfile
-      rvm: 2.2
-    - gemfile: gemfiles/rails_6_0.gemfile
-      rvm: 2.3
     - gemfile: gemfiles/rails_6_0.gemfile
       rvm: 2.4
-    - gemfile: gemfiles/rails_master.gemfile
-      rvm: 2.1
-    - gemfile: gemfiles/rails_master.gemfile
-      rvm: 2.2
-    - gemfile: gemfiles/rails_master.gemfile
-      rvm: 2.3
     - gemfile: gemfiles/rails_master.gemfile
       rvm: 2.4
   allow_failures:

data/Appraisals

@@ -1,27 +1,23 @@
-appraise "rails-4-2" do
-  gem "rails", "~> 4.2.0"
-  gem "grape", '~> 0.16', '< 0.19.2'
-  gem "sqlite3", "~> 1.3", "< 1.4", platform: [:ruby, :mswin, :mingw, :x64_mingw]
-end
+# frozen_string_literal: true
 
 appraise "rails-5-0" do
   gem "rails", "~> 5.0.0"
-  gem "sqlite3", "~> 1.3", "< 1.4", platform: [:ruby, :mswin, :mingw, :x64_mingw]
+  gem "sqlite3", "~> 1.3", "< 1.4", platform: %i[ruby mswin mingw x64_mingw]
 end
 
 appraise "rails-5-1" do
   gem "rails", "~> 5.1.0"
-  gem "sqlite3", "~> 1.3", "< 1.4", platform: [:ruby, :mswin, :mingw, :x64_mingw]
+  gem "sqlite3", "~> 1.3", "< 1.4", platform: %i[ruby mswin mingw x64_mingw]
 end
 
 appraise "rails-5-2" do
   gem "rails", "~> 5.2.0"
-  gem "sqlite3", "~> 1.3", "< 1.4", platform: [:ruby, :mswin, :mingw, :x64_mingw]
+  gem "sqlite3", "~> 1.3", "< 1.4", platform: %i[ruby mswin mingw x64_mingw]
 end
 
 appraise "rails-6-0" do
-  gem "rails", "~> 6.0.0.beta2"
-  gem "sqlite3", "~> 1.4", platform: [:ruby, :mswin, :mingw, :x64_mingw]
+  gem "rails", "~> 6.0.0.beta3"
+  gem "sqlite3", "~> 1.4", platform: %i[ruby mswin mingw x64_mingw]
 
   # TODO: Remove when rspec-rails 4.0 released
   gem "rspec-core", github: "rspec/rspec-core"
@@ -32,8 +28,8 @@ appraise "rails-6-0" do
 end
 
 appraise "rails-master" do
-  gem "rails", git: 'https://github.com/rails/rails'
-  gem "sqlite3", "~> 1.4", platform: [:ruby, :mswin, :mingw, :x64_mingw]
+  gem "rails", git: "https://github.com/rails/rails"
+  gem "sqlite3", "~> 1.4", platform: %i[ruby mswin mingw x64_mingw]
 
   # TODO: Remove when rspec-rails 4.0 released
   gem "rspec-core", github: "rspec/rspec-core"

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
@@ -12,9 +14,11 @@ gem "rspec-mocks", github: "rspec/rspec-mocks"
 gem "rspec-rails", github: "rspec/rspec-rails", branch: "4-0-dev"
 gem "rspec-support", github: "rspec/rspec-support"
 
+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 "sqlite3", "~> 1.4", platform: %i[ruby mswin mingw x64_mingw]
 
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
+gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw]

data/NEWS.md

@@ -7,6 +7,22 @@ User-visible changes worth mentioning.
 
 ## master
 
+- [#PR] Add your PR description here.
+
+## 5.1.0
+
+- [#1243]: Add nil check operator in token checking at token introspection.
+- [#1241] Explaining foreign key options for resource owner in a single place
+- [#1237] Allow to set blank redirect URI if Doorkeeper configured to use redirect URI-less grant flows.
+- [#1234] Fix `StaleRecordsCleaner` to properly work with big amount of records.
+- [#1228] Allow to explicitly set non-expiring tokens in `custom_access_token_expires_in` configuration
+  option using `Float::INIFINITY` return value.
+- [#1224] Do not try to store token if not found by fallback hashing strategy.
+- [#1223] Update Hound/Rubocop rules, correct Doorkeeper codebase to follow style-guides.
+- [#1220] Drop Rails 4.2 & Ruby < 2.4 support.
+
+## 5.1.0.rc2
+
 - [#1208] Unify hashing implementation into secret storing strategies
 
   **[IMPORTANT]**: If you have been using the master branch of doorkeeper with bcrypt in your Gemfile.lock,

data/README.md

@@ -6,6 +6,8 @@
 [![Coverage Status](https://coveralls.io/repos/github/doorkeeper-gem/doorkeeper/badge.svg?branch=master)](https://coveralls.io/github/doorkeeper-gem/doorkeeper?branch=master)
 [![Security](https://hakiri.io/github/doorkeeper-gem/doorkeeper/master.svg)](https://hakiri.io/github/doorkeeper-gem/doorkeeper/master)
 [![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
+[![GuardRails badge](https://badges.production.guardrails.io/doorkeeper-gem/doorkeeper.svg?token=66768ce8f6995814df81f65a2cff40f739f688492704f973e62809e15599bb62)](https://dashboard.guardrails.io/default/gh/doorkeeper-gem/doorkeeper)
+[![Dependabot](https://img.shields.io/badge/dependabot-enabled-success.svg)](https://dependabot.com)
 
 Doorkeeper is a gem (Rails engine) that makes it easy to introduce OAuth 2 provider
 functionality to your Ruby on Rails or Grape application.
@@ -75,7 +77,7 @@ And run `bundle install`. After this, check out the guide related to the framewo
 
 ### Ruby on Rails
 
-Doorkeeper currently supports Ruby on Rails 5. See the guide [here](https://doorkeeper.gitbook.io/guides/ruby-on-rails/getting-started).
+Doorkeeper currently supports Ruby on Rails >= 5.0. See the guide [here](https://doorkeeper.gitbook.io/guides/ruby-on-rails/getting-started).
 
 ### Grape
 
@@ -125,6 +127,11 @@ See [list of tutorials](https://github.com/doorkeeper-gem/doorkeeper/wiki#how-to
 
 ## Sponsors
 
+[![OpenCollective](https://opencollective.com/doorkeeper-gem/backers/badge.svg)](#backers) 
+[![OpenCollective](https://opencollective.com/doorkeeper-gem/sponsors/badge.svg)](#sponsors)
+
+Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/doorkeeper-gem#sponsor)]
+
 <a href="https://oauth.io/?utm_source=doorkeeper-gem" target="_blank"><img src="https://oauth.io/img/logo_text.png"/></a>
 
 > If you prefer not to deal with the gory details of OAuth 2, need dedicated customer support & consulting, try the cloud-based SaaS version: [https://oauth.io](https://oauth.io/?utm_source=doorkeeper-gem)
@@ -142,7 +149,7 @@ By default, it uses the latest Rails version with ActiveRecord. To run the
 tests with a specific ORM and Rails version:
 
 ```
-rails=4.2.0 orm=active_record bundle exec rake
+rails=5.2 orm=active_record bundle exec rake
 ```
 
 ## Contributing
@@ -161,6 +168,8 @@ page](https://github.com/doorkeeper-gem/doorkeeper/wiki/Contributing).
 Thanks to all our [awesome
 contributors](https://github.com/doorkeeper-gem/doorkeeper/graphs/contributors)!
 
+<a href="https://github.com/doorkeeper-gem/doorkeeper/graphs/contributors"><img src="https://opencollective.com/doorkeeper-gem/contributors.svg?width=890&button=false" /></a>
+
 ## License
 
 MIT License. Copyright 2011 Applicake.

data/Rakefile

@@ -1,7 +1,9 @@
-require 'bundler/setup'
-require 'rspec/core/rake_task'
+# frozen_string_literal: true
 
-desc 'Default: run specs.'
+require "bundler/setup"
+require "rspec/core/rake_task"
+
+desc "Default: run specs."
 task default: :spec
 
 desc "Run all specs"
@@ -12,14 +14,14 @@ end
 namespace :doorkeeper do
   desc "Install doorkeeper in dummy app"
   task :install do
-    cd 'spec/dummy'
-    system 'bundle exec rails g doorkeeper:install --force'
+    cd "spec/dummy"
+    system "bundle exec rails g doorkeeper:install --force"
   end
 
-  desc 'Runs local test server'
+  desc "Runs local test server"
   task :server do
-    cd 'spec/dummy'
-    system 'bundle exec rails server'
+    cd "spec/dummy"
+    system "bundle exec rails server"
   end
 end
 

data/app/controllers/doorkeeper/application_controller.rb

@@ -3,12 +3,11 @@
 module Doorkeeper
   class ApplicationController <
     Doorkeeper.configuration.base_controller.constantize
-
     include Helpers::Controller
 
     unless Doorkeeper.configuration.api_only
       protect_from_forgery with: :exception
-      helper 'doorkeeper/dashboard'
+      helper "doorkeeper/dashboard"
     end
   end
 end

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]
@@ -40,7 +40,11 @@ module Doorkeeper
       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,7 +53,7 @@ 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) }
@@ -58,13 +62,17 @@ module Doorkeeper
       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/token_info_controller.rb

@@ -3,7 +3,7 @@
 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::InvalidTokenResponse.new

data/app/controllers/doorkeeper/tokens_controller.rb

@@ -3,10 +3,9 @@
 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
+      headers.merge!(authorize_response.headers)
+      render json: authorize_response.body,
+             status: authorize_response.status
     rescue Errors::DoorkeeperError => error
       handle_token_exception(error)
     end
@@ -34,7 +33,7 @@ module Doorkeeper
         render json: introspection.to_json, status: 200
       else
         error = introspection.error_response
-        response.headers.merge!(error.headers)
+        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,8 +75,8 @@ module Doorkeeper
     end
 
     def token
-      @token ||= AccessToken.by_token(params['token']) ||
-        AccessToken.by_refresh_token(params['token'])
+      @token ||= AccessToken.by_token(params["token"]) ||
+                 AccessToken.by_refresh_token(params["token"])
     end
 
     def strategy

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