Fix team authorization, invite revocation, and slug handling
This commit is contained in:
@@ -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,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user