From 9335b18d16e56ad38b604e0279e09f33c0b8d988 Mon Sep 17 00:00:00 2001
From: Aubrey <aubrey.b@treskcow.tech>
Date: Fri, 27 Mar 2020 11:20:36 -0400
Subject: [PATCH 1/4] Check for a valid email.

---
 .../Modules/Admin/Register/Index.razor          | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/Oqtane.Client/Modules/Admin/Register/Index.razor b/Oqtane.Client/Modules/Admin/Register/Index.razor
index 46fdca01..a3624623 100644
--- a/Oqtane.Client/Modules/Admin/Register/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Register/Index.razor
@@ -1,4 +1,5 @@
 @namespace Oqtane.Modules.Admin.Register
+@using System.Text.RegularExpressions;
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
@@ -42,13 +43,15 @@
     string _confirm = "";
     string _email = "";
     string _displayName = "";
+    bool _isEmailValid = false;
 
     private async Task Register()
     {
         try
         {
             _message = "";
-            if (_username != "" && _password != "" && _confirm != "" && _email != "")
+            IsValidEmail();
+            if (_username != "" && _password != "" && _confirm != "" && _isEmailValid)
             {
                 if (_password == _confirm)
                 {
@@ -94,4 +97,16 @@
     {
         NavigationManager.NavigateTo(NavigateUrl(""));
     }
+}
+    private void IsValidEmail()
+    {
+        if (_email != ""){
+            _isEmailValid = true;
+        }
+
+        _isEmailValid = Regex.IsMatch(_email,
+              @"^(?("")("".+?(?<!\\)""@)|(([0-9a-z]((\.(?!\.))|[-!#\$%&'\*\+/=\?\^`\{\}\|~\w])*)(?<=[0-9a-z])@))" +
+              @"(?(\[)(\[(\d{1,3}\.){3}\d{1,3}\])|(([0-9a-z][-0-9a-z]*[0-9a-z]*\.)+[a-z0-9][\-a-z0-9]{0,22}[a-z0-9]))$",
+              RegexOptions.IgnoreCase, TimeSpan.FromMilliseconds(250));
+    }
 }

From 815572b9a7b5783b22b63beeac9cb9efc8f6fe7e Mon Sep 17 00:00:00 2001
From: Aubrey <aubrey.b@treskcow.tech>
Date: Fri, 27 Mar 2020 11:29:49 -0400
Subject: [PATCH 2/4] Fixed missing character.

---
 Oqtane.Client/Modules/Admin/Register/Index.razor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/Register/Index.razor b/Oqtane.Client/Modules/Admin/Register/Index.razor
index a3624623..efef6e81 100644
--- a/Oqtane.Client/Modules/Admin/Register/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Register/Index.razor
@@ -97,7 +97,7 @@
     {
         NavigationManager.NavigateTo(NavigateUrl(""));
     }
-}
+
     private void IsValidEmail()
     {
         if (_email != ""){
@@ -109,4 +109,4 @@
               @"(?(\[)(\[(\d{1,3}\.){3}\d{1,3}\])|(([0-9a-z][-0-9a-z]*[0-9a-z]*\.)+[a-z0-9][\-a-z0-9]{0,22}[a-z0-9]))$",
               RegexOptions.IgnoreCase, TimeSpan.FromMilliseconds(250));
     }
-}
+}
\ No newline at end of file

From f8d77320250540d99484f519aaace656066ed162 Mon Sep 17 00:00:00 2001
From: Aubrey <aubrey.b@treskcow.tech>
Date: Fri, 27 Mar 2020 13:42:14 -0400
Subject: [PATCH 3/4] Moved logic to  the Utilities class.

---
 .../Modules/Admin/Register/Index.razor          | 15 +--------------
 Oqtane.Shared/Shared/Utilities.cs               | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/Register/Index.razor b/Oqtane.Client/Modules/Admin/Register/Index.razor
