devise-security 0.14.2 → 0.17.0

data/test/controllers/test_password_expired_controller.rb

@@ -6,41 +6,143 @@ class Devise::PasswordExpiredControllerTest < ActionController::TestCase
   include Devise::Test::ControllerHelpers
 
   setup do
-    @request.env["devise.mapping"] = Devise.mappings[:user]
+    @controller.class.respond_to :json, :xml
+    @request.env['devise.mapping'] = Devise.mappings[:user]
     @user = User.create!(
       username: 'hello',
       email: 'hello@path.travel',
       password: 'Password4',
       password_changed_at: 4.months.ago,
-      confirmed_at: 5.months.ago
+      confirmed_at: 5.months.ago,
     )
     assert @user.valid?
+    assert @user.need_change_password?
+
     sign_in(@user)
   end
 
+  test 'redirects on show if user not logged in' do
+    sign_out(@user)
+    get :show
+    assert_redirected_to :root
+  end
+
+  test 'redirects on show if user does not need password change' do
+    @user.update(password_changed_at: Time.zone.now)
+    get :show
+    assert_redirected_to :root
+  end
+
   test 'should render show' do
     get :show
     assert_includes @response.body, 'Renew your password'
   end
 
-  test 'should update password' do
-    if Rails.version < "5"
-      put :update, {
-        user: {
-          current_password: 'Password4',
-          password: 'Password5',
-          password_confirmation: 'Password5'
-        }
-      }
-    else
-      put :update, params: {
-        user: {
-          current_password: 'Password4',
-          password: 'Password5',
-          password_confirmation: 'Password5'
+  test 'redirects on update if user not logged in' do
+    sign_out(@user)
+    put :update
+    assert_redirected_to :root
+  end
+
+  test 'redirects on update if user does not need password change' do
+    @user.update(password_changed_at: Time.zone.now)
+    put :update
+    assert_redirected_to :root
+  end
+
+  test 'update password with default format' do
+    put :update,
+        params: {
+          user: {
+            current_password: 'Password4',
+            password: 'Password5',
+            password_confirmation: 'Password5',
+          },
         }
-      }
-    end
     assert_redirected_to root_path
+    assert_equal response.media_type, 'text/html'
+  end
+
+  test 'password confirmation does not match' do
+    put :update,
+        params: {
+          user: {
+            current_password: 'Password4',
+            password: 'Password5',
+            password_confirmation: 'Password6',
+          },
+        }
+
+    assert_response :success
+    assert_template :show
+    assert_equal response.media_type, 'text/html'
+    assert_includes(
+      response.body,
+      'Password confirmation doesn&#39;t match Password'
+    )
+  end
+
+  test 'update password using JSON format' do
+    put :update,
+        format: :json,
+        params: {
+          user: {
+            current_password: 'Password4',
+            password: 'Password5',
+            password_confirmation: 'Password5',
+          },
+        }
+    assert_response 204
+    assert_equal root_url, response.location
+    assert_nil response.media_type, 'No Content-Type header should be set for No Content response'
+  end
+
+  test 'update password using XML format' do
+    put :update,
+        format: :xml,
+        params: {
+          user: {
+            current_password: 'Password4',
+            password: 'Password5',
+            password_confirmation: 'Password5',
+          },
+        }
+    assert_response 204
+    assert_equal root_url, response.location
+    assert_nil response.media_type, 'No Content-Type header should be set for No Content response'
+  end
+end
+
+class PasswordExpiredCustomRedirectTest < ActionController::TestCase
+  include Devise::Test::ControllerHelpers
+  tests Overrides::PasswordExpiredController
+
+  setup do
+    @controller.class.respond_to :json, :xml
+    @request.env['devise.mapping'] = Devise.mappings[:password_expired_user]
+    @user = PasswordExpiredUser.create!(
+      username: 'hello',
+      email: 'hello@path.travel',
+      password: 'Password4',
+      password_changed_at: 4.months.ago,
+      confirmed_at: 5.months.ago,
+    )
+    assert @user.valid?
+    assert @user.need_change_password?
+
+    sign_in(@user)
+  end
+
+  test 'update password with custom redirect route' do
+    put :update,
+        params: {
+          password_expired_user: {
+            current_password: 'Password4',
+            password: 'Password5',
+            password_confirmation: 'Password5',
+          },
+        }
+
+    assert_redirected_to '/cookies'
   end
 end

data/test/controllers/test_security_question_controller.rb

@@ -8,44 +8,28 @@ class TestWithSecurityQuestion < ActionController::TestCase
 
   setup do
     @user = SecurityQuestionUser.create!(username: 'hello', email: 'hello@microsoft.com',
-                        password: 'A1234567z!', security_question_answer: 'Right Answer')
+                                         password: 'A1234567z!', security_question_answer: 'Right Answer')
     @user.lock_access!
     assert @user.locked_at.present?
     @request.env['devise.mapping'] = Devise.mappings[:security_question_user]
   end
 
   test 'When security question is enabled, it is inserted correctly' do
