devise-security 0.14.1 → 0.18.0

data/test/dummy/config/application.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-require File.expand_path('../boot', __FILE__)
+require File.expand_path('boot', __dir__)
 
 require 'action_mailer/railtie'
-require "action_mailer/railtie"
-require "rails/test_unit/railtie"
+require 'rails/test_unit/railtie'
 DEVISE_ORM = ENV.fetch('DEVISE_ORM', 'active_record').to_sym
 
 Bundler.require :default, DEVISE_ORM
@@ -22,9 +21,6 @@ module RailsApp
     config.autoload_paths += ["#{config.root}/app/#{DEVISE_ORM}"]
     config.autoload_paths += ["#{config.root}/lib"]
 
-    config.assets.enabled = true
-
-    config.assets.version = '1.0'
-    config.secret_key_base = 'fuuuuuuuuuuu'
+    config.secret_key_base = 'foobar'
   end
 end

data/test/dummy/config/boot.rb

@@ -3,6 +3,6 @@
 require 'rubygems'
 
 # Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
 require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])

data/test/dummy/config/environment.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Load the rails application
-require File.expand_path('../application', __FILE__)
+require File.expand_path('application', __dir__)
 
 # Initialize the rails application
 RailsApp::Application.initialize!

data/test/dummy/config/environments/test.rb

@@ -4,13 +4,8 @@ RailsApp::Application.configure do
   config.cache_classes = true
   config.eager_load = false
 
-  if Rails.version > '5'
-    config.public_file_server.enabled = true
-    config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
-  else
-    config.serve_static_files = true
-    config.static_cache_control = 'public, max-age=3600'
-  end
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
@@ -27,11 +22,7 @@ RailsApp::Application.configure do
 
   config.active_support.test_order = :sorted
   config.log_level = :debug
-  if Rails.gem_version >= Gem::Version.new('4.2') && Rails.gem_version.release < Gem::Version.new('5.0')
-    config.active_record.raise_in_transactional_callbacks = true
-  end
-  if Rails.gem_version.release >= Gem::Version.new('5.2') && Rails.gem_version.release < Gem::Version.new('6.0')
-    config.active_record.sqlite3.represent_boolean_as_integer = true
-  end
+  config.active_record.sqlite3.represent_boolean_as_integer = true if Rails.gem_version.release >= Gem::Version.new('5.2') && Rails.gem_version.release < Gem::Version.new('6.0')
+  config.active_record.legacy_connection_handling = false if Rails.gem_version.release >= Gem::Version.new('6.1')
 end
 ActiveSupport::Deprecation.debug = true

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

@@ -8,10 +8,6 @@ Devise.setup do |config|
   config.secret_key = 'f08cf11a38906f531d2dfc9a2c2d671aa0021be806c21255d4'
   config.case_insensitive_keys = [:email]
   config.strip_whitespace_keys = [:email]
-  config.password_complexity = {
-    digit: 1,
-    lower: 1,
-    upper: 1,
-  }
+  config.password_complexity = { digit: 1, lower: 1, upper: 1 }
   config.password_length = 7..128
 end

data/test/dummy/config/initializers/migration_class.rb

@@ -1,10 +1,3 @@
 # frozen_string_literal: true
 
-if DEVISE_ORM == :active_record
-  MIGRATION_CLASS =
-    if Rails.gem_version >= Gem::Version.new('5.0')
-      ActiveRecord::Migration[Rails.version.to_f]
-    else
-      ActiveRecord::Migration
-    end
-end
+MIGRATION_CLASS = ActiveRecord::Migration[Rails.version.to_f] if DEVISE_ORM == :active_record

data/test/dummy/config/locales/en.yml

@@ -0,0 +1,10 @@
+en:
+  errors:
+    messages:
+      password_complexity:
+        letter:
+          one: must contain at least one letter
+          other: must contain at least %{count} letters
+        alnum:
+          one: must contain at least one letter or number
+          other: must contain at least %{count} letters or numbers

data/test/dummy/config/mongoid.yml

@@ -1,5 +1,5 @@
 test:
-  <%= Mongoid::VERSION.to_i > 4 ? 'clients' : 'sessions' %>:
+  clients:
     default:
       database: devise_security_test
       hosts:

data/test/dummy/config/routes.rb

@@ -3,10 +3,13 @@
 RailsApp::Application.routes.draw do
   devise_for :users
 
