doorkeeper-openid_connect 1.8.3 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 383563b00b174c7789b58e492149d560a7b9d80443898b0530e4e7f63c9f741a
-  data.tar.gz: be63514852442c766cbc29129e54675c5908240f3cf55f35ea0d46cd893e0fc0
+  metadata.gz: 981e1ef7a0f2f47cf63c8824c7cdfa802127f291a54836cb3a20e39b1bcd7ca9
+  data.tar.gz: 95b4e9a230daaebeee5df8d251a78921fe85178bbd656b7acd868afbb0871c83
 SHA512:
-  metadata.gz: 15a2b70ca0dfb03a98e6cbf39c12f3ddd06bfdc7baa65fb6ab3e5e08202dc4015d1f2e17ff59506d5e3f49134c58ba4932099e908741d2b53c2be92499a78fec
-  data.tar.gz: 65717e4cdc72d5199dd07d1dbddd2496f5fb3ae542c0e5f56feabdf63c13956d91cc93fbdeb0c1893f923b8c18070ea89997972be12e8c2bc4490ea4abbe5b39
+  metadata.gz: 569d7fcb3e77e8e77f2e3a2abe6b02c6664416e136e30fecc2c78462c74a87b936ec9b1d665d90c062db4b5ce2078ec26a93b938912b2e97dc6ebbb7c93ac94d
+  data.tar.gz: 60df7a49cef6ee6ff57efc4b9fc775053d0406015a9dc3fac0455d6177f86dcf98b8d6384204fc54033c2b4bb82a8947808e960543c47c1cceba1796035a5e63

data/CHANGELOG.md

@@ -1,11 +1,17 @@
 ## Unreleased
 
 - [#PR ID] Add your changelog entry here.
+- [#185] Don't call active_record_options for Doorkeeper >= 5.6.3.
+- [#183] stop render consent screen when user is not logged-in.
 
 ## v1.8.3 (2022-12-02)
 
 - [#180] Add PKCE support to OpenID discovery endpoint.
 
+## Unreleased next
+
+- [#177] Replace `json-jwt` with `ruby-jwt` to align with doorkeeper-jwt.
+
 ## v1.8.2 (2022-07-13)
 
 - [#168] Allow to use custom doorkeeper access grant model (thanks @nov).

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.4'
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper-openid_connect
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
 platform: ruby
 authors:
 - Sam Dengler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-02 00:00:00.000000000 Z
+date: 2023-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: doorkeeper
@@ -32,19 +32,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
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !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.