From a07751eaea0765ae6ac9164eed44ed14fcc493cf Mon Sep 17 00:00:00 2001
From: Sander Hurlen <sander.hurlen@icloud.com>
Date: Mon, 10 May 2021 09:42:27 +0200
Subject: [PATCH] fix ability to log in after changing mail

---
 src/services/AuthenticationService.ts    | 1 +
 src/services/ElectionOrganizerService.ts | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/services/AuthenticationService.ts b/src/services/AuthenticationService.ts
index 72660b56..4ab8c297 100644
--- a/src/services/AuthenticationService.ts
+++ b/src/services/AuthenticationService.ts
@@ -66,6 +66,7 @@ export class AuthenticationService {
 
         if (!electionOrg) return
         const passwordMatches = await this.hashService.compareAgainstHash(payload.password, electionOrg.password)
+
         if (!passwordMatches) return
         return this.generateTokenFromId(electionOrg.id)
     }
diff --git a/src/services/ElectionOrganizerService.ts b/src/services/ElectionOrganizerService.ts
index f65a2ab6..58a8e18b 100644
--- a/src/services/ElectionOrganizerService.ts
+++ b/src/services/ElectionOrganizerService.ts
@@ -78,8 +78,11 @@ export class ElectionOrganizerService extends BaseEntityService<ElectionOrganize
 
         const strippedOrganizer = strip(organizerDTO, ['id', 'createdAt', 'updatedAt'])
         if (strippedOrganizer?.password) {
-            const hashedPassword = await encryptionService.hash(organizerDTO.password)
-            strippedOrganizer.password = hashedPassword
+            const storedPassword = (await this.getElectionOrganizerById(id)).password
+            if (storedPassword !== strippedOrganizer.password) {
+                const hashedPassword = await encryptionService.hash(organizerDTO.password)
+                strippedOrganizer.password = hashedPassword
+            }
         }
 
         if (!isEmailValid(strippedOrganizer!.email)) {