Fix build errors after merge

This commit is contained in:
Nikolaj Geisle
2022-04-05 09:46:47 +02:00
parent a6128bfe8e
commit b6402c4cc8
15 changed files with 66 additions and 50 deletions

View File

@@ -82,17 +82,17 @@ namespace Umbraco.Cms.Core.Security
return PasswordVerificationResult.Failed;
}
PersistedPasswordSettings deserialized;
PersistedPasswordSettings? deserialized;
try
{
deserialized = _jsonSerializer.Deserialize<PersistedPasswordSettings>(user.PasswordConfig);
deserialized = _jsonSerializer.Deserialize<PersistedPasswordSettings>(user.PasswordConfig ?? string.Empty);
}
catch
{
return PasswordVerificationResult.Failed;
}
if (!LegacyPasswordSecurity.SupportHashAlgorithm(deserialized.HashAlgorithm))
if (deserialized?.HashAlgorithm is null || !LegacyPasswordSecurity.SupportHashAlgorithm(deserialized.HashAlgorithm))
{
return PasswordVerificationResult.Failed;
}