doorkeeper-openid_connect 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bcb761a45b80b603b387474f5393d9000d154468eb7974620e9aace796836c5
-  data.tar.gz: 51809691b1ea73f5f2a28f00c2aa105c821e9e4326ae781b4dcbb433c7e034ac
+  metadata.gz: dd500337bf3593b1f15ab64da67dd2da940797271fd1a169e47f2542371d6930
+  data.tar.gz: 4c3fdae9aca104f74f2bcf2e2805d09fe784e75326e3fa2382de8ba74133987a
 SHA512:
-  metadata.gz: d6e3df930e4e466ffac74df7d3e237158a34a7a831f6003749a9edf8766b762db132430c862287bd16a21a66d035cb4b62fa7f8f0f518452cf8bab3ec1fd4709
-  data.tar.gz: 32721653701e09ae2d022c627bf13f2bfce5390ffad046d976c880b186c97eaec5fa9173aed21789141056322786604224bfe62e6bfe4cdb43da030ed08b2b50
+  metadata.gz: 887f767a61bd22be260dfb2b3d37de2e3334b25ff53aacbf9b6b41aecb88a287ae308d9fd65950e7c850ab023569d08cb1c31cceda4182cb667c3b61a984406e
+  data.tar.gz: 670454a6c3e5dbe69dcb511e68acbb63b2b558410a3ae0268400918dd11e3ae4d320fb1bd7d876cade2b7313132c925befcd51ad0bd023bfb826f36ee9d127b9

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## Unreleased
 
+## v1.7.2 (2020-05-20)
+
+### Changes
+
+- [#108] Add support for Doorkeeper 5.4
+- [#103] Add support for end_session_endpoint
+- [#109] Test against Ruby 2.7 & Rails 6.x
+
 ## v1.7.1 (2020-02-07)
 
 ### Upgrading

data/README.md

@@ -152,6 +152,10 @@ The following settings are optional:
   - Note that the OIDC specification mandates HTTPS, so you shouldn't change this
     for production environments unless you have a really good reason!
 
+- `end_session_endpoint`
+  - The URL that the user is redirected to after ending the session on the client.
+  - Used by implementations like https://github.com/IdentityModel/oidc-client-js.
+
 ### Scopes
 
 To perform authentication over OpenID Connect, an OAuth client needs to request the `openid` scope. This scope needs to be enabled using either `optional_scopes` in the global Doorkeeper configuration in `config/initializers/doorkeeper.rb`, or by adding it to any OAuth application's `scope` attribute.

data/app/controllers/doorkeeper/authorizations_controller.rb

@@ -12,6 +12,6 @@ module Doorkeeper
       end
     end
 
-    Doorkeeper::AuthorizationsController.send :prepend, AuthorizationsExtension
+    Doorkeeper::AuthorizationsController.prepend AuthorizationsExtension
   end
 end

data/app/controllers/doorkeeper/openid_connect/discovery_controller.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OpenidConnect
     class DiscoveryController < ::Doorkeeper::ApplicationController
       include Doorkeeper::Helpers::Controller
 
-      WEBFINGER_RELATION = 'http://openid.net/specs/connect/1.0/issuer'.freeze
+      WEBFINGER_RELATION = 'http://openid.net/specs/connect/1.0/issuer'
 
       def provider
         render json: provider_response
@@ -30,20 +32,21 @@ module Doorkeeper
           introspection_endpoint: oauth_introspect_url(protocol: protocol),
           userinfo_endpoint: oauth_userinfo_url(protocol: protocol),
           jwks_uri: oauth_discovery_keys_url(protocol: protocol),
+          end_session_endpoint: openid_connect.end_session_endpoint.call,
 
           scopes_supported: doorkeeper.scopes,
 
           # TODO: support id_token response type
           response_types_supported: doorkeeper.authorization_response_types,
-          response_modes_supported: [ 'query', 'fragment' ],
+          response_modes_supported: ['query', 'fragment'],
 
           token_endpoint_auth_methods_supported: [
             'client_secret_basic',
             'client_secret_post',
 
             # TODO: look into doorkeeper-jwt_assertion for these
-            #'client_secret_jwt',
-            #'private_key_jwt'
+            # 'client_secret_jwt',
+            # 'private_key_jwt'
           ],
 
           subject_types_supported: openid_connect.subject_types_supported,
@@ -56,18 +59,18 @@ module Doorkeeper
             'normal',
 
             # TODO: support these
-            #'aggregated',
-            #'distributed',
+            # 'aggregated',
+            # 'distributed',
           ],
 
-          claims_supported: [
-            'iss',
-            'sub',
-            'aud',
-            'exp',
-            'iat',
+          claims_supported: %w[
+            iss
+            sub
+            aud
+            exp
+            iat
           ] | openid_connect.claims.to_h.keys,
-        }
+        }.compact
       end
 
       def webfinger_response

data/app/controllers/doorkeeper/openid_connect/userinfo_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OpenidConnect
     class UserinfoController < ::Doorkeeper::ApplicationController

data/lib/doorkeeper/oauth/id_token_request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OAuth
     class IdTokenRequest
@@ -10,7 +12,11 @@ module Doorkeeper
 
       def authorize
         @auth = Authorization::Token.new(pre_auth, resource_owner)
-        @auth.issue_token
+        if @auth.respond_to?(:issue_token!)
+          @auth.issue_token!
+        else
+          @auth.issue_token
+        end
         response
       end
 

data/lib/doorkeeper/oauth/id_token_response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OAuth
     class IdTokenResponse < BaseResponse

data/lib/doorkeeper/oauth/id_token_token_request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OAuth
     class IdTokenTokenRequest < IdTokenRequest

data/lib/doorkeeper/oauth/id_token_token_response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OAuth
     class IdTokenTokenResponse < IdTokenResponse

data/lib/doorkeeper/openid_connect.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'doorkeeper'
 require 'active_model'
 require 'json/jwt'
@@ -42,7 +44,7 @@ module Doorkeeper
 
     def self.signing_key
       key =
-        if [:HS256, :HS384, :HS512].include?(signing_algorithm)
+        if %i[HS256 HS384 HS512].include?(signing_algorithm)
           configuration.signing_key
         else
           OpenSSL::PKey.read(configuration.signing_key)

data/lib/doorkeeper/openid_connect/claims/aggregated_claim.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OpenidConnect
     module Claims

data/lib/doorkeeper/openid_connect/claims/claim.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OpenidConnect
     module Claims
@@ -11,10 +13,10 @@ module Doorkeeper
             name family_name given_name middle_name nickname preferred_username
             profile picture website gender birthdate zoneinfo locale updated_at
           ],
