Merge branch 'rs-improve-grace-period' into 'master'

Don't show any "2FA required" message if it's not actually required

Prior, if the user had enabled and then disabled 2FA, they would be
shown a "You must enable Two-factor Authentication for your account."
message when going back to re-activate it, even if 2FA enforcement was
disabled.

See merge request !3014

app/controllers/profiles/two_factor_auths_controller.rb

@@ -12,12 +12,14 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
 
     current_user.save! if current_user.changed?
 
+    if two_factor_authentication_required?
       if two_factor_grace_period_expired?
         flash.now[:alert] = 'You must enable Two-factor Authentication for your account.'
       else
         grace_period_deadline = current_user.otp_grace_period_started_at + two_factor_grace_period.hours
         flash.now[:alert] = "You must enable Two-factor Authentication for your account before #{l(grace_period_deadline)}."
       end
+    end
 
     @qr_code = build_qr_code
   end

app/models/user.rb

@@ -366,6 +366,7 @@ class User < ActiveRecord::Base
       encrypted_otp_secret:        nil,
       encrypted_otp_secret_iv:     nil,
       encrypted_otp_secret_salt:   nil,
+      otp_grace_period_started_at: nil,
       otp_backup_codes:            nil
     )
   end

spec/factories.rb

@@ -32,6 +32,7 @@ FactoryGirl.define do
       before(:create) do |user|
         user.two_factor_enabled = true
         user.otp_secret = User.generate_otp_secret(32)
+        user.otp_grace_period_started_at = Time.now
         user.generate_otp_backup_codes!
       end
     end

spec/models/user_spec.rb

@@ -268,6 +268,7 @@ describe User, models: true do
       expect(user).to be_two_factor_enabled
       expect(user.encrypted_otp_secret).not_to be_nil
       expect(user.otp_backup_codes).not_to be_nil
+      expect(user.otp_grace_period_started_at).not_to be_nil
 
       user.disable_two_factor!
 
@@ -276,6 +277,7 @@ describe User, models: true do
       expect(user.encrypted_otp_secret_iv).to be_nil
       expect(user.encrypted_otp_secret_salt).to be_nil
       expect(user.otp_backup_codes).to be_nil
+      expect(user.otp_grace_period_started_at).to be_nil
     end
   end