doorkeeper-openid_connect 1.7.1 → 1.8.0.pre.rc1

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 < ::ActiveRecord::Base
       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/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.8.0-rc1'
   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,15 @@
+# frozen_string_literal: true
+
 Doorkeeper::OpenidConnect.configure do
-  issuer 'issuer string'
+  issuer do |resource_owner, application|
+    'issuer string'
+  end
 
-  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]
 
@@ -26,6 +30,18 @@ EOL
     # redirect_to new_user_session_url
   end
 
+  # Depending on your configuration, a DoubleRenderError could be raised
+  # if render/redirect_to is called at some point before this callback is executed.
+  # To avoid the DoubleRenderError, you could add these two lines at the beginning
+  #  of this callback: (Reference: https://github.com/rails/rails/issues/25106)
+  #   self.response_body = nil
+  #   @_response_body = nil
+  select_account_for_resource_owner do |resource_owner, return_to|
+    # Example implementation:
+    # store_location_for resource_owner, return_to
+    # redirect_to account_select_url
+  end
+
   subject do |resource_owner, application|
     # Example implementation:
     # resource_owner.id

data/lib/generators/doorkeeper/openid_connect/templates/migration.rb.erb

@@ -1,7 +1,7 @@
 class CreateDoorkeeperOpenidConnectTables < ActiveRecord::Migration<%= migration_version %>
   def change
     create_table :oauth_openid_requests do |t|
-      t.integer :access_grant_id, null: false
+      t.references :access_grant, null: false, index: true
       t.string :nonce, null: false
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper-openid_connect
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0.pre.rc1
 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: 2021-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: doorkeeper
@@ -17,20 +17,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '5.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '5.6'
 - !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
@@ -166,7 +157,6 @@ files:
 - lib/doorkeeper/openid_connect/rails/routes.rb
 - lib/doorkeeper/openid_connect/rails/routes/mapper.rb
 - lib/doorkeeper/openid_connect/rails/routes/mapping.rb
-- lib/doorkeeper/openid_connect/response_types_config.rb
 - lib/doorkeeper/openid_connect/user_info.rb
 - lib/doorkeeper/openid_connect/version.rb
 - lib/doorkeeper/request/id_token.rb
@@ -187,14 +177,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 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