-          email: %i[ email email_verified ],
-          address: %i[ address ],
-          phone: %i[ phone_number phone_number_verified ],
-        }
+          email: %i[email email_verified],
+          address: %i[address],
+          phone: %i[phone_number phone_number_verified],
+        }.freeze
 
         def initialize(options = {})
           @name = options[:name].to_sym

data/lib/doorkeeper/openid_connect/claims/distributed_claim.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OpenidConnect
     module Claims

data/lib/doorkeeper/openid_connect/claims/normal_claim.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OpenidConnect
     module Claims

data/lib/doorkeeper/openid_connect/claims_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ostruct'
 
 module Doorkeeper
@@ -31,7 +33,7 @@ module Doorkeeper
             generator: block
           )
       end
-      alias_method :claim, :normal_claim
+      alias claim normal_claim
     end
   end
 end

data/lib/doorkeeper/openid_connect/config.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OpenidConnect
     def self.configure(&block)
       if Doorkeeper.configuration.orm != :active_record
-        fail Errors::InvalidConfiguration, 'Doorkeeper OpenID Connect currently only supports the ActiveRecord ORM adapter'
+        raise Errors::InvalidConfiguration, 'Doorkeeper OpenID Connect currently only supports the ActiveRecord ORM adapter'
       end
 
       @config = Config::Builder.new(&block).build
     end
 
     def self.configuration
-      @config || (fail Errors::MissingConfiguration)
+      @config || (raise Errors::MissingConfiguration)
     end
 
     class Config
@@ -23,12 +25,12 @@ module Doorkeeper
           @config
         end
 
