@@ -39,7 +39,7 @@ |
||
39 | 39 | $farmingType = $request->input('farming_type') !== null ? $request->input('farming_type') : []; |
40 | 40 | |
41 | 41 | $fillWikiUserProfile->fill(Auth::user()->uuid, $role, $firstname, $lastname, $email, $postalCode, $farmingType); |
42 | - if(session()->has('wiki_callback')){ |
|
42 | + if (session()->has('wiki_callback')) { |
|
43 | 43 | $user = Auth::user(); |
44 | 44 | $user->wiki_token = session()->get('wiki_token'); |
45 | 45 | $user->save(); |
@@ -11,11 +11,11 @@ |
||
11 | 11 | |
12 | 12 | class ContextRepositorySql implements ContextRepository |
13 | 13 | { |
14 | - public function getByUser(string $userId):?Context |
|
14 | + public function getByUser(string $userId): ?Context |
|
15 | 15 | { |
16 | 16 | $user = User::where('uuid', $userId)->first(); |
17 | 17 | $context = DB::table('contexts')->where('id', $user->context_id)->first(); |
18 | - if($context == null){ |
|
18 | + if ($context == null) { |
|
19 | 19 | return null; |
20 | 20 | } |
21 | 21 | return new Context($context->uuid, $context->postal_code, json_decode($context->farmings, true)); |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | public function register(string $provider, SocialiteUser $socialiteUser) |
30 | 30 | { |
31 | 31 | $user = $this->userRepository->getByProvider($provider, $socialiteUser->providerId()); |
32 | - if(isset($user)){ |
|
32 | + if (isset($user)) { |
|
33 | 33 | return [ |
34 | 34 | 'user_id' => $user->id(), |
35 | 35 | 'provider_id' => $socialiteUser->providerId(), |
@@ -37,10 +37,10 @@ discard block |
||
37 | 37 | ]; |
38 | 38 | } |
39 | 39 | |
40 | - if($socialiteUser->email() !== null && $socialiteUser->email() != "") { |
|
40 | + if ($socialiteUser->email() !== null && $socialiteUser->email() != "") { |
|
41 | 41 | $user = $this->userRepository->getByEmail($socialiteUser->email()); |
42 | 42 | } |
43 | - if(isset($user)){ |
|
43 | + if (isset($user)) { |
|
44 | 44 | $user->addProvider($provider, $socialiteUser->providerId()); |
45 | 45 | return [ |
46 | 46 | 'user_id' => $user->id(), |
@@ -11,10 +11,10 @@ |
||
11 | 11 | public function handle($request, \Closure $next) |
12 | 12 | { |
13 | 13 | $user = Auth::user(); |
14 | - if($user->context_id === null){ |
|
14 | + if ($user->context_id === null) { |
|
15 | 15 | return $next($request); |
16 | 16 | } |
17 | - if(session()->has('wiki_callback')){ |
|
17 | + if (session()->has('wiki_callback')) { |
|
18 | 18 | $user->wiki_token = session()->get('wiki_token'); |
19 | 19 | $user->save(); |
20 | 20 | $callback = urldecode(session()->get('wiki_callback')); |
@@ -15,12 +15,12 @@ discard block |
||
15 | 15 | { |
16 | 16 | $token = $request->input('wiki_token', null); |
17 | 17 | |
18 | - if($token === null || $token === ''){ |
|
18 | + if ($token === null || $token === '') { |
|
19 | 19 | return ['error' => 'invalid_token']; |
20 | 20 | } |
21 | 21 | $user = User::where('wiki_token', $token)->first(); |
22 | 22 | |
23 | - if($user === null){ |
|
23 | + if ($user === null) { |
|
24 | 24 | return ['error' => 'invalid_token']; |
25 | 25 | } |
26 | 26 | |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | public function logout() |
37 | 37 | { |
38 | 38 | $user = Auth::user(); |
39 | - if(isset($user)){ |
|
39 | + if (isset($user)) { |
|
40 | 40 | $user->wiki_token = ''; |
41 | 41 | $user->save(); |
42 | 42 | Auth::logout(); |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | { |
28 | 28 | $errors = []; |
29 | 29 | $user = $this->userRepository->getByEmail($email); |
30 | - if(isset($user) && $user->id() !== $userId){ |
|
30 | + if (isset($user) && $user->id() !== $userId) { |
|
31 | 31 | $errors[] = ['validation.unique']; |
32 | 32 | } |
33 | 33 | |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | 'email' => $email |
61 | 61 | ], $rules); |
62 | 62 | |
63 | - $validator->after(function () use ($validator, $errors) { |
|
63 | + $validator->after(function() use ($validator, $errors) { |
|
64 | 64 | foreach ($errors as $field => $error) { |
65 | 65 | $validator->errors()->add($field, $error); |
66 | 66 | } |
@@ -24,10 +24,10 @@ discard block |
||
24 | 24 | |
25 | 25 | public function showLoginForm(Request $request) |
26 | 26 | { |
27 | - if($request->session()->has('should_attach_to_organization')) { |
|
27 | + if ($request->session()->has('should_attach_to_organization')) { |
|
28 | 28 | session()->reflash(); |
29 | 29 | } |
30 | - if($request->has('wiki_callback')){ |
|
30 | + if ($request->has('wiki_callback')) { |
|
31 | 31 | session()->flash('wiki_callback', $request->input('wiki_callback')); |
32 | 32 | session()->flash('wiki_token', $request->input('wiki_token')); |
33 | 33 | } |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | |
37 | 37 | public function logout(Request $request) |
38 | 38 | { |
39 | - if($request->session()->has('should_attach_to_organization')) { |
|
39 | + if ($request->session()->has('should_attach_to_organization')) { |
|
40 | 40 | $shouldAttach = $request->session()->get('should_attach_to_organization'); |
41 | 41 | $shouldAttachToken = $request->session()->get('should_attach_to_organization_token'); |
42 | 42 | $linkToRedirect = $request->session()->get('should_attach_to_organization_redirect'); |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | |
49 | 49 | $request->session()->regenerateToken(); |
50 | 50 | |
51 | - if(isset($shouldAttach)){ |
|
51 | + if (isset($shouldAttach)) { |
|
52 | 52 | $request->session()->flash('should_attach_to_organization', $shouldAttach); |
53 | 53 | $request->session()->flash('should_attach_to_organization_token', $shouldAttachToken); |
54 | 54 | $request->session()->flash('should_attach_to_organization_redirect', $linkToRedirect); |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | protected function loggedOut(Request $request) |
67 | 67 | { |
68 | 68 | $request->session()->reflash(); |
69 | - if($request->session()->has('should_attach_to_organization')){ |
|
69 | + if ($request->session()->has('should_attach_to_organization')) { |
|
70 | 70 | $linkToRedirect = $request->session()->get('should_attach_to_organization_redirect'); |
71 | 71 | return $request->wantsJson() |
72 | 72 | ? new Response('', 204) |
@@ -76,17 +76,17 @@ discard block |
||
76 | 76 | |
77 | 77 | protected function authenticated(Request $request, $user) |
78 | 78 | { |
79 | - if($user->context_id === null){ |
|
79 | + if ($user->context_id === null) { |
|
80 | 80 | return redirect()->route('wizard.profile'); |
81 | 81 | } |
82 | 82 | |
83 | - if($request->session()->has('wiki_callback')){ |
|
83 | + if ($request->session()->has('wiki_callback')) { |
|
84 | 84 | $user->wiki_token = $request->session()->get('wiki_token'); |
85 | 85 | $user->save(); |
86 | 86 | $callback = urldecode($request->session()->get('wiki_callback')); |
87 | 87 | return redirect($callback); |
88 | 88 | } |
89 | - if($request->session()->has('should_attach_to_organization') && $request->session()->get('should_attach_to_organization') !== null){ |
|
89 | + if ($request->session()->has('should_attach_to_organization') && $request->session()->get('should_attach_to_organization') !== null) { |
|
90 | 90 | $token = $request->session()->get('should_attach_to_organization_token'); |
91 | 91 | $link = route('organization.invite.show').'?&token='.$token; |
92 | 92 | return $request->wantsJson() |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | |
99 | 99 | public function redirectToProvider(string $provider) |
100 | 100 | { |
101 | - if($provider === 'twitter'){ |
|
101 | + if ($provider === 'twitter') { |
|
102 | 102 | config(['services.'.$provider.'.redirect' => env(strtoupper($provider).'_CALLBACK_LOGIN')]); |
103 | 103 | return Socialite::driver($provider)->redirect(); |
104 | 104 | } |
@@ -16,7 +16,7 @@ |
||
16 | 16 | */ |
17 | 17 | public function handle($request, Closure $next) |
18 | 18 | { |
19 | - if(Auth::user() !== null && !Auth::user()->hasRole('admin')){ |
|
19 | + if (Auth::user() !== null && !Auth::user()->hasRole('admin')) { |
|
20 | 20 | return redirect(config('neayi.wiki_url')); |
21 | 21 | } |
22 | 22 | return $next($request); |
@@ -16,7 +16,7 @@ |
||
16 | 16 | */ |
17 | 17 | public function handle($request, Closure $next) |
18 | 18 | { |
19 | - if(session()->has('wiki_callback')){ |
|
19 | + if (session()->has('wiki_callback')) { |
|
20 | 20 | session()->keep(['wiki_callback', 'wiki_token']); |
21 | 21 | } |
22 | 22 | return $next($request); |