devise-doorkeeper 1.1.1 → 1.1.2.ci.62.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c716f6fe07604df7601700f23e7234552432ef9b
-  data.tar.gz: 1e811c9bb792a950a5d628652ba74359ab738100
+SHA256:
+  metadata.gz: 7cd36c2428014551a73ef3bed5df5120b3fb7e0f179af968de2a21c00fe10327
+  data.tar.gz: 40cd0ee1bda8d1ce10279efd6a4507fe4c35a96995ab7e882d183a6aa59c4a3a
 SHA512:
-  metadata.gz: 89b26391b24a799866b93f0a034d97440ff8cf8c8a822654b85db026c36d50eda33a96938e9dbfc561b6af4e3f8c2c7d4bdeb9e1e0f752b59d06bafba1105630
-  data.tar.gz: 0c636b1c194f77fb0f5c32d0607a0849fb41901b7c3a03e82b9f1e39c150a40dc6b35c7312d8c220e8304efda3b16e3db176ec4c5681663de13754c5c590da07
+  metadata.gz: d62e5bdbc8bcff5a68f49868c65a947ddcfba3b7ee158b1aa1402c08b14e2531cc1a1a8b3290edc8d695905d633037a797bcbf555d18c0e1a5928d3a78a85982
+  data.tar.gz: 205caf0da10740a538e598dd62b4d18b7bfcccd4ce9d2c876660384654dfa09e2e50f7848f47f05175c38ed18dafecfd183c5e9952fb286ef0c17077d3235572

data/.ruby-version

@@ -1 +1 @@
-2.2.2
+2.5.8

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2015 BetterUP, Inc.
+Copyright (c) 2015 BetterUp, Inc.
 
 MIT License
 

data/devise-doorkeeper.gemspec

@@ -6,8 +6,8 @@ require 'devise/doorkeeper/version'
 Gem::Specification.new do |spec|
   spec.name          = 'devise-doorkeeper'
   spec.version       = Devise::Doorkeeper::VERSION
-  spec.authors       = ['Ryan Sonnek']
-  spec.email         = ['ryan@codecrate.com']
+  spec.authors       = ['BetterUp']
+  spec.email         = ['developers@betterup.co']
   spec.summary       = %q{ Integrate Doorkeeper OAuth2 tokens into Devise applications }
   spec.description   = %q{ Support authentication via OAuth2 tokens dispensed from the Doorkeeper authorization flow }
   spec.homepage      = ''
@@ -18,21 +18,21 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rails'
-  spec.add_dependency 'devise'
-  spec.add_dependency 'doorkeeper'
+  spec.add_dependency 'rails', '~> 5.0.0'
+  spec.add_dependency 'devise', '~> 4.7.3'
+  spec.add_dependency 'doorkeeper', '~> 5.5'
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
-  spec.add_development_dependency 'rspec-rails'
-  spec.add_development_dependency 'factory_girl_rails'
-  spec.add_development_dependency 'factory_girl_rspec'
-  spec.add_development_dependency 'faker'
-  spec.add_development_dependency 'json_spec'
-  spec.add_development_dependency 'sqlite3'
-  spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'travis'
+  spec.add_development_dependency 'bundler', '~> 1.17.3'
+  spec.add_development_dependency 'rspec-rails', '~> 3.5.1'
+  spec.add_development_dependency 'factory_girl_rails', '~> 4.7.0'
+  spec.add_development_dependency 'factory_girl_rspec', '~> 2.1.0'
+  spec.add_development_dependency 'faker', '~> 1.6.6'
+  spec.add_development_dependency 'json_spec', '~> 1.1.4'
+  spec.add_development_dependency 'sqlite3', '~> 1.3.11'
+  spec.add_development_dependency 'coveralls', '~> 0.8.15'
+  spec.add_development_dependency 'pry', '~> 0.10.4'
+  spec.add_development_dependency 'rake', '~> 13.0.3'
+  spec.add_development_dependency 'travis', '~> 1.8.2'
 
   # configure gem version for continuous integration builds
   if ENV['TRAVIS_JOB_NUMBER']

data/lib/devise/doorkeeper.rb

@@ -1,15 +1,15 @@
 require 'devise/doorkeeper/version'
 require 'devise/strategies/doorkeeper'
+require 'devise/doorkeeper/doorkeeper_failure_app'
 
 module Devise
   module Doorkeeper
+    # configure devise to support doorkeeper error responses
     def self.configure_devise(config)
-      config.warden do |manager|
-        require 'devise/doorkeeper/doorkeeper_failure_app'
-        manager.failure_app = Devise::Doorkeeper::DoorkeeperFailureApp
-      end
+      Devise::FailureApp.prepend(Devise::Doorkeeper::DoorkeeperFailureApp)
     end
 
+    # configure doorkeeper to use devise authentication
     def self.configure_doorkeeper(base)
       base.instance_eval do
         resource_owner_authenticator do

data/lib/devise/doorkeeper/doorkeeper_failure_app.rb

@@ -1,11 +1,10 @@
-require 'devise/failure_app'
 require 'devise/strategies/doorkeeper'
 
 module Devise
   module Doorkeeper
