josh/django-mfa2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19 from Aquaveo/email-fixes

Browse Source 
Two Fixes to Make Email Method More Robust
This commit is contained in:
Mohamed El-Kalioby
2020-09-09 18:28:21 +03:00
committed by GitHub
parent d00083a0cf c34efd6ba9
commit 01a2766ef5
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mfa/Common.py
View File

@@ -2,7 +2,10 @@ from django.conf import settings
from django.core.mail import EmailMessage from django.core.mail import EmailMessage
def send(to,subject,body): def send(to,subject,body):
From = "%s <%s>" % (settings.EMAIL_FROM, settings.EMAIL_HOST_USER) from_email_address = settings.EMAIL_HOST_USER
if '@' not in from_email_address:
from_email_address = settings.DEFAULT_FROM_EMAIL
From = "%s <%s>" % (settings.EMAIL_FROM, from_email_address)
email = EmailMessage(subject,body,From,to) email = EmailMessage(subject,body,From,to)
email.content_subtype = "html" email.content_subtype = "html"
return email.send(False) return email.send(False)

2
mfa/Email.py
View File

@@ -14,7 +14,7 @@ def sendEmail(request,username,secret):
kwargs = {key: username} kwargs = {key: username}
user = User.objects.get(**kwargs) user = User.objects.get(**kwargs)
res=render(request,"mfa_email_token_template.html",{"request":request,"user":user,'otp':secret}) res=render(request,"mfa_email_token_template.html",{"request":request,"user":user,'otp':secret})
return send([user.email],"OTP", str(res.content)) return send([user.email],"OTP", res.content.decode())
@never_cache @never_cache
def start(request): def start(request):