Merge pull request #43 from HermessNRJ/new-mail

Mailgun API

.env

@@ -1,17 +1,23 @@
+#default
 SITE_URL=http://localhost:8000
-DEFAULT_FROM_EMAIL=dont-answer@mieuxvoter.fr
-EMAIL_HOST=mail
-EMAIL_PORT=25
 DJANGO_DEBUG=True
 DJANGO_ALLOWED_HOSTS=localhost
 DJANGO_SECRET_KEY=
 MAX_NUM_GRADES=20
 LANGUAGE_AVAILABLE=(fr en es de)
+DEFAULT_FROM_EMAIL=dont-answer@mieuxvoter.fr
+EMAIL_USE_TLS=
+EMAIL_TYPE=
 
+#API
+EMAIL_API_KEY=
+EMAIL_API_DOMAIN=
+EMAIL_SKIP_VERIFICATION=
+
+#SMTP
+EMAIL_HOST=mail
+EMAIL_PORT=25
 EMAIL_BACKEND=
 EMAIL_HOST=
-EMAIL_USE_TLS=
-EMAIL_USE_SSL=
-EMAIL_PORT=
 EMAIL_HOST_USER=
-EMAIL_HOST_PASSWORD=
+EMAIL_HOST_PASSWORD=

docker/run.sh

@@ -1,3 +1,5 @@
 #!/usr/bin/env bash
 DIR=$(dirname "$(readlink -f "$0")")
 python manage.py runserver 0.0.0.0:8000
+django-admin makemessages -a
+django-admin compilemessages

election/views.py

@@ -1,4 +1,7 @@
 import os
+import urllib
+import base64
+
 from typing import Optional, Dict, Tuple, List
 from time import time
 from django.db import IntegrityError
@@ -29,33 +32,100 @@ WRONG_ELECTION_ERROR = "E9: Parameters for the election are incorrect"
 SEND_MAIL_ERROR = "E10: Error sending email"
 
 # A Grade is always given a int
-Grade = int 
-
-def send_mail_invitation(
-        email: str, election: str, token_id: int
-    ):   
-    token_get: str = f"?token={token_id}"
-    merge_data: Dict[str, str] = {
-        "invitation_url": f"{settings.SITE_URL}/vote/{election.id}{token_get}",
-        "result_url": f"{settings.SITE_URL}/result/{election.id}",
-        "title": election.title,
-    }
-
-    if election.select_language not in settings.LANGUAGE_AVAILABLE:
-        activate(settings.DEFAULT_LANGUAGE)
-    else:
-        activate(election.select_language)
-
-    text_body = render_to_string("election/mail_invitation.txt", merge_data)
-    html_body = render_to_string("election/mail_invitation.html", merge_data)   
-
-    msg = EmailMultiAlternatives(
-        f"[{gettext('Mieux Voter')}] {election.title}",
-        text_body,
-        settings.EMAIL_HOST_USER,
-        [email])
-    msg.attach_alternative(html_body, "text/html")
-    msg.send()
+Grade = int
+
+def send_mails_invitation_api(list_email_token: list, election: str):
+    """
+    Def to send the election invitation by API
+    """ 
+
+    for couple in list_email_token:
+        token_get: str = f"?token={couple[1]}"
+        merge_data: Dict[str, str] = {
+            "invitation_url": f"{settings.SITE_URL}/vote/{election.id}{token_get}",
+            "result_url": f"{settings.SITE_URL}/result/{election.id}",
+            "title": election.title,
+        }
+
+        if election.select_language not in settings.LANGUAGE_AVAILABLE:
+            activate(settings.DEFAULT_LANGUAGE)
+        else:
+            activate(election.select_language)
+
+        text_body = render_to_string("election/mail_invitation.txt", merge_data)
+        html_body = render_to_string("election/mail_invitation.html", merge_data)
+
+        data= urllib.parse.urlencode({
+            "from": "Mieux Voter <" + settings.DEFAULT_FROM_EMAIL + ">",
+            "to": couple[0],
+            "subject": f"[{gettext('Mieux Voter')}] {election.title}",
+            "text": text_body,
+            "html": html_body,
+            "o:tracking": False,
+            "o:tag":"Invitation",
+            "o:require-tls": settings.EMAIL_USE_TLS,
+            "o:skip-verification": settings.EMAIL_SKIP_VERIFICATION
+            }, doseq=True).encode()
+
+        send_api(data)
+
+def send_mail_api(email: str, text_body, html_body, title):
+    """
+    Def to send mails by API
+    """
+    data= urllib.parse.urlencode({
+        "from": "Mieux Voter <" + settings.DEFAULT_FROM_EMAIL + ">",
+        "to": email,
+        "subject": f"[{gettext('Mieux Voter')}] {title}",
+        "text": text_body,
+        "html": html_body,
+        "o:tracking": False,
+        "o:tag":"Invitation",
+        "o:require-tls": settings.EMAIL_USE_TLS,
+        "o:skip-verification": settings.EMAIL_SKIP_VERIFICATION
+        }, doseq=True).encode()
+    send_api(data)
+
+
+def send_api(data):
+    """
+    def to do api request
+    """
+    request = urllib.request.Request(settings.EMAIL_API_DOMAIN, data=data)
+    encoded_token = base64.b64encode(("api:" + settings.EMAIL_API_KEY).encode("ascii")).decode("ascii")
+    request.add_header("Authorization","Basic {}".format(encoded_token))
+    try:
+        urllib.request.urlopen(request)
+    except Exception as err:
+        return(err)
+
+def send_mails_invitation_smtp(list_email_token: list, election: str):
+    """
+    Def to send the election invitation by SMTP
+    """
+    for couple in list_email_token:
+        token_get: str = f"?token={couple[1]}"
+        merge_data: Dict[str, str] = {
+            "invitation_url": f"{settings.SITE_URL}/vote/{election.id}{token_get}",
+            "result_url": f"{settings.SITE_URL}/result/{election.id}",
+            "title": election.title,
+        }
+
+        if election.select_language not in settings.LANGUAGE_AVAILABLE:
+            activate(settings.DEFAULT_LANGUAGE)
+        else:
+            activate(election.select_language)
+
+        text_body = render_to_string("election/mail_invitation.txt", merge_data)
+        html_body = render_to_string("election/mail_invitation.html", merge_data)   
+
+        msg = EmailMultiAlternatives(
+            f"[{gettext('Mieux Voter')}] {election.title}",
+            text_body,
+            settings.EMAIL_HOST_USER,
+            [couple[0]])
+        msg.attach_alternative(html_body, "text/html")
+        msg.send()
 
 
 class ElectionCreateAPIView(CreateAPIView):
