Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 23 additions & 12 deletions app/Exceptions/Handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,20 @@

namespace App\Exceptions;

use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Auth\AuthenticationException;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use Illuminate\Http\Request as HttpRequest;
use Illuminate\Http\Response;
use Illuminate\Queue\MaxAttemptsExceededException;
use Illuminate\Session\TokenMismatchException;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use Illuminate\Validation\ValidationException;
use League\OAuth2\Server\Exception\OAuthServerException;
use Symfony\Component\Console\Exception\CommandNotFoundException;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Throwable;

class Handler extends ExceptionHandler
Expand All @@ -15,16 +26,16 @@ class Handler extends ExceptionHandler
* @var array
*/
protected $dontReport = [
\Illuminate\Auth\AuthenticationException::class,
\Illuminate\Auth\Access\AuthorizationException::class,
\Symfony\Component\HttpKernel\Exception\HttpException::class,
\Symfony\Component\Console\Exception\CommandNotFoundException::class,
\Illuminate\Database\Eloquent\ModelNotFoundException::class,
\Illuminate\Session\TokenMismatchException::class,
\Illuminate\Validation\ValidationException::class,
\Illuminate\Queue\MaxAttemptsExceededException::class,
\League\OAuth2\Server\Exception\OAuthServerException::class,
\App\Exceptions\Discord\DiscordUserInviteException::class,
AuthenticationException::class,
AuthorizationException::class,
HttpException::class,
CommandNotFoundException::class,
ModelNotFoundException::class,
TokenMismatchException::class,
ValidationException::class,
MaxAttemptsExceededException::class,
OAuthServerException::class,
Discord\DiscordUserInviteException::class,
];

/**
Expand Down Expand Up @@ -61,8 +72,8 @@ public function report(Throwable $e)
/**
* Render an exception into an HTTP response.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
* @param HttpRequest $request
* @return Response
*/
public function render($request, Throwable $e)
{
Expand Down
27 changes: 14 additions & 13 deletions app/Filament/Admin/Resources/AccountResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use App\Enums\QualificationTypeEnum;
use App\Filament\Admin\Helpers\Resources\DefinesGatedAttributes;
use App\Filament\Training\Resources\AccountResource\RelationManagers\WaitingListsRelationManager;
use App\Models\Mship\Account;
use App\Models\Roster;
use AxonC\FilamentCopyablePlaceholder\Forms\Components\CopyablePlaceholder;
Expand Down Expand Up @@ -157,25 +158,25 @@ public static function table(Table $table): Table
public static function getRelations(): array
{
return [
\App\Filament\Admin\Resources\AccountResource\RelationManagers\StatesRelationManager::class,
\App\Filament\Admin\Resources\AccountResource\RelationManagers\QualificationsRelationManager::class,
\App\Filament\Admin\Resources\AccountResource\RelationManagers\FeedbackRelationManager::class,
\App\Filament\Admin\Resources\AccountResource\RelationManagers\RolesRelationManager::class,
\App\Filament\Admin\Resources\AccountResource\RelationManagers\BansRelationManager::class,
\App\Filament\Admin\Resources\AccountResource\RelationManagers\NotesRelationManager::class,
\App\Filament\Admin\Resources\AccountResource\RelationManagers\EndorsementsRelationManager::class,
\App\Filament\Training\Resources\AccountResource\RelationManagers\WaitingListsRelationManager::class,
\App\Filament\Admin\Resources\AccountResource\RelationManagers\RetentionChecksRelationManager::class,
\App\Filament\Admin\Resources\AccountResource\RelationManagers\VisitTransferRelationManager::class,
AccountResource\RelationManagers\StatesRelationManager::class,
AccountResource\RelationManagers\QualificationsRelationManager::class,
AccountResource\RelationManagers\FeedbackRelationManager::class,
AccountResource\RelationManagers\RolesRelationManager::class,
AccountResource\RelationManagers\BansRelationManager::class,
AccountResource\RelationManagers\NotesRelationManager::class,
AccountResource\RelationManagers\EndorsementsRelationManager::class,
WaitingListsRelationManager::class,
AccountResource\RelationManagers\RetentionChecksRelationManager::class,
AccountResource\RelationManagers\VisitTransferRelationManager::class,
];
}

public static function getPages(): array
{
return [
'index' => \App\Filament\Admin\Resources\AccountResource\Pages\ListAccounts::route('/'),
'view' => \App\Filament\Admin\Resources\AccountResource\Pages\ViewAccount::route('/{record}'),
'edit' => \App\Filament\Admin\Resources\AccountResource\Pages\EditAccount::route('/{record}/edit'),
'index' => AccountResource\Pages\ListAccounts::route('/'),
'view' => AccountResource\Pages\ViewAccount::route('/{record}'),
'edit' => AccountResource\Pages\EditAccount::route('/{record}/edit'),
];
}

Expand Down
4 changes: 2 additions & 2 deletions app/Filament/Admin/Resources/BanResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ public static function getRelations(): array
public static function getPages(): array
{
return [
'index' => \App\Filament\Admin\Resources\BanResource\Pages\ListBans::route('/'),
'view' => \App\Filament\Admin\Resources\BanResource\Pages\ViewBan::route('/{record}'),
'index' => BanResource\Pages\ListBans::route('/'),
'view' => BanResource\Pages\ViewBan::route('/{record}'),
];
}
}
4 changes: 2 additions & 2 deletions app/Filament/Admin/Resources/EndorsementRequestResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ public static function table(Table $table): Table
public static function getPages(): array
{
return [
'index' => \App\Filament\Admin\Resources\EndorsementRequestResource\Pages\ListEndorsementRequests::route('/'),
'create' => \App\Filament\Admin\Resources\EndorsementRequestResource\Pages\CreateEndorsementRequest::route('/create'),
'index' => EndorsementRequestResource\Pages\ListEndorsementRequests::route('/'),
'create' => EndorsementRequestResource\Pages\CreateEndorsementRequest::route('/create'),
];
}
}
4 changes: 2 additions & 2 deletions app/Filament/Admin/Resources/FeedbackResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ public static function table(Table $table): Table
public static function getPages(): array
{
return [
'index' => \App\Filament\Admin\Resources\FeedbackResource\Pages\ListFeedback::route('/'),
'view' => \App\Filament\Admin\Resources\FeedbackResource\Pages\ViewFeedback::route('/{record}'),
'index' => FeedbackResource\Pages\ListFeedback::route('/'),
'view' => FeedbackResource\Pages\ViewFeedback::route('/{record}'),
];
}

