Skip to content

Commit 07eae45

Browse files
authored
Merge pull request #41 from HiEventsDev/develop
Fix email change request going to incorrect email
2 parents e745797 + 1e20f05 commit 07eae45

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

backend/app/Helper/IdHelper.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ class IdHelper
1111
public const EVENT_PREFIX = 'e';
1212
public const ACCOUNT_PREFIX = 'acc';
1313

14-
public const SESSION_COOKIE_PREFIX = 'ord';
15-
1614
public static function randomPrefixedId(string $prefix, int $length = 13): string
1715
{
1816
return sprintf('%s%s', $prefix, Str::random($length));

backend/app/Services/Handlers/User/UpdateMeHandler.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function handle(UpdateMeDTO $updateUserData): UserDomainObject
4545

4646
if ($this->isChangingEmail($updateUserData, $existingUser)) {
4747
$updateArray['pending_email'] = $updateUserData->email;
48-
$this->sendEmailChangeConfirmation($updateUserData, $existingUser);
48+
$this->sendEmailChangeConfirmation($existingUser);
4949
}
5050
}
5151

@@ -92,10 +92,10 @@ private function getExistingUser(UpdateMeDTO $updateUserData): UserDomainObject
9292
return $existingUser;
9393
}
9494

95-
private function sendEmailChangeConfirmation(UpdateMeDTO $updateUserData, UserDomainObject $existingUser): void
95+
private function sendEmailChangeConfirmation(UserDomainObject $existingUser): void
9696
{
9797
$this->mailer
98-
->to($updateUserData->email)
98+
->to($existingUser->getEmail())
9999
->send(new ConfirmEmailChangeMail($existingUser, $this->encryptedPayloadService->encryptPayload([
100100
'id' => $existingUser->getId(),
101101
]))

frontend/src/utilites/apiClient.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@ import {publicApi} from "../api/public-client.ts";
33

44
export const setAuthToken = (token?: string | undefined | null) => {
55
if (!token) {
6-
console.log('No token provided');
76
delete api.defaults.headers.common['Authorization'];
87
delete publicApi.defaults.headers.common['Authorization'];
98
return;
109
}
1110

12-
console.log('Setting token:', token);
1311
api.defaults.headers.common['Authorization'] = `Bearer ${token}`;
1412
publicApi.defaults.headers.common['Authorization'] = `Bearer ${token}`;
1513
};

0 commit comments

Comments
 (0)