forest/net
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

define separate email for admin and mail sender

Browse source
This commit is contained in:
deflax 2024-04-03 19:32:33 +03:00
parent 413500c53f
commit dc6c3e0a31
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dist.env
View file

@ -14,10 +14,12 @@ POSTGRES_DB=forest_prod
PGADMIN_DEFAULT_EMAIL=mail@example.com PGADMIN_DEFAULT_EMAIL=mail@example.com
PGADMIN_DEFAULT_PASSWORD=hackme PGADMIN_DEFAULT_PASSWORD=hackme
MAIL_ADMIN=mail@example.com MAIL_SENDER=mail@example.com
MAIL_SUBJECT_PREFIX=ForestNet MAIL_SUBJECT_PREFIX=ForestNet
MAIL_SERVER=smtp.gmail.com MAIL_SERVER=smtp.gmail.com
MAIL_USERNAME=admin@gmail.com MAIL_USERNAME=admin@gmail.com
MAIL_PASSWORD=kur MAIL_PASSWORD=kur
MAIL_PORT=25 MAIL_PORT=25
MAIL_USE_TLS=1 MAIL_USE_TLS=1
ADMIN_MAIL=mail@example.com

5
src/forest/config.py
View file

@ -1,9 +1,7 @@
import os import os
basedir = os.path.abspath(os.path.dirname(__file__)) basedir = os.path.abspath(os.path.dirname(__file__))
class Config(object): class Config(object):
SECRET_KEY = f"{os.getenv('SECRET_KEY')}" SECRET_KEY = f"{os.getenv('SECRET_KEY')}"
RECAPTCHA_PUBLIC_KEY = f"{os.getenv('RECAPTCHA_PUBLIC_KEY')}" RECAPTCHA_PUBLIC_KEY = f"{os.getenv('RECAPTCHA_PUBLIC_KEY')}"
@ -13,10 +11,11 @@ class Config(object):
STATIC_FOLDER = f"{os.getenv('APP_HOME')}/forest/static" STATIC_FOLDER = f"{os.getenv('APP_HOME')}/forest/static"
MEDIA_FOLDER = f"{os.getenv('APP_HOME')}/forest/media" MEDIA_FOLDER = f"{os.getenv('APP_HOME')}/forest/media"
ADMIN_PREFIX = "fadmin" ADMIN_PREFIX = "fadmin"
MAIL_SENDER = f"{os.getenv('MAIL_SENDER')}"
MAIL_SERVER = f"{os.getenv('MAIL_SERVER')}" MAIL_SERVER = f"{os.getenv('MAIL_SERVER')}"
MAIL_USERNAME = f"{os.getenv('MAIL_USERNAME')}" MAIL_USERNAME = f"{os.getenv('MAIL_USERNAME')}"
MAIL_PASSWORD = f"{os.getenv('MAIL_PASSWORD')}" MAIL_PASSWORD = f"{os.getenv('MAIL_PASSWORD')}"
MAIL_PORT = f"{os.getenv('MAIL_PORT')}" MAIL_PORT = f"{os.getenv('MAIL_PORT')}"
MAIL_SUBJECT_PREFIX = f"{os.getenv('MAIL_SUBJECT_PREFIX')}" MAIL_SUBJECT_PREFIX = f"{os.getenv('MAIL_SUBJECT_PREFIX')}"
MAIL_ADMIN = f"{os.getenv('MAIL_ADMIN')}"
MAIL_USE_TLS = f"{os.getenv('MAIL_USE_TLS')}" MAIL_USE_TLS = f"{os.getenv('MAIL_USE_TLS')}"
ADMIN_MAIL = f"{os.getenv('ADMIN_MAIL')}"

2
src/forest/mailsender.py
View file

@ -16,7 +16,7 @@ def send_email(to, subject, template, **kwargs):
else: else:
newsubject = subject newsubject = subject
app = current_app._get_current_object() app = current_app._get_current_object()
msg = Message(app.config['MAIL_SUBJECT_PREFIX'] + ' ' + newsubject, sender=app.config['MAIL_ADMIN'], recipients=[to]) msg = Message(app.config['MAIL_SUBJECT_PREFIX'] + ' ' + newsubject, sender=app.config['MAIL_SENDER'], recipients=[to])
msg.body = render_template(template + '.txt', **kwargs) msg.body = render_template(template + '.txt', **kwargs)
msg.html = render_template(template + '.html', **kwargs) msg.html = render_template(template + '.html', **kwargs)
thr = Thread(target=send_async_email, args=[app, msg]) thr = Thread(target=send_async_email, args=[app, msg])

2
src/forest/models.py
View file

@ -88,7 +88,7 @@ class User(db.Model, UserMixin):
super(User, self).__init__(**kwargs) super(User, self).__init__(**kwargs)
if self.role is None: if self.role is None:
if self.email == current_app.config['MAIL_ADMIN']: if self.email == current_app.config['ADMIN_MAIL']:
#if email match config admin name create admin user #if email match config admin name create admin user
self.role = Role.query.filter_by(permissions=0xff).first() self.role = Role.query.filter_by(permissions=0xff).first()
if self.role is None: if self.role is None: