error handling for missing keys

diff --git a/config/application.rb b/config/application.rb
index da4c4d559709462b29e50bd39f7e3c6cdb3e1f6d..8a594dd10bf54bcb613fb60654a44987e06d4862 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -36,8 +36,12 @@ module Arelpe
     config.time_zone = "Australia/Adelaide"
     # config.eager_load_paths << Rails.root.join("extras")
     #2FA Encryption
-    config.active_record.encryption.primary_key = Rails.application.credentials.active_record_encryption[:primary_key]
-    config.active_record.encryption.deterministic_key = Rails.application.credentials.active_record_encryption[:deterministic_key]
-    config.active_record.encryption.key_derivation_salt = Rails.application.credentials.active_record_encryption[:key_derivation_salt]
+    if Rails.application.credentials.active_record_encryption.present?
+      config.active_record.encryption.primary_key = Rails.application.credentials.active_record_encryption[:primary_key]
+      config.active_record.encryption.deterministic_key = Rails.application.credentials.active_record_encryption[:deterministic_key]
+      config.active_record.encryption.key_derivation_salt = Rails.application.credentials.active_record_encryption[:key_derivation_salt]
+    else
+      Rails.logger.warn "Active Record encryption keys are not set in credentials."
+    end
   end
 end