-        def jws_public_key(*args)
-          puts "DEPRECATION WARNING: `jws_public_key` is not needed anymore and will be removed in a future version, please remove it from config/initializers/doorkeeper_openid_connect.rb"
+        def jws_public_key(*_args)
+          puts 'DEPRECATION WARNING: `jws_public_key` is not needed anymore and will be removed in a future version, please remove it from config/initializers/doorkeeper_openid_connect.rb'
         end
 
         def jws_private_key(*args)
-          puts "DEPRECATION WARNING: `jws_private_key` has been replaced by `signing_key` and will be removed in a future version, please remove it from config/initializers/doorkeeper_openid_connect.rb"
+          puts 'DEPRECATION WARNING: `jws_private_key` has been replaced by `signing_key` and will be removed in a future version, please remove it from config/initializers/doorkeeper_openid_connect.rb'
           signing_key(*args)
         end
       end
@@ -71,7 +73,7 @@ module Doorkeeper
               value = if attribute_builder
                         attribute_builder.new(&block).build
                       else
-                        block ? block : args.first
+                        block || args.first
                       end
 
               @config.instance_variable_set(:"@#{attribute}", value)
@@ -102,19 +104,19 @@ module Doorkeeper
       option :subject_types_supported, default: [:public]
 
       option :resource_owner_from_access_token, default: lambda { |*_|
-        fail Errors::InvalidConfiguration, I18n.translate('doorkeeper.openid_connect.errors.messages.resource_owner_from_access_token_not_configured')
+        raise Errors::InvalidConfiguration, I18n.translate('doorkeeper.openid_connect.errors.messages.resource_owner_from_access_token_not_configured')
       }
 
       option :auth_time_from_resource_owner, default: lambda { |*_|
-        fail Errors::InvalidConfiguration, I18n.translate('doorkeeper.openid_connect.errors.messages.auth_time_from_resource_owner_not_configured')
+        raise Errors::InvalidConfiguration, I18n.translate('doorkeeper.openid_connect.errors.messages.auth_time_from_resource_owner_not_configured')
       }
 
       option :reauthenticate_resource_owner, default: lambda { |*_|
-        fail Errors::InvalidConfiguration, I18n.translate('doorkeeper.openid_connect.errors.messages.reauthenticate_resource_owner_not_configured')
+        raise Errors::InvalidConfiguration, I18n.translate('doorkeeper.openid_connect.errors.messages.reauthenticate_resource_owner_not_configured')
       }
 
       option :subject, default: lambda { |*_|
-        fail Errors::InvalidConfiguration, I18n.translate('doorkeeper.openid_connect.errors.messages.subject_not_configured')
+        raise Errors::InvalidConfiguration, I18n.translate('doorkeeper.openid_connect.errors.messages.subject_not_configured')
       }
 
       option :expiration, default: 120
@@ -124,6 +126,10 @@ module Doorkeeper
       option :protocol, default: lambda { |*_|
         ::Rails.env.production? ? :https : :http
       }
+
+      option :end_session_endpoint, default: lambda { |*_|
+        nil
+      }
     end
   end
 end

data/lib/doorkeeper/openid_connect/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OpenidConnect
     class Engine < ::Rails::Engine

data/lib/doorkeeper/openid_connect/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OpenidConnect
     module Errors

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

@@ -1,9 +1,18 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OpenidConnect
     module Helpers
       module Controller
         private
 
+        # FIXME: remove after Doorkeeper will merge it
+        def current_resource_owner
+          return @current_resource_owner if defined?(@current_resource_owner)
+
+          super
+        end
+
         def authenticate_resource_owner!
           super.tap do |owner|
             next unless oidc_authorization_request?
@@ -11,8 +20,8 @@ module Doorkeeper
             handle_oidc_prompt_param!(owner)
             handle_oidc_max_age_param!(owner)
           end
-        rescue Errors::OpenidConnectError => exception
-          handle_oidc_error!(exception)
+        rescue Errors::OpenidConnectError => e
+          handle_oidc_error!(e)
         end
 
         def oidc_authorization_request?
