@@ -27,10 +27,11 @@ |
||
27 | 27 | */ |
28 | 28 | $user = $this->getUser(); |
29 | 29 | |
30 | - if ($user === null) |
|
31 | - return $this->json([ |
|
30 | + if ($user === null) { |
|
31 | + return $this->json([ |
|
32 | 32 | 'error' => 'User not found' |
33 | 33 | ]); |
34 | + } |
|
34 | 35 | |
35 | 36 | return $this->json($this->userService->getUserSession($user)); |
36 | 37 |
@@ -35,14 +35,16 @@ |
||
35 | 35 | public function authenticate(Request $request): Passport |
36 | 36 | { |
37 | 37 | $apiToken = $this->getKey($request); |
38 | - if (null === $apiToken) |
|
39 | - throw new CustomUserMessageAuthenticationException('No API token provided'); |
|
38 | + if (null === $apiToken) { |
|
39 | + throw new CustomUserMessageAuthenticationException('No API token provided'); |
|
40 | + } |
|
40 | 41 | |
41 | 42 | return new Passport( |
42 | 43 | new UserBadge($apiToken, function ($apiToken) { |
43 | 44 | $user = $this->em->getRepository(User::class)->findOneBy(['apiKey' => $apiToken]); |
44 | - if (null === $user) |
|
45 | - throw new CustomUserMessageAuthenticationException('Invalid API token'); |
|
45 | + if (null === $user) { |
|
46 | + throw new CustomUserMessageAuthenticationException('Invalid API token'); |
|
47 | + } |
|
46 | 48 | return $user; |
47 | 49 | }), |
48 | 50 | new CustomCredentials( |
@@ -31,20 +31,23 @@ |
||
31 | 31 | { |
32 | 32 | try { |
33 | 33 | |
34 | - if ($request->get('code')) |
|
35 | - $token = $this->provider->getAccessToken('authorization_code', [ |
|
34 | + if ($request->get('code')) { |
|
35 | + $token = $this->provider->getAccessToken('authorization_code', [ |
|
36 | 36 | 'code' => $request->get('code') |
37 | 37 | ]); |
38 | + } |
|
38 | 39 | |
39 | - if ($request->get('access_token')) |
|
40 | - $token = new AccessToken([ |
|
40 | + if ($request->get('access_token')) { |
|
41 | + $token = new AccessToken([ |
|
41 | 42 | 'access_token' => $request->get('access_token'), |
42 | 43 | ]); |
44 | + } |
|
43 | 45 | |
44 | - if ($request->get('code')) |
|
45 | - $token = $this->provider->getAccessToken('authorization_code', [ |
|
46 | + if ($request->get('code')) { |
|
47 | + $token = $this->provider->getAccessToken('authorization_code', [ |
|
46 | 48 | 'code' => $request->get('code') |
47 | 49 | ]); |
50 | + } |
|
48 | 51 | |
49 | 52 | $ownerDetails = $this->provider->getResourceOwner($token); |
50 | 53 |