Expand Down
4 changes: 2 additions & 2 deletions app/Filament/Admin/Resources/PositionGroupResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ public static function getRelations(): array
public static function getPages(): array
{
return [
'index' => \App\Filament\Admin\Resources\PositionGroupResource\Pages\ListPositionGroups::route('/'),
'view' => \App\Filament\Admin\Resources\PositionGroupResource\Pages\ViewPositionGroup::route('/{record}'),
'index' => PositionGroupResource\Pages\ListPositionGroups::route('/'),
'view' => PositionGroupResource\Pages\ViewPositionGroup::route('/{record}'),
];
}
}
10 changes: 5 additions & 5 deletions app/Filament/Admin/Resources/RoleResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -92,17 +92,17 @@ public static function table(Table $table): Table
public static function getRelations(): array
{
return [
\App\Filament\Admin\Resources\RoleResource\RelationManagers\UsersRelationManager::class,
\App\Filament\Admin\Resources\RoleResource\RelationManagers\DelegatesRelationManager::class,
RoleResource\RelationManagers\UsersRelationManager::class,
RoleResource\RelationManagers\DelegatesRelationManager::class,
];
}

public static function getPages(): array
{
return [
'index' => \App\Filament\Admin\Resources\RoleResource\Pages\ListRoles::route('/'),
'create' => \App\Filament\Admin\Resources\RoleResource\Pages\CreateRole::route('/create'),
'edit' => \App\Filament\Admin\Resources\RoleResource\Pages\EditRole::route('/{record}/edit'),
'index' => RoleResource\Pages\ListRoles::route('/'),
'create' => RoleResource\Pages\CreateRole::route('/create'),
'edit' => RoleResource\Pages\EditRole::route('/{record}/edit'),
];
}
}
2 changes: 1 addition & 1 deletion app/Filament/Admin/Resources/RosterRestrictionResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public static function getEloquentQuery(): Builder
public static function getPages(): array
{
return [
'index' => \App\Filament\Admin\Resources\RosterRestrictionResource\Pages\ListRosterRestrictions::route('/'),
'index' => RosterRestrictionResource\Pages\ListRosterRestrictions::route('/'),
];
}
}
2 changes: 1 addition & 1 deletion app/Filament/Admin/Resources/SoloEndorsementResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public static function table(Table $table): Table
public static function getPages(): array
{
return [
'index' => \App\Filament\Admin\Resources\SoloEndorsementResource\Pages\ListSoloEndorsements::route('/'),
'index' => SoloEndorsementResource\Pages\ListSoloEndorsements::route('/'),
];
}
}
8 changes: 4 additions & 4 deletions app/Filament/Training/Resources/WaitingListResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,10 @@ public static function getRelations(): array
public static function getPages(): array
{
return [
'index' => \App\Filament\Training\Resources\WaitingListResource\Pages\ListWaitingLists::route('/'),
'create' => \App\Filament\Training\Resources\WaitingListResource\Pages\CreateWaitingList::route('/create'),
'edit' => \App\Filament\Training\Resources\WaitingListResource\Pages\EditWaitingList::route('/{record}/edit'),
'view' => \App\Filament\Training\Resources\WaitingListResource\Pages\ViewWaitingList::route('/{record}'),
'index' => WaitingListResource\Pages\ListWaitingLists::route('/'),
'create' => WaitingListResource\Pages\CreateWaitingList::route('/create'),
'edit' => WaitingListResource\Pages\EditWaitingList::route('/{record}/edit'),
'view' => WaitingListResource\Pages\ViewWaitingList::route('/{record}'),
];
}
}
8 changes: 5 additions & 3 deletions app/Http/Controllers/BaseController.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,17 @@
use Auth;
use Carbon\Carbon;
use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Auth\Access\Response as AuthResponse;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Auth\RedirectsUsers;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller;
use Illuminate\Support\Facades\Cache;
use Session;
use View;