@@ -30,17 +39,17 @@ module Doorkeeper
           @_response_body = nil
 
           error_response = if exception.type == :invalid_request
-            ::Doorkeeper::OAuth::InvalidRequestResponse.new(
-              name: exception.type,
-              state: params[:state],
-              redirect_uri: params[:redirect_uri],
-            )
-          else
-            ::Doorkeeper::OAuth::ErrorResponse.new(
-              name: exception.type,
-              state: params[:state],
-              redirect_uri: params[:redirect_uri],
-            )
+                             ::Doorkeeper::OAuth::InvalidRequestResponse.new(
+                               name: exception.type,
+                               state: params[:state],
+                               redirect_uri: params[:redirect_uri],
+                             )
+                           else
+                             ::Doorkeeper::OAuth::ErrorResponse.new(
+                               name: exception.type,
+                               state: params[:state],
+                               redirect_uri: params[:redirect_uri],
+                             )
           end
 
           response.headers.merge!(error_response.headers)
@@ -58,7 +67,7 @@ module Doorkeeper
           prompt_values.each do |prompt|
             case prompt
             when 'none'
-              raise Errors::InvalidRequest if (prompt_values - [ 'none' ]).any?
+              raise Errors::InvalidRequest if (prompt_values - ['none']).any?
               raise Errors::LoginRequired unless owner
               raise Errors::ConsentRequired if oidc_consent_required?
             when 'login'
@@ -111,5 +120,5 @@ module Doorkeeper
     end
   end
 
-  Helpers::Controller.send :prepend, OpenidConnect::Helpers::Controller
+  Helpers::Controller.prepend OpenidConnect::Helpers::Controller
 end

data/lib/doorkeeper/openid_connect/id_token.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OpenidConnect
     class IdToken
@@ -9,7 +11,7 @@ module Doorkeeper
         @access_token = access_token
         @nonce = nonce
         @resource_owner = Doorkeeper::OpenidConnect.configuration.resource_owner_from_access_token.call(access_token)
-        @issued_at = Time.now
+        @issued_at = Time.zone.now
       end
 
       def claims

data/lib/doorkeeper/openid_connect/id_token_token.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OpenidConnect
     class IdTokenToken < IdToken

data/lib/doorkeeper/openid_connect/oauth/authorization/code.rb

@@ -1,22 +1,39 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OpenidConnect
     module OAuth
       module Authorization
         module Code
-          def issue_token
-            super.tap do |access_grant|
-              if pre_auth.nonce.present?
-                ::Doorkeeper::OpenidConnect::Request.create!(
-                  access_grant: access_grant,
-                  nonce: pre_auth.nonce
-                )
+          if Doorkeeper::OAuth::Authorization::Code.method_defined?(:issue_token!)
+            def issue_token!
+              super.tap do |access_grant|
+                create_openid_request(access_grant) if pre_auth.nonce.present?
+              end
+            end
+
+            alias issue_token issue_token!
+          else
+            # FIXME: drop this after dropping support of Doorkeeper < 5.4
+            def issue_token
+              super.tap do |access_grant|
+                create_openid_request(access_grant) if pre_auth.nonce.present?
               end
             end
           end
+
+          private
+
+          def create_openid_request(access_grant)
+            ::Doorkeeper::OpenidConnect::Request.create!(
+              access_grant: access_grant,
+              nonce: pre_auth.nonce
+            )
+          end
         end
       end
     end
   end
 
-  OAuth::Authorization::Code.send :prepend, OpenidConnect::OAuth::Authorization::Code
+  OAuth::Authorization::Code.prepend OpenidConnect::OAuth::Authorization::Code
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OpenidConnect
     module OAuth
@@ -8,7 +10,7 @@ module Doorkeeper
           super
 
           nonce =
-            if openid_request = grant.openid_request
+            if (openid_request = grant.openid_request)
               openid_request.destroy!
               openid_request.nonce
             end
@@ -20,5 +22,5 @@ module Doorkeeper
     end
   end
 
-  OAuth::AuthorizationCodeRequest.send :prepend, OpenidConnect::OAuth::AuthorizationCodeRequest
+  OAuth::AuthorizationCodeRequest.prepend OpenidConnect::OAuth::AuthorizationCodeRequest
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OpenidConnect
     module OAuth
