yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v10/dev' into v10/feature/nullable-reference-types-in-Umbraco-Core

Browse Source 
# Conflicts:
#	build/build.ps1
#	src/Umbraco.Core/Configuration/ConfigConnectionString.cs
#	src/Umbraco.Core/Configuration/Models/ConnectionStrings.cs
#	src/Umbraco.Core/Install/InstallSteps/TelemetryIdentifierStep.cs
#	src/Umbraco.Core/Models/ContentType.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
#	tests/Umbraco.Tests.AcceptanceTest/package.json
This commit is contained in:
Nikolaj Geisle
2022-03-16 13:00:38 +01:00
parent 029aecccb5 3961c4c233
commit 4ebd20bb66
480 changed files with 11569 additions and 6721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
View File

@@ -432,7 +432,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
{
if (userSave == null)
{
throw new ArgumentNullException("userSave");
throw new ArgumentNullException(nameof(userSave));
}
if (userSave.Message.IsNullOrWhiteSpace())
@@ -440,7 +440,6 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
ModelState.AddModelError("Message", "Message cannot be empty");
}
IUser user;
if (_securitySettings.UsernameIsEmail)
{
// ensure it's the same
@@ -449,16 +448,14 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
else
{
// first validate the username if we're showing it
var userResult = CheckUniqueUsername(userSave.Username, u => u.LastLoginDate != default || u.EmailConfirmedDate.HasValue);
if (!(userResult.Result is null))
ActionResult<IUser> userResult = CheckUniqueUsername(userSave.Username, u => u.LastLoginDate != default || u.EmailConfirmedDate.HasValue);
if (userResult.Result is not null)
{
return userResult.Result;
}
user = userResult.Value;
}
user = CheckUniqueEmail(userSave.Email, u => u.LastLoginDate != default || u.EmailConfirmedDate.HasValue);
IUser user = CheckUniqueEmail(userSave.Email, u => u.LastLoginDate != default || u.EmailConfirmedDate.HasValue);
if (ModelState.IsValid == false)
{