fix: send password reset emails to the correct user

Change-Id: I6e88d9fd742255a30a9572f446a3d2b35fb0fcf0

diff --git a/src/org/cacert/gigi/pages/PasswordResetPage.java b/src/org/cacert/gigi/pages/PasswordResetPage.java
index 580d0e54235da0c4e0305200f853fd1800ba86be..20b372d885e8133f11ada19bafc1b88fc0930149 100644 (file)
--- a/src/org/cacert/gigi/pages/PasswordResetPage.java
+++ b/src/org/cacert/gigi/pages/PasswordResetPage.java
@@ -125,7 +125,7 @@ public class PasswordResetPage extends Page {
                     + "?id=" + id + "&token=" + URLEncoder.encode(ptok, "UTF-8"));
             vars.put("hour_max", HOUR_MAX);
 
                     + "?id=" + id + "&token=" + URLEncoder.encode(ptok, "UTF-8"));
             vars.put("hour_max", HOUR_MAX);
 

-            passwordResetMail.sendMail(l, vars, Page.getUser(req).getEmail());
+            passwordResetMail.sendMail(l, vars, targetUser.getEmail());

         } catch (IOException e) {
             e.printStackTrace();
         }
         } catch (IOException e) {
             e.printStackTrace();
         }

diff --git a/tests/org/cacert/gigi/pages/account/TestPasswordResetExternal.java b/tests/org/cacert/gigi/pages/account/TestPasswordResetExternal.java
index 7112bd2d4e71494358614dd80e4a76f494816249..b00927b2a627ba19a0c252a91726a931a84b1711 100644 (file)
--- a/tests/org/cacert/gigi/pages/account/TestPasswordResetExternal.java
+++ b/tests/org/cacert/gigi/pages/account/TestPasswordResetExternal.java
@@ -37,6 +37,7 @@ public class TestPasswordResetExternal extends ClientTest {
         TestMail mail = getMailReceiver().receive();
         assertThat(mail.getSubject(), containsString("Verification"));
         mail = getMailReceiver().receive();
         TestMail mail = getMailReceiver().receive();
         assertThat(mail.getSubject(), containsString("Verification"));
         mail = getMailReceiver().receive();

+        assertEquals(mail.getTo(), this.u.getEmail());

         String link = mail.extractLink();
         String npw = TEST_PASSWORD + "'";
         System.out.println(link);
         String link = mail.extractLink();
         String npw = TEST_PASSWORD + "'";
         System.out.println(link);