@@ -20,5 +22,5 @@ module Doorkeeper
     end
   end
 
-  OAuth::PasswordAccessTokenRequest.send :prepend, OpenidConnect::OAuth::PasswordAccessTokenRequest
+  OAuth::PasswordAccessTokenRequest.prepend OpenidConnect::OAuth::PasswordAccessTokenRequest
 end

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

@@ -1,11 +1,18 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OpenidConnect
     module OAuth
       module PreAuthorization
         attr_reader :nonce
 
-        def initialize(server, attrs = {})
-          super
+        def initialize(server, attrs = {}, resource_owner = nil)
+          if (Doorkeeper::VERSION::MAJOR >= 5 && Doorkeeper::VERSION::MINOR >= 4) ||
+             Doorkeeper::VERSION::MAJOR >= 6
+            super
+          else
+            super(server, attrs)
+          end
           @nonce = attrs[:nonce]
         end
 
@@ -22,11 +29,11 @@ module Doorkeeper
         private
 
         def response_on_fragment?
-          response_type == "token" || response_type == "id_token" || response_type == "id_token token"
+          response_type == 'token' || response_type == 'id_token' || response_type == 'id_token token'
         end
       end
     end
   end
 
-  OAuth::PreAuthorization.send :prepend, OpenidConnect::OAuth::PreAuthorization
+  OAuth::PreAuthorization.prepend OpenidConnect::OAuth::PreAuthorization
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OpenidConnect
     module OAuth
@@ -19,5 +21,5 @@ module Doorkeeper
     end
   end
 
-  OAuth::TokenResponse.send :prepend, OpenidConnect::OAuth::TokenResponse
+  OAuth::TokenResponse.prepend OpenidConnect::OAuth::TokenResponse
 end

data/lib/doorkeeper/openid_connect/orm/active_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/lazy_load_hooks'
 
 module Doorkeeper

data/lib/doorkeeper/openid_connect/orm/active_record/access_grant.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OpenidConnect
     module AccessGrant
@@ -12,5 +14,5 @@ module Doorkeeper
     end
   end
 
-  AccessGrant.send :prepend, OpenidConnect::AccessGrant
+  AccessGrant.prepend OpenidConnect::AccessGrant
 end

data/lib/doorkeeper/openid_connect/orm/active_record/request.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OpenidConnect
-    class Request < ActiveRecord::Base
+    class Request < ApplicationRecord
       self.table_name = "#{table_name_prefix}oauth_openid_requests#{table_name_suffix}".to_sym
 
       validates :access_grant_id, :nonce, presence: true
       belongs_to :access_grant,
-        class_name: 'Doorkeeper::AccessGrant',
-        inverse_of: :openid_request
+                 class_name: 'Doorkeeper::AccessGrant',
+                 inverse_of: :openid_request
     end
   end
 end

data/lib/doorkeeper/openid_connect/rails/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'doorkeeper/openid_connect/rails/routes/mapping'
 require 'doorkeeper/openid_connect/rails/routes/mapper'
 
@@ -12,7 +14,7 @@ module Doorkeeper
         end
 
         def self.install!
-          ActionDispatch::Routing::Mapper.send :include, Doorkeeper::OpenidConnect::Rails::Routes::Helper
+          ActionDispatch::Routing::Mapper.include Doorkeeper::OpenidConnect::Rails::Routes::Helper
         end
 
         attr_accessor :routes

data/lib/doorkeeper/openid_connect/rails/routes/mapper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OpenidConnect
     module Rails

data/lib/doorkeeper/openid_connect/rails/routes/mapping.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OpenidConnect
     module Rails

data/lib/doorkeeper/openid_connect/response_types_config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OpenidConnect
     module ResponseTypeConfig
@@ -13,5 +15,5 @@ module Doorkeeper
     end
   end
 
-  Config.send :prepend, OpenidConnect::ResponseTypeConfig
+  Config.prepend OpenidConnect::ResponseTypeConfig
 end

data/lib/doorkeeper/openid_connect/user_info.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OpenidConnect
     class UserInfo

