diff --git a/app/Http/Controllers/Webhooks/GitlabController.php b/app/Http/Controllers/Webhooks/GitlabController.php index 545fb57..42c29a9 100644 --- a/app/Http/Controllers/Webhooks/GitlabController.php +++ b/app/Http/Controllers/Webhooks/GitlabController.php @@ -9,15 +9,22 @@ use Illuminate\Support\Facades\Mail; class GitlabController extends Controller { + /** + * Handle gitlab request + * + * @param GitlabRequest $request + * @return void + */ public function handle(GitlabRequest $request) { + // TODO: Check all request inputs, before sending unvalidated data by mail. $event_type = $request->event_type; if ($event_type === 'merge_request') { - // Si le state est <> de opened on ne fait rien + // Si le state est <> de opened on ne fait rien . if ($request->object_attributes['state'] !== 'opened') { exit; } - // Si l'action est set et egale à approved on ne fait rien + // Si l'action est set et egale à approved on ne fait rien . if (isset($request->object_attributes['action']) && $request->object_attributes['action'] === 'approved') { exit; } diff --git a/app/Http/Requests/Projects/UpdateProjectRequest.php b/app/Http/Requests/Projects/UpdateProjectRequest.php index c63c71a..e48a6ed 100644 --- a/app/Http/Requests/Projects/UpdateProjectRequest.php +++ b/app/Http/Requests/Projects/UpdateProjectRequest.php @@ -2,8 +2,6 @@ namespace App\Http\Requests\Projects; -use Illuminate\Support\Facades\Auth; - class UpdateProjectRequest extends StoreProjectRequest { /** @@ -14,7 +12,7 @@ class UpdateProjectRequest extends StoreProjectRequest public function rules() { return \array_merge(parent::rules(), [ - // TODO : compléter les rules + // TODO : compléter les rules . 'prod_laravel_app_key' => 'required_if:type,3', 'dev_laravel_app_key' => 'required_if:type,3', 'prod_smtp_config' => 'integer|required', diff --git a/app/Http/Requests/Webhooks/GitlabRequest.php b/app/Http/Requests/Webhooks/GitlabRequest.php index a7b95c0..f548082 100644 --- a/app/Http/Requests/Webhooks/GitlabRequest.php +++ b/app/Http/Requests/Webhooks/GitlabRequest.php @@ -13,7 +13,8 @@ class GitlabRequest extends FormRequest */ public function authorize() { - return $this->header('X-Gitlab-Token') !== null && $this->header('X-Gitlab-Token') === config('webhooks.gitlab.token'); + return $this->header('X-Gitlab-Token') !== null && + $this->header('X-Gitlab-Token') === config('webhooks.gitlab.token'); } /**