summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradityacp2017-05-03 16:08:43 +0530
committeradityacp2017-05-03 16:08:43 +0530
commit5cebef64ed9f3c164db964828a62c7e0a3bde290 (patch)
treeb1e249b232f55ebbc3fb0a0523de9834e2b0fddf
parente56c50bb99a8694e8f1c8533df3f04e4613bcb08 (diff)
downloadonline_test-5cebef64ed9f3c164db964828a62c7e0a3bde290.tar.gz
online_test-5cebef64ed9f3c164db964828a62c7e0a3bde290.tar.bz2
online_test-5cebef64ed9f3c164db964828a62c7e0a3bde290.zip
Rename email_verification.py to send_emails.py
-rw-r--r--yaksh/send_emails.py (renamed from yaksh/email_verification.py)18
1 files changed, 4 insertions, 14 deletions
diff --git a/yaksh/email_verification.py b/yaksh/send_emails.py
index 721fa61..37736d5 100644
--- a/yaksh/email_verification.py
+++ b/yaksh/send_emails.py
@@ -12,6 +12,8 @@ import smtplib
# Django imports
from django.utils.crypto import get_random_string
from django.conf import settings
+from django.core.mail import send_mass_mail, send_mail
+
def generate_activation_key(username):
""" Generate hashed secret key for email activation """
@@ -19,6 +21,7 @@ def generate_activation_key(username):
secret_key = get_random_string(randint(10, 40), chars)
return hashlib.sha256((secret_key + username).encode('utf-8')).hexdigest()
+
def send_user_mail(user_mail, key):
""" Send mail to user whose email is to be verified
This function should get two args i.e user_email and secret_key.
@@ -40,20 +43,7 @@ def send_user_mail(user_mail, key):
""".format(settings.PRODUCTION_URL, key, settings.REPLY_EMAIL)
)
- user = settings.EMAIL_HOST_USER
- pwd = settings.EMAIL_HOST_PASSWORD
- smtpserver = smtplib.SMTP(settings.EMAIL_HOST, settings.EMAIL_PORT)
- smtpserver.ehlo()
- smtpserver.starttls()
- smtpserver.ehlo()
- smtpserver.esmtp_features['auth']='LOGIN DIGEST-MD5 PLAIN'
-
- smtpserver.login(user, pwd)
- header = 'To:{0}\nFrom:{1}\nSubject:{2}\n'.format(to,
- settings.SENDER_EMAIL, subject)
- message = '{0}\n{1}\n\n'.format(header, message)
- smtpserver.sendmail(user, to, message)
- smtpserver.close()
+ send_mail(subject, message, settings.SENDER_EMAIL, [to])
msg = "An activation link is sent to your registered email.\
Please activate the link within 20 minutes."