From 311806ff56c9a2fdb92e63a5f2356e352c353096 Mon Sep 17 00:00:00 2001
From: William Todd <williamatodd@users.noreply.github.com>
Date: Mon, 23 Mar 2020 10:53:52 -0400
Subject: [PATCH 1/2] Updates model encryption field designation for
 SymmetricEncryption

---
 devise_2fa.gemspec                                        | 1 +
 .../active_record/devise_two_factor_generator.rb          | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/devise_2fa.gemspec b/devise_2fa.gemspec
index 51ea539..d832530 100644
--- a/devise_2fa.gemspec
+++ b/devise_2fa.gemspec
@@ -24,6 +24,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'rotp', '~> 5.1'
   gem.add_runtime_dependency 'rqrcode', '~> 0.10.1'
   gem.add_runtime_dependency 'symmetric-encryption', '~> 4.3.0'
+  gem.requirements << 'SymmetricEncryption must be configured prior to using this gem.'
 
   gem.add_development_dependency 'appraisal'
   gem.add_development_dependency 'capybara'
diff --git a/lib/generators/active_record/devise_two_factor_generator.rb b/lib/generators/active_record/devise_two_factor_generator.rb
index 70e4b7f..86de150 100755
--- a/lib/generators/active_record/devise_two_factor_generator.rb
+++ b/lib/generators/active_record/devise_two_factor_generator.rb
@@ -21,10 +21,10 @@ def inject_field_types
 
       def content
 <<RUBY
-  attr_encrypted :otp_auth_secret
-  attr_encrypted :otp_recovery_secret
-  validates :otp_auth_secret, symmetric_encryption: true
-  validates :otp_recovery_secret, symmetric_encryption: true
+  attribute :otp_auth_secret, :encrypted
+  attribute :otp_recovery_secret, :encrypted
+  validates :otp_auth_secret, symmetric_encryption: true, if: proc { |o| o.otp_enabled? }
+  validates :otp_recovery_secret, symmetric_encryption: true, if: proc { |o| o.otp_enabled? }
 RUBY
       end
 

From ec45a823fbf9029b561d2b93bd70d1fb6391e445 Mon Sep 17 00:00:00 2001
From: William Todd <williamatodd@users.noreply.github.com>
Date: Mon, 23 Mar 2020 13:17:55 -0400
Subject: [PATCH 2/2] Remove validations on encrypted fields.

"Using the attribute type approach with Rails 5 or above does not need a validation to ensure the field is encrypted before saving."
---
 lib/generators/active_record/devise_two_factor_generator.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/generators/active_record/devise_two_factor_generator.rb b/lib/generators/active_record/devise_two_factor_generator.rb
index 86de150..77075fb 100755
--- a/lib/generators/active_record/devise_two_factor_generator.rb
+++ b/lib/generators/active_record/devise_two_factor_generator.rb
@@ -23,8 +23,6 @@ def content
 <<RUBY
   attribute :otp_auth_secret, :encrypted
   attribute :otp_recovery_secret, :encrypted
-  validates :otp_auth_secret, symmetric_encryption: true, if: proc { |o| o.otp_enabled? }
-  validates :otp_recovery_secret, symmetric_encryption: true, if: proc { |o| o.otp_enabled? }
 RUBY
       end