merge 1

Signed-off-by: miguel456 <me@nogueira.codes>

app/Http/Requests/AddDobRequest.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Auth;
+
+class AddDobRequest extends FormRequest
+{
+    public function rules(): array
+    {
+        return [
+            'dob' => 'required|string|date_format:Y-m-d|before:-13 years',
+        ];
+    }
+
+    public function authorize(): bool
+    {
+        if (is_null(Auth::user()->dob)) {
+            return true;
+        }
+
+        return false;
+    }
+}

app/Http/Requests/AdminPasswordResetRequest.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Auth;
+
+class AdminPasswordResetRequest extends FormRequest
+{
+    public function rules(): array
+    {
+        if (Auth::user()->has2FA()) {
+            return [
+                'currentPassword' => 'required|current_password:web',
+                'otp' => 'required|integer|max:6',
+            ];
+        }
+
+        return [
+            'currentPassword' => 'required|current_password:web',
+        ];
+    }
+
+    public function authorize(): bool
+    {
+        return true;
+    }
+}

app/Http/Requests/Remove2FASecretRequest.php

@@ -44,7 +44,6 @@ class Remove2FASecretRequest extends FormRequest
     {
         return [
             'currentPassword' => 'required|current_password',
-            'consent' => 'required|accepted',
         ];
     }
 }

app/Http/Requests/Reset2FASecretRequest.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class Reset2FASecretRequest extends FormRequest
+{
+    public function rules(): array
+    {
+        return [
+            'currentPassword' => 'required|current_password',
+        ];
+    }
+
+    public function authorize(): bool
+    {
+        return true;
+    }
+}

app/Http/Requests/SetNewPasswordRequest.php

@@ -4,7 +4,7 @@ namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
-class HomeContactRequest extends FormRequest
+class SetNewPasswordRequest extends FormRequest
 {
     /**
      * Determine if the user is authorized to make this request.
@@ -13,7 +13,11 @@ class HomeContactRequest extends FormRequest
      */
     public function authorize()
     {
-        return true;
+        if (\Auth::user()->hasDiscordConnection()) {
+            return true;
+        }
+
+        return false;
     }
 
     /**
@@ -24,9 +28,7 @@ class HomeContactRequest extends FormRequest
     public function rules()
     {
         return [
-            'email' => 'required|email',
-            'msg' => 'required|string',
-            'captcha' => 'required|string'
+            'newpass' => 'required|string|min:10|confirmed',
         ];
     }
 }

app/Http/Requests/UpdateUserRequest.php

@@ -46,7 +46,7 @@ class UpdateUserRequest extends FormRequest
         return [
             'email' => 'required|email',
             'name' => 'required|string',
-            'uuid' => 'required|max:32|min:32',
+            'uuid' => 'nullable|max:32|min:32',
             'roles' => 'required_without_all',
         ];
     }

app/Http/Requests/VacancyEditRequest.php

@@ -47,6 +47,8 @@ class VacancyEditRequest extends FormRequest
             'vacancyDescription' => 'required|string',
             'vacancyFullDescription' => 'nullable|string',
             'vacancyCount' => 'required|integer|min:1',
+            'requireDiscordAccount' => 'required|string',
+            'requiredAge' => 'required|integer|numeric|min:13|max:100'
         ];
     }
 }

app/Http/Requests/VacancyRequest.php

@@ -25,6 +25,8 @@ use Illuminate\Foundation\Http\FormRequest;
 
 class VacancyRequest extends FormRequest
 {
+    public mixed $requiresDiscordAccount;
+
     /**
      * Determine if the user is authorized to make this request.
      *
@@ -46,10 +48,12 @@ class VacancyRequest extends FormRequest
             'vacancyName' => 'required|string',
             'vacancyDescription' => 'required|string',
             'vacancyFullDescription' => 'nullable|string',
-            'permissionGroup' => 'required|string',
-            'discordRole' => 'required|string',
+            'permissionGroup' => 'nullable|string',
+            'discordRole' => 'nullable|string',
             'vacancyCount' => 'required|integer',
             'vacancyFormID' => 'required|integer',
+            'requireDiscordAccount' => 'required|string',
+            'requiredAge' => 'required|integer|numeric|min:13|max:100'
         ];
     }
 }