diff --git a/app/Filament/Resources/Participants/Tables/ParticipantsTable.php b/app/Filament/Resources/Participants/Tables/ParticipantsTable.php index a46d438..8284f66 100644 --- a/app/Filament/Resources/Participants/Tables/ParticipantsTable.php +++ b/app/Filament/Resources/Participants/Tables/ParticipantsTable.php @@ -159,7 +159,7 @@ class ParticipantsTable ->action(function (array $data, Participant $record) { $mailContent = Mailtemplate::where('id', $data['mailtemplate'])->get(); Mail::to($record->guardian_email) - ->send(new LanMail($mailContent, $record)); + ->queue(new LanMail($mailContent, $record)); Participant::where('id', $record->id)->update(['emailed' => true]); }) ->hidden(fn($record) => !$record->emailed) diff --git a/app/Filament/Resources/Volunteers/Tables/VolunteersTable.php b/app/Filament/Resources/Volunteers/Tables/VolunteersTable.php index b766853..5da4b90 100644 --- a/app/Filament/Resources/Volunteers/Tables/VolunteersTable.php +++ b/app/Filament/Resources/Volunteers/Tables/VolunteersTable.php @@ -80,7 +80,7 @@ class VolunteersTable ->action(function (array $data, Volunteer $record) { $mailContent = Mailtemplate::where('id', $data['mailtemplate'])->get(); Mail::to($record->email) - ->send(new LanMail($mailContent, $record)); + ->queue(new LanMail($mailContent, $record)); Volunteer::where('id', $record->id)->update(['emailed' => true]); }) ->hidden(fn($record) => $record->emailed), diff --git a/app/Http/Middleware/ApiToken.php b/app/Http/Middleware/ApiToken.php index 810f55a..25a5606 100644 --- a/app/Http/Middleware/ApiToken.php +++ b/app/Http/Middleware/ApiToken.php @@ -15,19 +15,19 @@ class ApiToken */ public function handle(Request $request, Closure $next): Response { - if ($request->api_token === config('apikeys.key_1')) { + if ($request->header('X-API-KEY') === config('apikeys.key_1')) { $request->merge(["permission" => "key_1"]); - } elseif ($request->api_token === config('apikeys.key_2')) { + } elseif ($request->header('X-API-KEY') === config('apikeys.key_2')) { $request->merge(["permission" => "key_2"]); - } elseif ($request->api_token === config('apikeys.key_3')) { + } elseif ($request->header('X-API-KEY') === config('apikeys.key_3')) { $request->merge(["permission" => "key_3"]); - } elseif ($request->api_token === config('apikeys.key_4')) { + } elseif ($request->header('X-API-KEY') === config('apikeys.key_4')) { $request->merge(["permission" => "key_4"]); diff --git a/docs/endpoints.md b/docs/endpoints.md index 839084d..af9690f 100644 --- a/docs/endpoints.md +++ b/docs/endpoints.md @@ -1,13 +1,13 @@ ## Endpoints
- GET /data/{api_token} + GET /data -##### Parameters +##### Headers > | name | type | data type | description | > |-------------|------------|----------------|--------------------------------------------------------------| -> | `api_token` | required | string | Api key with permission | +> | `x-api-key` | required | string | Api key with permission | ##### Responses @@ -124,13 +124,13 @@
- GET /version/{api_token} + GET /version -##### Parameters +##### Headers > | name | type | data type | description | > |-------------|------------|----------------|--------------------------------------------------------------| -> | `api_token` | required | string | Api key with permission | +> | `x-api-key` | required | string | Api key with permission | ##### Responses @@ -181,13 +181,13 @@
- POST /participant/{api_token} + POST /participant -##### Parameters +##### Headers > | name | type | data type | description | > |-------------|-----------|-------------------------|-----------------------------------------------------------------------| -> | `api_token` | required | string | Api key with permission | +> | `x-api-key` | required | string | Api key with permission | ##### Body data @@ -237,13 +237,13 @@
- POST /volunteer/{api_token} + POST /volunteer -##### Parameters +##### Headers > | name | type | data type | description | > |-------------|-----------|-------------------------|-----------------------------------------------------------------------| -> | `api_token` | required | string | Api key with permission | +> | `x-api-key` | required | string | Api key with permission | ##### Body data diff --git a/routes/api.php b/routes/api.php index 99a372d..87b478b 100644 --- a/routes/api.php +++ b/routes/api.php @@ -12,10 +12,10 @@ use App\Http\Controllers\VersionController; // return $request->user(); //})->middleware('auth:sanctum'); -Route::get('/data/{api_token}', [ParticipantController::class, 'index'] )->middleware([ApiToken::class]); +Route::get('/data', [ParticipantController::class, 'index'] )->middleware([ApiToken::class]); -Route::get('/version/{api_token}', [VersionController::class, 'index'] )->middleware([ApiToken::class]); +Route::get('/version', [VersionController::class, 'index'] )->middleware([ApiToken::class]); -Route::post('/participant/{api_token}', [ParticipantController::class, 'store'] )->middleware([ApiToken::class]); +Route::post('/participant', [ParticipantController::class, 'store'] )->middleware([ApiToken::class]); -Route::post('/volunteer/{api_token}', [VolunteerController::class, 'store'] )->middleware([ApiToken::class]); +Route::post('/volunteer', [VolunteerController::class, 'store'] )->middleware([ApiToken::class]);