haveapi 0.18.0 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fedb085c210494a3173ef597e44f63a280485cc0490bd0c0b74610d26d52e5b4
-  data.tar.gz: 372f4a9cb544426ad1e06c3bb60e26a50077b5e3bef70e7b77ac008ca5008aaa
+  metadata.gz: 16eef5420692ea73c7b4969ec61c7efc26c74692c7a9a403d8f664fdf2dafbf8
+  data.tar.gz: 26e5cf981901ca19dc5c0d60c5b567f2cd81e66df2cf70c5333c24b920136554
 SHA512:
-  metadata.gz: 6ab713fd64ead24d6a21095bda69ddbc536da56fdd26745c0c60721a8c9e5767addafdf7906a3c98a23401472106e83f8d341903291e4c5e3b1c08974c3f12b3
-  data.tar.gz: 58b3cfc406d09868675f07b51050c5b914368c1c4ee70dbd9cf919a6f2b7e9124133e0f6f33292822f69e614cd1090e6f605ba5179d0c98802d4b1023e09cc6e
+  metadata.gz: '0876a3b9b10ad452c89a62e06fc56e29cfb6aff188e4943274adf4e4180464b90daa420e4ab0953faba1f1ae9a5df0a8a19ae0362acd7290043efefd050f8b19'
+  data.tar.gz: cddc8f6c09dea69afc3a359ab18cd947a5a338ec9413d2f16eb600fa4893c88f0cbe3e3224b9ae58ac0d3de5707b96ec0e0891162d3d0ee9c97e906bff0c8e44

data/haveapi.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rake'
   s.add_runtime_dependency 'github-markdown'
   s.add_runtime_dependency 'nesty', '~> 1.0'
-  s.add_runtime_dependency 'haveapi-client', '~> 0.18.0'
+  s.add_runtime_dependency 'haveapi-client', '~> 0.18.2'
   s.add_runtime_dependency 'mail'
   s.add_runtime_dependency 'rack-oauth2', '~> 2.2.0'
 end

data/lib/haveapi/authentication/oauth2/config.rb

@@ -130,13 +130,22 @@ module HaveAPI::Authentication
       #
       # @return [Hash<String, String>]
       def oauth2_params(req)
-        {
+        ret = {
           client_id: req.client_id,
           response_type: req.response_type,
           redirect_uri: req.redirect_uri,
           scope: req.scope.join(' '),
           state: req.state,
         }
+
+        if req.code_challenge.present? && req.code_challenge_method.present?
+          ret.update(
+            code_challenge: req.code_challenge,
+            code_challenge_method: req.code_challenge_method,
+          )
+        end
+
+        ret
       end
     end
   end

data/lib/haveapi/authentication/oauth2/provider.rb

@@ -35,6 +35,12 @@ module HaveAPI::Authentication
 
     # Abstract class describing ongoing authorization and what methods it must respond to
     class Authorization
+      # @return [String, nil]
+      attr_reader :code_challenge
+
+      # @return [String, nil]
+      attr_reader :code_challenge_method
+
       # @return [String]
       attr_reader :redirect_uri
 
@@ -190,10 +196,17 @@ module HaveAPI::Authentication
             when :authorization_code
               authorization = config.find_authorization_by_code(client, req.code)
 
-              if authorization.nil? || authorization.check_code_validity(req.redirect_uri)
+              if authorization.nil? || !authorization.check_code_validity(req.redirect_uri)
                 req.invalid_grant!
               end
 
+              if authorization.code_challenge && authorization.code_challenge_method
+                req.verify_code_verifier!(
+                  authorization.code_challenge,
+                  authorization.code_challenge_method.to_sym,
+                )
+              end
+
               access_token, expires_at, refresh_token = config.get_tokens(authorization, handler.request)
 
               bearer_token = Rack::OAuth2::AccessToken::Bearer.new(

data/lib/haveapi/version.rb

@@ -1,4 +1,4 @@
 module HaveAPI
   PROTOCOL_VERSION = '2.0'
-  VERSION = '0.18.0'
+  VERSION = '0.18.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haveapi
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.2
 platform: ruby
 authors:
 - Jakub Skokan
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.18.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.18.2
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement