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

Added null check for external login invocation when linking users.

Browse Source
This commit is contained in:
Andy Butland
2021-11-15 11:42:04 +01:00
committed by Bjarke Berg
parent 808ba62b34
commit 0217bdc063
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Web.BackOffice/Security/BackOfficeSignInManager.cs
View File

@@ -193,8 +193,8 @@ namespace Umbraco.Cms.Web.BackOffice.Security
return AutoLinkSignInResult.FailedException(ex.Message);
}
var shouldSignIn = autoLinkOptions.OnExternalLogin(autoLinkUser, loginInfo);
if (shouldSignIn == false)
var shouldLinkUser = autoLinkOptions.OnExternalLogin == null || autoLinkOptions.OnExternalLogin(autoLinkUser, loginInfo);
if (shouldLinkUser == false)
{
LogFailedExternalLogin(loginInfo, autoLinkUser);
return ExternalLoginSignInResult.NotAllowed;
@@ -235,8 +235,8 @@ namespace Umbraco.Cms.Web.BackOffice.Security
}
else
{
var shouldSignIn = autoLinkOptions.OnExternalLogin(autoLinkUser, loginInfo);
if (shouldSignIn == false)
var shouldLinkUser = autoLinkOptions.OnExternalLogin == null || autoLinkOptions.OnExternalLogin(autoLinkUser, loginInfo);
if (shouldLinkUser == false)
{
LogFailedExternalLogin(loginInfo, autoLinkUser);
return ExternalLoginSignInResult.NotAllowed;