Merge pull request #1636 from GSA/invites

fix invites again

app/delivery/send_to_providers.py

@@ -185,8 +185,10 @@ def send_email_to_provider(notification):
     recipient = recipient.decode("utf-8")
     personalisation = redis_store.get(f"email-personalisation-{notification.id}")
     if personalisation:
-        personalisation = personalisation.decode("utf-8")
-        notification.personalisation = json.loads(personalisation)
+        p = personalisation.decode("utf-8")
+
+        p = json.loads(p)
+        notification.personalisation = p
 
     service = SerialisedService.from_id(notification.service_id)
     if not service.active:
@@ -210,6 +212,12 @@ def send_email_to_provider(notification):
             template_dict, values=notification.personalisation
         )
 
+        html_email = str(html_email)
+        html_email = html_email.replace("%5B", "")
+        html_email = html_email.replace("%5D", "")
+        html_email = html_email.replace("(", "")
+        html_email = html_email.replace(")", "")
+
         if notification.key_type == KeyType.TEST:
             notification.reference = str(create_uuid())
             update_notification_to_sending(notification, provider)
@@ -225,7 +233,7 @@ def send_email_to_provider(notification):
                 recipient,
                 plain_text_email.subject,
                 body=str(plain_text_email),
-                html_body=str(html_email),
+                html_body=html_email,
                 reply_to_address=notification.reply_to_text,
             )
             notification.reference = reference

poetry.lock