class BaseController extends \Illuminate\Routing\Controller
class BaseController extends Controller
{
use AuthorizesRequests {
authorize as protected doAuthorize;
Expand Down Expand Up @@ -60,9 +62,9 @@ public function redirectTo()
*
* @param mixed $ability
* @param mixed|array $arguments
* @return \Illuminate\Auth\Access\Response
* @return AuthResponse
*
* @throws \Illuminate\Auth\Access\AuthorizationException
* @throws AuthorizationException
*/
public function authorize($ability, $arguments = [])
{
Expand Down
18 changes: 9 additions & 9 deletions app/Http/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class Kernel extends HttpKernel
protected $middleware = [
\Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\App\Http\Middleware\TrimStrings::class,
Middleware\TrimStrings::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
];

Expand All @@ -29,16 +29,16 @@ class Kernel extends HttpKernel
protected $middlewareGroups = [
'web' => [
// native
\App\Http\Middleware\EncryptCookies::class,
Middleware\EncryptCookies::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\Session\Middleware\AuthenticateSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\App\Http\Middleware\VerifyCsrfToken::class,
Middleware\VerifyCsrfToken::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class,

// custom
\App\Http\Middleware\TrackInactivity::class,
Middleware\TrackInactivity::class,
],
'api' => [
'throttle:60,1',
Expand Down Expand Up @@ -67,17 +67,17 @@ class Kernel extends HttpKernel
*/
protected $routeMiddleware = [
// native
'auth' => \App\Http\Middleware\Authenticate::class,
'auth' => Middleware\Authenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
'can' => \Illuminate\Auth\Middleware\Authorize::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
'guest' => Middleware\RedirectIfAuthenticated::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,

// custom
'admin' => Middleware\CheckAdminPermissions::class,
'user.must.read.notifications' => Middleware\UserMustReadNotifications::class,
'api.tracking' => \App\Http\Middleware\ApiTracking::class,
'api.tracking' => Middleware\ApiTracking::class,
'denyifbanned' => Middleware\DenyIfBanned::class,
'mandatorypasswords' => Middleware\MandatoryPasswords::class,
'redirecttointended' => Middleware\RedirectToIntended::class,
Expand All @@ -95,8 +95,8 @@ class Kernel extends HttpKernel
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\Illuminate\Session\Middleware\AuthenticateSession::class,
\App\Http\Middleware\TrackInactivity::class,
\App\Http\Middleware\Authenticate::class,
Middleware\TrackInactivity::class,
Middleware\Authenticate::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class,
\Illuminate\Auth\Middleware\Authorize::class,
];
Expand Down
6 changes: 4 additions & 2 deletions app/Http/Middleware/AdminPanelFilamentAccessMiddleware.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@
namespace App\Http\Middleware;

use Closure;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Session;

class AdminPanelFilamentAccessMiddleware
{
/**
* Handle an incoming request.
*
* @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next
* @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
* @param Closure(Request): (Response|RedirectResponse) $next
* @return Response|RedirectResponse
*/
public function handle(Request $request, Closure $next)
{
Expand Down
4 changes: 2 additions & 2 deletions app/Http/Requests/VisitTransfer/ApplicationStartRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ public function rules()
'terms_hours_minimum_relevant' => 'required',
'terms_recent_transfer' => 'required',
'terms_90_day' => 'required',
'terms_not_staff' => 'required_if:application_type,'.\App\Models\VisitTransfer\Application::TYPE_TRANSFER,
'application_type' => 'required|in:'.\App\Models\VisitTransfer\Application::TYPE_TRANSFER.','.\App\Models\VisitTransfer\Application::TYPE_VISIT,
'terms_not_staff' => 'required_if:application_type,'.Application::TYPE_TRANSFER,
'application_type' => 'required|in:'.Application::TYPE_TRANSFER.','.Application::TYPE_VISIT,
'training_team' => 'required|in:pilot,atc',
];
}
Expand Down
8 changes: 4 additions & 4 deletions app/Libraries/TeamSpeak.php
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ public static function checkMemberStanding(Client $client, Account $member)
* Check a member has accepted any necessary notifications.
*
*
* @throws \App\Exceptions\TeamSpeak\ClientKickedFromServerException
* @throws ClientKickedFromServerException
*/
public static function checkMemberMandatoryNotifications(Client $client, Account $member)
{
Expand Down Expand Up @@ -251,7 +251,7 @@ public static function checkMemberMandatoryNotifications(Client $client, Account
* Check the client's nickname is correct.
*
*
* @throws \App\Exceptions\TeamSpeak\ClientKickedFromServerException
* @throws ClientKickedFromServerException
*/
public static function checkClientNickname(Client $client, Account $member)
{
Expand Down Expand Up @@ -380,7 +380,7 @@ public static function checkClientChannelGroups(Client $client, Account $member)
* Check the client's (allowed) idle time.
*
*
* @throws \App\Exceptions\TeamSpeak\ClientKickedFromServerException
* @throws ClientKickedFromServerException
*/
public static function checkClientIdleTime(Client $client, Account $member)
{
Expand Down Expand Up @@ -483,7 +483,7 @@ public static function banClient(Client $client, $reason, $duration)
*
* @param string $reason
*
* @throws \App\Exceptions\TeamSpeak\ClientKickedFromServerException
* @throws ClientKickedFromServerException
*/
public static function deactivateClient(Client $client, $reason)
{
Expand Down
10 changes: 5 additions & 5 deletions app/Models/Airport.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* @property float|null $latitude
* @property float|null $longitude
* @property int|null $elevation
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Sys\Data\Change[] $dataChanges
* @property-read \Illuminate\Database\Eloquent\Collection|Sys\Data\Change[] $dataChanges
*
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Airport whereElevation($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Airport whereId($value)
Expand All @@ -41,10 +41,10 @@
* @property \Carbon\Carbon|null $updated_at
* @property-read mixed $controllers
* @property-read mixed $pilots
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Airport\Navaid[] $navaids
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Airport\Procedure[] $procedures
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Airport\Runway[] $runways
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Atc\Position[] $positions
* @property-read \Illuminate\Database\Eloquent\Collection|Navaid[] $navaids
* @property-read \Illuminate\Database\Eloquent\Collection|Procedure[] $procedures
* @property-read \Illuminate\Database\Eloquent\Collection|Runway[] $runways
* @property-read \Illuminate\Database\Eloquent\Collection|Position[] $positions
*
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Airport iCAO($icao)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Airport uK()
Expand Down
2 changes: 1 addition & 1 deletion app/Models/Airport/Navaid.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* @property string|null $remarks
* @property \Carbon\Carbon|null $created_at
* @property \Carbon\Carbon|null $updated_at
* @property-read \App\Models\Airport $airport
* @property-read Airport $airport
*
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Airport\Navaid whereAirportId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Airport\Navaid whereCreatedAt($value)
Expand Down
Loading
Loading