doorkeeper-sequel 1.5.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 553728671816109cbf8e780da862de70222768b0
-  data.tar.gz: c241ff98bec1bef3de150659beebcc4b73853ad4
+  metadata.gz: d016a084c8970dfd895fb289df936babf93c5fa9
+  data.tar.gz: 79e8e295db71fee33e9112463f41b7bd63cf4711
 SHA512:
-  metadata.gz: d98ed140d5c131fbfc3d1967199c1a664baf9e6f2d2e398415fe52ad3e316c599f524bf6f058d9bbdd85c3f11cc17544a3eef7f78f41c39a63b86c8bb47c1225
-  data.tar.gz: 9fb3f5c993b40d5ef0a85dfe6ffbbd5b806ed74c5f3adaeb51429c8fbbe0f78a6f01c6de0de7f2633fe88ab00f260d595a1567d41a777547a4f3952924fdacdb
+  metadata.gz: e654a464b6f0d2e7ef2d4ab81bbb2b2709a32fa847971dd4deca85052dc4055bcda4a270065a006f438fa9713abc8490d02d4da3086f79d9afca31e4e703a8c7
+  data.tar.gz: cfc5de44d6bc888d76f5041f7e9f4c4cc11dac6aefbeb4e4f3eb087eea73b7f926c5a561286931451912816b5fa0fa8cb8350b029959e5c3919d4b5419a536f7

data/.gitignore

