diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-02-29 13:56:40 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-29 13:56:40 -0500 |
| commit | 3334c3fc7026497fc9da258824795c0ce23a8ffd (patch) | |
| tree | 319a10073764e84cd0fc7855c7ff26b872a41776 /app | |
| parent | 333ad73e765d87fa1ccbd4a361f7f172c790f897 (diff) | |
| download | gitlab-ce-3334c3fc7026497fc9da258824795c0ce23a8ffd.tar.gz | |
Reset `otp_grace_period_started_at` after disabling 2FA
Prior, if the user enabled 2FA, then disabled it and came back some time
after the grace period expired, they would be forced to enable 2FA
immediately.
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/user.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 6baf2468ade..4bc4ab8de7f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -362,11 +362,12 @@ class User < ActiveRecord::Base def disable_two_factor! update_attributes( - two_factor_enabled: false, - encrypted_otp_secret: nil, - encrypted_otp_secret_iv: nil, - encrypted_otp_secret_salt: nil, - otp_backup_codes: nil + two_factor_enabled: false, + 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 |