doorkeeper-openid_connect 1.8.0.pre.rc1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f78f5dd79c5979e4c8e4ba7e24524f9b6fbe412944e353c1ce3e1b11eaf6479
-  data.tar.gz: 86801e079f717fe9723018c0ac7a5eae02a6a2cc867ff855bb73f1d75bc5ac8f
+  metadata.gz: 580964e8b1538ed3a9eb35826fe502698ab43c7a7343909d5371d2e177592737
+  data.tar.gz: 3593a4e8975761cff3aa38840a88f8e21da5e65109fb90b7296dccb7442c6382
 SHA512:
-  metadata.gz: 281765487d56b6c8cccbe51d56d33074d74307eaf5ff5c618c2ba1c19c0a0b936794fab02ec897ac0768115bb043f100487957a453b49ae067b636d01b332367
-  data.tar.gz: '0381cfe02e6b5b898ed5bd4ff1323351cb054b5a983ba7d34c1e67e21bf24a6f1a48b993595d04b59db8c17e25bb51ec06523a7877a50ca8220fea8068e903e9'
+  metadata.gz: 80e1ca10f0d89071970458b2ac237164cba4c8e143abcd2ea3f45b727f35f59e3f106d4435d2066b759eec8cc599e904255b57ff560743e29c5eb3a78ef8efca
+  data.tar.gz: 741c3d256765a8bd6ca5d838ac2ced86dadf98635b5d39c64a2a589231c9ba2151be4822ec7b9c11aac48d819261823319d4161a5702d00cab492acb00aa04d3

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 ## Unreleased
 