index efef6e81..8401c1f0 100644
--- a/Oqtane.Client/Modules/Admin/Register/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Register/Index.razor
@@ -1,5 +1,4 @@
 @namespace Oqtane.Modules.Admin.Register
-@using System.Text.RegularExpressions;
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
@@ -50,7 +49,7 @@
         try
         {
             _message = "";
-            IsValidEmail();
+            _isEmailValid  = Utilities.IsValidEmail(_email);
             if (_username != "" && _password != "" && _confirm != "" && _isEmailValid)
             {
                 if (_password == _confirm)
@@ -97,16 +96,4 @@
     {
         NavigationManager.NavigateTo(NavigateUrl(""));
     }
-
-    private void IsValidEmail()
-    {
-        if (_email != ""){
-            _isEmailValid = true;
-        }
-
-        _isEmailValid = Regex.IsMatch(_email,
-              @"^(?("")("".+?(?<!\\)""@)|(([0-9a-z]((\.(?!\.))|[-!#\$%&'\*\+/=\?\^`\{\}\|~\w])*)(?<=[0-9a-z])@))" +
-              @"(?(\[)(\[(\d{1,3}\.){3}\d{1,3}\])|(([0-9a-z][-0-9a-z]*[0-9a-z]*\.)+[a-z0-9][\-a-z0-9]{0,22}[a-z0-9]))$",
-              RegexOptions.IgnoreCase, TimeSpan.FromMilliseconds(250));
-    }
 }
\ No newline at end of file
diff --git a/Oqtane.Shared/Shared/Utilities.cs b/Oqtane.Shared/Shared/Utilities.cs
index a4d10ce5..f54f80c4 100644
--- a/Oqtane.Shared/Shared/Utilities.cs
+++ b/Oqtane.Shared/Shared/Utilities.cs
@@ -1,5 +1,7 @@
-using System.Globalization;
+using System;
+using System.Globalization;
 using System.Text;
+using System.Text.RegularExpressions;
 
 namespace Oqtane.Shared
 {
@@ -217,5 +219,18 @@ namespace Oqtane.Shared
                 return "";
             }
         }
+
+        public static bool IsValidEmail(string email)
+        {
+            if (email != "")
+            {
+                return true;
+            }
+
+            return Regex.IsMatch(email,
+                  @"^(?("")("".+?(?<!\\)""@)|(([0-9a-z]((\.(?!\.))|[-!#\$%&'\*\+/=\?\^`\{\}\|~\w])*)(?<=[0-9a-z])@))" +
+                  @"(?(\[)(\[(\d{1,3}\.){3}\d{1,3}\])|(([0-9a-z][-0-9a-z]*[0-9a-z]*\.)+[a-z0-9][\-a-z0-9]{0,22}[a-z0-9]))$",
+                  RegexOptions.IgnoreCase, TimeSpan.FromMilliseconds(250));
+        }
     }
 }

From 52cb3cb980f2869157db384994afc94353f4fe53 Mon Sep 17 00:00:00 2001
From: Aubrey <aubrey.b@treskcow.tech>
Date: Sun, 29 Mar 2020 09:00:26 -0400
Subject: [PATCH 4/4] Modified null and empty string check.

---
 Oqtane.Shared/Shared/Utilities.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Oqtane.Shared/Shared/Utilities.cs b/Oqtane.Shared/Shared/Utilities.cs
index f54f80c4..1e2a568c 100644
--- a/Oqtane.Shared/Shared/Utilities.cs
+++ b/Oqtane.Shared/Shared/Utilities.cs
@@ -222,10 +222,7 @@ namespace Oqtane.Shared
 
         public static bool IsValidEmail(string email)
         {
-            if (email != "")
-            {
-                return true;
-            }
+            if (string.IsNullOrEmpty(email)) return false;
 
             return Regex.IsMatch(email,
                   @"^(?("")("".+?(?<!\\)""@)|(([0-9a-z]((\.(?!\.))|[-!#\$%&'\*\+/=\?\^`\{\}\|~\w])*)(?<=[0-9a-z])@))" +