Skip to content

Commit 6a9ddfc

Browse files
committed
update
1 parent b526e2e commit 6a9ddfc

File tree

3 files changed

+37
-6
lines changed

3 files changed

+37
-6
lines changed

app/Http/Controllers/Auth/LoginController.php

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,16 @@ public function login(Request $request){
3232
if($request->role_id != $loginUser['role_id']){
3333
return response()->json(['message'=>"vous n'avez pas les droits d'acces à cette application"], 403);
3434
}
35+
if($request->role_id==1 || $request->role_id==3){
36+
$accessTokenName="accessToken";
37+
$refreshTokenName="refreshToken";
38+
}else if ($request->role_id==2){
39+
$accessTokenName="accessTokenSeller";
40+
$refreshTokenName="refreshTokenSeller";
41+
}else{
42+
$accessTokenName="accessTokenDelivery";
43+
$refreshTokenName="refreshTokenDelivery";
44+
}
3545
$tokenUser=(new GenerateTokenUserService())->generate($client,$loginUser,$data['password'],$request);
3646

3747
$tokenData = json_decode($tokenUser->getContent(), true);
@@ -43,10 +53,10 @@ public function login(Request $request){
4353
$domain = (config('app.env') === 'production') ? '.akevas.com' : null;
4454
$secure = config('app.env') === 'production';
4555

46-
return response()->noContent(204)->cookie('accessToken', $accessToken,
56+
return response()->noContent(204)->cookie($accessTokenName, $accessToken,
4757
Carbon::now()->addMinutes(config('passport.token_ttl'))->timestamp,
4858
'/', $domain, $secure, true, false, 'none')
49-
->cookie('refreshToken', $refreshToken,
59+
->cookie($refreshTokenName, $refreshToken,
5060
Carbon::now()->addDays(30)->timestamp,
5161
'/', $domain, $secure, true, false, 'none');
5262
}

app/Http/Controllers/Auth/LogoutController.php

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,27 @@ public function logout(){
1616
$domain = (config('app.env') === 'production') ? '.akevas.com' : null;
1717
$secure = config('app.env') === 'production';
1818

19+
if($user->role_id==1 || $user->role_id==3){
20+
$accessTokenName="accessToken";
21+
$refreshTokenName="refreshToken";
22+
}else if ($user->role_id==2){
23+
$accessTokenName="accessTokenSeller";
24+
$refreshTokenName="refreshTokenSeller";
25+
}else{
26+
$accessTokenName="accessTokenDelivery";
27+
$refreshTokenName="refreshTokenDelivery";
28+
}
1929
// 3. Définir la date d'expiration dans le passé (expire immédiatement)
2030
$pastExpiration = Carbon::now()->subMinutes(5)->timestamp;
2131

2232
// 4. Construire la réponse (statut 204 No Content est courant pour le logout)
2333
return response()->noContent(204)
2434
// 5. Faire expirer l'accessToken
25-
->cookie('accessToken', null,
35+
->cookie($accessTokenName, null,
2636
$pastExpiration,
2737
'/', $domain, $secure, true, false, 'none') // Utiliser les mêmes paramètres que la pose
2838
// 6. Faire expirer le refreshToken
29-
->cookie('refreshToken', null,
39+
->cookie($refreshTokenName, null,
3040
$pastExpiration,
3141
'/', $domain, $secure, true, false, 'none');
3242
}

app/Http/Controllers/Auth/SocialAuthController.php

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,17 @@ public function handleGoogleCallback(): RedirectResponse
5151
return redirect("{$frontendUrl}/login?code=401");
5252
}
5353

54+
if($user->role_id==1 || $user->role_id==3){
55+
$accessTokenName="accessToken";
56+
$refreshTokenName="refreshToken";
57+
}else if ($user->role_id==2){
58+
$accessTokenName="accessTokenSeller";
59+
$refreshTokenName="refreshTokenSeller";
60+
}else{
61+
$accessTokenName="accessTokenDelivery";
62+
$refreshTokenName="refreshTokenDelivery";
63+
}
64+
5465
$scope = $this->getUserScope($user->role_id);
5566
$tokenResult = $user->createToken('GoogleAuthToken', [$scope]);
5667
$accessToken = $tokenResult->accessToken;
@@ -62,10 +73,10 @@ public function handleGoogleCallback(): RedirectResponse
6273
$secure = config('app.env') === 'production';
6374

6475

65-
return redirect("{$frontendUrl}/authenticate")->cookie('accessToken', $accessToken,
76+
return redirect("{$frontendUrl}/authenticate")->cookie($accessTokenName, $accessToken,
6677
Carbon::now()->addMinutes(config('passport.token_ttl'))->timestamp,
6778
'/', $domain, $secure, true, false, 'none') // ttl, path, domain, secure, httpOnly, raw, sameSite
68-
->cookie('refreshToken', $refreshToken,
79+
->cookie($refreshTokenName, $refreshToken,
6980
Carbon::now()->addDays(30)->timestamp, // Longue durée de vie
7081
'/', $domain, $secure, true, false, 'none');
7182
}

0 commit comments

Comments
 (0)