+- [#] Add here
+
+## v1.8.2 (2022-07-13)
+
+- [#168] Allow to use custom doorkeeper access grant model (thanks @nov).
+- [#170] Controllers inherit `Doorkeeper::AppliactionMetalController` (thanks @sato11).
+- [#171] Correctly override `AuthorizationsController` params (thanks to @nbulaj).
+
+## v1.8.1 (2022-02-09)
+
+- [#153] Fix ArgumentError caused by client credential validation introduced in Doorkeeper 5.5.1 (thanks to @CircumnavigatingFlatEarther)
+- [#161] Fix .well-known/openid-connect issuer (respond to block if provided) (thanks to @fkowal).
+- [#152] Expose oauth-authorization-server in routes (thanks to @mitar)
+
+## v1.8.0 (2021-05-11)
+
+No changes from v1.8.0-rc1.
+
 ## v1.8.0-rc1 (2021-04-20)
 
 ### Upgrading

data/README.md

@@ -1,6 +1,6 @@
 # Doorkeeper::OpenidConnect
 
-[![Build Status](https://travis-ci.org/doorkeeper-gem/doorkeeper-openid_connect.svg?branch=master)](https://travis-ci.org/doorkeeper-gem/doorkeeper-openid_connect)
+[![Build Status](https://app.travis-ci.com/doorkeeper-gem/doorkeeper-openid_connect.svg?branch=master)](https://app.travis-ci.com/github/doorkeeper-gem/doorkeeper-openid_connect)
 [![Code Climate](https://codeclimate.com/github/doorkeeper-gem/doorkeeper-openid_connect.svg)](https://codeclimate.com/github/doorkeeper-gem/doorkeeper-openid_connect)
 [![Gem Version](https://badge.fury.io/rb/doorkeeper-openid_connect.svg)](https://rubygems.org/gems/doorkeeper-openid_connect)
 
@@ -104,7 +104,7 @@ The following settings are required in `config/initializers/doorkeeper_openid_co
 
 - `issuer`
   - Identifier for the issuer of the response (i.e. your application URL). The value is a case sensitive URL using the `https` scheme that contains scheme, host, and optionally, port number and path components and no query or fragment components.
-  - You can either pass a string value, or a block to generate the issuer dynamically based on the `resource_owner` and `application` passed to the block.
+  - You can either pass a string value, or a block to generate the issuer dynamically based on the `resource_owner` and `application` or [request](app/controllers/doorkeeper/openid_connect/discovery_controller.rb#L123) passed to the block.
 - `subject`
   - Identifier for the resource owner (i.e. the authenticated user). A locally unique and never reassigned identifier within the issuer for the end-user, which is intended to be consumed by the client. The value is a case-sensitive string and must not exceed 255 ASCII characters in length.
   - The database ID of the user is an acceptable choice if you don't mind leaking that information.

data/app/controllers/concerns/doorkeeper/openid_connect/authorizations_extension.rb

@@ -0,0 +1,12 @@
+module Doorkeeper
+  module OpenidConnect
+    module AuthorizationsExtension
+      private
+
+      def pre_auth_param_fields
+        super.append(:nonce)
+      end
+    end
+  end
+end
+

data/app/controllers/doorkeeper/openid_connect/discovery_controller.rb

@@ -2,7 +2,7 @@
 
 module Doorkeeper
   module OpenidConnect
-    class DiscoveryController < ::Doorkeeper::ApplicationController
+    class DiscoveryController < ::Doorkeeper::ApplicationMetalController
       include Doorkeeper::Helpers::Controller
 
       WEBFINGER_RELATION = 'http://openid.net/specs/connect/1.0/issuer'
@@ -24,12 +24,13 @@ module Doorkeeper
       def provider_response
         doorkeeper = ::Doorkeeper.configuration
         openid_connect = ::Doorkeeper::OpenidConnect.configuration
+
         {
-          issuer: openid_connect.issuer,
+          issuer: issuer,
           authorization_endpoint: oauth_authorization_url(authorization_url_options),
           token_endpoint: oauth_token_url(token_url_options),
           revocation_endpoint: oauth_revoke_url(revocation_url_options),
-          introspection_endpoint: oauth_introspect_url(introspection_url_options),
+          introspection_endpoint: respond_to?(:oauth_introspect_url) ? oauth_introspect_url(introspection_url_options) : nil,
           userinfo_endpoint: oauth_userinfo_url(userinfo_url_options),
           jwks_uri: oauth_discovery_keys_url(jwks_url_options),
           end_session_endpoint: instance_exec(&openid_connect.end_session_endpoint),
@@ -119,6 +120,14 @@ module Doorkeeper
         }
       end
 
+      def issuer
+        if Doorkeeper::OpenidConnect.configuration.issuer.respond_to?(:call)
+          Doorkeeper::OpenidConnect.configuration.issuer.call(request).to_s
+        else
+          Doorkeeper::OpenidConnect.configuration.issuer
+        end
+      end
+
       %i[authorization token revocation introspection userinfo jwks webfinger].each do |endpoint|
         define_method :"#{endpoint}_url_options" do
           discovery_url_default_options.merge(discovery_url_options[endpoint.to_sym] || {})

data/app/controllers/doorkeeper/openid_connect/userinfo_controller.rb

@@ -2,10 +2,7 @@
 
 module Doorkeeper
   module OpenidConnect
-    class UserinfoController < ::Doorkeeper::ApplicationController
-      unless Doorkeeper.configuration.api_only
-        skip_before_action :verify_authenticity_token
-      end
+    class UserinfoController < ::Doorkeeper::ApplicationMetalController
       before_action -> { doorkeeper_authorize! :openid }
 
       def show

data/lib/doorkeeper/openid_connect/engine.rb

@@ -6,6 +6,10 @@ module Doorkeeper
       initializer 'doorkeeper.openid_connect.routes' do
         Doorkeeper::OpenidConnect::Rails::Routes.install!
       end
+
+      config.to_prepare do
+        Doorkeeper::AuthorizationsController.prepend Doorkeeper::OpenidConnect::AuthorizationsExtension
+      end
     end
   end
 end

data/lib/doorkeeper/openid_connect/oauth/password_access_token_request.rb

@@ -6,9 +6,16 @@ module Doorkeeper
       module PasswordAccessTokenRequest
         attr_reader :nonce
 
-        def initialize(server, client, resource_owner, parameters = {})
-          super
-          @nonce = parameters[:nonce]
+        if Gem.loaded_specs['doorkeeper'].version >= Gem::Version.create('5.5.1')
+          def initialize(server, client, credentials, resource_owner, parameters = {})
+            super
+            @nonce = parameters[:nonce]
+          end
+        else
+          def initialize(server, client, resource_owner, parameters = {})
+            super
+            @nonce = parameters[:nonce]
+          end
         end
 
         private

data/lib/doorkeeper/openid_connect/orm/active_record/access_grant.rb

@@ -7,12 +7,11 @@ module Doorkeeper
         base.class_eval do
           has_one :openid_request,
             class_name: 'Doorkeeper::OpenidConnect::Request',
+            foreign_key: 'access_grant_id',
             inverse_of: :access_grant,
             dependent: :delete
         end
       end
     end
   end
-
-  AccessGrant.prepend OpenidConnect::AccessGrant
 end

data/lib/doorkeeper/openid_connect/orm/active_record/request.rb

@@ -6,9 +6,16 @@ module Doorkeeper
       self.table_name = "#{table_name_prefix}oauth_openid_requests#{table_name_suffix}".to_sym
 
       validates :access_grant_id, :nonce, presence: true
-      belongs_to :access_grant,
-                 class_name: 'Doorkeeper::AccessGrant',
-                 inverse_of: :openid_request
+
+      if Gem.loaded_specs['doorkeeper'].version >= Gem::Version.create('5.5.0')
+        belongs_to :access_grant,
+                   class_name: Doorkeeper.config.access_grant_class.to_s,
+                   inverse_of: :openid_request
+      else
+        belongs_to :access_grant,
+                   class_name: 'Doorkeeper::AccessGrant',
+                   inverse_of: :openid_request
+      end
     end
   end
 end

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

@@ -4,14 +4,39 @@ require 'active_support/lazy_load_hooks'
 
 module Doorkeeper
   module OpenidConnect
+    autoload :AccessGrant, "doorkeeper/openid_connect/orm/active_record/access_grant"
+    autoload :Request, "doorkeeper/openid_connect/orm/active_record/request"
+
     module Orm
       module ActiveRecord
+        def run_hooks
+          super
+
+          if Gem.loaded_specs['doorkeeper'].version >= Gem::Version.create('5.5.0')
+            Doorkeeper.config.access_grant_model.prepend Doorkeeper::OpenidConnect::AccessGrant
+          else
+            Doorkeeper::AccessGrant.prepend Doorkeeper::OpenidConnect::AccessGrant
+          end
+
+          if Doorkeeper.configuration.active_record_options[:establish_connection]
+            [Doorkeeper::OpenidConnect::Request].each do |c|
+              c.send :establish_connection, Doorkeeper.configuration.active_record_options[:establish_connection]
+            end
+          end
+        end
+
         def initialize_models!
           super
           ActiveSupport.on_load(:active_record) do
             require 'doorkeeper/openid_connect/orm/active_record/access_grant'
             require 'doorkeeper/openid_connect/orm/active_record/request'
 
+            if Gem.loaded_specs['doorkeeper'].version >= Gem::Version.create('5.5.0')
+              Doorkeeper.config.access_grant_model.prepend Doorkeeper::OpenidConnect::AccessGrant
+            else
+              Doorkeeper::AccessGrant.prepend Doorkeeper::OpenidConnect::AccessGrant
+            end
+
             if Doorkeeper.configuration.active_record_options[:establish_connection]
               [Doorkeeper::OpenidConnect::Request].each do |c|
                 c.send :establish_connection, Doorkeeper.configuration.active_record_options[:establish_connection]

data/lib/doorkeeper/openid_connect/rails/routes.rb

@@ -62,6 +62,7 @@ module Doorkeeper
         def discovery_well_known_routes
           routes.scope path: '.well-known' do
             routes.get :provider, path: 'openid-configuration'
+            routes.get :provider, path: 'oauth-authorization-server'
             routes.get :webfinger
           end
         end

data/lib/doorkeeper/openid_connect/version.rb

@@ -2,6 +2,6 @@
 
 module Doorkeeper
   module OpenidConnect
-    VERSION = '1.8.0-rc1'
+    VERSION = '1.8.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper-openid_connect
 version: !ruby/object:Gem::Version
-  version: 1.8.0.pre.rc1
+  version: 1.8.2
 platform: ruby
 authors:
 - Sam Dengler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-20 00:00:00.000000000 Z
+date: 2022-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: doorkeeper
@@ -20,7 +20,7 @@ dependencies:
         version: '5.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.6'
+        version: '5.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '5.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.6'
+        version: '5.7'
 - !ruby/object:Gem::Dependency
   name: json-jwt
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +126,7 @@ files:
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
-- app/controllers/doorkeeper/authorizations_controller.rb
+- app/controllers/concerns/doorkeeper/openid_connect/authorizations_extension.rb
 - app/controllers/doorkeeper/openid_connect/discovery_controller.rb
 - app/controllers/doorkeeper/openid_connect/userinfo_controller.rb
 - config/locales/en.yml
@@ -180,9 +180,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.4
 signing_key: 

data/app/controllers/doorkeeper/authorizations_controller.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require_dependency "#{Doorkeeper::Engine.root}/app/controllers/doorkeeper/authorizations_controller.rb"
-
-module Doorkeeper
-  class AuthorizationsController
-    module AuthorizationsExtension
-      private
-
-      def pre_auth_param_fields
-        super.append(:nonce)
-      end
-    end
-
-    Doorkeeper::AuthorizationsController.prepend AuthorizationsExtension
-  end
-end