scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-26 22:16:28 +08:00
Code Issues Projects Releases Packages Wiki Activity

Small 2fa improvments

Browse source
This commit is contained in:
aignatov-bio 2020-07-01 14:41:55 +02:00
parent 4b9881e31e
commit 742fb0d27b
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/users/registrations_controller.rb
View file

@ -183,9 +183,8 @@ class Users::RegistrationsController < Devise::RegistrationsController
end end
def two_factor_enable def two_factor_enable
totp = ROTP::TOTP.new(current_user.otp_secret, issuer: 'SciNote') if current_user.valid_otp?(params[:submit_code])
if totp.verify(params[:submit_code], drift_behind: 10) current_user.enable_2fa
current_user.update!(two_factor_auth_enabled: true)
redirect_to edit_user_registration_path redirect_to edit_user_registration_path
else else
render json: { error: t('users.registrations.edit.2fa_errors.wrong_submit_code') }, status: :unprocessable_entity render json: { error: t('users.registrations.edit.2fa_errors.wrong_submit_code') }, status: :unprocessable_entity
@ -194,7 +193,7 @@ class Users::RegistrationsController < Devise::RegistrationsController
def two_factor_disable def two_factor_disable
if current_user.valid_password?(params[:password]) if current_user.valid_password?(params[:password])
current_user.update!(two_factor_auth_enabled: false, otp_secret: nil) current_user.disable_2fa
redirect_to edit_user_registration_path redirect_to edit_user_registration_path
else else
render json: { error: t('users.registrations.edit.2fa_errors.wrong_password') }, status: :forbidden render json: { error: t('users.registrations.edit.2fa_errors.wrong_password') }, status: :forbidden

2
app/controllers/users/sessions_controller.rb
View file

@ -4,7 +4,7 @@ class Users::SessionsController < Devise::SessionsController
layout :session_layout layout :session_layout
# before_filter :configure_sign_in_params, only: [:create] # before_filter :configure_sign_in_params, only: [:create]
after_action :after_sign_in, only: :create after_action :after_sign_in, only: %i(create authenticate_with_two_factor)
prepend_before_action :redirect_2fa, only: :create prepend_before_action :redirect_2fa, only: :create
rescue_from ActionController::InvalidAuthenticityToken do rescue_from ActionController::InvalidAuthenticityToken do

8
app/models/user.rb
View file

@ -635,6 +635,14 @@ class User < ApplicationRecord
save! save!
end end
def enable_2fa
update!(two_factor_auth_enabled: true)
end
def disable_2fa
update!(two_factor_auth_enabled: false, otp_secret: nil)
end
protected protected
def confirmation_required? def confirmation_required?