doorkeeper-openid_connect 1.6.3 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87cffdb0b8767c7cb1a254e74fd4c7b3ce5f4b92a8502538b9c09ee6a68915af
-  data.tar.gz: 050c8765bb944400e148a4d981371d4a560cb2295d47036e45d57cfa64914aae
+  metadata.gz: 9f38540bf15e49809e21423a76e0fd8313c5494aee4a3537f6b6d1bcd5645951
+  data.tar.gz: d1408e8c1a4755356746a55957dbc941242fb266ead2e5f92d29d46646258958
 SHA512:
-  metadata.gz: 0e90c44c55b03ab497357b6d3abfc3d8652ff53b88e41556733e2f30584b13f64bd0cca9721f0127c12f0c08a3676668c9a2164c5805c8db6cad375d94f72d2e
-  data.tar.gz: 51f41fa2dc0d4f26104f6a96a656bde761d9df1754001b645cad625f44657f44b7d54cc17a48c9b4dbf6fc53c294f716fe08de9a80bb7a748f78c4a798933542
+  metadata.gz: 71ca0f37f65e787785550e64d4b5fc4ad05ad74ec93601e909924d1984f6b42612c4856bc8439373f8af52a8958e0e80beaf711ed78b012784eb941f46aeb889
+  data.tar.gz: f5c46bc891ed65513493cbeb7304fe76c04a62c03e8ce51b5f1849319da9be27bfa304b5064e028421a88583db4adf4e3ec71e3c4d900fd6ff850e44fa76a826

data/.travis.yml

@@ -18,17 +18,10 @@ script:
   - bundle exec rake spec
 
 env:
-  - rails=4.2.0
   - rails=5.0.0
   - rails=5.2.0
 
 rvm:
-  - 2.3
   - 2.4
   - 2.5
   - 2.6
-
-matrix:
-  exclude:
-    - env: rails=4.2.0
-      rvm: 2.6

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 No changes yet.
 
+## v1.7.0
+
+### Changes
+
+- [#85] This gem now requires Doorkeeper 5.2, Rails 5, and Ruby 2.4
+
 ## v1.6.3 (2019-09-24)
 
 ### Changes

data/Gemfile

@@ -3,9 +3,6 @@ source 'https://rubygems.org'
 # use Rails version specified by environment
 ENV['rails'] ||= '5.2.0'
 gem 'rails', "~> #{ENV['rails']}"
-
-if ENV['rails'] =~ /^5./
-  gem 'rails-controller-testing'
-end
+gem 'rails-controller-testing'
 
 gemspec

data/doorkeeper-openid_connect.gemspec

@@ -17,13 +17,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = ">= 2.3"
+  spec.required_ruby_version = ">= 2.4"
 
-  spec.add_runtime_dependency 'doorkeeper', '>= 5.0', '< 5.2'
+  spec.add_runtime_dependency 'doorkeeper', '~> 5.2.0'
   spec.add_runtime_dependency 'json-jwt', '~> 1.6'
 
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'factory_bot'
+  # We need to stick to this sqlite3 version for Rails 5.0
+  # https://github.com/rails/rails/pull/35154
   spec.add_development_dependency 'sqlite3', '~> 1.3.6'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'conventional-changelog', '~> 1.2'

data/lib/doorkeeper/openid_connect/errors.rb

@@ -2,8 +2,8 @@ module Doorkeeper
   module OpenidConnect
     module Errors
       class OpenidConnectError < StandardError
-        def error_name
-          self.class.name.demodulize.underscore
+        def type
+          self.class.name.demodulize.underscore.to_sym
         end
       end
 

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

@@ -18,6 +18,7 @@ module Doorkeeper
         def oidc_authorization_request?
           controller_path == Doorkeeper::Rails::Routes.mapping[:authorizations][:controllers] &&
             action_name == 'new' &&
+            pre_auth.valid? &&
             pre_auth.client &&
             pre_auth.scopes.include?('openid')
         end
@@ -29,14 +30,18 @@ module Doorkeeper
           # FIXME: workaround for Rails 5, see https://github.com/rails/rails/issues/25106
           @_response_body = nil
 
-          error_response = if pre_auth.valid?
-            ::Doorkeeper::OAuth::ErrorResponse.new(
-              name: exception.error_name,
+          error_response = if exception.type == :invalid_request
+            ::Doorkeeper::OAuth::InvalidRequestResponse.new(
+              name: exception.type,
               state: params[:state],
-              redirect_uri: params[:redirect_uri]
+              redirect_uri: params[:redirect_uri],
             )
           else
-            pre_auth.error_response
+            ::Doorkeeper::OAuth::ErrorResponse.new(
+              name: exception.type,
+              state: params[:state],
+              redirect_uri: params[:redirect_uri],
+            )
           end
 
           response.headers.merge!(error_response.headers)
@@ -53,15 +58,15 @@ module Doorkeeper
 
           prompt_values.each do |prompt|
             case prompt
-            when 'none' then
+            when 'none'
               raise Errors::InvalidRequest if (prompt_values - [ 'none' ]).any?
               raise Errors::LoginRequired unless owner
               raise Errors::ConsentRequired if oidc_consent_required?(owner)
-            when 'login' then
+            when 'login'
               reauthenticate_oidc_resource_owner(owner) if owner
-            when 'consent' then
+            when 'consent'
               render :new
-            when 'select_account' then
+            when 'select_account'
               # TODO: let the user implement this
               raise Errors::AccountSelectionRequired
             else
@@ -74,8 +79,10 @@ module Doorkeeper
           max_age = params[:max_age].to_i
           return unless max_age > 0 && owner
 
-          auth_time = instance_exec owner,
+          auth_time = instance_exec(
+            owner,
             &Doorkeeper::OpenidConnect.configuration.auth_time_from_resource_owner
+          )
 
           if !auth_time || (Time.zone.now - auth_time) > max_age
             reauthenticate_oidc_resource_owner(owner)
@@ -89,8 +96,11 @@ module Doorkeeper
             params.delete('prompt') if params['prompt'].blank?
           end.to_query
 
-          instance_exec owner, return_to.to_s,
+          instance_exec(
+            owner,
+            return_to.to_s,
             &Doorkeeper::OpenidConnect.configuration.reauthenticate_resource_owner
+          )
 
           raise Errors::LoginRequired unless performed?
         end
@@ -103,6 +113,7 @@ module Doorkeeper
 
         def oidc_consent_required?(owner)
           return false if skip_authorization?
+
           matching_tokens_for_oidc_resource_owner(owner).blank?
         end
       end

data/lib/doorkeeper/openid_connect/oauth/pre_authorization.rb

@@ -4,7 +4,7 @@ module Doorkeeper
       module PreAuthorization
         attr_reader :nonce
 
-        def initialize(server, client, attrs = {})
+        def initialize(server, attrs = {})
           super
           @nonce = attrs[:nonce]
         end

data/lib/doorkeeper/openid_connect/version.rb

@@ -1,5 +1,5 @@
 module Doorkeeper
   module OpenidConnect
-    VERSION = '1.6.3'.freeze
+    VERSION = '1.7.0'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper-openid_connect
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.7.0
 platform: ruby
 authors:
 - Sam Dengler
@@ -9,28 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-24 00:00:00.000000000 Z
+date: 2019-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: doorkeeper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: json-jwt
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="