@@ -18,24 +18,24 @@ |
||
| 18 | 18 | * @param string $role |
| 19 | 19 | * @return mixed |
| 20 | 20 | */ |
| 21 | - public function handle($request, Closure $next, $role) |
|
| 21 | + public function handle ($request, Closure $next, $role) |
|
| 22 | 22 | { |
| 23 | 23 | // If user logged in as admin, always pass, regardless of $role |
| 24 | - if (Auth::check() && Auth::user()->isAdmin()) { |
|
| 25 | - Log::info('CheckRole Bypassed as Admin'); |
|
| 26 | - return $next($request); |
|
| 24 | + if (Auth::check () && Auth::user ()->isAdmin ()) { |
|
| 25 | + Log::info ('CheckRole Bypassed as Admin'); |
|
| 26 | + return $next ($request); |
|
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | // Redirect if not logged in, or if not the correct role |
| 30 | - if (Auth::guest() || !Auth::user()->hasRole($role)) { |
|
| 31 | - Log::info('CheckRole Failed'); |
|
| 30 | + if (Auth::guest () || !Auth::user ()->hasRole ($role)) { |
|
| 31 | + Log::info ('CheckRole Failed'); |
|
| 32 | 32 | // TODO: redirect to some sort of error messag |
| 33 | - if (WhichPortal::isManagerPortal()) { |
|
| 34 | - return redirect(route('manager.home')); |
|
| 33 | + if (WhichPortal::isManagerPortal ()) { |
|
| 34 | + return redirect (route ('manager.home')); |
|
| 35 | 35 | } else { |
| 36 | - return redirect(route('home')); |
|
| 36 | + return redirect (route ('home')); |
|
| 37 | 37 | } |
| 38 | 38 | } |
| 39 | - return $next($request); |
|
| 39 | + return $next ($request); |
|
| 40 | 40 | } |
| 41 | 41 | } |
@@ -12,11 +12,11 @@ |
||
| 12 | 12 | * @param \Closure $next |
| 13 | 13 | * @return mixed |
| 14 | 14 | */ |
| 15 | - public function handle($request, Closure $next) { |
|
| 15 | + public function handle ($request, Closure $next) { |
|
| 16 | 16 | |
| 17 | - $response = $next($request); |
|
| 17 | + $response = $next ($request); |
|
| 18 | 18 | |
| 19 | - $response->headers->set('X-Frame-Options', 'SAMEORIGIN'); |
|
| 19 | + $response->headers->set ('X-Frame-Options', 'SAMEORIGIN'); |
|
| 20 | 20 | |
| 21 | 21 | return $response; |
| 22 | 22 | } |
@@ -13,11 +13,11 @@ |
||
| 13 | 13 | * @param \Closure $next |
| 14 | 14 | * @return mixed |
| 15 | 15 | */ |
| 16 | - public function handle($request, Closure $next) |
|
| 16 | + public function handle ($request, Closure $next) |
|
| 17 | 17 | { |
| 18 | - if (\App::environment('local')) { |
|
| 19 | - return $next($request); |
|
| 18 | + if (\App::environment ('local')) { |
|
| 19 | + return $next ($request); |
|
| 20 | 20 | } |
| 21 | - abort(404); |
|
| 21 | + abort (404); |
|
| 22 | 22 | } |
| 23 | 23 | } |
@@ -16,18 +16,18 @@ |
||
| 16 | 16 | * @param string|null $guard |
| 17 | 17 | * @return mixed |
| 18 | 18 | */ |
| 19 | - public function handle($request, Closure $next, $guard = null) |
|
| 19 | + public function handle ($request, Closure $next, $guard = null) |
|
| 20 | 20 | { |
| 21 | - if (Auth::guard($guard)->check()) { |
|
| 22 | - if (Auth::user()->isAdmin()) { |
|
| 23 | - return redirect(backpack_url('')); |
|
| 24 | - } elseif (WhichPortal::isManagerPortal()) { |
|
| 25 | - return redirect(route('manager.home')); |
|
| 21 | + if (Auth::guard ($guard)->check ()) { |
|
| 22 | + if (Auth::user ()->isAdmin ()) { |
|
| 23 | + return redirect (backpack_url ('')); |
|
| 24 | + } elseif (WhichPortal::isManagerPortal ()) { |
|
| 25 | + return redirect (route ('manager.home')); |
|
| 26 | 26 | } else { |
| 27 | - return redirect(route('home')); |
|
| 27 | + return redirect (route ('home')); |
|
| 28 | 28 | } |
| 29 | 29 | } |
| 30 | 30 | |
| 31 | - return $next($request); |
|
| 31 | + return $next ($request); |
|
| 32 | 32 | } |
| 33 | 33 | } |
@@ -58,21 +58,21 @@ discard block |
||
| 58 | 58 | * @param \Exception $exception |
| 59 | 59 | * @return void |
| 60 | 60 | */ |
| 61 | - public function report(Exception $exception) |
|
| 61 | + public function report (Exception $exception) |
|
| 62 | 62 | { |
| 63 | 63 | if ($exception instanceof TokenMismatchException) { |
| 64 | 64 | $logData = [ |
| 65 | - 'requestToken' => request()->header('x-csrf-token'), |
|
| 66 | - 'sessionToken' => session()->token(), |
|
| 67 | - 'session' => session()->all(), |
|
| 68 | - 'user' => request()->user(), |
|
| 69 | - 'requestUrl' => request()->url() |
|
| 65 | + 'requestToken' => request ()->header ('x-csrf-token'), |
|
| 66 | + 'sessionToken' => session ()->token (), |
|
| 67 | + 'session' => session ()->all (), |
|
| 68 | + 'user' => request ()->user (), |
|
| 69 | + 'requestUrl' => request ()->url () |
|
| 70 | 70 | ]; |
| 71 | - $message = '419 CSRF Token Mismatch. ' . collect($logData)->toJson(); |
|
| 72 | - Log::debug($message); |
|
| 71 | + $message = '419 CSRF Token Mismatch. '.collect ($logData)->toJson (); |
|
| 72 | + Log::debug ($message); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | - parent::report($exception); |
|
| 75 | + parent::report ($exception); |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | /** |
@@ -81,15 +81,15 @@ discard block |
||
| 81 | 81 | * |
| 82 | 82 | * @return array |
| 83 | 83 | */ |
| 84 | - protected function context() |
|
| 84 | + protected function context () |
|
| 85 | 85 | { |
| 86 | 86 | try { |
| 87 | - return array_filter([ |
|
| 88 | - 'userId' => Auth::id(), |
|
| 87 | + return array_filter ([ |
|
| 88 | + 'userId' => Auth::id (), |
|
| 89 | 89 | // 'email' => optional(Auth::user())->email, |
| 90 | - 'url' => Request::path(), |
|
| 91 | - 'method' => Request::method(), |
|
| 92 | - 'referer' => Request::header('referer', '') |
|
| 90 | + 'url' => Request::path (), |
|
| 91 | + 'method' => Request::method (), |
|
| 92 | + 'referer' => Request::header ('referer', '') |
|
| 93 | 93 | ]); |
| 94 | 94 | } catch (Throwable $e) { |
| 95 | 95 | return []; |
@@ -103,17 +103,17 @@ discard block |
||
| 103 | 103 | * @param \Exception $exception |
| 104 | 104 | * @return \Illuminate\Http\Response |
| 105 | 105 | */ |
| 106 | - public function render($request, Exception $exception) |
|
| 106 | + public function render ($request, Exception $exception) |
|
| 107 | 107 | { |
| 108 | 108 | if ($exception instanceof AdminException) { |
| 109 | - return $exception->render($request); |
|
| 109 | + return $exception->render ($request); |
|
| 110 | 110 | } |
| 111 | 111 | if ($exception instanceof TokenMismatchException) { |
| 112 | - $newMessage = $exception->getMessage() . ' ' . Lang::get('errors.refresh_page'); |
|
| 113 | - $modifiedException = new TokenMismatchException($newMessage, $exception->getCode(), $exception); |
|
| 114 | - return parent::render($request, $modifiedException); |
|
| 112 | + $newMessage = $exception->getMessage ().' '.Lang::get ('errors.refresh_page'); |
|
| 113 | + $modifiedException = new TokenMismatchException ($newMessage, $exception->getCode (), $exception); |
|
| 114 | + return parent::render ($request, $modifiedException); |
|
| 115 | 115 | } |
| 116 | - return parent::render($request, $exception); |
|
| 116 | + return parent::render ($request, $exception); |
|
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | /** |
@@ -123,17 +123,17 @@ discard block |
||
| 123 | 123 | * @param \Illuminate\Auth\AuthenticationException $exception |
| 124 | 124 | * @return \Illuminate\Http\Response |
| 125 | 125 | */ |
| 126 | - protected function unauthenticated($request, AuthenticationException $exception) |
|
| 126 | + protected function unauthenticated ($request, AuthenticationException $exception) |
|
| 127 | 127 | { |
| 128 | - if ($request->expectsJson()) { |
|
| 129 | - return response()->json(['error' => 'Unauthenticated.'], 401); |
|
| 128 | + if ($request->expectsJson ()) { |
|
| 129 | + return response ()->json (['error' => 'Unauthenticated.'], 401); |
|
| 130 | 130 | } |
| 131 | - if (WhichPortal::isManagerPortal()) { |
|
| 132 | - $loginRoute = route('manager.login'); |
|
| 131 | + if (WhichPortal::isManagerPortal ()) { |
|
| 132 | + $loginRoute = route ('manager.login'); |
|
| 133 | 133 | } else { |
| 134 | - $loginRoute = route('login'); |
|
| 134 | + $loginRoute = route ('login'); |
|
| 135 | 135 | } |
| 136 | - return redirect()->guest($loginRoute); |
|
| 136 | + return redirect ()->guest ($loginRoute); |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | /** |
@@ -143,18 +143,18 @@ discard block |
||
| 143 | 143 | * @param \Symfony\Component\HttpKernel\Exception\HttpExceptionInterface $e |
| 144 | 144 | * @return \Symfony\Component\HttpFoundation\Response |
| 145 | 145 | */ |
| 146 | - protected function renderHttpException(HttpExceptionInterface $e) |
|
| 146 | + protected function renderHttpException (HttpExceptionInterface $e) |
|
| 147 | 147 | { |
| 148 | - if (!view()->exists("errors.{$e->getStatusCode()}")) { |
|
| 149 | - return response()->view('errors.default', [ |
|
| 148 | + if (!view ()->exists ("errors.{$e->getStatusCode ()}")) { |
|
| 149 | + return response ()->view ('errors.default', [ |
|
| 150 | 150 | 'exception' => $e, |
| 151 | - 'goc' => Lang::get('common/goc'), |
|
| 152 | - 'alert' => Lang::get('common/alert'), |
|
| 151 | + 'goc' => Lang::get ('common/goc'), |
|
| 152 | + 'alert' => Lang::get ('common/alert'), |
|
| 153 | 153 | 'error' => [ |
| 154 | 154 | 'title' => 'Error' |
| 155 | 155 | ] |
| 156 | - ], $e->getStatusCode(), $e->getHeaders()); |
|
| 156 | + ], $e->getStatusCode (), $e->getHeaders ()); |
|
| 157 | 157 | } |
| 158 | - return parent::renderHttpException($e); |
|
| 158 | + return parent::renderHttpException ($e); |
|
| 159 | 159 | } |
| 160 | 160 | } |
@@ -22,10 +22,10 @@ discard block |
||
| 22 | 22 | * |
| 23 | 23 | * @return void |
| 24 | 24 | */ |
| 25 | - public function __construct(string $message, int $code, ?\Throwable $previous = null, array $links = null) |
|
| 25 | + public function __construct (string $message, int $code, ?\Throwable $previous = null, array $links = null) |
|
| 26 | 26 | { |
| 27 | 27 | $this->links = $links; |
| 28 | - parent::__construct($message, $code, $previous); |
|
| 28 | + parent::__construct ($message, $code, $previous); |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | /** |
@@ -34,9 +34,9 @@ discard block |
||
| 34 | 34 | * @param \Illuminate\Http\Request $request Incoming request object. |
| 35 | 35 | * @return \Illuminate\Http\Response|\Illuminate\Contracts\Routing\ResponseFactory |
| 36 | 36 | */ |
| 37 | - public function render(\Illuminate\Http\Request $request) |
|
| 37 | + public function render (\Illuminate\Http\Request $request) |
|
| 38 | 38 | { |
| 39 | - return response()->view( |
|
| 39 | + return response ()->view ( |
|
| 40 | 40 | 'errors/admin', |
| 41 | 41 | [ |
| 42 | 42 | 'exception' => $this, |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | * |
| 55 | 55 | * @return mixed |
| 56 | 56 | */ |
| 57 | - public function getStatusCode() |
|
| 57 | + public function getStatusCode () |
|
| 58 | 58 | { |
| 59 | 59 | return 500; |
| 60 | 60 | } |
@@ -12,10 +12,10 @@ |
||
| 12 | 12 | * |
| 13 | 13 | * @return void |
| 14 | 14 | */ |
| 15 | - public function boot() |
|
| 15 | + public function boot () |
|
| 16 | 16 | { |
| 17 | - Broadcast::routes(); |
|
| 17 | + Broadcast::routes (); |
|
| 18 | 18 | |
| 19 | - require base_path('routes/channels.php'); |
|
| 19 | + require base_path ('routes/channels.php'); |
|
| 20 | 20 | } |
| 21 | 21 | } |
@@ -63,15 +63,15 @@ discard block |
||
| 63 | 63 | * |
| 64 | 64 | * @return void |
| 65 | 65 | */ |
| 66 | - protected function defineGates(): void |
|
| 66 | + protected function defineGates (): void |
|
| 67 | 67 | { |
| 68 | - Gate::define('view-assessment-plan', function ($user, $jobPoster) { |
|
| 69 | - return $user->isAdmin() || |
|
| 70 | - $user->isManager() && $jobPoster->manager->user_id === $user->id; |
|
| 68 | + Gate::define ('view-assessment-plan', function ($user, $jobPoster) { |
|
| 69 | + return $user->isAdmin () || |
|
| 70 | + $user->isManager () && $jobPoster->manager->user_id === $user->id; |
|
| 71 | 71 | }); |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | - public function register(): void |
|
| 74 | + public function register (): void |
|
| 75 | 75 | { |
| 76 | 76 | } |
| 77 | 77 | |
@@ -80,10 +80,10 @@ discard block |
||
| 80 | 80 | * |
| 81 | 81 | * @return void |
| 82 | 82 | */ |
| 83 | - public function boot(): void |
|
| 83 | + public function boot (): void |
|
| 84 | 84 | { |
| 85 | - $this->registerPolicies(); |
|
| 85 | + $this->registerPolicies (); |
|
| 86 | 86 | |
| 87 | - $this->defineGates(); |
|
| 87 | + $this->defineGates (); |
|
| 88 | 88 | } |
| 89 | 89 | } |
@@ -39,9 +39,9 @@ |
||
| 39 | 39 | * |
| 40 | 40 | * @return void |
| 41 | 41 | */ |
| 42 | - public function boot(): void |
|
| 42 | + public function boot (): void |
|
| 43 | 43 | { |
| 44 | - parent::boot(); |
|
| 44 | + parent::boot (); |
|
| 45 | 45 | |
| 46 | 46 | // |
| 47 | 47 | } |