-    if Rails.gem_version.release <= Gem::Version.new('5.0')
-      post :create, {
-        security_question_user: {
-          email: @user.email
-        }, security_question_answer: "wrong answer"
-      }
-    else
-      post :create, params: {
-        security_question_user: {
-          email: @user.email
-        }, security_question_answer: "wrong answer"
-      }
-    end
+    post :create, params: {
+      security_question_user: {
+        email: @user.email,
+      }, security_question_answer: 'wrong answer'
+    }
     assert_equal I18n.t('devise.invalid_security_question'), flash[:alert]
     assert_redirected_to new_security_question_user_unlock_path
   end
 
   test 'When security_question is valid, it runs as normal' do
-    if Rails.gem_version.release <= Gem::Version.new('5.0')
-      post :create, {
-        security_question_user: {
-          email: @user.email
-        }, security_question_answer: @user.security_question_answer
-      }
-    else
-      post :create, params: {
-        security_question_user: {
-          email: @user.email
-        }, security_question_answer: @user.security_question_answer
-      }
-    end
+    post :create, params: {
+      security_question_user: {
+        email: @user.email,
+      }, security_question_answer: @user.security_question_answer
+    }
 
     assert_equal I18n.t('devise.unlocks.send_instructions'), flash[:notice]
     assert_redirected_to new_security_question_user_session_path
@@ -64,19 +48,11 @@ class TestWithoutSecurityQuestion < ActionController::TestCase
   end
 
   test 'When security question is not enabled it is not inserted' do
-    if Rails.gem_version.release <= Gem::Version.new('5.0')
-      post :create, {
-        user: {
-          email: @user.email
-        }
-      }
-    else
-      post :create, params: {
-        user: {
-          email: @user.email
-        }
-      }
-    end
+    post :create, params: {
+      user: {
+        email: @user.email,
+      },
+    }
 
     assert_equal I18n.t('devise.unlocks.send_instructions'), flash[:notice]
     assert_redirected_to new_user_session_path

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

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

data/test/dummy/app/controllers/overrides/paranoid_verification_code_controller.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class Overrides::ParanoidVerificationCodeController < Devise::ParanoidVerificationCodeController
+  def after_paranoid_verification_code_update_path_for(_)
+    '/cats'
+  end
+end

data/test/dummy/app/controllers/overrides/password_expired_controller.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class Overrides::PasswordExpiredController < Devise::PasswordExpiredController
+  def after_password_expired_update_path_for(_)
+    '/cookies'
+  end
+end

data/test/dummy/app/controllers/widgets_controller.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 class WidgetsController < ApplicationController
   before_action :authenticate_user!
+
   def show
     render plain: 'success'
   end

data/test/dummy/app/models/application_user_record.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
+
 if DEVISE_ORM == :active_record
-  class ApplicationUserRecord < ActiveRecord::Base
+  class ApplicationUserRecord < ApplicationRecord
     self.table_name = 'users'
   end
 else

data/test/dummy/app/models/mongoid/confirmable_fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ConfirmableFields
   extend ::ActiveSupport::Concern
 

data/test/dummy/app/models/mongoid/database_authenticable_fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DatabaseAuthenticatableFields
   extend ::ActiveSupport::Concern
 
@@ -6,10 +8,9 @@ module DatabaseAuthenticatableFields
 
     ## Database authenticatable
     field :username, type: String
-    field :email, type: String, default: ""
-    #validates_presence_of :email
+    field :email, type: String, default: ''
 