-    class DoorkeeperFailureApp < ::Devise::FailureApp
+    module DoorkeeperFailureApp
       def respond
-        if warden_message == Devise::Strategies::Doorkeeper::WARDEN_INVALID_TOKEN_MESSAGE
+        if oauth_error?
           invalid_oauth_token
         else
           super
@@ -14,11 +13,15 @@ module Devise
 
       private
 
+      def oauth_error?
+        warden_message == Devise::Strategies::Doorkeeper::WARDEN_INVALID_TOKEN_MESSAGE
+      end
+
       def invalid_oauth_token
         error = ::Doorkeeper::OAuth::InvalidTokenResponse.new
         headers.merge! error.headers
         self.response_body = error.body.to_json
-        self.status        = error.status
+        self.status = error.status
       end
     end
   end

data/lib/devise/doorkeeper/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module Doorkeeper
-    VERSION = '1.1.1'
+    VERSION = '1.1.2'
   end
 end

data/spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/spec/dummy/app/services/custom_failure_app.rb

@@ -0,0 +1,7 @@
+class CustomFailureApp < Devise::FailureApp
+  # test that sublclassing FailureApp works properly
+  def respond
+    super
+    Rails.logger.info('Testing error flow')
+  end
+end

data/spec/dummy/config/initializers/devise.rb

@@ -244,6 +244,9 @@ Devise.setup do |config|
   #   manager.intercept_401 = false
   #   manager.default_strategies(scope: :user).unshift :some_external_strategy
   # end
+  config.warden do |manager|
+    manager.failure_app = CustomFailureApp
+  end
 
   # ==> Mountable engine configurations
   # When using Devise inside an engine, let's call it `MyEngine`, and this engine

data/spec/dummy/db/migrate/20150120154622_create_users.rb

@@ -1,4 +1,4 @@
-class CreateUsers < ActiveRecord::Migration
+class CreateUsers < ActiveRecord::Migration[4.2]
   def change
     create_table :users do |t|
 

data/spec/dummy/db/migrate/20150120154657_create_doorkeeper_tables.rb

@@ -1,4 +1,4 @@
-class CreateDoorkeeperTables < ActiveRecord::Migration
+class CreateDoorkeeperTables < ActiveRecord::Migration[4.2]
   def change
     create_table :oauth_applications do |t|
       t.string  :name,         null: false

data/spec/dummy/db/migrate/20150120162830_add_devise_to_users.rb

@@ -1,4 +1,4 @@
-class AddDeviseToUsers < ActiveRecord::Migration
+class AddDeviseToUsers < ActiveRecord::Migration[4.2]
   def self.up
     change_table(:users) do |t|
       ## Database authenticatable

data/spec/dummy/db/migrate/20210301163315_add_confidential_to_doorkeeper_application.rb

@@ -0,0 +1,11 @@
+class AddConfidentialToDoorkeeperApplication < ActiveRecord::Migration[5.2]
+  def change
+    add_column(
+      :oauth_applications,
+      :confidential,
+      :boolean,
+      null: false,
+      default: true # maintaining backwards compatibility: require secrets
+    )
+  end
+end

data/spec/dummy/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -11,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150120162830) do
+ActiveRecord::Schema.define(version: 20210301163315) do
 
   create_table "oauth_access_grants", force: :cascade do |t|
     t.integer  "resource_owner_id", null: false
@@ -22,10 +21,9 @@ ActiveRecord::Schema.define(version: 20150120162830) do
     t.datetime "created_at",        null: false
     t.datetime "revoked_at"
     t.string   "scopes"
+    t.index ["token"], name: "index_oauth_access_grants_on_token", unique: true
   end
 
-  add_index "oauth_access_grants", ["token"], name: "index_oauth_access_grants_on_token", unique: true
-
   create_table "oauth_access_tokens", force: :cascade do |t|
     t.integer  "resource_owner_id"
     t.integer  "application_id"
@@ -35,24 +33,23 @@ ActiveRecord::Schema.define(version: 20150120162830) do
     t.datetime "revoked_at"
     t.datetime "created_at",        null: false
     t.string   "scopes"
+    t.index ["refresh_token"], name: "index_oauth_access_tokens_on_refresh_token", unique: true
+    t.index ["resource_owner_id"], name: "index_oauth_access_tokens_on_resource_owner_id"
+    t.index ["token"], name: "index_oauth_access_tokens_on_token", unique: true
   end
 
-  add_index "oauth_access_tokens", ["refresh_token"], name: "index_oauth_access_tokens_on_refresh_token", unique: true
-  add_index "oauth_access_tokens", ["resource_owner_id"], name: "index_oauth_access_tokens_on_resource_owner_id"
-  add_index "oauth_access_tokens", ["token"], name: "index_oauth_access_tokens_on_token", unique: true
-
   create_table "oauth_applications", force: :cascade do |t|
-    t.string   "name",                      null: false
-    t.string   "uid",                       null: false
-    t.string   "secret",                    null: false
-    t.text     "redirect_uri",              null: false
-    t.string   "scopes",       default: "", null: false
+    t.string   "name",                        null: false
+    t.string   "uid",                         null: false
+    t.string   "secret",                      null: false
+    t.text     "redirect_uri",                null: false
+    t.string   "scopes",       default: "",   null: false
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "confidential", default: true, null: false
+    t.index ["uid"], name: "index_oauth_applications_on_uid", unique: true
   end
 
