Fix export when smtp settings are nil (#362)

OpenSourcePolitics · Jul 21, 2023 · ff74b79 · ff74b79
1 parent c516315
commit ff74b79
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/decidim_app/k8s/organization_exporter.rb b/lib/decidim_app/k8s/organization_exporter.rb
@@ -127,8 +127,8 @@ def omniauth_settings
       end
 
       def smtp_settings
-        settings = @organization.smtp_settings.deep_dup
-        settings["password"] = Decidim::AttributeEncryptor.decrypt(settings["encrypted_password"])
+        settings = @organization.smtp_settings.deep_dup || {}
+        settings["password"] = Decidim::AttributeEncryptor.decrypt(settings["encrypted_password"]) if settings["encrypted_password"].present?
         settings.delete("encrypted_password")
 
         settings = settings.transform_keys do |key|

diff --git a/spec/lib/decidim_app/k8s/organization_exporter_spec.rb b/spec/lib/decidim_app/k8s/organization_exporter_spec.rb
@@ -231,6 +231,16 @@
     it "returns the smtp settings" do
       expect(subject.smtp_settings).to eq({ "SMTP_ADDRESS" => "smtp.example.org", "SMTP_FROM" => "[email protected]", "SMTP_PASSWORD" => "demo", "SMTP_PORT" => "25", "SMTP_USER_NAME" => "test" })
     end
+
+    context "when smtp settings are not present" do
+      before do
+        organization.update!(smtp_settings: nil)
+      end
+
+      it "returns empty smtp settings" do
+        expect(subject.smtp_settings).to eq({})
+      end
+    end
   end
 
   describe "#omniauth_settings" do