-    field :encrypted_password, type: String, default: ""
+    field :encrypted_password, type: String, default: ''
     validates_presence_of :encrypted_password
 
     include Mongoid::Timestamps

data/test/dummy/app/models/mongoid/expirable_fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ExpirableFields
   extend ::ActiveSupport::Concern
 

data/test/dummy/app/models/mongoid/lockable_fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LockableFields
   extend ::ActiveSupport::Concern
 

data/test/dummy/app/models/mongoid/mappings.rb

@@ -1,11 +1,13 @@
-Dir[File.expand_path("*_fields.rb", __dir__)].each { |f| require_relative f }
+# frozen_string_literal: true
+
+Dir[File.expand_path('*_fields.rb', __dir__)].each { |f| require_relative f }
 
 module Mongoid
   module Mappings
     extend ::ActiveSupport::Concern
 
     included do
-      self.devise_modules.each do |devise_module_name|
+      devise_modules.each do |devise_module_name|
         include "#{devise_module_name.to_s.classify}Fields".constantize
       end
     end

data/test/dummy/app/models/mongoid/omniauthable_fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OmniauthableFields
   extend ::ActiveSupport::Concern
 

data/test/dummy/app/models/mongoid/paranoid_verification_fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ParanoidVerificationFields
   extend ::ActiveSupport::Concern
 

data/test/dummy/app/models/mongoid/password_archivable_fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PasswordArchivableFields
   extend ::ActiveSupport::Concern
 

data/test/dummy/app/models/mongoid/password_expirable_fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PasswordExpirableFields
   extend ::ActiveSupport::Concern
 

data/test/dummy/app/models/mongoid/recoverable_fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RecoverableFields
   extend ::ActiveSupport::Concern
 

data/test/dummy/app/models/mongoid/registerable_fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RegisterableFields
   extend ::ActiveSupport::Concern
 
@@ -5,10 +7,10 @@ module RegisterableFields
     include Mongoid::Document
 
     ## Database authenticatable
-    field :email, type: String, default: ""
+    field :email, type: String, default: ''
     validates_presence_of :email
 
-    field :encrypted_password, type: String, default: ""
+    field :encrypted_password, type: String, default: ''
     validates_presence_of :encrypted_password
 
     field :password_changed_at, type: Time

data/test/dummy/app/models/mongoid/rememberable_fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RememberableFields
   extend ::ActiveSupport::Concern
 

data/test/dummy/app/models/mongoid/secure_validatable_fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SecureValidatableFields
   extend ::ActiveSupport::Concern
 

data/test/dummy/app/models/mongoid/security_questionable_fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SecurityQuestionableFields
   extend ::ActiveSupport::Concern
 

data/test/dummy/app/models/mongoid/session_limitable_fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SessionLimitableFields
   extend ::ActiveSupport::Concern
 

data/test/dummy/app/models/mongoid/timeoutable_fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TimeoutableFields
   extend ::ActiveSupport::Concern
 

data/test/dummy/app/models/mongoid/trackable_fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TrackableFields
   extend ::ActiveSupport::Concern
 

data/test/dummy/app/models/mongoid/validatable_fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ValidatableFields
   extend ::ActiveSupport::Concern
 

data/test/dummy/app/models/paranoid_verification_user.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class ParanoidVerificationUser < ApplicationUserRecord
+  devise :database_authenticatable,
+         :confirmable,
+         :expirable,
+         :lockable,
+         :omniauthable,
+         :paranoid_verification,
+         :password_archivable,
+         :password_expirable,
+         :recoverable,
+         :registerable,
+         :rememberable,
+         :secure_validatable,
+         :security_questionable,
+         :session_limitable,
+         :timeoutable,
+         :trackable,
+         :validatable
+
+  if DEVISE_ORM == :mongoid
+    require './test/dummy/app/models/mongoid/mappings'
+    include ::Mongoid::Mappings
+  end
+end

data/test/dummy/app/models/password_expired_user.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class PasswordExpiredUser < ApplicationUserRecord
+  devise :database_authenticatable,
+         :confirmable,
+         :expirable,
+         :lockable,
+         :omniauthable,
+         :paranoid_verification,
+         :password_archivable,
+         :password_expirable,
+         :recoverable,
+         :registerable,
+         :rememberable,
+         :secure_validatable,
+         :security_questionable,
+         :session_limitable,
+         :timeoutable,
+         :trackable,
+         :validatable
+
+  if DEVISE_ORM == :mongoid
+    require './test/dummy/app/models/mongoid/mappings'
+    include ::Mongoid::Mappings
+  end
+end