-  add_index "oauth_applications", ["uid"], name: "index_oauth_applications_on_uid", unique: true
-
   create_table "users", force: :cascade do |t|
     t.datetime "created_at",                          null: false
     t.datetime "updated_at",                          null: false
@@ -66,15 +63,8 @@ ActiveRecord::Schema.define(version: 20150120162830) do
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
     t.string   "last_sign_in_ip"
-  end
-
-  add_index "users", ["email"], name: "index_users_on_email", unique: true
-  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
-
-  create_table "waitlist_subscribers", force: :cascade do |t|
-    t.string   "email"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.index ["email"], name: "index_users_on_email", unique: true
+    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end
 
 end

data/spec/requests/oauth/bearer_tokens_spec.rb

@@ -35,7 +35,8 @@ RSpec.describe 'OAuth bearer token requests', type: :request do
       get request_path, params, headers
     end
     it { expect(response.status).to eq 401 }
-    it { expect(response.headers).to include('WWW-Authenticate' => 'Bearer realm="DeviseDoorkeeperApp", error="invalid_token", error_description="The access token is invalid"') }
+    it { expect(response.headers['WWW-Authenticate']).to eq 'Bearer realm="DeviseDoorkeeperApp", error="invalid_token", error_description="The access token is invalid"' }
+    it { expect(response.body).to eq '{"error":"invalid_token","error_description":"The access token is invalid","state":"unauthorized"}' }
   end
   context 'with revoked access token' do
     with :access_token, revoked_at: 1.year.ago

data/spec/requests/oauth/password_grant_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe 'oauth/tokens password grant flow', type: :request do
     let(:expected_response) do
       {
         access_token: @new_token.token,
-        token_type: 'bearer',
+        token_type: 'Bearer',
         expires_in: 'ignored',
         created_at: 'ignored'
       }.to_json
@@ -45,7 +45,7 @@ RSpec.describe 'oauth/tokens password grant flow', type: :request do
     before do
       post '/oauth/token', params, headers
     end
-    it { expect(response.status).to eq 401 }
+    it { expect(response.status).to eq 400 }
   end
   context 'with invalid username' do
     with :user
@@ -63,6 +63,6 @@ RSpec.describe 'oauth/tokens password grant flow', type: :request do
     before do
       post '/oauth/token', params, headers
     end
-    it { expect(response.status).to eq 401 }
+    it { expect(response.status).to eq 400 }
   end
 end

metadata

@@ -1,215 +1,215 @@
 --- !ruby/object:Gem::Specification
 name: devise-doorkeeper
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2.ci.62.1
 platform: ruby
 authors:
-- Ryan Sonnek
+- BetterUp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.7.3
 - !ruby/object:Gem::Dependency
   name: doorkeeper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.17.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.17.3
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.7.0
 - !ruby/object:Gem::Dependency
   name: factory_girl_rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.6
 - !ruby/object:Gem::Dependency
   name: json_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.11
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.15
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.3
 - !ruby/object:Gem::Dependency
   name: travis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.2
 description: " Support authentication via OAuth2 tokens dispensed from the Doorkeeper
   authorization flow "
 email:
-- ryan@codecrate.com
+- developers@betterup.co
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -229,6 +229,7 @@ files:
 - spec/dummy/.rspec
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/images/.keep
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
@@ -241,6 +242,7 @@ files:
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/concerns/.keep
 - spec/dummy/app/models/user.rb
+- spec/dummy/app/services/custom_failure_app.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/welcome/index.html.erb
 - spec/dummy/bin/bundle
@@ -272,6 +274,7 @@ files:
 - spec/dummy/db/migrate/20150120154622_create_users.rb
 - spec/dummy/db/migrate/20150120154657_create_doorkeeper_tables.rb
 - spec/dummy/db/migrate/20150120162830_add_devise_to_users.rb
+- spec/dummy/db/migrate/20210301163315_add_confidential_to_doorkeeper_application.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.keep
 - spec/dummy/log/.keep
@@ -305,12 +308,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Integrate Doorkeeper OAuth2 tokens into Devise applications
@@ -318,6 +320,7 @@ test_files:
 - spec/dummy/.rspec
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/images/.keep
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
@@ -330,6 +333,7 @@ test_files:
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/concerns/.keep
 - spec/dummy/app/models/user.rb
+- spec/dummy/app/services/custom_failure_app.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/welcome/index.html.erb
 - spec/dummy/bin/bundle
@@ -361,6 +365,7 @@ test_files:
 - spec/dummy/db/migrate/20150120154622_create_users.rb
 - spec/dummy/db/migrate/20150120154657_create_doorkeeper_tables.rb
 - spec/dummy/db/migrate/20150120162830_add_devise_to_users.rb
+- spec/dummy/db/migrate/20210301163315_add_confidential_to_doorkeeper_application.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.keep
 - spec/dummy/log/.keep