doorkeeper-device_authorization_grant 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a95bd7a093b27e1735e590152c1eb72b0d24ddfe24769ef096bdfed7e5085fe7
-  data.tar.gz: 787d3736c5b2689191d505d67bd997c6ead61a6ca6f5c41233fde9c25d9cbc3e
+  metadata.gz: 918728396ff79ae1d4efcc5343698057ba21f210ba1337ca4f9e5506b7c93270
+  data.tar.gz: 40c2be408c998eb5c6c27c9feaa384cd7d028488b1c74bbedee9f93625a0d00f
 SHA512:
-  metadata.gz: aa55bc03f056f52064fd0defd3f8562508e62af6006cf28ba60cb1371a6f89ca1d5109f33a1d36639fdc8fdafecda7c6cf934a04c99ac169d158fc41318f7775
-  data.tar.gz: 335a27953d47a3ee17e6052510f9cfdd75cc55eaaacac1cd0e8b76b1eea8c09a4dbd573ba41ab4d68f0bda34da36a115a0dd2c7601e4640c1171b87e06ce8dc0
+  metadata.gz: ee2ed1c9be3d69d8aee4429c84b46b49845c266c06e0337b71b9798dea6701009b86926bc413441a8b5c82500521ea70f060a52197123d8c75ddf1e76b274370
+  data.tar.gz: e38f960d8d614c201fa5062142c7c22670c30fff51173e506ae4aa5efcff78ec86482583363bc79fcfcbb7520f44cf0066d3e252fcb6ec1578794077c90456d7

data/app/controllers/doorkeeper/device_authorization_grant/device_authorizations_controller.rb

@@ -18,8 +18,8 @@ module Doorkeeper
       def authorize
         device_grant_model.transaction do
           device_grant = device_grant_model.lock.find_by(user_code: user_code)
-          return authorization_error_response(:invalid_user_code) if device_grant.nil?
-          return authorization_error_response(:expired_user_code) if device_grant.expired?
+          next authorization_error_response(:invalid_user_code) if device_grant.nil?
+          next authorization_error_response(:expired_user_code) if device_grant.expired?
 
           device_grant.update!(user_code: nil, resource_owner_id: current_resource_owner.id)
         end

data/lib/doorkeeper/device_authorization_grant/config.rb

@@ -20,7 +20,7 @@ module Doorkeeper
       def initialize
         super(
           'Configuration for Doorkeeper::DeviceAuthorizationGrant missing. ' \
-          'Do you have Doorkeeper::DeviceAuthorizationGrant initializer?'
+            'Do you have Doorkeeper::DeviceAuthorizationGrant initializer?'
         )
       end
     end

data/lib/doorkeeper/device_authorization_grant/oauth/device_authorization_request.rb

@@ -7,8 +7,7 @@ module Doorkeeper
       #
       # @see https://tools.ietf.org/html/rfc8628#section-3.1 RFC 8628, sect. 3.1
       class DeviceAuthorizationRequest < Doorkeeper::OAuth::BaseRequest
-        attr_accessor :server,
-                      :client
+        attr_accessor :server, :client
 
         # @return [String]
         attr_accessor :host_name

data/lib/doorkeeper/device_authorization_grant/oauth/device_authorization_response.rb

@@ -35,7 +35,7 @@ module Doorkeeper
             'verification_uri_complete' => verification_uri_complete,
             'expires_in' => device_grant.expires_in,
             'interval' => interval
-          }.reject { |_, value| value.blank? }
+          }.reject { |_, value| value.blank? } # rubocop:disable Rails/CompactBlank does not exist in Rails < 6.1
         end
 
         # @return [Hash]

data/lib/doorkeeper/device_authorization_grant/oauth/device_code_request.rb

@@ -7,9 +7,7 @@ module Doorkeeper
       #
       # @see https://tools.ietf.org/html/rfc8628#section-3.4 RFC 8628, sect. 3.4
       class DeviceCodeRequest < ::Doorkeeper::OAuth::BaseRequest