data/test/dummy/app/models/user.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class User < ApplicationRecord
-
   devise :database_authenticatable,
          :confirmable,
          :expirable,
@@ -25,7 +24,7 @@ class User < ApplicationRecord
   if DEVISE_ORM == :mongoid
     require './test/dummy/app/models/mongoid/mappings'
     include ::Mongoid::Mappings
-    
+
     def some_method_calling_mongoid
       Mongoid.logger
     end

data/test/dummy/app/models/widget.rb

@@ -4,7 +4,5 @@ class Widget < ApplicationRecord
   belongs_to :user
   validates_associated :user
 
-  if DEVISE_ORM == :mongoid
-    field :name, type: String
-  end
+  field :name, type: String if DEVISE_ORM == :mongoid
 end

data/test/dummy/app/mongoid/one_user.rb

@@ -11,16 +11,16 @@ class OneUser
   field :password_changed_at, type: Time
   index({ password_changed_at: 1 }, {})
 
-  #field :paranoid_verification_code, type: String
-  #field :paranoid_verified_at, type: Time
-  #field :paranoid_verification_attempt, type: Integer, default: 0
+  field :paranoid_verification_code, type: String
+  field :paranoid_verified_at, type: Time
+  field :paranoid_verification_attempt, type: Integer, default: 0
 
   field :username, type: String
   field :facebook_token, type: String
 
   ## Database authenticatable
-  field :email,              type: String, default: ""
-  field :encrypted_password, type: String, default: ""
+  field :email,              type: String, default: ''
+  field :encrypted_password, type: String, default: ''
 
   ## Recoverable
   field :reset_password_token,   type: String

data/test/dummy/app/mongoid/user_on_engine.rb

@@ -11,8 +11,8 @@ class UserOnEngine
   field :facebook_token, type: String
 
   ## Database authenticatable
-  field :email, type: String, default: ""
-  field :encrypted_password, type: String, default: ""
+  field :email, type: String, default: ''
+  field :encrypted_password, type: String, default: ''
 
   ## Recoverable
   field :reset_password_token, type: String

data/test/dummy/app/mongoid/user_on_main_app.rb

@@ -11,8 +11,8 @@ class UserOnMainApp
   field :facebook_token, type: String
 
   ## Database authenticatable
-  field :email, type: String, default: ""
-  field :encrypted_password, type: String, default: ""
+  field :email, type: String, default: ''
+  field :encrypted_password, type: String, default: ''
 
   ## Recoverable
   field :reset_password_token, type: String

data/test/dummy/app/mongoid/user_with_validations.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "shared_user"
+require 'shared_user'
 
 class UserWithValidations
   include Mongoid::Document
@@ -11,8 +11,8 @@ class UserWithValidations
   field :facebook_token, type: String
 
   ## Database authenticatable
-  field :email, type: String, default: ""
-  field :encrypted_password, type: String, default: ""
+  field :email, type: String, default: ''
+  field :encrypted_password, type: String, default: ''
 
   ## Recoverable
   field :reset_password_token, type: String

data/test/dummy/app/mongoid/user_without_email.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "shared_user_without_email"
+require 'shared_user_without_email'
 
 class UserWithoutEmail
   include Mongoid::Document
@@ -11,8 +11,8 @@ class UserWithoutEmail
   field :facebook_token, type: String
 
   ## Database authenticatable
-  field :email, type: String, default: ""
-  field :encrypted_password, type: String, default: ""
+  field :email, type: String, default: ''
+  field :encrypted_password, type: String, default: ''
 
   ## Recoverable
   field :reset_password_token, type: String

data/test/dummy/config/application.rb

@@ -1,10 +1,10 @@
 # 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 'action_mailer/railtie'
+require 'rails/test_unit/railtie'
 DEVISE_ORM = ENV.fetch('DEVISE_ORM', 'active_record').to_sym
 
 Bundler.require :default, DEVISE_ORM
@@ -25,6 +25,6 @@ module RailsApp
     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!