Validate email for member models

src/Umbraco.Core/Extensions/StringExtensions.cs

@@ -1,7 +1,8 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Security.Cryptography;
@@ -1558,6 +1559,14 @@
         yield return sb.ToString();
     }
 
+    /// <summary>
+    ///     Checks whether a string is a valid email address.
+    /// </summary>
+    /// <param name="email">The string check</param>
+    /// <returns>Returns a bool indicating whether the string is an email address.</returns>
+    public static bool IsEmail(this string? email) =>
+        email is not null && new EmailAddressAttribute().IsValid(email);
+
     // having benchmarked various solutions (incl. for/foreach, split and LINQ based ones),
     // this is by far the fastest way to find string needles in a string haystack
     public static int CountOccurrences(this string haystack, string needle)

src/Umbraco.Core/Services/UserService.cs

@@ -1,4 +1,4 @@
 using System.ComponentModel.DataAnnotations;
 using System.Globalization;
 using System.Linq.Expressions;
 using Microsoft.Extensions.DependencyInjection;
@@ -917,7 +917,7 @@
         {
             return UserOperationStatus.UserNameIsNotEmail;
         }
-        if (!IsEmailValid(model.Email))
+        if (model.Email.IsEmail() is false)
         {
             return UserOperationStatus.InvalidEmail;
         }
@@ -1136,7 +1136,7 @@
             return UserOperationStatus.UserNameIsNotEmail;
         }
 
-        if (IsEmailValid(model.Email) is false)
+        if (model.Email.IsEmail() is false)
         {
             return UserOperationStatus.InvalidEmail;
         }
@@ -1164,8 +1164,6 @@
         return UserOperationStatus.Success;
     }
 
-    private static bool IsEmailValid(string email) => new EmailAddressAttribute().IsValid(email);
-
     private List<int>? GetIdsFromKeys(IEnumerable<Guid>? guids, UmbracoObjectTypes type)
     {
         var keys = guids?

src/Umbraco.Infrastructure/Services/MemberEditingService.cs

@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Identity;
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Logging;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.ContentEditing;
@@ -225,6 +226,11 @@
             return MemberEditingOperationStatus.InvalidUsername;
         }
 
+        if (IsEmailValid(model.Email) is false)
+        {
+            return MemberEditingOperationStatus.InvalidEmail;
+        }
+
         if (password is not null)
         {
             IdentityResult validatePassword = await _memberManager.ValidatePasswordAsync(password);
@@ -393,4 +399,6 @@
 
         return true;
     }
+
+    private static bool IsEmailValid(string email) => new EmailAddressAttribute().IsValid(email);
 }

tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringExtensionsTests.cs

@@ -1,4 +1,4 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using System.Collections.Generic;
@@ -364,6 +364,16 @@
         TryIsFullPath("   ", false, false); // technically, a valid filename on Linux
     }
 
+    [TestCase("[email protected]",true)]
+    [TestCase("test@test",  true)]
+    [TestCase("testtest.com",  false)]
+    [TestCase("[email protected]",  true)]
+    [TestCase("[email protected]",  true)]
+    [TestCase(null,  false)]
+    [TestCase("",  false)]
+    [TestCase(" ",  false)]
+    public void IsEmail(string email, bool isEmail) => Assert.AreEqual(isEmail, email.IsEmail());
+
     private static void TryIsFullPath(string path, bool expectedIsFull, bool expectedIsValid = true)
     {
         Assert.AreEqual(expectedIsFull, path.IsFullPath(), "IsFullPath('" + path + "')");