From 66bf945770d613bb58ec5c08ad1ca43e6a2289fa Mon Sep 17 00:00:00 2001
From: Oliver Falk <oliver@linux-kernel.at>
Date: Thu, 17 Nov 2022 12:00:26 +0100
Subject: [PATCH 1/2] Need to use non-release version, since use_2to3 doesn't
 work with newer python any more + resort

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index f385a08..50fef72 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,6 +12,7 @@ django-user-accounts
 email-validator
 fabric
 flake8-respect-noqa
+git+https://github.com/daboth/pagan.git
 git+https://github.com/ercpe/pydenticon5.git
 git+https://github.com/flavono123/identicon.git
 git+https://github.com/ofalk/django-openid-auth
@@ -19,7 +20,6 @@ git+https://github.com/ofalk/monsterid.git
 git+https://github.com/ofalk/Robohash.git@devel
 mysqlclient
 notsetuptools
-pagan
 Pillow
 pip
 psycopg2-binary

From 93e8b3f07fda66bf224753c989f5447d7da3a978 Mon Sep 17 00:00:00 2001
From: Oliver Falk <oliver@linux-kernel.at>
Date: Thu, 17 Nov 2022 12:26:08 +0100
Subject: [PATCH 2/2] Workaround for #89

---
 ivatar/ivataraccount/views.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ivatar/ivataraccount/views.py b/ivatar/ivataraccount/views.py
index 2bb7711..b1dba83 100644
--- a/ivatar/ivataraccount/views.py
+++ b/ivatar/ivataraccount/views.py
@@ -1080,10 +1080,9 @@ class PasswordResetView(PasswordResetViewOriginal):
             user = None
 
             # Try to find the user via the normal user class
-            try:
-                user = User.objects.get(email=request.POST["email"])
-            except ObjectDoesNotExist:
-                pass
+            # TODO: How to handle the case that multiple user accounts
+            # could have the same password set?
+            user = User.objects.filter(email=request.POST["email"]).first()
 
             # If we didn't find the user in the previous step,
             # try the ConfirmedEmail class instead.