devise-doorkeeper 1.1.2.ci.45.1 → 1.1.2.ci.103.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae9fb3fb4f5678c2985f9dbd51d3b2ac0fa0285ee33ca77e1dbd2e451bc35b46
-  data.tar.gz: 5151e1c305427f6d8d71a225ee97e8c6abd191ac788ad4f3033e2ddd0a7e94a6
+  metadata.gz: 8ff454b6926e2e285ba8e7ba835b1c3f20a37a44d84f84e1041b7424128a65b1
+  data.tar.gz: 661d5342a5ba37b9f895bca4564dbfe0f3afcca501d1bea5df0646a4f3eca759
 SHA512:
-  metadata.gz: 9ee81784339ff60f99c51ffb208a908cd82898229770bf952e319b47166539fd8eb1371cd0ee220cc39074c0fe49fdc993869ec7d00ca7f644b99995ee793e31
-  data.tar.gz: a329c1864a964721e4898059e935f0ec03e79c238358b2efb5b41b29feca5916302a933a7b7b391245bdc1e98e6b106c5659d2676fe1c75b9187f21a6abbad1f
+  metadata.gz: 92a905f0ace3ab2dab0a265cbbe9ade46b66a0d4b2d8d2b6a2f23c770c1d53d4ae1e439804afbb7e0a225c39382cfbe45f6f25eff3e14d59666646d468b0af49
+  data.tar.gz: dbc634ecf30b54e7118e0e8678c733134dd9ee9222b9ce2b0121c03477025ba9ecf72488a4b77d3c303c09c2aec7e7d159607a3e8a03ec46d04e47f693fd6131

data/devise-doorkeeper.gemspec

@@ -19,20 +19,20 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'rails', '~> 5.0.0'
-  spec.add_dependency 'devise', '~> 4.2.0'
-  spec.add_dependency 'doorkeeper', '~> 4.1.0'
+  spec.add_dependency 'devise', '~> 4.7.3'
+  spec.add_dependency 'doorkeeper', '~> 5.5'
 
   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 'rspec-rails', '~> 4.0.2'
+  spec.add_development_dependency 'factory_bot_rails', '~> 4.9'
+  spec.add_development_dependency 'factory_girl_rspec', '~> 3.0.0'
+  spec.add_development_dependency 'faker', '~> 2.16.0'
   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', '~> 11.2.2'
-  spec.add_development_dependency 'travis', '~> 1.8.2'
+  spec.add_development_dependency 'pry', '~> 0.14.0'
+  spec.add_development_dependency 'rake', '~> 13.0.3'
+  spec.add_development_dependency 'travis', '~> 1.10.0'
 
   # configure gem version for continuous integration builds
   if ENV['TRAVIS_JOB_NUMBER']

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/factories/access_tokens.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :access_token, class: Doorkeeper::AccessToken do
     resource_owner_id { association(:user).id }
     application_id { association(:application).id }

data/spec/factories/applications.rb

@@ -1,8 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :application, class: Doorkeeper::Application do
-    name 'sample app'
-    # uid { SecureRandom.hex(20) }
-    # secret { SecureRandom.hex(20) }
-    redirect_uri 'urn:ietf:wg:oauth:2.0:oob'
+    name { 'sample app' }
+    redirect_uri { 'urn:ietf:wg:oauth:2.0:oob' }
   end
 end

data/spec/factories/users.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   sequence(:email) { "jon.doe+#{SecureRandom.hex(10)}@acme.com" }
 
   factory :user do

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

data/spec/support/{factory_girl.rb → factory_bot.rb}

@@ -1,6 +1,6 @@
 require 'faker'
 require 'factory_girl_rspec'
-require 'factory_girl_rails'
-FactoryGirl.definition_file_paths = [
+require 'factory_bot_rails'
+FactoryBot.definition_file_paths = [
   File.join(__dir__, '../factories')
 ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise-doorkeeper
 version: !ruby/object:Gem::Version
-  version: 1.1.2.ci.45.1
+  version: 1.1.2.ci.103.1
 platform: ruby
 authors:
 - BetterUp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-27 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.7.3
 - !ruby/object:Gem::Dependency
   name: doorkeeper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '5.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '5.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,56 +72,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 4.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 4.0.2
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: '4.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: '4.9'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.6
+        version: 2.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.6
+        version: 2.16.0
 - !ruby/object:Gem::Dependency
   name: json_spec
   requirement: !ruby/object:Gem::Requirement
@@ -170,42 +170,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.2.2
+        version: 13.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.2.2
+        version: 13.0.3
 - !ruby/object:Gem::Dependency
   name: travis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 1.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 1.10.0
 description: " Support authentication via OAuth2 tokens dispensed from the Doorkeeper
   authorization flow "
 email:
@@ -274,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
@@ -289,7 +290,7 @@ files:
 - spec/requests/oauth/bearer_tokens_spec.rb
 - spec/requests/oauth/password_grant_spec.rb
 - spec/spec_helper.rb
-- spec/support/factory_girl.rb
+- spec/support/factory_bot.rb
 - spec/support/json_spec.rb
 - spec/support/pry.rb
 homepage: ''
@@ -364,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
@@ -379,6 +381,6 @@ test_files:
 - spec/requests/oauth/bearer_tokens_spec.rb
 - spec/requests/oauth/password_grant_spec.rb
 - spec/spec_helper.rb
-- spec/support/factory_girl.rb
+- spec/support/factory_bot.rb
 - spec/support/json_spec.rb
 - spec/support/pry.rb