From 095f64793fffee748e3655509357167f609ea74d Mon Sep 17 00:00:00 2001 From: pablohashescobar Date: Tue, 14 Nov 2023 20:31:29 +0530 Subject: [PATCH] dev: fix email senders --- apiserver/plane/bgtasks/analytic_plot_export.py | 2 +- apiserver/plane/bgtasks/email_verification_task.py | 2 +- apiserver/plane/bgtasks/forgot_password_task.py | 2 +- apiserver/plane/bgtasks/magic_link_code_task.py | 4 +--- apiserver/plane/bgtasks/project_invitation_task.py | 2 +- apiserver/plane/bgtasks/workspace_invitation_task.py | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/apiserver/plane/bgtasks/analytic_plot_export.py b/apiserver/plane/bgtasks/analytic_plot_export.py index 19ee2306e1..8cccc2299b 100644 --- a/apiserver/plane/bgtasks/analytic_plot_export.py +++ b/apiserver/plane/bgtasks/analytic_plot_export.py @@ -61,7 +61,7 @@ def send_export_email(email, slug, csv_buffer): use_ssl=bool(get_configuration_value(instance_configuration, "EMAIL_USE_SSL", "0")), ) - msg = EmailMultiAlternatives(subject=subject, text_content=text_content, from_email=settings.EMAIL_FROM, to=[email], connection=connection) + msg = EmailMultiAlternatives(subject=subject, body=text_content, from_email=get_configuration_value(instance_configuration, "EMAIL_FROM"), to=[email], connection=connection) msg.attach(f"{slug}-analytics.csv", csv_buffer.getvalue()) msg.send(fail_silently=False) diff --git a/apiserver/plane/bgtasks/email_verification_task.py b/apiserver/plane/bgtasks/email_verification_task.py index aedc48e0e8..220f963907 100644 --- a/apiserver/plane/bgtasks/email_verification_task.py +++ b/apiserver/plane/bgtasks/email_verification_task.py @@ -46,7 +46,7 @@ def email_verification(first_name, email, token, current_site): ) # Initiate email alternatives - msg = EmailMultiAlternatives(subject=subject, text_content=text_content, from_email=settings.EMAIL_FROM, to=[email], connection=connection) + msg = EmailMultiAlternatives(subject=subject, body=text_content, from_email=get_configuration_value(instance_configuration, "EMAIL_FROM"), to=[email], connection=connection) msg.attach_alternative(html_content, "text/html") msg.send() return diff --git a/apiserver/plane/bgtasks/forgot_password_task.py b/apiserver/plane/bgtasks/forgot_password_task.py index fa4e2ea45e..676ca5a9c1 100644 --- a/apiserver/plane/bgtasks/forgot_password_task.py +++ b/apiserver/plane/bgtasks/forgot_password_task.py @@ -42,7 +42,7 @@ def forgot_password(first_name, email, uidb64, token, current_site): use_ssl=bool(get_configuration_value(instance_configuration, "EMAIL_USE_SSL", "0")), ) # Initiate email alternatives - msg = EmailMultiAlternatives(subject=subject, text_content=text_content, from_email=settings.EMAIL_FROM, to=[email], connection=connection) + msg = EmailMultiAlternatives(subject=subject, body=text_content, from_email=get_configuration_value(instance_configuration, "EMAIL_FROM"), to=[email], connection=connection) msg.attach_alternative(html_content, "text/html") msg.send() return diff --git a/apiserver/plane/bgtasks/magic_link_code_task.py b/apiserver/plane/bgtasks/magic_link_code_task.py index e6d047e9c8..8d64029ee1 100644 --- a/apiserver/plane/bgtasks/magic_link_code_task.py +++ b/apiserver/plane/bgtasks/magic_link_code_task.py @@ -18,8 +18,6 @@ def magic_link(email, key, token, current_site): realtivelink = f"/magic-sign-in/?password={token}&key={key}" abs_url = current_site + realtivelink - from_email_string = settings.EMAIL_FROM - subject = "Login for Plane" context = {"magic_url": abs_url, "code": token} @@ -38,7 +36,7 @@ def magic_link(email, key, token, current_site): use_ssl=bool(get_configuration_value(instance_configuration, "EMAIL_USE_SSL", "0")), ) # Initiate email alternatives - msg = EmailMultiAlternatives(subject=subject, text_content=text_content, from_email=settings.EMAIL_FROM, to=[email], connection=connection) + msg = EmailMultiAlternatives(subject=subject, body=text_content, from_email=get_configuration_value(instance_configuration, "EMAIL_FROM"), to=[email], connection=connection) msg.attach_alternative(html_content, "text/html") msg.send() return diff --git a/apiserver/plane/bgtasks/project_invitation_task.py b/apiserver/plane/bgtasks/project_invitation_task.py index 7a47b619d4..a9adad02f7 100644 --- a/apiserver/plane/bgtasks/project_invitation_task.py +++ b/apiserver/plane/bgtasks/project_invitation_task.py @@ -55,7 +55,7 @@ def project_invitation(email, project_id, token, current_site): use_ssl=bool(get_configuration_value(instance_configuration, "EMAIL_USE_SSL", "0")), ) # Initiate email alternatives - msg = EmailMultiAlternatives(subject=subject, text_content=text_content, from_email=settings.EMAIL_FROM, to=[email], connection=connection) + msg = EmailMultiAlternatives(subject=subject, body=text_content, from_email=get_configuration_value(instance_configuration, "EMAIL_FROM"), to=[email], connection=connection) msg.attach_alternative(html_content, "text/html") msg.send() return diff --git a/apiserver/plane/bgtasks/workspace_invitation_task.py b/apiserver/plane/bgtasks/workspace_invitation_task.py index ad06b53b06..d8c40a6a30 100644 --- a/apiserver/plane/bgtasks/workspace_invitation_task.py +++ b/apiserver/plane/bgtasks/workspace_invitation_task.py @@ -58,7 +58,7 @@ def workspace_invitation(email, workspace_id, token, current_site, invitor): use_ssl=bool(get_configuration_value(instance_configuration, "EMAIL_USE_SSL", "0")), ) # Initiate email alternatives - msg = EmailMultiAlternatives(subject=subject, text_content=text_content, from_email=settings.EMAIL_FROM, to=[email], connection=connection) + msg = EmailMultiAlternatives(subject=subject, body=text_content, from_email=get_configuration_value(instance_configuration, "EMAIL_FROM"), to=[email], connection=connection) msg.attach_alternative(html_content, "text/html") msg.send()