Merge pull request #1335 from younginnovations/1334-fix-invalid-email…

…-validation Review: 1334-fix-invalid-email-validation
IATI · Dec 13, 2023 · 487498f · 487498f
2 parents 9c087c0 + 234122e
commit 487498f
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
@@ -220,7 +220,7 @@ public function register(Request $request): JsonResponse|RedirectResponse
         $validator = Validator::make($request->all(), [
             'username'              => ['required', 'max:255', 'string', 'unique:users,username'],
             'full_name'             => ['required', 'string', 'max:255'],
-            'email'                 => ['required', 'string', 'email', 'regex:/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,6}$/ix', 'max:255', 'unique:users,email'],
+            'email'                 => ['required', 'string', 'email', 'regex:/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,}$/ix', 'max:255', 'unique:users,email'],
             'publisher_id'          => ['required', 'string', 'max:255', 'unique:organizations,publisher_id'],
             'password'              => ['required', 'string', 'min:8', 'max:255', 'confirmed'],
             'password_confirmation' => ['required', 'string', 'min:8', 'max:255'],

diff --git a/app/Http/Requests/Activity/ContactInfo/ContactInfoRequest.php b/app/Http/Requests/Activity/ContactInfo/ContactInfoRequest.php
@@ -539,7 +539,7 @@ protected function getErrorsForEmail($formFields, $formBase): array
         $rules = [];
 
         foreach ($formFields as $emailIndex => $email) {
-            $rules[sprintf('%s.email.%s.email', $formBase, $emailIndex)] = ['nullable', ' email', 'regex:/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,6}$/ix'];
+            $rules[sprintf('%s.email.%s.email', $formBase, $emailIndex)] = ['nullable', ' email', 'regex:/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,}$/ix'];
         }
 
         return $rules;

diff --git a/app/Http/Requests/User/UserProfileRequest.php b/app/Http/Requests/User/UserProfileRequest.php
@@ -33,7 +33,7 @@ public function rules(): array
         $rules = [
             'username'              => ['required', 'max:255', sprintf('unique:users,username,%d', $id)],
             'full_name'             => ['required', 'string', 'max:255'],
-            'email'                 => ['required', 'string', 'email', 'regex:/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,6}$/ix', 'max:255', sprintf('unique:users,email,%d', $id)],
+            'email'                 => ['required', 'string', 'email', 'regex:/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,}$/ix', 'max:255', sprintf('unique:users,email,%d', $id)],
             'language_preference'   => 'required',
         ];
 

diff --git a/app/Http/Requests/User/UserRequest.php b/app/Http/Requests/User/UserRequest.php
@@ -32,7 +32,7 @@ public function rules(): array
         $rules = [
             'username'              => ['required', 'max:255', 'string', 'unique:users,username'],
             'full_name'             => ['required', 'string', 'max:255'],
-            'email'                 => ['required', 'string', 'email', 'regex:/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,6}$/ix', 'max:255', 'unique:users,email'],
+            'email'                 => ['required', 'string', 'email', 'regex:/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,}$/ix', 'max:255', 'unique:users,email'],
             'status'                => ['required'],
             'password'              => ['required', 'string', 'min:6', 'max:255', 'confirmed'],
             'password_confirmation' => ['required', 'string', 'min:6', 'max:255'],

diff --git a/app/Http/Requests/User/UserUpdateRequest.php b/app/Http/Requests/User/UserUpdateRequest.php
@@ -34,7 +34,7 @@ public function rules(): array
         $rules = [
             'username' => ['required', 'max:255', 'string', sprintf('unique:users,username,%d', $id)],
             'full_name' => ['required', 'string', 'max:255'],
-            'email' => ['required', 'string', 'email', 'regex:/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,6}$/ix', 'max:255', sprintf('unique:users,email,%d', $id)],
+            'email' => ['required', 'string', 'email', 'regex:/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,}$/ix', 'max:255', sprintf('unique:users,email,%d', $id)],
         ];
 
         if (!empty(Arr::get($request, 'password', null))) {

diff --git a/app/Http/Requests/Web/IatiRegister/IatiRegisterFormRequest.php b/app/Http/Requests/Web/IatiRegister/IatiRegisterFormRequest.php
@@ -47,7 +47,7 @@ public function rules(): array
                 break;
             case '2':
                 $rules = [
-                    'contact_email' => ['required', 'string', 'email', 'regex:/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,6}$/ix', 'max:255'],
+                    'contact_email' => ['required', 'string', 'email', 'regex:/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,}$/ix', 'max:255'],
                     'website' => ['nullable', 'url'],
                 ];
                 break;
@@ -60,7 +60,7 @@ public function rules(): array
                 $rules = [
                     'username'              => ['required', 'max:255', 'string', 'regex:/^[a-z]([0-9a-z-_])*$/', 'unique:users,username'],
                     'full_name'             => ['required', 'string', 'max:255'],
-                    'email'                 => ['required', 'string', 'email', 'regex:/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,6}$/ix', 'max:255', 'unique:users,email'],
+                    'email'                 => ['required', 'string', 'email', 'regex:/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,}$/ix', 'max:255', 'unique:users,email'],
                     'password'              => ['required', 'string', 'min:6', 'max:255', 'confirmed'],
                     'password_confirmation' => ['required', 'string', 'min:6', 'max:255'],
                 ];