Fixes umbraco#11591

rickbutterfield · Nov 8, 2021 · b00e686 · b00e686
1 parent 1117440
commit b00e686
Showing 1 changed file with 21 additions and 1 deletion.
diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeSignInManager.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficeSignInManager.cs
@@ -193,6 +193,17 @@ private async Task<SignInResult> AutoLinkAndSignInExternalAccount(ExternalLoginI
                         return AutoLinkSignInResult.FailedException(ex.Message);
                     }
 
+                    var shouldSignIn = autoLinkOptions.OnExternalLogin(autoLinkUser, loginInfo);
+                    if (shouldSignIn == false)
+                    {
+                        Logger.LogWarning("The AutoLinkOptions of the external authentication provider '{LoginProvider}' have refused the login based on the OnExternalLogin method. Affected user id: '{UserId}'", loginInfo.LoginProvider, autoLinkUser.Id);
+                        return SignInResult.NotAllowed;
+                    }
+                    else
+                    {
+                        return await LinkUser(autoLinkUser, loginInfo);
+                    }
+
                     return await LinkUser(autoLinkUser, loginInfo);
                 }
                 else
@@ -226,7 +237,16 @@ private async Task<SignInResult> AutoLinkAndSignInExternalAccount(ExternalLoginI
                     }
                     else
                     {
-                        return await LinkUser(autoLinkUser, loginInfo);
+                        var shouldSignIn = autoLinkOptions.OnExternalLogin(autoLinkUser, loginInfo);
+                        if (shouldSignIn == false)
+                        {
+                            Logger.LogWarning("The AutoLinkOptions of the external authentication provider '{LoginProvider}' have refused the login based on the OnExternalLogin method. Affected user id: '{UserId}'", loginInfo.LoginProvider, autoLinkUser.Id);
+                            return SignInResult.NotAllowed;
+                        }
+                        else
+                        {
+                            return await LinkUser(autoLinkUser, loginInfo);
+                        }
                     }
                 }
             }