doorkeeper-openid_connect 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f8730c21c150af733bea02800bb68a3f5687ca27f017fabd846e704c4a851f9
-  data.tar.gz: 38eed534e3e2f831db66d575ae57978e25311c4713dcd9fe61f9a341cc15f5ea
+  metadata.gz: 566a3678dd53056632685419826a124ee76a17b29606be3de9ada204c44b8c2e
+  data.tar.gz: 49ec3634d3be81fb98be0f94ad6eb9f550adf8d13a8c2abbf2332f6e5bc3405b
 SHA512:
-  metadata.gz: 9c28efcc38a1fcbebeda2aad749031c003d0cb97076b7e3ecc04e535759acaa3191c7e94ae3c0a2358a528bb092a271d3bf543e3995375f1744393102eac8ce2
-  data.tar.gz: 0ab836dd35f97ac947839b08c3cb7c6eec8b3155c3701e5dfa67acc9a8e0c4f0f0bfb1c572581965f198e46a3c5ba4ad1bc7f7274adc94e4a8f4c3a39c46260b
+  metadata.gz: 76d674cc0218cbceaa942f0b4716fe3680cf02228d166deb9df21e55291a2fd6189803ddd81adfac91708b1310e8bee764599b7968582a9c178fddb5619f2d33
+  data.tar.gz: 460eee7bb2ebf59e356d1ac21c7eb0b1bac3dba97b24204ef8a70ab6e16490cf0e02b9c6d75fdf6d1a315ee1661c09af9cea5fa5652906ea9bdc359f98212d9d

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 No changes yet.
 
+## v1.5.2 (2018-09-04)
+
+### Changes
+
+- The previous release was a bit premature, this fixes some compatibility issues with Doorkeeper 5.x
+
 ## v1.5.1 (2018-09-04)
 
 ### Changes

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

@@ -77,14 +77,8 @@ module Doorkeeper
         end
 
         def matching_tokens_for_resource_owner(owner)
-          # TODO: maybe use Doorkeeper::AccessToken.matching_token_for once
-          # https://github.com/doorkeeper-gem/doorkeeper/pull/907 is merged
-          Doorkeeper::AccessToken.where(
-            application_id: pre_auth.client.id,
-            resource_owner_id: owner.id,
-            revoked_at: nil,
-          ).select do |token|
-            Doorkeeper::AccessToken.scopes_match?(token.scopes, pre_auth.scopes, nil)
+          Doorkeeper::AccessToken.authorized_tokens_for(pre_auth.client.id, owner.id).select do |token|
+            Doorkeeper::AccessToken.scopes_match?(token.scopes, pre_auth.scopes, pre_auth.client.scopes)
           end
         end
       end

data/lib/doorkeeper/openid_connect/version.rb

@@ -1,5 +1,5 @@
 module Doorkeeper
   module OpenidConnect
-    VERSION = '1.5.1'.freeze
+    VERSION = '1.5.2'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper-openid_connect
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Sam Dengler