miguel456/athenahr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "merge 1"

Browse Source 
This reverts commit 0bc6c20a6d.
This commit is contained in:
Miguel Nogueira
2022-10-24 01:03:43 +01:00
parent 0bc6c20a6d
commit 0c463d1f10
166 changed files with 1849 additions and 4266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/Http/Requests/AddDobRequest.php
View File

@@ -1,25 +0,0 @@
<?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;
}
}

28
app/Http/Requests/AdminPasswordResetRequest.php
View File

@@ -1,28 +0,0 @@
<?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;
}
}

12
app/Http/Requests/SetNewPasswordRequest.php → app/Http/Requests/HomeContactRequest.php
View File

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

1
app/Http/Requests/Remove2FASecretRequest.php
View File

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

20
app/Http/Requests/Reset2FASecretRequest.php
View File

@@ -1,20 +0,0 @@
<?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;
}
}

2
app/Http/Requests/UpdateUserRequest.php
View File

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

2
app/Http/Requests/VacancyEditRequest.php
View File

@@ -47,8 +47,6 @@ 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'
];
}
}

8
app/Http/Requests/VacancyRequest.php
View File

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