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] 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));
+        }
     }
 }