@@ -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(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); |
@@ -27,12 +27,12 @@ |
||
| 27 | 27 | $w = $img->width(); |
| 28 | 28 | |
| 29 | 29 | $img = Image::cache(function($image) use($pathPicture, $dim, $w, $h){ |
| 30 | - if($w <= $h) { |
|
| 31 | - $image->make($pathPicture)->widen($dim, function ($constraint) { |
|
| 30 | + if ($w <= $h) { |
|
| 31 | + $image->make($pathPicture)->widen($dim, function($constraint) { |
|
| 32 | 32 | $constraint->upsize(); |
| 33 | 33 | }); |
| 34 | - }else{ |
|
| 35 | - $image->make($pathPicture)->heighten($dim, function ($constraint) { |
|
| 34 | + } else { |
|
| 35 | + $image->make($pathPicture)->heighten($dim, function($constraint) { |
|
| 36 | 36 | $constraint->upsize(); |
| 37 | 37 | }); |
| 38 | 38 | } |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | $image->make($pathPicture)->widen($dim, function ($constraint) { |
| 32 | 32 | $constraint->upsize(); |
| 33 | 33 | }); |
| 34 | - }else{ |
|
| 34 | + } else{ |
|
| 35 | 35 | $image->make($pathPicture)->heighten($dim, function ($constraint) { |
| 36 | 36 | $constraint->upsize(); |
| 37 | 37 | }); |
@@ -12,15 +12,15 @@ |
||
| 12 | 12 | { |
| 13 | 13 | public function user(string $provider): SocialiteUser |
| 14 | 14 | { |
| 15 | - if($provider === 'twitter'){ |
|
| 15 | + if ($provider === 'twitter') { |
|
| 16 | 16 | $user = Socialite::driver($provider)->user(); |
| 17 | - }else { |
|
| 17 | + } else { |
|
| 18 | 18 | $user = Socialite::driver($provider)->stateless()->user(); |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | $email = $user->getEmail(); |
| 22 | 22 | $firstname = $user->getNickname() !== null ? $user->getNickname() : $user->getName(); |
| 23 | - if(isset($user->user['given_name'])){ |
|
| 23 | + if (isset($user->user['given_name'])) { |
|
| 24 | 24 | $firstname = $user->user['given_name']; |
| 25 | 25 | } |
| 26 | 26 | $lastname = isset($user->user['family_name']) ? $user->user['family_name'] : $user->getName(); |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | { |
| 15 | 15 | if($provider === 'twitter'){ |
| 16 | 16 | $user = Socialite::driver($provider)->user(); |
| 17 | - }else { |
|
| 17 | + } else { |
|
| 18 | 18 | $user = Socialite::driver($provider)->stateless()->user(); |
| 19 | 19 | } |
| 20 | 20 | |
@@ -33,7 +33,7 @@ |
||
| 33 | 33 | public function toDto() |
| 34 | 34 | { |
| 35 | 35 | $icon = null; |
| 36 | - if(isset($this->icon)){ |
|
| 36 | + if (isset($this->icon)) { |
|
| 37 | 37 | $icon = route('api.icon.serve', ['id' => $this->uuid]); |
| 38 | 38 | } |
| 39 | 39 | return new CharacteristicDto( |
@@ -22,17 +22,17 @@ |
||
| 22 | 22 | { |
| 23 | 23 | $relativePath = $newPath; |
| 24 | 24 | $finalNewPath = storage_path().'/'.$newPath; |
| 25 | - if(isset($this->ext)){ |
|
| 25 | + if (isset($this->ext)) { |
|
| 26 | 26 | $finalNewPath = storage_path().'/'.$newPath.'.'.$this->ext; |
| 27 | 27 | $relativePath = $newPath.'.'.$this->ext; |
| 28 | 28 | } |
| 29 | - if(app(PictureHandler::class)->width($this->path) > 600) { |
|
| 29 | + if (app(PictureHandler::class)->width($this->path) > 600) { |
|
| 30 | 30 | app(PictureHandler::class)->widen($this->path, $finalNewPath, 600); |
| 31 | 31 | $this->relativePath = $relativePath; |
| 32 | 32 | return; |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | - if(app(PictureHandler::class)->height($this->path) > 400) { |
|
| 35 | + if (app(PictureHandler::class)->height($this->path) > 400) { |
|
| 36 | 36 | app(PictureHandler::class)->heighten($this->path, $finalNewPath, 400); |
| 37 | 37 | $this->relativePath = $relativePath; |
| 38 | 38 | return; |
@@ -39,23 +39,23 @@ |
||
| 39 | 39 | $organizationToJoin = $this->organizationRepository->get($organizationId); |
| 40 | 40 | |
| 41 | 41 | $currentUser = $this->authGateway->current(); |
| 42 | - if(isset($currentUser) && $currentUser->email() !== $email){ |
|
| 42 | + if (isset($currentUser) && $currentUser->email() !== $email) { |
|
| 43 | 43 | $action = 'logout'; |
| 44 | 44 | $action .= !isset($user) ? '-register' : '-login'; |
| 45 | 45 | |
| 46 | - if($action == 'logout-login') { |
|
| 46 | + if ($action == 'logout-login') { |
|
| 47 | 47 | return $this->badUserLoginToAcceptAction($action, $organizationToJoin); |
| 48 | 48 | } |
| 49 | 49 | return $this->returnLogoutAction($action, $organizationToJoin, $email, $firstname, $lastname); |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | |
| 53 | - if(!isset($user)){ |
|
| 53 | + if (!isset($user)) { |
|
| 54 | 54 | return $this->returnRegisterAction($organizationId, $email, $firstname, $lastname); |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | $currentUser = $this->authGateway->current(); |
| 58 | - if(!isset($currentUser)){ |
|
| 58 | + if (!isset($currentUser)) { |
|
| 59 | 59 | return $this->returnLoginAction($organizationToJoin); |
| 60 | 60 | } |
| 61 | 61 | |
@@ -23,9 +23,9 @@ discard block |
||
| 23 | 23 | $usersLoop = $this->getUsersToProcess($users, $usersLoop, $filePathUsers); |
| 24 | 24 | $errors = $imported = 0; |
| 25 | 25 | |
| 26 | - foreach($usersLoop as $userToInvite){ |
|
| 26 | + foreach ($usersLoop as $userToInvite) { |
|
| 27 | 27 | $validator = $this->validateUserData($userToInvite); |
| 28 | - if($validator->fails()){ |
|
| 28 | + if ($validator->fails()) { |
|
| 29 | 29 | $userToInvite['error'] = 'email.error.syntax'; |
| 30 | 30 | $usersToProcess['users'][] = $userToInvite; |
| 31 | 31 | $errors++; |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | list($userToInvite, $errors) = $this->checkIfUserAlreadyIn($organizationId, $userToInvite, $errors); |
| 36 | 36 | |
| 37 | 37 | $usersToProcess['users'][] = $userToInvite; |
| 38 | - if(!isset($userToInvite["error"])){ |
|
| 38 | + if (!isset($userToInvite["error"])) { |
|
| 39 | 39 | $imported++; |
| 40 | 40 | } |
| 41 | 41 | } |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | { |
| 30 | 30 | $invitations = []; |
| 31 | 31 | $organization = $this->organizationRepository->get($organizationId); |
| 32 | - foreach($users as $user){ |
|
| 32 | + foreach ($users as $user) { |
|
| 33 | 33 | $email = $user['email']; |
| 34 | 34 | $firstname = isset($user['firstname']) ? $user['firstname'] : ''; |
| 35 | 35 | $lastname = isset($user['lastname']) ? $user['lastname'] : ''; |