doorkeeper 5.2.2 → 5.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64def194ba59abd58240aa70f39ac3406d98b22f5d7b8b9cfe5399806a4e151f
-  data.tar.gz: 746dd0ba0787e9c2d2fae79557c5bea548eb5553c8912c5fa9fbc39fe7ef3669
+  metadata.gz: c9d518348b70a1f9aed5f17d689151c1c5129c8508b25f9965887e101e9c1fd3
+  data.tar.gz: d41ca23bd09b61ede59a73cc8e23ed3355d9ff4045019c15a65180836b5f597a
 SHA512:
-  metadata.gz: 1d04c62db89266915673e8527bcfbe61da5ebff72141de2a1b5712c2989fd283eb379008ef78c5f365e5f04fcfc10646a7614069ab23ddf0acc14a445bd54bed
-  data.tar.gz: 788ea936761f3f91aa5906fedfea068427ac9f2a8412440fbde81938947f56b62beed61be8fcce4591fa252212a0072779711d3214488f3bc94723baa1468bf0
+  metadata.gz: 812f872a66a89ac7a3a33efd529a04ff78af4bcddce2c0024f979994bd3855bc74f24c3e01dcdfbce31f90e8bb65efefec121abbd94469706b89fc00b0c43c2b
+  data.tar.gz: f447e906568a6ba487772fd5555c861c51c3eaa97ee15bb1250aa51db71f5fece1e0cc652de1e6d0c385a47bd61d96cff984b9e493dc23b925e620fa6a293d85

data/CHANGELOG.md

@@ -9,6 +9,13 @@ User-visible changes worth mentioning.
 
 - [#PR ID] Your PR short description.
 
+## 5.2.3
+
+- [#1334] Remove `application_secret` flash helper and `redirect_to` keyword.
+- [#1331] Move redirect_uri_validator to where it is used (`Application` model).
+- [#1326] Move response_type check in pre_authorization to a method to be easily to override.
+- [#1329] Fix `find_in_batches` order warning.
+
 ## 5.2.2
 
 - [#1320] Call configured `authenticate_resource_owner` method once per request.

data/app/controllers/doorkeeper/applications_controller.rb

@@ -4,7 +4,6 @@ module Doorkeeper
   class ApplicationsController < Doorkeeper::ApplicationController
     layout "doorkeeper/admin" unless Doorkeeper.configuration.api_only
 
-    add_flash_types :application_secret unless Doorkeeper.configuration.api_only
     before_action :authenticate_admin!
     before_action :set_application, only: %i[show edit update destroy]
 

data/lib/doorkeeper/models/access_token_mixin.rb

@@ -191,10 +191,9 @@ module Doorkeeper
       # @return [Doorkeeper::AccessToken] array of matching AccessToken objects
       #
       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)
+        where(application_id: application_id,
+              resource_owner_id: resource_owner_id,
+              revoked_at: nil)
       end
 
       # Convenience method for backwards-compatibility, return the last
@@ -209,7 +208,8 @@ module Doorkeeper
       #   nil if nothing was found
       #
       def last_authorized_token_for(application_id, resource_owner_id)
-        authorized_tokens_for(application_id, resource_owner_id).first
+        authorized_tokens_for(application_id, resource_owner_id)
+          .ordered_by(:created_at, :desc).first
       end
 
       ##

data/lib/doorkeeper/oauth/pre_authorization.rb

@@ -45,12 +45,11 @@ module Doorkeeper
       end
 
       def error_response
-        is_implicit_flow = response_type == "token"
-
         if error == :invalid_request
-          OAuth::InvalidRequestResponse.from_request(self, response_on_fragment: is_implicit_flow)
+          OAuth::InvalidRequestResponse.from_request(self,
+                                                     response_on_fragment: response_on_fragment?)
         else
-          OAuth::ErrorResponse.from_request(self, response_on_fragment: is_implicit_flow)
+          OAuth::ErrorResponse.from_request(self, response_on_fragment: response_on_fragment?)
         end
       end
 
@@ -123,6 +122,10 @@ module Doorkeeper
           (code_challenge_method.present? && code_challenge_method =~ /^plain$|^S256$/)
       end
 
+      def response_on_fragment?
+        response_type == "token"
+      end
+
       def pre_auth_hash
         {
           client_id: client.uid,

data/lib/doorkeeper/orm/active_record.rb

@@ -16,7 +16,6 @@ module Doorkeeper
       def self.initialize_models!
         lazy_load do
           require "doorkeeper/orm/active_record/stale_records_cleaner"
-          require "doorkeeper/orm/active_record/redirect_uri_validator"
           require "doorkeeper/orm/active_record/access_grant"
           require "doorkeeper/orm/active_record/access_token"
           require "doorkeeper/orm/active_record/application"

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "doorkeeper/orm/active_record/redirect_uri_validator"
+
 module Doorkeeper
   class Application < ActiveRecord::Base
     self.table_name = "#{table_name_prefix}oauth_applications#{table_name_suffix}"

data/lib/doorkeeper/version.rb

@@ -9,7 +9,7 @@ module Doorkeeper
     # Semantic versioning
     MAJOR = 5
     MINOR = 2
-    TINY = 2
+    TINY = 3
     PRE = nil
 
     # Full version number

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 5.2.3
 platform: ruby
 authors:
 - Felipe Elias Philipp
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-10 00:00:00.000000000 Z
+date: 2019-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties