From 361ab675d3e2daffe9c98dcb7942d6f5aa0273d3 Mon Sep 17 00:00:00 2001
From: Matthew Grove <me@mgrove.uk>
Date: Thu, 19 Jan 2023 23:49:04 +0000
Subject: [PATCH] [FEAT] Attempt to include password reset link in welcome
 email

---
 breccia_mapper/settings.py           | 6 ------
 people/fixtures/email_templates.json | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/breccia_mapper/settings.py b/breccia_mapper/settings.py
index 3c55ead..ba14690 100644
--- a/breccia_mapper/settings.py
+++ b/breccia_mapper/settings.py
@@ -348,9 +348,6 @@ CONSTANCE_CONFIG = {
     'RELATIONSHIP_FORM_HELP': (
         '',
         'Help text to display at the top of relationship forms.'),
-    'DEPLOYMENT_URL': (
-      'http://localhost',
-      'URL at which this mapper tool is accessible - do NOT include a trailing forward slash'),
     'PARENT_PROJECT_NAME': (
       '',
       'Parent project name'),
@@ -448,9 +445,6 @@ CONSTANCE_CONFIG_FIELDSETS = {
         'ORGANISATION_LIST_HELP',
         'RELATIONSHIP_FORM_HELP',
     ),
-    'Deployment': (
-        'DEPLOYMENT_URL',
-    ),
 }  # yapf: disable
 
 CONSTANCE_BACKEND = 'constance.backends.database.DatabaseBackend'
diff --git a/people/fixtures/email_templates.json b/people/fixtures/email_templates.json
index ceacc07..09511ac 100644
--- a/people/fixtures/email_templates.json
+++ b/people/fixtures/email_templates.json
@@ -7,8 +7,8 @@
             "created": "2020-04-27T12:13:30.448Z",
             "last_updated": "2020-04-27T14:45:27.152Z",
             "subject": "Welcome to {{config.PROJECT_LONG_NAME}}",
-            "content": "Dear user,\r\n\r\nWelcome to {{ config.PROJECT_LONG_NAME }}. You can set your password at {{ config.DEPLOYMENT_URL }}/password_reset/.\r\n\r\nThanks,\r\n\r\nThe {{ config.PROJECT_SHORT_NAME }} team",
-            "html_content": "<h1>{{ config.PROJECT_LONG_NAME }}</h1><br/><p>Dear user,</p><br/><p>Welcome to {{ config.PROJECT_LONG_NAME }}. You can set your password <a href='{{ config.DEPLOYMENT_URL }}/password_reset/'>here</a>.</p><br/><p>Thanks,</p><p>The {{ config.PROJECT_SHORT_NAME }} team</p>",
+            "content": "Dear user,\r\n\r\nWelcome to {{ config.PROJECT_LONG_NAME }}. You can set your password at {% block reset_link %}{{ protocol }}://{{ domain }}{% url 'password_reset_confirm' uidb64=uid token=token %}{% endblock %}.\r\n\r\nThanks,\r\n\r\nThe {{ config.PROJECT_SHORT_NAME }} team",
+            "html_content": "<h1>{{ config.PROJECT_LONG_NAME }}</h1><br/><p>Dear user,</p><br/><p>Welcome to {{ config.PROJECT_LONG_NAME }}. {% block reset_link %}You can set your password <a href='{{ protocol }}://{{ domain }}{% url 'password_reset_confirm' uidb64=uid token=token %}'>here</a>.{% endblock %}</p><br/><p>Thanks,</p><p>The {{ config.PROJECT_SHORT_NAME }} team</p>",
             "language": "",
             "default_template": null
         }