@@ -28,13 +28,13 @@ |
||
28 | 28 | public function updatePassword(string $email, string $password): ?User |
29 | 29 | { |
30 | 30 | if ($user = $this->findOneByEmail($email)) { |
31 | - $user->setPassword($password); |
|
31 | + $user->setPassword($password); |
|
32 | 32 | |
33 | - $this->getEntityManager()->persist($user); |
|
33 | + $this->getEntityManager()->persist($user); |
|
34 | 34 | |
35 | - $this->getEntityManager()->flush(); |
|
35 | + $this->getEntityManager()->flush(); |
|
36 | 36 | |
37 | - return $user; |
|
37 | + return $user; |
|
38 | 38 | } |
39 | 39 | } |
40 | 40 |
@@ -95,10 +95,11 @@ discard block |
||
95 | 95 | ->findOneBy([ |
96 | 96 | 'username' => $ownerDetails->getEmail(), |
97 | 97 | ]); |
98 | - if (!$user) |
|
99 | - |
|
98 | + if (!$user) { |
|
99 | + |
|
100 | 100 | |
101 | 101 | $user = $this->createUser($ownerDetails); |
102 | + } |
|
102 | 103 | |
103 | 104 | |
104 | 105 | |
@@ -122,20 +123,23 @@ discard block |
||
122 | 123 | try { |
123 | 124 | |
124 | 125 | |
125 | - if ($request->get('code')) |
|
126 | - $token = $this->provider->getAccessToken('authorization_code', [ |
|
126 | + if ($request->get('code')) { |
|
127 | + $token = $this->provider->getAccessToken('authorization_code', [ |
|
127 | 128 | 'code' => $request->get('code') |
128 | 129 | ]); |
130 | + } |
|
129 | 131 | |
130 | - if ($request->get('access_token')) |
|
131 | - $token = new AccessToken([ |
|
132 | + if ($request->get('access_token')) { |
|
133 | + $token = new AccessToken([ |
|
132 | 134 | 'access_token' => $request->get('access_token'), |
133 | 135 | ]); |
136 | + } |
|
134 | 137 | |
135 | - if ($request->get('code')) |
|
136 | - $token = $this->provider->getAccessToken('authorization_code', [ |
|
138 | + if ($request->get('code')) { |
|
139 | + $token = $this->provider->getAccessToken('authorization_code', [ |
|
137 | 140 | 'code' => $request->get('code') |
138 | 141 | ]); |
142 | + } |
|
139 | 143 | |
140 | 144 | |
141 | 145 | $data = $this->discoveryUser($token); |
@@ -164,8 +168,9 @@ discard block |
||
164 | 168 | { |
165 | 169 | $peopleLink = $user->getPeople()->getLink()->first(); |
166 | 170 | |
167 | - if ($peopleLink !== false && $peopleLink->getCompany() instanceof People) |
|
168 | - return $peopleLink->getCompany(); |
|
171 | + if ($peopleLink !== false && $peopleLink->getCompany() instanceof People) { |
|
172 | + return $peopleLink->getCompany(); |
|
173 | + } |
|
169 | 174 | } |
170 | 175 | |
171 | 176 | private function getCompanyId(User $user) |
@@ -30,10 +30,11 @@ discard block |
||
30 | 30 | */ |
31 | 31 | $user = $this->getUser(); |
32 | 32 | |
33 | - if ($user === null) |
|
34 | - return $this->json([ |
|
33 | + if ($user === null) { |
|
34 | + return $this->json([ |
|
35 | 35 | 'error' => 'User not found' |
36 | 36 | ]); |
37 | + } |
|
37 | 38 | |
38 | 39 | // get contact data from user |
39 | 40 | |
@@ -41,8 +42,9 @@ discard block |
||
41 | 42 | $code = ''; |
42 | 43 | $number = ''; |
43 | 44 | |
44 | - if ($user->getPeople()->getEmail()->count() > 0) |
|
45 | - $email = $user->getPeople()->getEmail()->first()->getEmail(); |
|
45 | + if ($user->getPeople()->getEmail()->count() > 0) { |
|
46 | + $email = $user->getPeople()->getEmail()->first()->getEmail(); |
|
47 | + } |
|
46 | 48 | |
47 | 49 | if ($user->getPeople()->getPhone()->count() > 0) { |
48 | 50 | $phone = $user->getPeople()->getPhone()->first(); |
@@ -68,10 +70,9 @@ discard block |
||
68 | 70 | { |
69 | 71 | $realName = 'John Doe'; |
70 | 72 | |
71 | - if ($people->getPeopleType() == 'J') |
|
72 | - $realName = $people->getAlias(); |
|
73 | - |
|
74 | - else { |
|
73 | + if ($people->getPeopleType() == 'J') { |
|
74 | + $realName = $people->getAlias(); |
|
75 | + } else { |
|
75 | 76 | if ($people->getPeopleType() == 'F') { |
76 | 77 | $realName = $people->getName(); |
77 | 78 | $realName .= ' ' . $people->getAlias(); |
@@ -85,8 +86,9 @@ discard block |
||
85 | 86 | private function getCompany(User $user): ?People |
86 | 87 | { |
87 | 88 | $peopleLink = $this->manager->getRepository(People::class)->getPeopleLink($user->getPeople(), 'employee', 1); |
88 | - if ($peopleLink !== false && $peopleLink->getCompany() instanceof People) |
|
89 | - return $peopleLink->getCompany(); |
|
89 | + if ($peopleLink !== false && $peopleLink->getCompany() instanceof People) { |
|
90 | + return $peopleLink->getCompany(); |
|
91 | + } |
|
90 | 92 | } |
91 | 93 | |
92 | 94 | private function getCompanyId(User $user): ?int |
@@ -14,23 +14,23 @@ discard block |
||
14 | 14 | { |
15 | 15 | |
16 | 16 | |
17 | - public function __construct( |
|
17 | + public function __construct( |
|
18 | 18 | private PeopleRoleService $roleService, |
19 | 19 | private EntityManagerInterface $manager, |
20 | - ) { |
|
21 | - } |
|
20 | + ) { |
|
21 | + } |
|
22 | 22 | |
23 | - public function __invoke(Request $request) |
|
24 | - { |
|
23 | + public function __invoke(Request $request) |
|
24 | + { |
|
25 | 25 | /** |
26 | 26 | * @var \ControleOnline\Entity\User |
27 | 27 | */ |
28 | 28 | $user = $this->getUser(); |
29 | 29 | |
30 | 30 | if ($user === null) |
31 | - return $this->json([ |
|
31 | + return $this->json([ |
|
32 | 32 | 'error' => 'User not found' |
33 | - ]); |
|
33 | + ]); |
|
34 | 34 | |
35 | 35 | // get contact data from user |
36 | 36 | |
@@ -39,56 +39,56 @@ discard block |
||
39 | 39 | $number = ''; |
40 | 40 | |
41 | 41 | if ($user->getPeople()->getEmail()->count() > 0) |
42 | - $email = $user->getPeople()->getEmail()->first()->getEmail(); |
|
42 | + $email = $user->getPeople()->getEmail()->first()->getEmail(); |
|
43 | 43 | |
44 | 44 | if ($user->getPeople()->getPhone()->count() > 0) { |
45 | - $phone = $user->getPeople()->getPhone()->first(); |
|
46 | - $code = $phone->getDdd(); |
|
47 | - $number = $phone->getPhone(); |
|
45 | + $phone = $user->getPeople()->getPhone()->first(); |
|
46 | + $code = $phone->getDdd(); |
|
47 | + $number = $phone->getPhone(); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | return $this->json([ |
51 | - 'username' => $user->getUsername(), |
|
52 | - 'roles' => $user->getRoles(), |
|
53 | - 'api_key' => $user->getApiKey(), |
|
54 | - 'people' => $user->getPeople()->getId(), |
|
55 | - 'mycompany' => $this->getCompanyId($user), |
|
56 | - 'realname' => $this->getUserRealName($user->getPeople()), |
|
57 | - 'avatar' => $user->getPeople()->getFile() ? '/files/download/' . $user->getPeople()->getFile()->getId() : null, |
|
58 | - 'email' => $email, |
|
59 | - 'phone' => sprintf('%s%s', $code, $number), |
|
60 | - 'active' => (int) $user->getPeople()->getEnabled(), |
|
51 | + 'username' => $user->getUsername(), |
|
52 | + 'roles' => $user->getRoles(), |
|
53 | + 'api_key' => $user->getApiKey(), |
|
54 | + 'people' => $user->getPeople()->getId(), |
|
55 | + 'mycompany' => $this->getCompanyId($user), |
|
56 | + 'realname' => $this->getUserRealName($user->getPeople()), |
|
57 | + 'avatar' => $user->getPeople()->getFile() ? '/files/download/' . $user->getPeople()->getFile()->getId() : null, |
|
58 | + 'email' => $email, |
|
59 | + 'phone' => sprintf('%s%s', $code, $number), |
|
60 | + 'active' => (int) $user->getPeople()->getEnabled(), |
|
61 | 61 | ]); |
62 | - } |
|
62 | + } |
|
63 | 63 | |
64 | - private function getUserRealName(People $people): string |
|
65 | - { |
|
64 | + private function getUserRealName(People $people): string |
|
65 | + { |
|
66 | 66 | $realName = 'John Doe'; |
67 | 67 | |
68 | 68 | if ($people->getPeopleType() == 'J') |
69 | - $realName = $people->getAlias(); |
|
69 | + $realName = $people->getAlias(); |
|
70 | 70 | |
71 | 71 | else { |
72 | - if ($people->getPeopleType() == 'F') { |
|
72 | + if ($people->getPeopleType() == 'F') { |
|
73 | 73 | $realName = $people->getName(); |
74 | 74 | $realName .= ' ' . $people->getAlias(); |
75 | 75 | $realName = trim($realName); |
76 | - } |
|
76 | + } |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | return $realName; |
80 | - } |
|
80 | + } |
|
81 | 81 | |
82 | - private function getCompany(User $user): ?People |
|
83 | - { |
|
82 | + private function getCompany(User $user): ?People |
|
83 | + { |
|
84 | 84 | $peopleLink = $this->manager->getRepository(People::class)->getPeopleLink($user->getPeople(), 'employee', 1); |
85 | 85 | if ($peopleLink !== false && $peopleLink->getCompany() instanceof People) |
86 | - return $peopleLink->getCompany(); |
|
87 | - } |
|
86 | + return $peopleLink->getCompany(); |
|
87 | + } |
|
88 | 88 | |
89 | - private function getCompanyId(User $user): ?int |
|
90 | - { |
|
89 | + private function getCompanyId(User $user): ?int |
|
90 | + { |
|
91 | 91 | $company = $this->getCompany($user); |
92 | 92 | return $company ? $company->getId() : null; |
93 | - } |
|
93 | + } |
|
94 | 94 | } |