-        attr_accessor :server,
-                      :client,
-                      :access_token
+        attr_accessor :server, :client, :access_token
 
         # @return [DeviceGrant]
         attr_accessor :device_grant
@@ -46,6 +44,25 @@ module Doorkeeper
         private
 
         def generate_access_token
+          # Doorkeeper 5.6.5 introduced an additional argument, see https://github.com/doorkeeper-gem/doorkeeper/pull/1602
+          if Doorkeeper.gem_version >= Gem::Version.new('5.6.5')
+            generate_access_token_with_empty_custom_attributes
+          else
+            generate_access_token_without_custom_attributes
+          end
+        end
+
+        def generate_access_token_with_empty_custom_attributes
+          find_or_create_access_token(
+            device_grant.application,
+            device_grant.resource_owner_id,
+            device_grant.scopes,
+            {},
+            server
+          )
+        end
+
+        def generate_access_token_without_custom_attributes
           find_or_create_access_token(
             device_grant.application,
             device_grant.resource_owner_id,
@@ -64,7 +81,7 @@ module Doorkeeper
         def check_user_interaction!
           raise Errors::SlowDown if polling_too_fast?
 
-          device_grant.update!(last_polling_at: Time.now)
+          device_grant.update!(last_polling_at: Time.now.utc)
 
           raise Errors::AuthorizationPending if authorization_pending?
         end

data/lib/doorkeeper/device_authorization_grant/orm/active_record/device_grant.rb

@@ -4,7 +4,7 @@ module Doorkeeper
   module DeviceAuthorizationGrant
     # Model class, similar to Doorkeeper `AccessGrant`, but specific for
     # handling OAuth 2.0 Device Authorization Grant.
-    class DeviceGrant < ActiveRecord::Base
+    class DeviceGrant < ActiveRecord::Base # rubocop:disable Rails/ApplicationRecord Doorkeeper models inherit from ActiveRecord::Base.
       include DeviceGrantMixin
 
       # @!attribute application_id

data/lib/doorkeeper/device_authorization_grant/orm/active_record/device_grant_mixin.rb

@@ -15,7 +15,7 @@ module Doorkeeper
 
         delegate :secret_strategy, :fallback_secret_strategy, to: :class
 
-        belongs_to :application, class_name: Doorkeeper.configuration.application_class, optional: true
+        belongs_to :application, class_name: Doorkeeper.configuration.application_class.to_s, optional: true
 
         before_validation :generate_device_code, on: :create
 
@@ -130,7 +130,7 @@ module Doorkeeper
       end
 
       def scopes_match_configured
-        if scopes.present? && !Doorkeeper::OAuth::Helpers::ScopeChecker.valid?(
+        if scopes.present? && !Doorkeeper::OAuth::Helpers::ScopeChecker.valid?( # rubocop:disable Style/InverseMethods
           scope_str: scopes.to_s,
           server_scopes: Doorkeeper.config.scopes
         )

data/lib/doorkeeper/device_authorization_grant/version.rb

@@ -2,7 +2,7 @@
 
 module Doorkeeper
   module DeviceAuthorizationGrant
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
     public_constant :VERSION
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper-device_authorization_grant
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - EXOP Group
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-03 00:00:00.000000000 Z
+date: 2023-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: doorkeeper
@@ -30,34 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.23'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.23'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rails
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.10.1
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
-    - - ">="
+        version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.1
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -78,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.26
+        version: 0.9.27
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.26
+        version: 0.9.27
 description: OAuth 2.0 Device Authorization Grant extension for Doorkeeper.
 email:
 - opensource@exop-group.com
@@ -142,6 +150,7 @@ metadata:
   homepage_uri: https://github.com/exop-group/doorkeeper-device_authorization_grant
   source_code_uri: https://github.com/exop-group/doorkeeper-device_authorization_grant
   changelog_uri: https://github.com/exop-group/doorkeeper-device_authorization_grant/blob/master/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -157,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: OAuth 2.0 Device Authorization Grant extension for Doorkeeper.