data/lib/doorkeeper/openid_connect/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OpenidConnect
-    VERSION = '1.7.1'.freeze
+    VERSION = '1.7.2'
   end
 end

data/lib/doorkeeper/request/id_token.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'doorkeeper/request/strategy'
 
 module Doorkeeper

data/lib/doorkeeper/request/id_token_token.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'doorkeeper/request/strategy'
 
 module Doorkeeper

data/lib/generators/doorkeeper/openid_connect/install_generator.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 module Doorkeeper
   module OpenidConnect
     class InstallGenerator < ::Rails::Generators::Base
       include ::Rails::Generators::Migration
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path('templates', __dir__)
       desc 'Installs Doorkeeper OpenID Connect.'
 
       def install
         template 'initializer.rb', 'config/initializers/doorkeeper_openid_connect.rb'
-        copy_file File.expand_path('../../../../../config/locales/en.yml', __FILE__), 'config/locales/doorkeeper_openid_connect.en.yml'
+        copy_file File.expand_path('../../../../config/locales/en.yml', __dir__), 'config/locales/doorkeeper_openid_connect.en.yml'
         route 'use_doorkeeper_openid_connect'
       end
     end

data/lib/generators/doorkeeper/openid_connect/migration_generator.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'rails/generators/active_record'
 
 module Doorkeeper
   module OpenidConnect
     class MigrationGenerator < ::Rails::Generators::Base
       include ::Rails::Generators::Migration
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path('templates', __dir__)
       desc 'Installs Doorkeeper OpenID Connect migration file.'
 
       def install

data/lib/generators/doorkeeper/openid_connect/templates/initializer.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 Doorkeeper::OpenidConnect.configure do
   issuer 'issuer string'
 
-  signing_key <<-EOL
------BEGIN RSA PRIVATE KEY-----
-....
------END RSA PRIVATE KEY-----
-EOL
+  signing_key <<~KEY
+    -----BEGIN RSA PRIVATE KEY-----
+    ....
+    -----END RSA PRIVATE KEY-----
+  KEY
 
   subject_types_supported [:public]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper-openid_connect
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Sam Dengler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-07 00:00:00.000000000 Z
+date: 2020-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: doorkeeper
@@ -20,7 +20,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '5.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '5.5'
 - !ruby/object:Gem::Dependency
   name: json-jwt
   requirement: !ruby/object:Gem::Requirement
@@ -46,19 +46,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.11.0
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: conventional-changelog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
@@ -74,21 +74,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -102,19 +102,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: conventional-changelog
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.6
 description: OpenID Connect extension for Doorkeeper.
 email:
 - sam.dengler@playonsports.com
@@ -123,22 +123,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
-- CONTRIBUTING.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
 - app/controllers/doorkeeper/authorizations_controller.rb
 - app/controllers/doorkeeper/openid_connect/discovery_controller.rb
 - app/controllers/doorkeeper/openid_connect/userinfo_controller.rb
-- bin/console
-- bin/setup
 - config/locales/en.yml
-- doorkeeper-openid_connect.gemspec
 - lib/doorkeeper/oauth/id_token_request.rb
 - lib/doorkeeper/oauth/id_token_response.rb
 - lib/doorkeeper/oauth/id_token_token_request.rb
@@ -194,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: OpenID Connect extension for Doorkeeper.

data/.gitignore

