Skip to content

Makes encrypt/decrypt method names unique: #126

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

Merged
Houdini merged 1 commit into from
Jul 18, 2017
Merged

Makes encrypt/decrypt method names unique: #126

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 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 @@ -113,16 +113,16 @@ def clear_direct_otp

module EncryptionInstanceMethods
def otp_secret_key
decrypt(encrypted_otp_secret_key)
otp_decrypt(encrypted_otp_secret_key)
end

def otp_secret_key=(value)
self.encrypted_otp_secret_key = encrypt(value)
self.encrypted_otp_secret_key = otp_encrypt(value)
end

private

def decrypt(encrypted_value)
def otp_decrypt(encrypted_value)
return encrypted_value if encrypted_value.blank?

encrypted_value = encrypted_value.unpack('m').first
Expand All @@ -137,7 +137,7 @@ def decrypt(encrypted_value)
value
end

def encrypt(value)
def otp_encrypt(value)
return value if value.blank?

value = value.to_s
Expand Down