-  devise_for :captcha_users, only: [:sessions], controllers: { sessions: "captcha/sessions" }
-  devise_for :security_question_users, only: [:sessions, :unlocks], controllers: { unlocks: "security_question/unlocks" }
+  devise_for :captcha_users, only: [:sessions], controllers: { sessions: 'captcha/sessions' }
+  devise_for :password_expired_users, only: [:password_expired], controllers: { password_expired: 'overrides/password_expired' }
+  devise_for :paranoid_verification_users, only: [:verification_code], controllers: { paranoid_verification_code: 'overrides/paranoid_verification_code' }
+  devise_for :security_question_users, only: %i[sessions unlocks], controllers: { unlocks: 'security_question/unlocks' }
 
   resources :foos
+  resource :widgets
 
-  root to: 'foos#index'
+  root to: 'widgets#show'
 end

data/test/dummy/config.ru

@@ -2,5 +2,5 @@
 
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment', __FILE__)
+require ::File.expand_path('config/environment', __dir__)
 run RailsApp::Application

data/test/dummy/db/migrate/20120508165529_create_tables.rb

@@ -1,17 +1,26 @@
 # frozen_string_literal: true
 
 class CreateTables < MIGRATION_CLASS
-  def self.up
+  def self.up # rubocop:disable Metrics/AbcSize
     create_table :users do |t|
       t.string :username
       t.string :facebook_token
-      t.string :unique_session_id, :limit => 20
+
+      # session_limitable
+      t.string :unique_session_id
 
       ## Database authenticatable
       t.string :email,              null: false, default: ''
       t.string :encrypted_password, null: false, default: ''
 
       t.datetime :password_changed_at
+
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string :current_sign_in_ip
+      t.string :last_sign_in_ip
+      t.integer :sign_in_count, default: 0
+      t.integer :failed_attempts, default: 0
       t.timestamps null: false
     end
     add_index :users, :password_changed_at
@@ -24,13 +33,13 @@ class CreateTables < MIGRATION_CLASS
     end
 
     create_table :old_passwords do |t|
-      t.string :encrypted_password, :null => false
+      t.string :encrypted_password, null: false
       t.string :password_salt
-      t.string :password_archivable_type, :null => false
-      t.integer :password_archivable_id, :null => false
+      t.string :password_archivable_type, null: false
+      t.integer :password_archivable_id, null: false
       t.datetime :created_at
     end
-    add_index :old_passwords, [:password_archivable_type, :password_archivable_id], name: 'index_password_archivable'
+    add_index :old_passwords, %i[password_archivable_type password_archivable_id], name: 'index_password_archivable'
   end
 
   def self.down

data/test/dummy/lib/shared_expirable_columns.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'shared_user'
 
 module SharedVerificationColumns

data/test/dummy/lib/shared_security_questions_fields.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'shared_user'
 
 module SharedSecurityQuestionsFields

data/test/dummy/lib/shared_user.rb

@@ -4,10 +4,21 @@ module SharedUser
   extend ActiveSupport::Concern
 
   included do
-    devise :database_authenticatable, :confirmable, :lockable, :recoverable,
-           :registerable, :rememberable, :timeoutable,
-           :trackable, :secure_validatable, :omniauthable, :validatable, password_length: 7..72,
-           reconfirmable: false
+    devise(
+      :database_authenticatable,
+      :confirmable,
+      :lockable,
+      :recoverable,
+      :registerable,
+      :rememberable,
+      :timeoutable,
+      :trackable,
+      :secure_validatable,
+      :omniauthable,
+      :validatable,
+      password_length: 7..72,
+      reconfirmable: false
+    )
 
     attr_accessor :other_key
 
@@ -22,8 +33,8 @@ module SharedUser
   module ExtendMethods
     def new_with_session(params, session)
       super.tap do |user|
-        if data = session["devise.facebook_data"]
-          user.email = data["email"]
+        if (data = session['devise.facebook_data'])
+          user.email = data['email']
           user.confirmed_at = Time.zone.now
         end
       end

data/test/dummy/lib/shared_user_without_omniauth.rb

@@ -4,9 +4,18 @@ module SharedUserWithoutOmniauth
   extend ActiveSupport::Concern
 
   included do
-    devise :database_authenticatable, :confirmable, :lockable, :recoverable,
-      :registerable, :rememberable, :timeoutable,
-      :trackable, :validatable, reconfirmable: false
+    devise(
+      :database_authenticatable,
+      :confirmable,
+      :lockable,
+      :recoverable,
+      :registerable,
+      :rememberable,
+      :timeoutable,
+      :trackable,
+      :validatable,
+      reconfirmable: false
+    )
   end
 
   def raw_confirmation_token

data/test/dummy/lib/shared_verification_fields.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'shared_user'
 
 module SharedVerificationFields