doorkeeper-openid_connect 1.8.3 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 383563b00b174c7789b58e492149d560a7b9d80443898b0530e4e7f63c9f741a
-  data.tar.gz: be63514852442c766cbc29129e54675c5908240f3cf55f35ea0d46cd893e0fc0
+  metadata.gz: 5bff9200998de53d57960fb1b0bd63e2a692e214285fdf720b26b574fd2ab20b
+  data.tar.gz: 83143a584098d2c164ad076d00b71af22f74c54a9c99c2cde823bc89e13e6bc3
 SHA512:
-  metadata.gz: 15a2b70ca0dfb03a98e6cbf39c12f3ddd06bfdc7baa65fb6ab3e5e08202dc4015d1f2e17ff59506d5e3f49134c58ba4932099e908741d2b53c2be92499a78fec
-  data.tar.gz: 65717e4cdc72d5199dd07d1dbddd2496f5fb3ae542c0e5f56feabdf63c13956d91cc93fbdeb0c1893f923b8c18070ea89997972be12e8c2bc4490ea4abbe5b39
+  metadata.gz: 19a46eaf1bb1224a0a1e3e76fd59a7a9fd90d7bafa3c0da6c68f1684a199fec659627dc0d13600bda8aca1267bcf386317a80773612110a396f750bffa0cd6e8
+  data.tar.gz: 4ad9bd1ddfaf2b0e5b01e92559b134ed36f39e01df9612a2763368787f13a16ca0bccbc3d18ae538b2208daf7b53e39453a66ee114b2c112b596f5a670a4d151

data/CHANGELOG.md

@@ -2,9 +2,24 @@
 
 - [#PR ID] Add your changelog entry here.
 
+## v1.8.5 (2023-02-02)
+
+- [#186] Simplify gem configuration reusing Doorkeeper configuration option DSL (thanks to @nbulaj).
+- [#182] Drop support for Ruby 2.6 and Rails 5 (thanks to @sato11).
+- [#188] Fix dookeeper-jwt compatibility (thanks to @zavan).
+
+## v1.8.4 (2023-02-01)
+
+- [#185] Don't call active_record_options for Doorkeeper >= 5.6.3 (thanks to @zavan).
+- [#183] Stop render consent screen when user is not logged-in (thanks to @nov).
+
 ## v1.8.3 (2022-12-02)
 
-- [#180] Add PKCE support to OpenID discovery endpoint.
+- [#180] Add PKCE support to OpenID discovery endpoint (thanks to @stanhu).
+
+## Unreleased next
+
+- [#177] Replace `json-jwt` with `ruby-jwt` to align with doorkeeper-jwt (thanks to @kristof-mattei).
 
 ## v1.8.2 (2022-07-13)
 

data/lib/doorkeeper/openid_connect/config.rb

@@ -35,68 +35,9 @@ module Doorkeeper
         end
       end
 
-      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
-        #
-        # ==== 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
-            define_method name do |*args, &block|
-              # TODO: is builder_class option being used?
-              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 |*_|
-            if instance_variable_defined?(:"@#{attribute}")
-              instance_variable_get(:"@#{attribute}")
-            else
-              options[:default]
-            end
-          end
-
-          public attribute
-        end
-
-        def extended(base)
-          base.send(:private, :option)
-        end
-      end
+      mattr_reader(:builder_class) { Config::Builder }
 
-      extend Option
+      extend ::Doorkeeper::Config::Option
 
       option :issuer
       option :signing_key

data/lib/doorkeeper/openid_connect/helpers/controller.rb

@@ -76,7 +76,7 @@ module Doorkeeper
             when 'login'
               reauthenticate_oidc_resource_owner(owner) if owner
             when 'consent'
-              render :new
+              render :new if owner
             when 'select_account'
               select_account_for_oidc_resource_owner(owner)
             else

data/lib/doorkeeper/openid_connect/id_token.rb

@@ -31,9 +31,10 @@ module Doorkeeper
       end
 
       def as_jws_token
-        JSON::JWT.new(as_json).sign(
-          Doorkeeper::OpenidConnect.signing_key,
-          Doorkeeper::OpenidConnect.signing_algorithm
+        ::JWT.encode(as_json,
+          Doorkeeper::OpenidConnect.signing_key.keypair,
+          Doorkeeper::OpenidConnect.signing_algorithm.to_s,
+          { kid: Doorkeeper::OpenidConnect.signing_key.kid }
         ).to_s
       end
 

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

@@ -18,7 +18,7 @@ module Doorkeeper
             Doorkeeper::AccessGrant.prepend Doorkeeper::OpenidConnect::AccessGrant
           end
 
-          if Doorkeeper.configuration.active_record_options[:establish_connection]
+          if Doorkeeper.configuration.respond_to?(:active_record_options) && 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

data/lib/doorkeeper/openid_connect/version.rb

@@ -2,6 +2,6 @@
 
 module Doorkeeper
   module OpenidConnect
-    VERSION = '1.8.3'
+    VERSION = '1.8.5'
   end
 end

data/lib/doorkeeper/openid_connect.rb

@@ -2,7 +2,7 @@
 
 require 'doorkeeper'
 require 'active_model'
-require 'json/jwt'
+require 'jwt'
 
 require 'doorkeeper/request'
 require 'doorkeeper/request/id_token'
@@ -48,19 +48,11 @@ module Doorkeeper
         else
           OpenSSL::PKey.read(configuration.signing_key)
         end
-      JSON::JWK.new(key)
+      ::JWT::JWK.new(key)
     end
 
     def self.signing_key_normalized
-      key = signing_key
-      case key[:kty].to_sym
-      when :RSA
-        key.slice(:kty, :kid, :e, :n)
-      when :EC
-        key.slice(:kty, :kid, :crv, :x, :y)
-      when :oct
-        key.slice(:kty, :kid)
-      end
+      signing_key.export
     end
 
     Doorkeeper::GrantFlow.register(

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper-openid_connect
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.5
 platform: ruby
 authors:
 - Sam Dengler
 - Markus Koller
+- Nikita Bulai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-02 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: doorkeeper
@@ -32,19 +33,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.7'
 - !ruby/object:Gem::Dependency
-  name: json-jwt
+  name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: conventional-changelog
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +120,7 @@ description: OpenID Connect extension for Doorkeeper.
 email:
 - sam.dengler@playonsports.com
 - markus-koller@gmx.ch
+- bulajnikita@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -177,14 +179,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: OpenID Connect extension for Doorkeeper.