A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: email update request validation does not match user registration
aminnausin99396067b1fe
diff --git a/app/Http/Controllers/Api/V1/EmailController.php b/app/Http/Controllers/Api/V1/EmailController.phpindex adecac52..7721ed88 100644--- a/app/Http/Controllers/Api/V1/EmailController.php+++ b/app/Http/Controllers/Api/V1/EmailController.php@@ -3,28 +3,12 @@namespace App\Http\Controllers\Api\V1;use App\Http\Controllers\Controller;-use Illuminate\Http\Request;-use Illuminate\Validation\Rule;+use App\Http\Requests\User\EmailUpdateRequest;class EmailController extends Controller {- public function update(Request $request) {- $request->merge(['current_email' => $request->user()->email]);-- $validated = $request->validate([- 'password' => ['required', 'current_password'],- 'email' => [- 'required',- 'email',- 'different:current_email',- Rule::unique('users', 'email')->ignore($request->user()->id),- ],-- ], [- 'email.different' => 'You already use this email.',- ]);-+ public function update(EmailUpdateRequest $request) {$request->user()->update([- 'email' => $validated['email'],+ 'email' => $request->validated('email'),]);return response()->noContent();diff --git a/app/Http/Requests/User/EmailUpdateRequest.php b/app/Http/Requests/User/EmailUpdateRequest.phpnew file mode 100644index 00000000..859a0eeb--- /dev/null+++ b/app/Http/Requests/User/EmailUpdateRequest.php@@ -0,0 +1,53 @@+<?php++namespace App\Http\Requests\User;++use Illuminate\Foundation\Http\FormRequest;+use Illuminate\Support\Facades\Auth;+use Illuminate\Validation\Rule;+use Illuminate\Validation\Rules;++class EmailUpdateRequest extends FormRequest {+ /**+ * Determine if the user is authorized to make this request.+ */+ public function authorize(): bool {+ return Auth::check();+ }++ /**+ * Prepare the data for validation.+ */+ protected function prepareForValidation(): void {+ $this->merge([+ 'current_email' => $this->user()->email,+ 'email' => strtolower($this->email),+ ]);+ }++ /**+ * Get the validation rules that apply to the request.+ *+ * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>+ */+ public function rules(): array {+ return [+ 'password' => ['required', 'current_password'],+ 'email' => [+ 'required',+ 'string',+ 'lowercase',+ 'max:255',+ Rules\Email::defaults(),+ 'different:current_email',+ Rule::unique('users', 'email')->ignore($this->user()->id),+ ],+ ];+ }++ public function messages(): array {+ return [+ 'email.different' => 'You already use this email.',+ ];+ }+}