@@ -67,12 +137,19 @@ class ElectionCreateAPIView(CreateAPIView):
 
         election = serializer.save()
         electors_emails = serializer.validated_data.get("elector_emails", [])
+
+        list_email_token = []
         for email in electors_emails:
             token = Token.objects.create(
                 election=election,
             )
-            send_mail_invitation(email, election, token.id)
+            list_email_token.append([email,token.id])
 
+        if settings.EMAIL_TYPE == "API":
+            send_mails_invitation_api(list_email_token, election)
+        else:
+            send_mails_invitation_smtp(list_email_token, election)
+        
         headers = self.get_success_headers(serializer.data)
         return Response(
             serializer.data,
@@ -267,19 +344,7 @@ class LinkAPIView(CreateAPIView):
             merge_data["vote_url"]=(f"{settings.SITE_URL}/vote/{election.id}")
             text_body = render_to_string("election/mail_two_links.txt", merge_data)
             html_body = render_to_string("election/mail_two_links.html", merge_data)
+        
+        send_status = send_mail_api(emails,text_body,html_body,election.title)
 
-        try:
-            msg = EmailMultiAlternatives(
-                f"[{gettext('Mieux Voter')}] {election.title}",
-                text_body,
-                settings.EMAIL_HOST_USER,
-                bcc=emails)
-            msg.attach_alternative(html_body, "text/html")
-            msg.send()
-        except:
-            Response(
-                SEND_MAIL_ERROR,
-                status=status.HTTP_400_BAD_REQUEST,
-                )
-        headers = self.get_success_headers(serializer.data)
-        return Response(status=status.HTTP_200_OK, headers=headers)
+        return Response(status=send_status)

locale/fr/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-16 10:37+0000\n"
+"POT-Creation-Date: 2020-12-08 11:16+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgid ""
 "judgment."
 msgstr ""
 "Nous sommes heureux de vous envoyer ce mail ! Vous pourrez voter avec le "
-"jugementmajoritaire."
+"jugement majoritaire."
 
 #: templates/election/mail_invitation.html:98
 #: templates/election/mail_one_link.html:98

mvapi/settings.py

@@ -10,6 +10,8 @@ https://docs.djangoproject.com/en/2.1/ref/settings/
 
 import os
 
+from django.http.request import RAISE_ERROR
+
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
@@ -136,9 +138,21 @@ if os.environ['EMAIL_USE_TLS'] in ("True", "true", "on", "1"):
 else:
     EMAIL_USE_TLS = False
 
-#Pour test avec compte Gmail
-EMAIL_BACKEND=os.environ['EMAIL_BACKEND']
-EMAIL_HOST_USER=os.environ['EMAIL_HOST_USER']
-EMAIL_HOST_PASSWORD=os.environ.get('EMAIL_HOST_PASSWORD')
-EMAIL_PORT=os.environ['EMAIL_PORT']
-EMAIL_HOST=os.environ['EMAIL_HOST']
+EMAIL_TYPE = os.environ['EMAIL_TYPE']
+if EMAIL_TYPE == "API":
+    #To use the Mailgun's API
+    EMAIL_API_KEY=os.environ['EMAIL_API_KEY']
+    EMAIL_API_DOMAIN=os.environ['EMAIL_API_DOMAIN']
+    DEFAULT_FROM_EMAIL=os.environ['DEFAULT_FROM_EMAIL']
+    EMAIL_SKIP_VERIFICATION=os.environ['EMAIL_SKIP_VERIFICATION']
+
+elif EMAIL_TYPE == "SMTP":
+    #To use with a SMTP service
+    EMAIL_BACKEND=os.environ['EMAIL_BACKEND']
+    EMAIL_HOST_USER=os.environ['EMAIL_HOST_USER']
+    EMAIL_HOST_PASSWORD=os.environ.get('EMAIL_HOST_PASSWORD')
+    EMAIL_PORT=os.environ['EMAIL_PORT']
+    EMAIL_HOST=os.environ['EMAIL_HOST']
+
+else:
+    raise ValueError('API and SMTP are only available')