doorkeeper-device_authorization_grant 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08caf432de1258cd6b0dab0346a332f0a49698e35838194e1e6e9f999d1a2ccc'
-  data.tar.gz: 98c6b042087cb1a1df1f84d4e9aca7327f2cb637eaee58729de53a0d76fd9900
+  metadata.gz: 87c9de51f80c701da39179d542265e15fc426cefdff8b7b70827305d27c89a16
+  data.tar.gz: '028cb5145903789550175cb6acdec567a214d4b84186d9e08fb9274b4016a4f3'
 SHA512:
-  metadata.gz: 05dca92fad2e8ef88aae7d9739aa08c990dd5643c1ef4aab563b761d3afb1f08727efd2f508d45155e524943f9082203fa8e7019bd0829867a0c218266aa9fb8
-  data.tar.gz: c603c13d33a65616bd370dac83625396318ee7e47e0dc16f99cd620c23ebd5e1df0f9a30a6b7915eb33f85dd9ba7e2d2284793c0156808c86350591e97ae9085
+  metadata.gz: 667775d114f8a4559eaf84e84e8806acbdae0555bacb57db2c13a73d07dc447a60a2e135b837ffb42382e403f43774ce02f9933e619a0a6a28b291f771898f33
+  data.tar.gz: d8e6b3a77372b2dfe23e4a5f65d669878403b3ed803e1b66861d9c8c1279d3b7ecad1c97313a74475bd0a2ecc107e81410f74f9bf5de259a94a1292d48b1701c

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

@@ -9,7 +9,7 @@ module Doorkeeper
       def create
         headers.merge!(authorize_response.headers)
         render(json: authorize_response.body, status: authorize_response.status)
-      rescue Errors::DoorkeeperError => e
+      rescue Doorkeeper::Errors::DoorkeeperError => e
         handle_token_exception(e)
       end
 

data/config/locales/en.yml

@@ -1,4 +1,11 @@
 en:
+  activerecord:
+    errors:
+      models:
+        doorkeeper/device_authorization_grant/device_grant:
+          attributes:
+            scopes:
+              not_match_configured: "doesn't match configured on the server."
   doorkeeper:
     device_authorization_grant:
       device_authorizations:

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

@@ -18,11 +18,13 @@ module Doorkeeper
         # @param server
         # @param client
         # @param host_name [String]
-        def initialize(server, client, host_name)
+        # @param parameters [Hash]
+        def initialize(server, client, host_name, parameters = {}) # rubocop:disable Style/OptionHash
           super()
           @server = server
           @client = client
           @host_name = host_name
+          @original_scopes = parameters[:scope]
         end
 
         # @return [DeviceAuthorizationResponse, Doorkeeper::OAuth::ErrorResponse]

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

@@ -10,7 +10,7 @@ module Doorkeeper
       extend ActiveSupport::Concern
       include ::Doorkeeper::Models::Expirable
 
-      included do
+      included do # rubocop:disable Metrics/BlockLength
         self.table_name = "#{table_name_prefix}oauth_device_grants#{table_name_suffix}"
 
         delegate :secret_strategy, :fallback_secret_strategy, to: :class
@@ -28,6 +28,7 @@ module Doorkeeper
 
         validates :resource_owner_id, presence: true, if: -> { user_code.blank? }
         validates :resource_owner_id, absence: true, if: -> { user_code.present? }
+        validate :scopes_match_configured, if: :enforce_scopes?
 
         scope(
           :expired,
@@ -127,6 +128,19 @@ module Doorkeeper
         @raw_device_code = Doorkeeper::OAuth::Helpers::UniqueToken.generate
         secret_strategy.store_secret(self, :device_code, @raw_device_code)
       end
+
+      def scopes_match_configured
+        if scopes.present? && !Doorkeeper::OAuth::Helpers::ScopeChecker.valid?(
+          scope_str: scopes.to_s,
+          server_scopes: Doorkeeper.config.scopes
+        )
+          errors.add(:scopes, :not_match_configured)
+        end
+      end
+
+      def enforce_scopes?
+        Doorkeeper.config.enforce_configured_scopes?
+      end
     end
   end
 end

data/lib/doorkeeper/device_authorization_grant/request/device_authorization.rb

@@ -7,14 +7,15 @@ module Doorkeeper
       #
       # @see https://tools.ietf.org/html/rfc8628#section-3.1 RFC 8628, sect. 3.1
       class DeviceAuthorization < ::Doorkeeper::Request::Strategy
-        delegate :client, to: :server
+        delegate :client, :parameters, to: :server
 
         # @return [OAuth::DeviceAuthorizationRequest]
         def request
           @request ||= OAuth::DeviceAuthorizationRequest.new(
             Doorkeeper.configuration,
             client,
-            host_name
+            host_name,
+            parameters
           )
         end
 

data/lib/doorkeeper/device_authorization_grant/version.rb

@@ -2,7 +2,7 @@
 
 module Doorkeeper
   module DeviceAuthorizationGrant
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
     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: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - EXOP Group
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-08 00:00:00.000000000 Z
+date: 2021-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: doorkeeper