@@ -19,7 +19,7 @@ |
||
| 19 | 19 | public function grant(string $userId, string $organizationId) |
| 20 | 20 | { |
| 21 | 21 | $user = $this->userRepository->getById($userId); |
| 22 | - if(!$user->belongsTo($organizationId)){ |
|
| 22 | + if (!$user->belongsTo($organizationId)) { |
|
| 23 | 23 | throw new UserGrantAdminException(); |
| 24 | 24 | } |
| 25 | 25 | |
@@ -23,10 +23,10 @@ |
||
| 23 | 23 | $this->authGateway = $authGateway; |
| 24 | 24 | } |
| 25 | 25 | |
| 26 | - public function execute():?string |
|
| 26 | + public function execute(): ?string |
|
| 27 | 27 | { |
| 28 | 28 | $currentUser = $this->authGateway->current(); |
| 29 | - if(!isset($currentUser)){ |
|
| 29 | + if (!isset($currentUser)) { |
|
| 30 | 30 | return 'nothing_to_do'; |
| 31 | 31 | } |
| 32 | 32 | $anonymousUser = new AnonymousUser($this->authGateway->wikiSessionId()); |
@@ -8,6 +8,6 @@ |
||
| 8 | 8 | |
| 9 | 9 | interface PageRepository |
| 10 | 10 | { |
| 11 | - public function get(string $pageId):?Page; |
|
| 11 | + public function get(string $pageId): ?Page; |
|
| 12 | 12 | public function save(Page $page); |
| 13 | 13 | } |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | |
| 49 | 49 | $canInteractUser = $this->getInteractUser(); |
| 50 | 50 | $interaction = $this->interactionRepository->getByInteractUser($canInteractUser, $pageId); |
| 51 | - if(!isset($interaction)) { |
|
| 51 | + if (!isset($interaction)) { |
|
| 52 | 52 | $canInteractUser->addInteraction($interactions, $pageId, $doneValue); |
| 53 | 53 | return; |
| 54 | 54 | } |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | public function get(string $pageId): ?Page |
| 14 | 14 | { |
| 15 | 15 | $pageModel = PageModel::where('page_id', $pageId)->first(); |
| 16 | - if(!isset($pageModel)){ |
|
| 16 | + if (!isset($pageModel)) { |
|
| 17 | 17 | return null; |
| 18 | 18 | } |
| 19 | 19 | return new Page($pageModel->page_id, $pageModel->dry); |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | public function save(Page $page) |
| 23 | 23 | { |
| 24 | 24 | $pageModel = PageModel::where('page_id', $page->pageId())->first(); |
| 25 | - if(!isset($pageModel)){ |
|
| 25 | + if (!isset($pageModel)) { |
|
| 26 | 26 | $pageModel = new PageModel(); |
| 27 | 27 | } |
| 28 | 28 | $pageModel->page_id = $page->pageId(); |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | { |
| 12 | 12 | public function handle($request, Closure $next) |
| 13 | 13 | { |
| 14 | - if($request->input('wiki_session_id')){ |
|
| 14 | + if ($request->input('wiki_session_id')) { |
|
| 15 | 15 | Session::put('wiki_session_id', $request->input('wiki_session_id')); |
| 16 | 16 | } |
| 17 | 17 | return $next($request); |
@@ -8,7 +8,7 @@ |
||
| 8 | 8 | |
| 9 | 9 | interface AuthGateway |
| 10 | 10 | { |
| 11 | - public function current():? User; |
|
| 11 | + public function current(): ? User; |
|
| 12 | 12 | public function log(User $u); |
| 13 | - public function wikiSessionId():?string; |
|
| 13 | + public function wikiSessionId(): ?string; |
|
| 14 | 14 | } |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | { |
| 24 | 24 | $httpClient = new Client(); |
| 25 | 25 | |
| 26 | - PageModel::query()->where('dry', true)->chunkById(50, function ($items, $count) use($httpClient){ |
|
| 26 | + PageModel::query()->where('dry', true)->chunkById(50, function($items, $count) use($httpClient){ |
|
| 27 | 27 | $this->info(($count*50).' Pages'); |
| 28 | 28 | $pages = $items->pluck('page_id')->toArray(); |
| 29 | 29 | $pagesApiUri = config('wiki.api_uri').$this->queryPages.implode('|', $pages); |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | $content = json_decode($response->getBody()->getContents(), true); |
| 32 | 32 | $wikiPages = $content['query']['pages']; |
| 33 | 33 | |
| 34 | - foreach($wikiPages as $page){ |
|
| 34 | + foreach ($wikiPages as $page) { |
|
| 35 | 35 | $pageModel = PageModel::query()->where('page_id', $page['pageid'])->first(); |
| 36 | 36 | $pageModel->dry = false; |
| 37 | 37 | $pageModel->title = $page['title']; |
@@ -31,19 +31,19 @@ discard block |
||
| 31 | 31 | { |
| 32 | 32 | $email = $firstname = $lastname = ''; |
| 33 | 33 | |
| 34 | - if($request->session()->has('user_to_register')){ |
|
| 34 | + if ($request->session()->has('user_to_register')) { |
|
| 35 | 35 | $user = $request->session()->get('user_to_register'); |
| 36 | 36 | $email = $user['email']; |
| 37 | 37 | $firstname = $user['firstname']; |
| 38 | 38 | $lastname = $user['lastname']; |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | - if($request->has('wiki_callback')){ |
|
| 41 | + if ($request->has('wiki_callback')) { |
|
| 42 | 42 | session()->flash('wiki_callback', $request->input('wiki_callback')); |
| 43 | 43 | session()->flash('wiki_token', $request->input('wiki_token')); |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | - if(session()->has('should_attach_to_organization')) { |
|
| 46 | + if (session()->has('should_attach_to_organization')) { |
|
| 47 | 47 | session()->reflash(); |
| 48 | 48 | } |
| 49 | 49 | return view('public.auth.register', [ |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | |
| 56 | 56 | protected function validator(array $data) |
| 57 | 57 | { |
| 58 | - if(session()->has('should_attach_to_organization')) { |
|
| 58 | + if (session()->has('should_attach_to_organization')) { |
|
| 59 | 59 | session()->reflash(); |
| 60 | 60 | } |
| 61 | 61 | return Validator::make($data, [ |
@@ -80,16 +80,16 @@ discard block |
||
| 80 | 80 | protected function registered(Request $request, $user) |
| 81 | 81 | { |
| 82 | 82 | $this->guard()->login($user, true); |
| 83 | - if($request->session()->has('should_attach_to_organization')){ |
|
| 83 | + if ($request->session()->has('should_attach_to_organization')) { |
|
| 84 | 84 | app(AttachUserToAnOrganization::class)->attach($user->uuid, $request->session()->get('should_attach_to_organization')); |
| 85 | 85 | } |
| 86 | 86 | $user = Auth::user(); |
| 87 | 87 | |
| 88 | - if($user->context_id === null) { |
|
| 88 | + if ($user->context_id === null) { |
|
| 89 | 89 | return redirect()->route('wizard.profile'); |
| 90 | 90 | } |
| 91 | 91 | |
| 92 | - if($request->session()->has('wiki_callback')){ |
|
| 92 | + if ($request->session()->has('wiki_callback')) { |
|
| 93 | 93 | $user->wiki_token = $request->session()->get('wiki_token'); |
| 94 | 94 | $user->save(); |
| 95 | 95 | $callback = urldecode($request->session()->get('wiki_callback')); |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | public function redirectToProvider(string $provider) |
| 103 | 103 | { |
| 104 | 104 | config(['services.'.$provider.'.redirect' => env(strtoupper($provider).'_CALLBACK')]); |
| 105 | - if($provider === 'twitter'){ |
|
| 105 | + if ($provider === 'twitter') { |
|
| 106 | 106 | return Socialite::driver($provider)->redirect(); |
| 107 | 107 | } |
| 108 | 108 | return Socialite::driver($provider)->redirectUrl(config('services.'.$provider.'.redirect'))->redirect(); |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | $user = User::where('uuid', $userId)->first(); |
| 116 | 116 | $this->guard()->login($user); |
| 117 | 117 | |
| 118 | - if($user->context_id !== null){ |
|
| 118 | + if ($user->context_id !== null) { |
|
| 119 | 119 | $user->wiki_token = $request->session()->get('wiki_token'); |
| 120 | 120 | $user->save(); |
| 121 | 121 | $callback = urldecode($request->session()->get('wiki_callback')); |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | return redirect()->route('wizard.profile'); |
| 126 | - }catch (ValidationException $e) { |
|
| 126 | + } catch (ValidationException $e) { |
|
| 127 | 127 | $attributes = $e->validator->attributes(); |
| 128 | 128 | $attributes['provider'] = $provider; |
| 129 | 129 | return redirect()->route('register-social-network') |