Skip to content

Commit 63e4c2f

Browse files
committed
Hotfix: Correction on ProfileReset Route
1 parent c0c94da commit 63e4c2f

File tree

3 files changed

+24
-22
lines changed

3 files changed

+24
-22
lines changed

app/Http/Controllers/ProfileController.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,10 @@ public function uploadAvatar(Request $request, ProfileService $profileService):
5151

5252
public function requestProfileReset(ProfileService $profileService): JsonResponse|RedirectResponse{
5353
$profileService->resetProfile();
54-
return response()->redirectTo('/register');
54+
return response()->json([
55+
'success' => true,
56+
'redirectUri' => '/register'
57+
]);
5558
}
5659

5760
public function validatePasskey(Request $request){

app/Services/Profile/ProfileService.php

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -63,29 +63,30 @@ public function assignAvatar($image): string{
6363
}
6464

6565

66+
/**
67+
* @throws Exception
68+
*/
6669
public function resetProfile(): void{
67-
try{
68-
$user = Auth::user();
69-
$this->deleteUserData($user);
70+
$user = Auth::user();
71+
$this->deleteUserData($user);
7072

71-
$userInfo = [
72-
'username' => $user->username,
73-
'name' => $user->name,
74-
'email' => $user->email,
75-
'employeetype' => $user->employeetype,
76-
];
73+
$userInfo = [
74+
'username' => $user->username,
75+
'name' => $user->name,
76+
'email' => $user->email,
77+
'employeetype' => $user->employeetype,
78+
];
7779

78-
Auth::logout();
80+
Auth::logout();
7981

80-
Session::put('registration_access', true);
81-
Session::put('authenticatedUserInfo', json_encode($userInfo));
82-
}
83-
catch(Exception $e){
84-
throw $e;
85-
}
82+
Session::put('registration_access', true);
83+
Session::put('authenticatedUserInfo', json_encode($userInfo));
8684
}
8785

8886

87+
/**
88+
* @throws Exception
89+
*/
8990
public function deleteUserData(User $user): void{
9091

9192
try{
@@ -137,17 +138,15 @@ public function deleteUserData(User $user): void{
137138

138139

139140
/// Sends back user's encrypted keychain
140-
public function fetchUserKeychain(){
141+
public function fetchUserKeychain(): string{
141142

142143
$user = Auth::user();
143144
$prvUserData = PrivateUserData::where('user_id', $user->id)->first();
144-
$keychainData = json_encode([
145+
return json_encode([
145146
'keychain'=> $prvUserData->keychain,
146147
'KCIV'=> $prvUserData->KCIV,
147148
'KCTAG'=> $prvUserData->KCTAG,
148149
]);
149-
150-
return $keychainData;
151150
}
152151

153152
}

routes/web.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
Route::post('/req/profile/uploadAvatar', [ProfileController::class, 'uploadAvatar']);
153153
Route::get('/req/profile/requestPasskeyBackup', [ProfileController::class, 'requestPasskeyBackup']);
154154

155-
Route::post('/req/profile/reset', [ProfileController::class, 'requestProfileRest']);
155+
Route::post('/req/profile/reset', [ProfileController::class, 'requestProfileReset']);
156156
Route::post('/req/backupKeychain', [ProfileController::class, 'backupKeychain']);
157157

158158

0 commit comments

Comments
 (0)