{{ title }}
- +
Errors: {{ error }}
+
+
+
+
+
+
diff --git a/poetry.lock b/poetry.lock
index 7d6c5fcfb86a..bb54912ee9f6 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -153,6 +153,14 @@ typing-extensions = ">=3.7.4"
colorama = ["colorama (>=0.4.3)"]
d = ["aiohttp (>=3.3.2)", "aiohttp-cors"]
+[[package]]
+name = "cachetools"
+version = "4.2.4"
+description = "Extensible memoizing collections and decorators"
+category = "main"
+optional = false
+python-versions = "~=3.5"
+
[[package]]
name = "certifi"
version = "2021.5.30"
@@ -172,6 +180,14 @@ python-versions = "*"
[package.dependencies]
pycparser = "*"
+[[package]]
+name = "chardet"
+version = "4.0.0"
+description = "Universal encoding detector for Python 2 and 3"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+
[[package]]
name = "charset-normalizer"
version = "2.0.6"
@@ -240,6 +256,26 @@ sdist = ["setuptools-rust (>=0.11.4)"]
ssh = ["bcrypt (>=3.1.5)"]
test = ["pytest (>=6.0)", "pytest-cov", "pytest-subtests", "pytest-xdist", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"]
+[[package]]
+name = "cssselect"
+version = "1.1.0"
+description = "cssselect parses CSS3 Selectors and translates them to XPath 1.0"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+
+[[package]]
+name = "cssutils"
+version = "2.3.0"
+description = "A CSS Cascading Style Sheets library for Python"
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.extras]
+docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"]
+testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "mock", "lxml", "cssselect", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources"]
+
[[package]]
name = "decorator"
version = "5.1.0"
@@ -263,6 +299,22 @@ six = ">=1.9.0"
gmpy = ["gmpy"]
gmpy2 = ["gmpy2"]
+[[package]]
+name = "emails"
+version = "0.6"
+description = "Modern python library for emails."
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+chardet = "*"
+cssutils = "*"
+lxml = "*"
+premailer = "*"
+python-dateutil = "*"
+requests = "*"
+
[[package]]
name = "extruct"
version = "0.12.0"
@@ -707,6 +759,25 @@ python-versions = ">=3.6"
dev = ["pre-commit", "tox"]
testing = ["pytest", "pytest-benchmark"]
+[[package]]
+name = "premailer"
+version = "3.10.0"
+description = "Turns CSS blocks into style attributes"
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+cachetools = "*"
+cssselect = "*"
+cssutils = "*"
+lxml = "*"
+requests = "*"
+
+[package.extras]
+dev = ["tox", "twine", "therapist", "black", "flake8", "wheel"]
+test = ["nose", "mock"]
+
[[package]]
name = "psycopg2-binary"
version = "2.9.1"
@@ -887,7 +958,7 @@ testing = ["fields", "hunter", "process-tests", "six", "pytest-xdist", "virtuale
name = "python-dateutil"
version = "2.8.2"
description = "Extensions to the standard Python datetime module"
-category = "dev"
+category = "main"
optional = false
python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
@@ -1334,7 +1405,7 @@ pgsql = ["psycopg2-binary"]
[metadata]
lock-version = "1.1"
python-versions = "^3.9"
-content-hash = "1b9a18e7114a8f157226c20e951dce0bd08ac884e0795f0f816e9f57d72ec309"
+content-hash = "c030cae2012cedbcad514df8f63a79288d0390d211cfdf4f5a6489a11c96d923"
[metadata.files]
aiofiles = [
@@ -1385,6 +1456,10 @@ beautifulsoup4 = [
black = [
{file = "black-20.8b1.tar.gz", hash = "sha256:1c02557aa099101b9d21496f8a914e9ed2222ef70336404eeeac8edba836fbea"},
]
+cachetools = [
+ {file = "cachetools-4.2.4-py3-none-any.whl", hash = "sha256:92971d3cb7d2a97efff7c7bb1657f21a8f5fb309a37530537c71b1774189f2d1"},
+ {file = "cachetools-4.2.4.tar.gz", hash = "sha256:89ea6f1b638d5a73a4f9226be57ac5e4f399d22770b92355f92dcb0f7f001693"},
+]
certifi = [
{file = "certifi-2021.5.30-py2.py3-none-any.whl", hash = "sha256:50b1e4f8446b06f41be7dd6338db18e0990601dce795c2b1686458aa7e8fa7d8"},
{file = "certifi-2021.5.30.tar.gz", hash = "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee"},
@@ -1436,6 +1511,10 @@ cffi = [
{file = "cffi-1.14.6-cp39-cp39-win_amd64.whl", hash = "sha256:818014c754cd3dba7229c0f5884396264d51ffb87ec86e927ef0be140bfdb0d2"},
{file = "cffi-1.14.6.tar.gz", hash = "sha256:c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd"},
]
+chardet = [
+ {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"},
+ {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"},
+]
charset-normalizer = [
{file = "charset-normalizer-2.0.6.tar.gz", hash = "sha256:5ec46d183433dcbd0ab716f2d7f29d8dee50505b3fdb40c6b985c7c4f5a3591f"},
{file = "charset_normalizer-2.0.6-py3-none-any.whl", hash = "sha256:5d209c0a931f215cee683b6445e2d77677e7e75e159f78def0db09d68fafcaa6"},
@@ -1525,6 +1604,14 @@ cryptography = [
{file = "cryptography-3.4.8-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:cd65b60cfe004790c795cc35f272e41a3df4631e2fb6b35aa7ac6ef2859d554e"},
{file = "cryptography-3.4.8.tar.gz", hash = "sha256:94cc5ed4ceaefcbe5bf38c8fba6a21fc1d365bb8fb826ea1688e3370b2e24a1c"},
]
+cssselect = [
+ {file = "cssselect-1.1.0-py2.py3-none-any.whl", hash = "sha256:f612ee47b749c877ebae5bb77035d8f4202c6ad0f0fc1271b3c18ad6c4468ecf"},
+ {file = "cssselect-1.1.0.tar.gz", hash = "sha256:f95f8dedd925fd8f54edb3d2dfb44c190d9d18512377d3c1e2388d16126879bc"},
+]
+cssutils = [
+ {file = "cssutils-2.3.0-py3-none-any.whl", hash = "sha256:0cf1f6086b020dee18048ff3999339499f725934017ef9ae2cd5bb77f9ab5f46"},
+ {file = "cssutils-2.3.0.tar.gz", hash = "sha256:b2d3b16047caae82e5c590036935bafa1b621cf45c2f38885af4be4838f0fd00"},
+]
decorator = [
{file = "decorator-5.1.0-py3-none-any.whl", hash = "sha256:7b12e7c3c6ab203a29e157335e9122cb03de9ab7264b137594103fd4a683b374"},
{file = "decorator-5.1.0.tar.gz", hash = "sha256:e59913af105b9860aa2c8d3272d9de5a56a4e608db9a2f167a8480b323d529a7"},
@@ -1533,6 +1620,10 @@ ecdsa = [
{file = "ecdsa-0.17.0-py2.py3-none-any.whl", hash = "sha256:5cf31d5b33743abe0dfc28999036c849a69d548f994b535e527ee3cb7f3ef676"},
{file = "ecdsa-0.17.0.tar.gz", hash = "sha256:b9f500bb439e4153d0330610f5d26baaf18d17b8ced1bc54410d189385ea68aa"},
]
+emails = [
+ {file = "emails-0.6-py2.py3-none-any.whl", hash = "sha256:72c1e3198075709cc35f67e1b49e2da1a2bc087e9b444073db61a379adfb7f3c"},
+ {file = "emails-0.6.tar.gz", hash = "sha256:a4c2d67ea8b8831967a750d8edc6e77040d7693143fe280e6d2a367d9c36ff88"},
+]
extruct = [
{file = "extruct-0.12.0-py2.py3-none-any.whl", hash = "sha256:42c6c9f50b00aa6c17b5c26b5f1b3a337ebc27b427fafc3714f34ce3bbb16c2f"},
{file = "extruct-0.12.0.tar.gz", hash = "sha256:d4a68bb79d1b85ff36d603a42c2666888bb480191a399a659d9daaf735358276"},
@@ -1876,6 +1967,10 @@ pluggy = [
{file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
{file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
]
+premailer = [
+ {file = "premailer-3.10.0-py2.py3-none-any.whl", hash = "sha256:021b8196364d7df96d04f9ade51b794d0b77bcc19e998321c515633a2273be1a"},
+ {file = "premailer-3.10.0.tar.gz", hash = "sha256:d1875a8411f5dc92b53ef9f193db6c0f879dc378d618e0ad292723e388bfe4c2"},
+]
psycopg2-binary = [
{file = "psycopg2-binary-2.9.1.tar.gz", hash = "sha256:b0221ca5a9837e040ebf61f48899926b5783668b7807419e4adae8175a31f773"},
{file = "psycopg2_binary-2.9.1-cp36-cp36m-macosx_10_14_x86_64.macosx_10_9_intel.macosx_10_9_x86_64.macosx_10_10_intel.macosx_10_10_x86_64.whl", hash = "sha256:c250a7ec489b652c892e4f0a5d122cc14c3780f9f643e1a326754aedf82d9a76"},
diff --git a/pyproject.toml b/pyproject.toml
index 82fd607589ba..3eed9876aa27 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -36,6 +36,7 @@ apprise = "0.9.3"
recipe-scrapers = "^13.2.7"
psycopg2-binary = {version = "^2.9.1", optional = true}
gunicorn = "^20.1.0"
+emails = "^0.6"
[tool.poetry.dev-dependencies]
pylint = "^2.6.0"
diff --git a/template.env b/template.env
index e53ade848d21..b98cde18f8de 100644
--- a/template.env
+++ b/template.env
@@ -24,8 +24,13 @@ POSTGRES_DB=mealie
TOKEN_TIME=24
# NOT USED
-SFTP_USERNAME=None
-SFTP_PASSWORD=None
+# SMTP_HOST=""
+# SMTP_PORT=""
+# SMTP_FROM_NAME=""
+# SMTP_TLS=""
+# SMTP_FROM_EMAIL=""
+# SMTP_USER=""
+# SMTP_PASSWORD=""
# Default Recipe Settings
RECIPE_PUBLIC=False
diff --git a/tests/unit_tests/test_config.py b/tests/unit_tests/test_config.py
index 3ceb507ce7e4..837e0fc36471 100644
--- a/tests/unit_tests/test_config.py
+++ b/tests/unit_tests/test_config.py
@@ -77,3 +77,19 @@ def test_set_data_dir():
assert determine_data_dir(True) == PROD_DIR
assert determine_data_dir(False) == DEV_DIR
+
+
+def test_smtp_enable(monkeypatch):
+ app_settings = AppSettings()
+ assert app_settings.SMTP_ENABLE is False
+
+ monkeypatch.setenv("SMTP_HOST", "email.mealie.io")
+ monkeypatch.setenv("SMTP_PORT", "587")
+ monkeypatch.setenv("SMTP_TLS", "true")
+ monkeypatch.setenv("SMTP_FROM_NAME", "Mealie")
+ monkeypatch.setenv("SMTP_FROM_EMAIL", "mealie@mealie.io")
+ monkeypatch.setenv("SMTP_USER", "mealie@mealie.io")
+ monkeypatch.setenv("SMTP_PASSWORD", "mealie-password")
+
+ app_settings = AppSettings()
+ assert app_settings.SMTP_ENABLE is True
diff --git a/tests/unit_tests/test_email_service.py b/tests/unit_tests/test_email_service.py
new file mode 100644
index 000000000000..ea15477e31a4
--- /dev/null
+++ b/tests/unit_tests/test_email_service.py
@@ -0,0 +1,65 @@
+import pytest
+
+from mealie.core.config import AppSettings
+from mealie.services.email import EmailService
+from mealie.services.email.email_senders import ABCEmailSender
+
+FAKE_ADDRESS = "my_secret_email@email.com"
+
+SUBJECTS = {"Mealie Forgot Password", "Invitation to join Mealie", "Test Email"}
+
+
+class TestEmailSender(ABCEmailSender):
+ def send(self, email_to: str, subject: str, html: str) -> bool:
+
+ # check email_to:
+ assert email_to == FAKE_ADDRESS
+
+ # check subject:
+ assert subject in SUBJECTS
+
+ # check html is rendered:
+ assert "{{" not in html
+ assert "}}" not in html
+
+ return True
+
+
+def patch_env(monkeypatch):
+ monkeypatch.setenv("SMTP_HOST", "email.mealie.io")
+ monkeypatch.setenv("SMTP_PORT", 587)
+ monkeypatch.setenv("SMTP_TLS", True)
+ monkeypatch.setenv("SMTP_FROM_NAME", "Mealie")
+ monkeypatch.setenv("SMTP_FROM_EMAIL", "mealie@mealie.io")
+ monkeypatch.setenv("SMTP_USER", "mealie@mealie.io")
+ monkeypatch.setenv("SMTP_PASSWORD", "mealie-password")
+
+
+@pytest.fixture()
+def email_service(monkeypatch) -> EmailService:
+ patch_env(monkeypatch)
+ email_service = EmailService(TestEmailSender())
+ email_service.settings = AppSettings()
+ return email_service
+
+
+def test_email_disabled():
+ email_service = EmailService(TestEmailSender())
+ email_service.settings = AppSettings()
+ success = email_service.send_test_email(FAKE_ADDRESS)
+ assert not success
+
+
+def test_test_email(email_service):
+ success = email_service.send_test_email(FAKE_ADDRESS)
+ assert success
+
+
+def test_forgot_password_email(email_service):
+ success = email_service.send_forgot_password(FAKE_ADDRESS, "https://password-url.com")
+ assert success
+
+
+def test_invitation_email(email_service):
+ success = email_service.send_invitation(FAKE_ADDRESS, "https://invitie-url.com")
+ assert success
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
|
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
|
+