Fix GH-291, member must be able to keep own email

GEWIS · May 30, 2023 · 581eaad · 581eaad
1 parent 593bc1c
commit 581eaad
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/module/Database/src/Controller/MemberController.php b/module/Database/src/Controller/MemberController.php
@@ -75,12 +75,19 @@ public function renewAction(): ViewModel
         $request = $this->getRequest();
 
         if ($request->isPost()) {
+            $oldEmail = $form->get('email')->getValue();
             $form->setMutableData($request->getPost()->toArray());
 
-            // find if there is an earlier member with the same email
+            // if we changed our email
+            // check if it is not in use by someone else
             if (
-                $this->memberService->getMemberMapper()->hasMemberWith($form->get('email')->getValue())
-                || $this->memberService->getProspectiveMemberMapper()->hasMemberWith($form->get('email')->getValue())
+                $oldEmail !== $form->get('email')->getValue()
+                && (
+                    $this->memberService->getMemberMapper()->hasMemberWith($form->get('email')->getValue())
+                    || $this->memberService->getProspectiveMemberMapper()->hasMemberWith(
+                        $form->get('email')->getValue(),
+                    )
+                )
             ) {
                 $form->get('email')->setMessages(['There already is a member with this email address.']);
             } elseif ($form->isValid()) {