Password reset mail (#85)

* Change reset password link in Mailer to front * Fix password reset URL in tests.py
InsaLan · Oct 25, 2023 · e0a33ef · e0a33ef
1 parent 61af992
commit e0a33ef
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/insalan/user/models.py b/insalan/user/models.py
@@ -170,16 +170,12 @@ def send_password_reset(user_object: User):
                 "pour votre compte. Si vous êtes à l'origine de cette demande,"
                 "vous pouvez cliquer sur le lien suivant: "
             )
-            + "http://api."
+            + "http://"
             + getenv("WEBSITE_HOST", "localhost")
-            + reverse("reset-password")
-            + "?"
-            + urlencode(
-                {
-                    "user": user,
-                    "token": token,
-                }
-            ),
+            + "/reset-password/"
+            + user
+            + "/"
+            + token,
             None,  # Django falls back to default of settings.py
             [user_object.email],
             fail_silently=False,

diff --git a/insalan/user/tests.py b/insalan/user/tests.py
@@ -503,7 +503,7 @@ def test_can_reset_password(self):
 
         match = re.search(
             # "https?://[^ ]*/password-reset/ask[^ ]*",
-            ".*https?://[^ ]*/\?user=(?P<username>[^ &]*)&token=(?P<token>[^ /]*)",
+            ".*https?://[^ ]*/(?P<username>[^ &]*)/(?P<token>[^ /]*)",
             mail.outbox[0].body,
         )
 
@@ -550,7 +550,7 @@ def test_can_reset_password_only_once(self):
 
         match = re.search(
             # "https?://[^ ]*/password-reset/ask[^ ]*",
-            ".*https?://[^ ]*/\?user=(?P<username>[^ &]*)&token=(?P<token>[^ /]*)",
+            ".*https?://[^ ]*/(?P<username>[^ &]*)/(?P<token>[^ /]*)",
             mail.outbox[0].body,
         )
 
@@ -592,7 +592,7 @@ def test_password_reset_is_token_checked(self):
         self.client.post("/v1/user/password-reset/ask/", data, format="json")
 
         match = re.search(
-            ".*https?://[^ ]*/\?user=(?P<username>[^ &]*)&token=(?P<token>[^ /]*)",
+            ".*https?://[^ ]*/(?P<username>[^ &]*)/(?P<token>[^ /]*)",
             mail.outbox[0].body,
         )