@@ -1,8 +0,0 @@
-/.bundle
-/Gemfile.lock
-/spec/dummy/db/*.sqlite3*
-/spec/dummy/db/migrate/*doorkeeper_openid_connect*
-/spec/dummy/log/*.log
-/spec/dummy/tmp/
-/spec/examples.txt
-/pkg

data/.ruby-version

@@ -1 +0,0 @@
-2.6.5

data/.travis.yml

@@ -1,27 +0,0 @@
-language: ruby
-cache: bundler
-sudo: false
-
-before_install:
-  - gem update --system
-  # Bundler 2.0 is not compatible with Rails 4.2
-  # https://docs.travis-ci.com/user/languages/ruby/#bundler-20
-  - "find /home/travis/.rvm/rubies -wholename '*default/bundler-*.gemspec' -delete"
-  - rvm @global do gem uninstall bundler -a -x -I || true
-  - gem install bundler -v '< 2'
-
-before_script:
-  - bundle update
-  - bundle exec rake migrate
-
-script:
-  - bundle exec rake spec
-
-env:
-  - rails=5.0.0
-  - rails=5.2.0
-
-rvm:
-  - 2.4
-  - 2.5
-  - 2.6

data/CONTRIBUTING.md

@@ -1,45 +0,0 @@
-# Contributing
-
-## Workflow
-
-We are using the [Feature Branch Workflow (also known as GitHub Flow)](https://guides.github.com/introduction/flow/), and prefer delivery as pull requests.
-
-Our first line of defense is the [Travis CI](https://travis-ci.org/doorkeeper-gem/doorkeeper-openid_connect) build defined within [.travis.yml](.travis.yml) and triggered for every pull request.
-
-Create a feature branch:
-
-```sh
-git checkout -B feature/contributing
-```
-
-## Creating Good Commits
-
-The cardinal rule for creating good commits is to ensure there is only one
-"logical change" per commit. Why is this an important rule?
-
-* The smaller the amount of code being changed, the quicker & easier it is to
-  review & identify potential flaws.
-
-* If a change is found to be flawed later, it may be necessary to revert the
-  broken commit. This is much easier to do if there are not other unrelated
-  code changes entangled with the original commit.
-
-* When troubleshooting problems using Git's bisect capability, small well
-  defined changes will aid in isolating exactly where the code problem was
-  introduced.
-
-* When browsing history using Git annotate/blame, small well defined changes
-  also aid in isolating exactly where & why a piece of code came from.
-
-Things to avoid when creating commits:
-
-* Mixing whitespace changes with functional code changes.
-* Mixing two unrelated functional changes.
-* Sending large new features in a single giant commit.
-
-## Release process
-
-- Bump version in `lib/doorkeeper/openid_connect/version.rb`
-- Update `CHANGELOG.md`
-- Commit all changes
-- Tag release and publish gem with `rake release`

data/Gemfile

@@ -1,8 +0,0 @@
-source 'https://rubygems.org'
-
-# use Rails version specified by environment
-ENV['rails'] ||= '5.2.0'
-gem 'rails', "~> #{ENV['rails']}"
-gem 'rails-controller-testing'
-
-gemspec

data/Rakefile

@@ -1,24 +0,0 @@
-ENV['RAILS_ENV'] ||= 'test'
-
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new
-
-task default: :spec
-task test: :spec
-
-desc 'Generate and run migrations in the test application'
-task :migrate do
-  Dir.chdir('spec/dummy') do
-    system('bin/rails generate doorkeeper:openid_connect:migration')
-    system('bin/rake db:migrate')
-  end
-end
-
-desc 'Run server in the test application'
-task :server do
-  Dir.chdir('spec/dummy') do
-    system('bin/rails server')
-  end
-end

data/bin/console

@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bundler/setup'
-Bundler.require :default
-
-require 'doorkeeper/openid_connect'
-
-require 'pry'
-Pry.start

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/doorkeeper-openid_connect.gemspec

@@ -1,32 +0,0 @@
-$:.push File.expand_path('../lib', __FILE__)
-require 'doorkeeper/openid_connect/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'doorkeeper-openid_connect'
-  spec.version       = Doorkeeper::OpenidConnect::VERSION
-  spec.authors       = ['Sam Dengler', 'Markus Koller']
-  spec.email         = ['sam.dengler@playonsports.com', 'markus-koller@gmx.ch']
-  spec.homepage      = 'https://github.com/doorkeeper-gem/doorkeeper-openid_connect'
-  spec.summary       = %q{OpenID Connect extension for Doorkeeper.}
-  spec.description   = %q{OpenID Connect extension for Doorkeeper.}
-  spec.license       = %q{MIT}
-
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
-
-  spec.required_ruby_version = ">= 2.4"
-
-  spec.add_runtime_dependency 'doorkeeper', '>= 5.2', '< 5.4'
-  spec.add_runtime_dependency 'json-jwt', '>= 1.11.0'
-
-  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'
-end