Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Devise.available_router_name to support routing correctly with engines #183

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+8 −3
Open

Add Devise.available_router_name to support routing correctly with engines #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
365e01c
Add Devise.available_router_name to support routing correctly with en…
Jan 5, 2020
4f6491a
replace update_attributes with update_columns
Jan 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion lib/two_factor_authentication/controllers/helpers.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,13 @@ def handle_failed_second_factor(scope)

def two_factor_authentication_path_for(resource_or_scope = nil)
scope = Devise::Mapping.find_scope!(resource_or_scope)
namespace = if Devise.available_router_name
send(Devise.available_router_name)
else
self
end
change_path = "#{scope}_two_factor_authentication_path"
send(change_path)
namespace.send(change_path)
end

end
Expand Down
4 changes: 2 additions & 2 deletions lib/two_factor_authentication/models/two_factor_authenticatable.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def generate_totp_secret
def create_direct_otp(options = {})
# Create a new random OTP and store it in the database
digits = options[:length] || self.class.direct_otp_length || 6
update_attributes(
update_columns(
direct_otp: random_base10(digits),
direct_otp_sent_at: Time.now.utc
)
Expand All @@ -122,7 +122,7 @@ def direct_otp_expired?
end

def clear_direct_otp
update_attributes(direct_otp: nil, direct_otp_sent_at: nil)
update_columns(direct_otp: nil, direct_otp_sent_at: nil)
end
end

Expand Down