@@ -208,14 +208,14 @@ files = [
 
 [[package]]
 name = "async-timeout"
-version = "4.0.3"
+version = "5.0.1"
 description = "Timeout context manager for asyncio programs"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 groups = ["main"]
 files = [
-    {file = "async-timeout-4.0.3.tar.gz", hash = "sha256:4640d96be84d82d02ed59ea2b7105a0f7b33abe8703703cd0ab0bf87c427522f"},
-    {file = "async_timeout-4.0.3-py3-none-any.whl", hash = "sha256:7405140ff1230c310e51dc27b3145b9092d659ce68ff733fb0cefe3ee42be028"},
+    {file = "async_timeout-5.0.1-py3-none-any.whl", hash = "sha256:39e3809566ff85354557ec2398b55e096c8364bacac9405a7a1fa429e77fe76c"},
+    {file = "async_timeout-5.0.1.tar.gz", hash = "sha256:d9321a7a3d5a6a5e187e824d2fa0793ce379a202935782d555d6e9d2735677d3"},
 ]
 
 [[package]]
@@ -853,21 +853,19 @@ colorama = {version = "*", markers = "platform_system == \"Windows\""}
 
 [[package]]
 name = "click-datetime"
-version = "0.2"
+version = "0.4.0"
 description = "Datetime type support for click."
 optional = false
-python-versions = "*"
+python-versions = "<4.0,>=3.12"
 groups = ["main"]
 files = [
-    {file = "click-datetime-0.2.tar.gz", hash = "sha256:c562ad24b3711784a655a49141b4a87933a78608fe66296259acae95fda5e115"},
-    {file = "click_datetime-0.2-py2.py3-none-any.whl", hash = "sha256:7256ca518e648ada8e2550239ab328de125906e5b7199a5bd5bcbb4dfe28f946"},
+    {file = "click_datetime-0.4.0-py3-none-any.whl", hash = "sha256:dfd2f54142f0f899535e400946d724cc8319b4cf70d110d1451f892a6f010b04"},
+    {file = "click_datetime-0.4.0.tar.gz", hash = "sha256:9f35ed3fab13f553221ce8c5a895e5185d7360993c51dd7f8628b9b4f636930b"},
 ]
 
 [package.dependencies]
-click = "*"
-
-[package.extras]
-dev = ["wheel"]
+click = ">=8.0.0,<9.0.0"
+wheel = ">=0.44.0,<0.45.0"
 
 [[package]]
 name = "click-didyoumean"
@@ -3691,18 +3689,18 @@ dev = ["argcomplete", "attrs (>=19.2)", "hypothesis (>=3.56)", "mock", "pygments
 
 [[package]]
 name = "pytest-cov"
-version = "5.0.0"
+version = "6.1.1"
 description = "Pytest plugin for measuring coverage."
 optional = false
-python-versions = ">=3.8"
+python-versions = ">=3.9"
 groups = ["dev"]
 files = [
-    {file = "pytest-cov-5.0.0.tar.gz", hash = "sha256:5837b58e9f6ebd335b0f8060eecce69b662415b16dc503883a02f45dfeb14857"},
-    {file = "pytest_cov-5.0.0-py3-none-any.whl", hash = "sha256:4f0764a1219df53214206bf1feea4633c3b558a2925c8b59f144f682861ce652"},
+    {file = "pytest_cov-6.1.1-py3-none-any.whl", hash = "sha256:bddf29ed2d0ab6f4df17b4c55b0a657287db8684af9c42ea546b21b1041b3dde"},
+    {file = "pytest_cov-6.1.1.tar.gz", hash = "sha256:46935f7aaefba760e716c2ebfbe1c216240b9592966e7da99ea8292d4d3e2a0a"},
 ]
 
 [package.dependencies]
-coverage = {version = ">=5.2.1", extras = ["toml"]}
+coverage = {version = ">=7.5", extras = ["toml"]}
 pytest = ">=4.6"
 
 [package.extras]
@@ -4919,6 +4917,21 @@ MarkupSafe = ">=2.1.1"
 [package.extras]
 watchdog = ["watchdog (>=2.3)"]
 
+[[package]]
+name = "wheel"
+version = "0.44.0"
+description = "A built-package format for Python"
+optional = false
+python-versions = ">=3.8"
+groups = ["main"]
+files = [
+    {file = "wheel-0.44.0-py3-none-any.whl", hash = "sha256:2376a90c98cc337d18623527a97c31797bd02bad0033d41547043a1cbfbe448f"},
+    {file = "wheel-0.44.0.tar.gz", hash = "sha256:a29c3f2817e95ab89aa4660681ad547c0e9547f20e75b0562fe7723c9a2a9d49"},
+]
+
+[package.extras]
+test = ["pytest (>=6.0.0)", "setuptools (>=65)"]
+
 [[package]]
 name = "wrapt"
 version = "1.16.0"
@@ -5186,4 +5199,4 @@ propcache = ">=0.2.0"
 [metadata]
 lock-version = "2.1"
 python-versions = "^3.12.2"
-content-hash = "845e698d8dfbbc28183b315c057e33c2d5e7af13c9321dab85fbb32ec4f76957"
+content-hash = "192d1c32b0f75b984ffe4c95c381b160fe5239c3d03c54ebfae4e4aec73c4223"

pyproject.toml

@@ -19,7 +19,7 @@ certifi = ">=2022.12.7"
 cffi = "==1.17.1"
 charset-normalizer = "^3.1.0"
 click = "==8.1.7"
-click-datetime = "==0.2"
+click-datetime = "==0.4.0"
 click-didyoumean = "==0.3.1"
 click-plugins = "==1.1.1"
 click-repl = "==0.3.0"
@@ -49,7 +49,7 @@ python-dotenv = "==1.0.1"
 sqlalchemy = "==2.0.31"
 werkzeug = "^3.0.6"
 faker = "^26.0.0"
-async-timeout = "^4.0.3"
+async-timeout = "^5.0.1"
 bleach = "^6.1.0"
 geojson = "^3.2.0"
 numpy = "^2.2.3"
@@ -96,7 +96,7 @@ pre-commit = "^3.8.0"
 pytest = "^8.3.2"
 pytest-env = "^1.1.3"
 pytest-mock = "^3.14.0"
-pytest-cov = "^5.0.0"
+pytest-cov = "^6.1.1"
 pytest-xdist = "^3.5.0"
 radon = "^6.0.1"
 requests-mock = "^1.11.0"