Merge pull request #188 from zavan/fix-doorkeeper-jwt-compatibility

Fix dookeeper-jwt compatibility
doorkeeper-gem · Feb 2, 2023 · 9de10c0 · 9de10c0
2 parents b268d28 + 1d7c03b
commit 9de10c0
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/lib/doorkeeper/openid_connect.rb b/lib/doorkeeper/openid_connect.rb
@@ -48,7 +48,7 @@ def self.signing_key
         else
           OpenSSL::PKey.read(configuration.signing_key)
         end
-      JWT::JWK.new(key)
+      ::JWT::JWK.new(key)
     end
 
     def self.signing_key_normalized

diff --git a/lib/doorkeeper/openid_connect/id_token.rb b/lib/doorkeeper/openid_connect/id_token.rb
@@ -31,7 +31,7 @@ def as_json(*_)
       end
 
       def as_jws_token
-        JWT.encode(as_json,
+        ::JWT.encode(as_json,
           Doorkeeper::OpenidConnect.signing_key.keypair,
           Doorkeeper::OpenidConnect.signing_algorithm.to_s,
           { kid: Doorkeeper::OpenidConnect.signing_key.kid }

diff --git a/spec/dummy/config/initializers/jwt.rb b/spec/dummy/config/initializers/jwt.rb
@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-JWT.configuration.jwk.kid_generator_type = :rfc7638_thumbprint
+::JWT.configuration.jwk.kid_generator_type = :rfc7638_thumbprint
diff --git a/spec/lib/id_token_spec.rb b/spec/lib/id_token_spec.rb
@@ -74,7 +74,7 @@
       it 'returns claims encoded as JWT' do
         algorithms = [Doorkeeper::OpenidConnect.signing_algorithm.to_s]
 
-        data, headers = JWT.decode subject.as_jws_token, Doorkeeper::OpenidConnect.signing_key.keypair, true, { algorithms: algorithms }
+        data, headers = ::JWT.decode subject.as_jws_token, Doorkeeper::OpenidConnect.signing_key.keypair, true, { algorithms: algorithms }
 
         expect(data.to_hash).to eq subject.as_json.stringify_keys
         expect(headers["kid"]).to eq Doorkeeper::OpenidConnect.signing_key.kid

diff --git a/spec/lib/openid_connect_spec.rb b/spec/lib/openid_connect_spec.rb
@@ -11,7 +11,7 @@
 
   describe '.signing_key' do
     it 'returns the private key as JWK instance' do
-      expect(subject.signing_key).to be_a JWT::JWK::KeyBase
+      expect(subject.signing_key).to be_a ::JWT::JWK::KeyBase
       expect(subject.signing_key.kid).to eq 'IqYwZo2cE6hsyhs48cU8QHH4GanKIx0S4Dc99kgTIMA'
     end
   end