From 699221184cf0cfe6cef60b6f90a6cd2228627c8f Mon Sep 17 00:00:00 2001
From: Florian Gareis <TheZoker@users.noreply.github.com>
Date: Thu, 12 Oct 2023 16:36:11 +0000
Subject: [PATCH] Fix regex for email

---
 lib/screens/on_boarding/auth/forgot_password.dart    | 2 +-
 lib/screens/on_boarding/auth/invite_co_workers.dart  | 4 ++--
 lib/screens/on_boarding/auth/signUp.dart             | 2 +-
 lib/screens/on_boarding/auth/sign_in.dart            | 2 +-
 lib/screens/on_boarding/auth/sign_in_selfhosted.dart | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/screens/on_boarding/auth/forgot_password.dart b/lib/screens/on_boarding/auth/forgot_password.dart
index 3571fc5..3b5bd6c 100644
--- a/lib/screens/on_boarding/auth/forgot_password.dart
+++ b/lib/screens/on_boarding/auth/forgot_password.dart
@@ -89,7 +89,7 @@ class _ForgotPasswordState extends ConsumerState<ForgotPassword> {
                         }
 
                         if (!RegExp(
-                                r"^[a-zA-Z0-9.a-zA-Z0-9.!#$%&'*+-/=?^_`{|}~]+@[a-zA-Z0-9]+\.[a-zA-Z]+")
+                                r"^[a-zA-Z0-9.a-zA-Z0-9.!#$%&'*+-/=?^_`{|}~]+@[a-zA-Z0-9-]+\.[a-zA-Z]+")
                             .hasMatch(val)) {
                           return '*Please Enter valid email';
                         } else {
diff --git a/lib/screens/on_boarding/auth/invite_co_workers.dart b/lib/screens/on_boarding/auth/invite_co_workers.dart
index 8478305..0d935a5 100644
--- a/lib/screens/on_boarding/auth/invite_co_workers.dart
+++ b/lib/screens/on_boarding/auth/invite_co_workers.dart
@@ -26,7 +26,7 @@ class _InviteCOWorkersState extends ConsumerState<InviteCOWorkers> {
 
   bool validateEmail(String email) {
     return RegExp(
-            r"^[a-zA-Z0-9.a-zA-Z0-9.!#$%&'*+-/=?^_`{|}~]+@[a-zA-Z0-9]+\.[a-zA-Z]+")
+            r"^[a-zA-Z0-9.a-zA-Z0-9.!#$%&'*+-/=?^_`{|}~]+@[a-zA-Z0-9-]+\.[a-zA-Z]+")
         .hasMatch(email);
   }
 
@@ -114,7 +114,7 @@ class _InviteCOWorkersState extends ConsumerState<InviteCOWorkers> {
                                                   .validate(),
                                               validator: (email) {
                                                 if (RegExp(
-                                                        r"^[a-zA-Z0-9.a-zA-Z0-9.!#$%&'*+-/=?^_`{|}~]+@[a-zA-Z0-9]+\.[a-zA-Z]+")
+                                                        r"^[a-zA-Z0-9.a-zA-Z0-9.!#$%&'*+-/=?^_`{|}~]+@[a-zA-Z0-9-]+\.[a-zA-Z]+")
                                                     .hasMatch(email!)) {
                                                   invitations[index]
                                                       ["is_valid"] = true;
diff --git a/lib/screens/on_boarding/auth/signUp.dart b/lib/screens/on_boarding/auth/signUp.dart
index 224835d..fc2a415 100644
--- a/lib/screens/on_boarding/auth/signUp.dart
+++ b/lib/screens/on_boarding/auth/signUp.dart
@@ -112,7 +112,7 @@ class _SignUpState extends ConsumerState<SignUp> {
                             }
 
                             if (!RegExp(
-                                    r"^[a-zA-Z0-9.a-zA-Z0-9.!#$%&'*+-/=?^_`{|}~]+@[a-zA-Z0-9]+\.[a-zA-Z]+")
+                                    r"^[a-zA-Z0-9.a-zA-Z0-9.!#$%&'*+-/=?^_`{|}~]+@[a-zA-Z0-9-]+\.[a-zA-Z]+")
                                 .hasMatch(val)) {
                               return '*Please Enter valid email';
                             } else {
diff --git a/lib/screens/on_boarding/auth/sign_in.dart b/lib/screens/on_boarding/auth/sign_in.dart
index 9adcdfe..8761410 100644
--- a/lib/screens/on_boarding/auth/sign_in.dart
+++ b/lib/screens/on_boarding/auth/sign_in.dart
@@ -173,7 +173,7 @@ class _SignInScreenState extends ConsumerState<SignInScreen>
                               }
 
                               if (!RegExp(
-                                      r"^[a-zA-Z0-9.a-zA-Z0-9.!#$%&'*+-/=?^_`{|}~]+@[a-zA-Z0-9]+\.[a-zA-Z]+")
+                                      r"^[a-zA-Z0-9.a-zA-Z0-9.!#$%&'*+-/=?^_`{|}~]+@[a-zA-Z0-9-]+\.[a-zA-Z]+")
                                   .hasMatch(val)) {
                                 return '*Please Enter valid email';
                               } else {
diff --git a/lib/screens/on_boarding/auth/sign_in_selfhosted.dart b/lib/screens/on_boarding/auth/sign_in_selfhosted.dart
index 3d40c2f..c9d0722 100644
--- a/lib/screens/on_boarding/auth/sign_in_selfhosted.dart
+++ b/lib/screens/on_boarding/auth/sign_in_selfhosted.dart
@@ -111,7 +111,7 @@ class _SignInSelfHostedState extends ConsumerState<SignInSelfHosted> {
                             }
 
                             if (!RegExp(
-                                    r"^[a-zA-Z0-9.a-zA-Z0-9.!#$%&'*+-/=?^_`{|}~]+@[a-zA-Z0-9]+\.[a-zA-Z]+")
+                                    r"^[a-zA-Z0-9.a-zA-Z0-9.!#$%&'*+-/=?^_`{|}~]+@[a-zA-Z0-9-]+\.[a-zA-Z]+")
                                 .hasMatch(val)) {
                               return '*Please Enter valid email';
                             } else {