PetschStudios/ots
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix team authorization, invite revocation, and slug handling
CI/CD / test_and_check_app (push) Failing after 58s
Details
CI/CD / Publish immutable image (push) Skipped
Details

Browse Source
This commit is contained in:
Twyco
2026-09-19 05:54:18 +02:00
parent 3db250ca51
commit e9fc8cabb5
18 changed files with 688 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Requests/StoreTeamRequest.php
+5 -5
View File
@@ -5,6 +5,7 @@ namespace App\Http\Requests;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Str;
use Illuminate\Validation\Rule;
class StoreTeamRequest extends FormRequest
{
@@ -17,7 +18,7 @@ class StoreTeamRequest extends FormRequest
{
return [
'name' => ['required', 'string', 'max:255'],
'slug' => ['required', 'string', 'max:255', 'unique:teams,slug'],
'slug' => ['required', 'string', 'max:255', Rule::notIn(['create']), Rule::unique('teams', 'slug')],
'require_2fa' => ['required', 'boolean'],
];
}
@@ -25,9 +26,8 @@ class StoreTeamRequest extends FormRequest
public function messages(): array
{
return [
'slug.string' => '',
'slug.required' => '',
'slug.max' => '',
'slug.required' => 'The name must contain letters or numbers.',
'slug.not_in' => 'This name is reserved.',
'slug.unique' => 'The name has already been taken.',
];
}
@@ -35,7 +35,7 @@ class StoreTeamRequest extends FormRequest
protected function prepareForValidation(): void
{
$this->merge([
'slug' => Str::slug($this->name),
'slug' => is_string($this->input('name')) ? Str::slug($this->input('name')) : null,
]);
}
}
app/Http/Requests/UpdateTeamRequest.php
+6 -6
View File
@@ -5,6 +5,7 @@ namespace App\Http\Requests;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Str;
use Illuminate\Validation\Rule;
class UpdateTeamRequest extends FormRequest
{
@@ -16,8 +17,8 @@ class UpdateTeamRequest extends FormRequest
public function rules(): array
{
return [
'name' => ['nullable', 'string', 'max:255'],
'slug' => ['nullable', 'required_with:name', 'string', 'max:255', 'unique:teams,slug,'.$this->route('team')->id],
'name' => ['sometimes', 'required', 'string', 'max:255'],
'slug' => [Rule::excludeIf(! $this->has('name')), 'required', 'string', 'max:255', Rule::notIn(['create']), Rule::unique('teams', 'slug')->ignore($this->route('team'))],
'require_2fa' => ['required', 'boolean'],
];
}
@@ -25,9 +26,8 @@ class UpdateTeamRequest extends FormRequest
public function messages(): array
{
return [
'slug.string' => '',
'slug.required' => '',
'slug.max' => '',
'slug.required' => 'The name must contain letters or numbers.',
'slug.not_in' => 'This name is reserved.',
'slug.unique' => 'The name has already been taken.',
];
}
@@ -35,7 +35,7 @@ class UpdateTeamRequest extends FormRequest
protected function prepareForValidation(): void
{
$this->merge([
'slug' => Str::slug($this->name),
'slug' => is_string($this->input('name')) ? Str::slug($this->input('name')) : null,
]);
}
}