@@ -10,3 +10,4 @@ log/*.log
 gemfiles/*.lock
 Gemfile.lock
 doorkeeper-sequel-*.gem
+coverage

data/.gitmodules

@@ -1,4 +1,3 @@
 [submodule "doorkeeper"]
 	path = doorkeeper
 	url = https://github.com/doorkeeper-gem/doorkeeper.git
-    branch = 4.4.0

data/CHANGELOG.md

@@ -1,14 +1,20 @@
-# Doorkeeper-Sequel ORM 1.x Changelog
+# Doorkeeper-Sequel ORM Changelog
 
 Reverse Chronological Order:
 
 ## master
 
-https://github.com/nbulaj/doorkeeper-sequel/compare/1.3.2...master
+https://github.com/nbulaj/doorkeeper-sequel/compare/2.0.0...master
+
+## `2.0.0` (2018-10-04)
+
+https://github.com/nbulaj/doorkeeper-sequel/compare/1.5.0...2.0.0
+
+* Support Doorkeeper >= 5.0.0
 
 ## `1.5.0` (2018-10-03)
 
-https://github.com/nbulaj/doorkeeper-sequel/compare/1.5.0...1.4.0
+https://github.com/nbulaj/doorkeeper-sequel/compare/1.4.0...1.5.0
 
 * Support Doorkeeper >= 4.2.7 && < 5.0.0
 

data/README.md

@@ -17,8 +17,13 @@
 To start using the Doorkeeper Sequel ORM, add to your Gemfile:
 
 ``` ruby
-gem 'doorkeeper', '~> 4.0'
-gem 'doorkeeper-sequel', '~> 1.4'
+# For Doorkeeper 4.x
+gem 'doorkeeper', '~> 4.3'
+gem 'doorkeeper-sequel', '~> 1.5'
+
+# For Doorkeeper 5.x
+gem 'doorkeeper', '~> 5.0'
+gem 'doorkeeper-sequel', '~> 2.0'
 ```
 
 Or you can use git `master` branch for the latest gem version:
@@ -42,6 +47,7 @@ rake doorkeeper_sequel:generate:migration
 rake doorkeeper_sequel:generate:application_owner
 rake doorkeeper_sequel:generate:previous_refresh_token
 rake doorkeeper_sequel:generate:confidential_applications # for Doorkeeper >= 4.4
+rake doorkeeper_sequel:generate:pkce # for Doorkeeper >= 5.x
 ```
 
 ## Tests

data/Rakefile

@@ -26,6 +26,7 @@ class ExtensionIntegrator
 
     def copy_spec_stubs!
       FileUtils.cp_r('spec/stubs/spec_helper_integration.rb', 'spec/spec_helper_integration.rb')
+      FileUtils.cp_r('spec/stubs/spec_helper_integration.rb', 'spec/spec_helper.rb')
       FileUtils.cp_r('spec/stubs/models/user.rb', 'spec/dummy/app/models/user.rb')
       FileUtils.cp_r('spec/stubs/config/initializers/db.rb', 'spec/dummy/config/initializers/db.rb')
       FileUtils.cp_r('spec/stubs/config/application.rb', 'spec/dummy/config/application.rb')
@@ -33,6 +34,7 @@ class ExtensionIntegrator
       FileUtils.rm('spec/dummy/config/initializers/active_record_belongs_to_required_by_default.rb', force: true)
       FileUtils.rm('spec/dummy/config/initializers/new_framework_defaults.rb', force: true)
       FileUtils.rm('spec/models/doorkeeper/base_record_spec.rb', force: true)
+      FileUtils.rm('spec/lib/orm/active_record/stale_records_cleaner_spec.rb', force: true)
       # Remove generators specs because we are using our own
       FileUtils.rm(Dir.glob('spec/generators/*.rb'))
     end

data/config/locales/en.yml

@@ -15,3 +15,5 @@ en:
               relative_uri: 'must be an absolute URI.'
               secured_uri: 'must be an HTTPS/SSL URI.'
               forbidden_uri: 'is forbidden by the server.'
+            scopes:
+              not_match_configured: "doesn't match configured on the server."

data/doorkeeper-sequel.gemspec

@@ -20,11 +20,12 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.0.0'
 
-  gem.add_runtime_dependency 'doorkeeper', '>= 4.2.6', '< 5.0'
+  gem.add_runtime_dependency 'doorkeeper', '>= 5.0.0'
   gem.add_runtime_dependency 'sequel', '>= 4.0.0', '< 6'
   gem.add_runtime_dependency 'sequel_polymorphic', '~> 0.2', '< 1.0'
   gem.add_runtime_dependency 'thor', '>= 0.18', '< 6'
 
+  gem.add_development_dependency 'coveralls'
   gem.add_development_dependency 'grape'
   gem.add_development_dependency 'capybara', '~> 2.14', '>= 2.14.0'
   gem.add_development_dependency 'database_cleaner', '~> 1.5', '>= 1.5.0'

data/lib/doorkeeper-sequel/gem_version.rb

@@ -4,8 +4,8 @@ module DoorkeeperSequel
   end
 
   module VERSION
-    MAJOR = 1
-    MINOR = 5
+    MAJOR = 2
+    MINOR = 0
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')

data/lib/doorkeeper-sequel/generators/pkce_generator.rb

@@ -0,0 +1,14 @@
+module DoorkeeperSequel
+  class PkceGenerator < ::Thor::Group
+    include ::Thor::Actions
+    include MigrationActions
+
+    source_root File.expand_path('../templates', __FILE__)
+
+    desc 'Provide support for PKCE.'
+
+    def install
+      create_migration 'enable_pkce_migration.rb.erb'
+    end
+  end
+end

data/lib/doorkeeper-sequel/generators/templates/enable_pkce_migration.rb

@@ -0,0 +1,8 @@
+Sequel.migration do
+  change do
+    alter_table(:oauth_access_grants) do
+      add_column :code_challenge, Integer, null: true
+      add_column :code_challenge_method, String, null: true
+    end
+  end
+end

data/lib/doorkeeper-sequel/mixins/access_grant_mixin.rb

@@ -16,7 +16,7 @@ module DoorkeeperSequel
       many_to_one :application, class: 'Doorkeeper::Application'
 
       set_allowed_columns :resource_owner_id, :application_id,
-                          :expires_in, :redirect_uri, :scopes
+                          :expires_in, :redirect_uri, :scopes, :code_challenge, :code_challenge_method
 
       def before_validation
         generate_token if new?
@@ -29,12 +29,36 @@ module DoorkeeperSequel
                             :token, :expires_in, :redirect_uri]
         validates_unique [:token]
       end
+
+      def uses_pkce?
+        pkce_supported? && code_challenge.present?
+      end
+
+      def pkce_supported?
+        respond_to? :code_challenge
+      end
     end
 
     module ClassMethods
       def by_token(token)
         first(token: token.to_s)
       end
+
+      def revoke_all_for(application_id, resource_owner, clock = Time)
+        where(application_id: application_id,
+              resource_owner_id: resource_owner.id,
+              revoked_at: nil)
+          .update(revoked_at: clock.now.utc)
+      end
+
+      def generate_code_challenge(code_verifier)
+        padded_result = Base64.urlsafe_encode64(Digest::SHA256.digest(code_verifier))
+        padded_result.split('=')[0] # Remove any trailing '='
+      end
+
+      def pkce_supported?
+        new.pkce_supported?
+      end
     end
 
     private

data/lib/doorkeeper-sequel/mixins/access_token_mixin.rb

@@ -64,21 +64,29 @@ module DoorkeeperSequel
                             else
                               resource_owner_or_id
                             end
-        token = last_authorized_token_for(application.try(:id), resource_owner_id)
-        if token && scopes_match?(token.scopes, scopes, application.try(:scopes))
-          token
+        tokens = authorized_tokens_for(application.try(:id), resource_owner_id)
+        tokens.detect do |token|
+          scopes_match?(token.scopes, scopes, application.try(:scopes))
         end
       end
 
       def scopes_match?(token_scopes, param_scopes, app_scopes)
-        (token_scopes.blank? && param_scopes.blank?) ||
-          Doorkeeper::OAuth::Helpers::ScopeChecker.match?(
-            token_scopes.to_s,
-            param_scopes,
+        return true if token_scopes.empty? && param_scopes.empty?
+        (token_scopes.sort == param_scopes.sort) &&
+          Doorkeeper::OAuth::Helpers::ScopeChecker.valid?(
+            param_scopes.to_s,
+            Doorkeeper.configuration.scopes,
             app_scopes
           )
       end
 
+      def authorized_tokens_for(application_id, resource_owner_id)
+        ordered_by(:created_at, :desc).
+          where(application_id: application_id,
+                resource_owner_id: resource_owner_id,
+                revoked_at: nil)
+      end
+
       def find_or_create_for(application, resource_owner_id, scopes, expires_in, use_refresh_token)
         if Doorkeeper.configuration.reuse_access_token
           access_token = matching_token_for(application, resource_owner_id, scopes)
@@ -95,11 +103,7 @@ module DoorkeeperSequel
       end
 
       def last_authorized_token_for(application_id, resource_owner_id)
-        where(application_id: application_id,
-              resource_owner_id: resource_owner_id,
-              revoked_at: nil)
-          .send(order_method, created_at_desc)
-          .first
+        authorized_tokens_for(application_id, resource_owner_id).first
       end
     end
 
@@ -114,8 +118,8 @@ module DoorkeeperSequel
     def as_json(_options = {})
       {
         resource_owner_id: resource_owner_id,
-        scopes: scopes,
-        expires_in_seconds: expires_in_seconds,
+        scope: scopes,
+        expires_in: expires_in_seconds,
         application: { uid: application.try(:uid) },
         created_at: created_at.to_i
       }

data/lib/doorkeeper-sequel/mixins/application_mixin.rb

@@ -34,10 +34,27 @@ module DoorkeeperSequel
         validates_redirect_uri :redirect_uri
         validates_includes [true, false], :confidential, allow_missing: true
 
+        validate_scopes_match_configured if enforce_scopes?
+
         if respond_to?(:validate_owner?)
           validates_presence [:owner_id] if validate_owner?
         end
       end
+
+      protected
+
+      def validate_scopes_match_configured
+        if scopes.present? &&
+           !Doorkeeper::OAuth::Helpers::ScopeChecker.valid?(scopes.to_s, Doorkeeper.configuration.scopes)
+
+          scope = 'sequel.errors.models.doorkeeper/application.attributes.scopes'
+          errors.add(:scopes, I18n.t(:not_match_configured, scope: scope))
+        end
+      end
+
+      def enforce_scopes?
+        Doorkeeper.configuration.enforce_configured_scopes?
+      end
     end
 
     module ClassMethods

data/lib/doorkeeper-sequel/mixins/concerns/sequel_compat.rb

@@ -34,6 +34,12 @@ module DoorkeeperSequel
       def invalid?
         !valid?
       end
+
+      def exists?
+        !self.empty?
+      end
+
+      alias_method :exist?, :exists?
     end
 
     module ClassMethods
@@ -58,6 +64,14 @@ module DoorkeeperSequel
           super(id: args)
         end
       end
+
+      def exists?(*args)
+        if args.any?
+          !where(*args).empty?
+        else
+          !empty?
+        end
+      end
     end
   end
 end

data/lib/doorkeeper-sequel/tasks/doorkeeper-sequel.rake

@@ -14,5 +14,15 @@ namespace :doorkeeper_sequel do
     task :previous_refresh_token do
       DoorkeeperSequel::PreviousRefreshTokenGenerator.start
     end
+
+    desc 'Generate migration file for PKCE'
+    task :pkce do
+      DoorkeeperSequel::PkceGenerator.start
+    end
+
+    desc 'Add confidential column to Doorkeeper applications'
+    task :confidential_applications do
+      DoorkeeperSequel::ConfidentialApplicationsGenerator.start
+    end
   end
 end

data/lib/doorkeeper/orm/sequel.rb

@@ -1,3 +1,5 @@
+require 'doorkeeper/orm/sequel/stale_records_cleaner'
+
 module Doorkeeper
   module Orm
     module Sequel

data/lib/doorkeeper/orm/sequel/application.rb

@@ -14,5 +14,10 @@ module Doorkeeper
       resource_access_tokens = AccessToken.active_for(resource_owner)
       where(id: resource_access_tokens.select_map(:application_id)).all
     end
+
+    def self.revoke_tokens_and_grants_for(id, resource_owner)
+      AccessToken.revoke_all_for(id, resource_owner)
+      AccessGrant.revoke_all_for(id, resource_owner)
+    end
   end
 end

data/lib/doorkeeper/orm/sequel/stale_records_cleaner.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Doorkeeper
+  module Orm
+    module Sequel
+      class StaleRecordsCleaner
+        def initialize(base_scope)
+          @base_scope = base_scope
+        end
+
+        def clean_revoked
+          @base_scope
+            .where(::Sequel.~(revoked_at: nil))
+            .where { revoked_at < Time.current }
+            .delete
+        end
+
+        def clean_expired(ttl)
+          @base_scope
+            .where { created_at < (Time.current - ttl) }
+            .delete
+        end
+      end
+    end
+  end
+end

data/spec/stubs/config/initializers/db.rb

@@ -36,6 +36,9 @@ DB.create_table :oauth_access_grants do
   column :created_at, DateTime, null: false
   column :revoked_at, DateTime
   column :scopes, String, size: 255
+
+  column :code_challenge, String
+  column :code_challenge_method, String
 end
 
 DB.create_table :oauth_access_tokens do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper-sequel
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Nikita Bulai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2018-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: doorkeeper
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +84,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
@@ -215,11 +223,13 @@ files:
 - lib/doorkeeper-sequel/generators/concerns/migration_actions.rb
 - lib/doorkeeper-sequel/generators/confidential_applications_generator.rb
 - lib/doorkeeper-sequel/generators/migration_generator.rb
+- lib/doorkeeper-sequel/generators/pkce_generator.rb
 - lib/doorkeeper-sequel/generators/previous_refresh_token_generator.rb
 - lib/doorkeeper-sequel/generators/templates/add_confidential_to_application_migration.rb
 - lib/doorkeeper-sequel/generators/templates/add_owner_to_application.rb
 - lib/doorkeeper-sequel/generators/templates/add_previous_refresh_token_to_access_tokens.rb
 - lib/doorkeeper-sequel/generators/templates/create_doorkeeper_tables.rb
+- lib/doorkeeper-sequel/generators/templates/enable_pkce_migration.rb
 - lib/doorkeeper-sequel/mixins/access_grant_mixin.rb
 - lib/doorkeeper-sequel/mixins/access_token_mixin.rb
 - lib/doorkeeper-sequel/mixins/application_mixin.rb
@@ -233,13 +243,15 @@ files:
 - lib/doorkeeper/orm/sequel/access_grant.rb
 - lib/doorkeeper/orm/sequel/access_token.rb
 - lib/doorkeeper/orm/sequel/application.rb
-- spec/controllers/application_metal_controller.rb
+- lib/doorkeeper/orm/sequel/stale_records_cleaner.rb
+- spec/controllers/application_metal_controller_spec.rb
 - spec/controllers/applications_controller_spec.rb
 - spec/controllers/authorizations_controller_spec.rb
 - spec/controllers/protected_resources_controller_spec.rb
 - spec/controllers/token_info_controller_spec.rb
 - spec/controllers/tokens_controller_spec.rb
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/custom_authorizations_controller.rb
 - spec/dummy/app/controllers/full_protected_resources_controller.rb
@@ -271,7 +283,8 @@ files:
 - spec/dummy/db/migrate/20151223192035_create_doorkeeper_tables.rb
 - spec/dummy/db/migrate/20151223200000_add_owner_to_application.rb
 - spec/dummy/db/migrate/20160320211015_add_previous_refresh_token_to_access_tokens.rb
-- spec/dummy/db/migrate/20180210183654_add_confidential_to_application.rb
+- spec/dummy/db/migrate/20170822064514_enable_pkce.rb
+- spec/dummy/db/migrate/20180210183654_add_confidential_to_applications.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
@@ -280,47 +293,43 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/0p/0pa3wNbGHqFC6gxrMvdOJiP6gPwFv9VJ_npjEfRWxAE.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/0x/0x7itSE_jjN9NM8w3jE4isMgaQPBrVx0prZCwBURBV0.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/2C/2C9t8HfJg90nE6MPdwPjat-x10FoGiWgZPUw9kmsPsI.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/3P/3PoguHEOEeItUjmwC74MWLLP-_Ijow7798bF5U6K2dw.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/4Q/4QEkO7sOQsz2KI7mJWxhmltotR8iDKMhV-8Gui8l1Yo.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/4_/4_AVHXD_fQP3S2gUiYF1Azv90b6luuMnAM0hxD901y0.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/6b/6b0anrSo7Fvoc05t4Ca0zZmfS_cpERy1DsG3ea6lBOg.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/6k/6kyl2zElqd6QNgJLE7Ej-F9Xofwmq0OiAIJTHGtoCt8.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/9D/9DkYxrjE-y5KTPxxIo5Zs3AOaylSDDJPPWbghYbc6tA.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/7L/7LMxo1fRhQsTzTk4HEOKaKrXZZ6W6h1y3NP1bitM7ZQ.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/7q/7q9VgVs--Akr7g5EzfwMMjm7kzT9nfzupV_6i1iZ2UM.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/BA/BAC3ZaGoeZ9Od-kKg-UQYelvRgsCa0H72-52nLdcTNw.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/BP/BPg8R8WCRaQjKyU4cbh_OtZKlqrO3SNih8XEK6HFgt0.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/Bw/Bw6Nimjvy5Yv1AYbZb1t-v0eMNhv-bhwBzR-b5mY7FU.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/E5/E5sdePtlY78DzZGK0ss7hIguFKUxwdooY8WiM3BWo3s.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/Fq/FqQWjMAz8yjZQlMC_dUsztaOxGruI2IXyGAAUF9SvQ0.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/Hc/HcIx4yYPg3w0vv-Cj49orJw9fudDS4Qpe3WXtuej7MI.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/Ht/HtCMc1ZaTgZy2o1DFs1PbbISOEzOsyW0aFFkquK8ywY.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/Hn/HnZczabSGuPuyZkh8kkTVR9fsNh_10o7xc5uzxcm-6Y.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/J_/J_D9clwKidN28hnVB1O3zEfKDwg90Usdb5ToKiPq_aw.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/Jg/JgpBOeANnJqUX61iOsyq9gnH5CdODzg18IvAQYJC_PE.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/Ji/JitNKkP1dYdu9ObSdIkkEAsiFxEmRO5oy1UIyhT_hYs.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/Jq/JqTLVvnY2AgGkHftWPwqt_HkbwhYRsmgHxk37VqKJAY.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/K-/K-zIshtjhzfsKunHgtf4oRnTZuW_C9lUh_vP8EuydZY.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/LF/LF3zCtek7hbLgoNRiXnEYsN9BkXVGw5dqB2W-pALTcU.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/Pk/PkX2fMYiAxTYc9kX4pFVXseR-CdZmnpWX7GniCMQHO0.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/QX/QXcp8DweOJ6BfMedGMfeHvVXv2hjDIleln1LSJk7vOE.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/Rw/RwtI_j7fJhgLfhnUQlGxoS-oFn2XExsMONzyxeaNhQ0.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/T3/T3h82qJsdqVlH178VSlblhU1evf9RZq83rqKMwjdRKI.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/Rg/RgtUEkFKU-oi_LZ0R-kXz4SfnJIf_pEG-BwRK2Jc0v0.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/Ta/TaYxNn81MhqC3DnMC6_y_Q7xap5Ntn4ggFo94EUaiak.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/Wn/WnJTlULZ65547f83Wc-LjLXHGBPvOi_0ItAaE_6SlzY.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/W7/W7gU40NzeL-YSA7WVWNmHkpNN8cocSrXN6iD-0EJwfw.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/Wq/WqbLVKOcTMZtttygYt_ncr1mGIDrzevSTaPGNmzV1D8.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/Xv/Xvu9wgL0ZoJUg40hTfJ7VEhswxHSZTFqafJONsalmSo.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/YF/YF60qiQ28QMoYDrLmrbHWZr7X7bl5MxVPR5QrrVCFak.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/Yf/YfJJZvm_NONHd4eCasDibCcRapZ_WYIO5MUxSUUbYFk.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/Yi/YigT9tpj4dQzAx0EBR0E5d3g7wtv9X1Qw7eprYkoeNE.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/Z0/Z0e47cT2a-21U-w-3gkbgqC3o5jWnEzOB8vW06aJH1E.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/Z3/Z3pV6hviTFmi6L98n9tVOy94nUUt8X_dSnvO0FqTjzc.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/_1/_1LQPrIlY8mTaxRd58w68ZBIVwaDge57_fpmw6PKGTI.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/dL/dL7SLUWUIeVdyA1UuH-rvif0nzesOar3LdEtqzdb4bE.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/f1/f11L16ip-n_en5vxM7LnyFPv_A9VDsPUKXzg-hDG0dE.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/ej/ej1aKu26DikNnd9272jY2Y2o4C3QI2B1JdZhdPTQvA4.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/f8/f8WT8jqR1qNIdQaRDpXbyLN7E5AWkbYFBwdh9Ozk7gk.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/fX/fXlPiyPj8HG3QoJDYpup0DTLBnq8hw6Np2VeMHWKuaQ.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/g5/g5VAxZ-YK0jKJukhexFCoUQqI2yLS1eOYNbU__THPvo.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/hU/hUU3IwUkZwk7JZj3LvnwlHPmwPh0Dz9B2Fv0aj17VJw.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/hk/hk2YB6skvc72qL4IzzQKU8Emyfe5vARjoD1bvQTw4zE.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/ii/iiJRBZIsxKiwyzU_Z7UtQeUTXMRJRPTreTKRvAWO7_8.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/lx/lxLzW5UwcFlFj1MV5uZ_icpe7sCVc6_WUMMLMqUqbzQ.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/qS/qSc-air8Wm-UxxbdyXgOBiwA1g2VgejS3oE4CTPnUJs.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/mx/mxO2JNHTQy9FY1xVYenKUIupjGyjFgEKhw7bF6oYCes.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/pA/pAXzgvvIc7N1TYHmLtkgkRI_Nj58_VIMBT8CSRxDg5A.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/qo/qo6SpT75QykYB63Aqq5bgzpXyNU1Y4dGFvCCJgoWQpE.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/vO/vOXN0mER62j4JiPpMTSVS7MMqs0067cZx14vD5B8qiQ.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/wC/wCg1fNgvPgN-FNalk0y-pOrMrUUVpjjG_3jLzh3J29I.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/x1/x1j1iA1FTi7zaePBRFSuc5hzG2jhJ0Otdn8LnC-PHvU.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/zI/zIwTd39w92Mk6c86cODQlqHM3ymkZwY8N6Ee2plkTKg.cache
 - spec/factories.rb
 - spec/generators/templates/routes.rb
 - spec/generators/tmp/dummy/app/views/doorkeeper/applications/_delete_form.html.erb
@@ -372,6 +381,7 @@ files:
 - spec/lib/oauth/token_spec.rb
 - spec/lib/request/strategy_spec.rb
 - spec/lib/server_spec.rb
+- spec/lib/stale_records_cleaner_spec.rb
 - spec/models/doorkeeper/access_grant_spec.rb
 - spec/models/doorkeeper/access_token_spec.rb
 - spec/models/doorkeeper/application_spec.rb
@@ -401,7 +411,8 @@ files:
 - spec/stubs/models/user.rb
 - spec/stubs/spec_helper_integration.rb
 - spec/stubs/support/sequel.rb
-- spec/support/dependencies/factory_girl.rb
+- spec/support/dependencies/factory_bot.rb
+- spec/support/doorkeeper_rspec.rb
 - spec/support/helpers/access_token_request_helper.rb
 - spec/support/helpers/authorization_request_helper.rb
 - spec/support/helpers/config_helper.rb
@@ -457,6 +468,7 @@ test_files:
 - spec/generators/tmp/dummy/app/views/doorkeeper/applications/_form.html.erb
 - spec/generators/templates/routes.rb
 - spec/support/http_method_shim.rb
+- spec/support/doorkeeper_rspec.rb
 - spec/support/shared/models_shared_examples.rb
 - spec/support/shared/controllers_shared_context.rb
 - spec/support/orm/sequel.rb
@@ -467,7 +479,7 @@ test_files:
 - spec/support/helpers/request_spec_helper.rb
 - spec/support/helpers/access_token_request_helper.rb
 - spec/support/helpers/authorization_request_helper.rb
-- spec/support/dependencies/factory_girl.rb
+- spec/support/dependencies/factory_bot.rb
 - spec/stubs/generators/tmp/dummy/db/migrate/20170810125729_add_previous_refresh_token_to_access_tokens.rb
 - spec/stubs/support/sequel.rb
 - spec/stubs/models/user.rb
@@ -484,52 +496,49 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/404.html
 - spec/dummy/public/500.html
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/Jg/JgpBOeANnJqUX61iOsyq9gnH5CdODzg18IvAQYJC_PE.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/4Q/4QEkO7sOQsz2KI7mJWxhmltotR8iDKMhV-8Gui8l1Yo.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/7L/7LMxo1fRhQsTzTk4HEOKaKrXZZ6W6h1y3NP1bitM7ZQ.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/Pk/PkX2fMYiAxTYc9kX4pFVXseR-CdZmnpWX7GniCMQHO0.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/Xv/Xvu9wgL0ZoJUg40hTfJ7VEhswxHSZTFqafJONsalmSo.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/BA/BAC3ZaGoeZ9Od-kKg-UQYelvRgsCa0H72-52nLdcTNw.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/hk/hk2YB6skvc72qL4IzzQKU8Emyfe5vARjoD1bvQTw4zE.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/hU/hUU3IwUkZwk7JZj3LvnwlHPmwPh0Dz9B2Fv0aj17VJw.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/K-/K-zIshtjhzfsKunHgtf4oRnTZuW_C9lUh_vP8EuydZY.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/T3/T3h82qJsdqVlH178VSlblhU1evf9RZq83rqKMwjdRKI.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/Rw/RwtI_j7fJhgLfhnUQlGxoS-oFn2XExsMONzyxeaNhQ0.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/x1/x1j1iA1FTi7zaePBRFSuc5hzG2jhJ0Otdn8LnC-PHvU.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/7q/7q9VgVs--Akr7g5EzfwMMjm7kzT9nfzupV_6i1iZ2UM.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/mx/mxO2JNHTQy9FY1xVYenKUIupjGyjFgEKhw7bF6oYCes.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/BP/BPg8R8WCRaQjKyU4cbh_OtZKlqrO3SNih8XEK6HFgt0.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/Ta/TaYxNn81MhqC3DnMC6_y_Q7xap5Ntn4ggFo94EUaiak.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/Yf/YfJJZvm_NONHd4eCasDibCcRapZ_WYIO5MUxSUUbYFk.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/3P/3PoguHEOEeItUjmwC74MWLLP-_Ijow7798bF5U6K2dw.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/Jq/JqTLVvnY2AgGkHftWPwqt_HkbwhYRsmgHxk37VqKJAY.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/Rg/RgtUEkFKU-oi_LZ0R-kXz4SfnJIf_pEG-BwRK2Jc0v0.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/Wq/WqbLVKOcTMZtttygYt_ncr1mGIDrzevSTaPGNmzV1D8.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/wC/wCg1fNgvPgN-FNalk0y-pOrMrUUVpjjG_3jLzh3J29I.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/lx/lxLzW5UwcFlFj1MV5uZ_icpe7sCVc6_WUMMLMqUqbzQ.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/YF/YF60qiQ28QMoYDrLmrbHWZr7X7bl5MxVPR5QrrVCFak.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/Hn/HnZczabSGuPuyZkh8kkTVR9fsNh_10o7xc5uzxcm-6Y.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/vO/vOXN0mER62j4JiPpMTSVS7MMqs0067cZx14vD5B8qiQ.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/fX/fXlPiyPj8HG3QoJDYpup0DTLBnq8hw6Np2VeMHWKuaQ.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/LF/LF3zCtek7hbLgoNRiXnEYsN9BkXVGw5dqB2W-pALTcU.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/ej/ej1aKu26DikNnd9272jY2Y2o4C3QI2B1JdZhdPTQvA4.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/E5/E5sdePtlY78DzZGK0ss7hIguFKUxwdooY8WiM3BWo3s.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/f8/f8WT8jqR1qNIdQaRDpXbyLN7E5AWkbYFBwdh9Ozk7gk.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/Yi/YigT9tpj4dQzAx0EBR0E5d3g7wtv9X1Qw7eprYkoeNE.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/6k/6kyl2zElqd6QNgJLE7Ej-F9Xofwmq0OiAIJTHGtoCt8.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/6b/6b0anrSo7Fvoc05t4Ca0zZmfS_cpERy1DsG3ea6lBOg.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/qS/qSc-air8Wm-UxxbdyXgOBiwA1g2VgejS3oE4CTPnUJs.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/Ht/HtCMc1ZaTgZy2o1DFs1PbbISOEzOsyW0aFFkquK8ywY.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/Hc/HcIx4yYPg3w0vv-Cj49orJw9fudDS4Qpe3WXtuej7MI.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/_1/_1LQPrIlY8mTaxRd58w68ZBIVwaDge57_fpmw6PKGTI.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/Z3/Z3pV6hviTFmi6L98n9tVOy94nUUt8X_dSnvO0FqTjzc.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/Z0/Z0e47cT2a-21U-w-3gkbgqC3o5jWnEzOB8vW06aJH1E.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/ii/iiJRBZIsxKiwyzU_Z7UtQeUTXMRJRPTreTKRvAWO7_8.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/0p/0pa3wNbGHqFC6gxrMvdOJiP6gPwFv9VJ_npjEfRWxAE.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/W7/W7gU40NzeL-YSA7WVWNmHkpNN8cocSrXN6iD-0EJwfw.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/QX/QXcp8DweOJ6BfMedGMfeHvVXv2hjDIleln1LSJk7vOE.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/Wn/WnJTlULZ65547f83Wc-LjLXHGBPvOi_0ItAaE_6SlzY.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/pA/pAXzgvvIc7N1TYHmLtkgkRI_Nj58_VIMBT8CSRxDg5A.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/Bw/Bw6Nimjvy5Yv1AYbZb1t-v0eMNhv-bhwBzR-b5mY7FU.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/Fq/FqQWjMAz8yjZQlMC_dUsztaOxGruI2IXyGAAUF9SvQ0.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/0x/0x7itSE_jjN9NM8w3jE4isMgaQPBrVx0prZCwBURBV0.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/9D/9DkYxrjE-y5KTPxxIo5Zs3AOaylSDDJPPWbghYbc6tA.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/g5/g5VAxZ-YK0jKJukhexFCoUQqI2yLS1eOYNbU__THPvo.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/2C/2C9t8HfJg90nE6MPdwPjat-x10FoGiWgZPUw9kmsPsI.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/J_/J_D9clwKidN28hnVB1O3zEfKDwg90Usdb5ToKiPq_aw.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/dL/dL7SLUWUIeVdyA1UuH-rvif0nzesOar3LdEtqzdb4bE.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/f1/f11L16ip-n_en5vxM7LnyFPv_A9VDsPUKXzg-hDG0dE.cache
-- spec/dummy/tmp/cache/assets/sprockets/v3.0/4_/4_AVHXD_fQP3S2gUiYF1Azv90b6luuMnAM0hxD901y0.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/Ji/JitNKkP1dYdu9ObSdIkkEAsiFxEmRO5oy1UIyhT_hYs.cache
+- spec/dummy/tmp/cache/assets/sprockets/v3.0/zI/zIwTd39w92Mk6c86cODQlqHM3ymkZwY8N6Ee2plkTKg.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/qo/qo6SpT75QykYB63Aqq5bgzpXyNU1Y4dGFvCCJgoWQpE.cache
 - spec/dummy/app/views/home/index.html.erb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/controllers/metal_controller.rb
 - spec/dummy/app/controllers/full_protected_resources_controller.rb
 - spec/dummy/app/controllers/home_controller.rb
@@ -540,10 +549,11 @@ test_files:
 - spec/dummy/config.ru
 - spec/dummy/script/rails
 - spec/dummy/db/schema.rb
+- spec/dummy/db/migrate/20170822064514_enable_pkce.rb
 - spec/dummy/db/migrate/20120312140401_add_password_to_users.rb
 - spec/dummy/db/migrate/20111122132257_create_users.rb
-- spec/dummy/db/migrate/20180210183654_add_confidential_to_application.rb
 - spec/dummy/db/migrate/20151223200000_add_owner_to_application.rb
+- spec/dummy/db/migrate/20180210183654_add_confidential_to_applications.rb
 - spec/dummy/db/migrate/20160320211015_add_previous_refresh_token_to_access_tokens.rb
 - spec/dummy/db/migrate/20151223192035_create_doorkeeper_tables.rb
 - spec/dummy/config/environment.rb
@@ -587,6 +597,7 @@ test_files:
 - spec/lib/models/revocable_spec.rb
 - spec/lib/server_spec.rb
 - spec/lib/doorkeeper_spec.rb
+- spec/lib/stale_records_cleaner_spec.rb
 - spec/lib/config_spec.rb
 - spec/lib/oauth/code_response_spec.rb
 - spec/lib/oauth/scopes_spec.rb
@@ -620,6 +631,6 @@ test_files:
 - spec/controllers/authorizations_controller_spec.rb
 - spec/controllers/protected_resources_controller_spec.rb
 - spec/controllers/token_info_controller_spec.rb
-- spec/controllers/application_metal_controller.rb
+- spec/controllers/application_metal_controller_spec.rb
 - spec/spec_helper.rb
 - spec/grape/grape_integration_spec.rb