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

Revert "Revert "Gets oauth working (with google) now need to test others and debug why the styles aren't working""

Browse Source 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
This commit is contained in:
Bjarke Berg
2020-11-27 13:34:32 +01:00
parent 88c1259d84
commit d6357e8fde
10 changed files with 126 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
View File

@@ -414,7 +414,7 @@ namespace Umbraco.Web.BackOffice.Controllers
}
else
{
autoLinkOptions = _externalLogins.Get(authType.Name)?.AutoLinkOptions;
autoLinkOptions = _externalLogins.Get(authType.Name)?.Options?.AutoLinkOptions;
}
// Sign in the user with this external login provider if the user already has a login
@@ -445,7 +445,7 @@ namespace Umbraco.Web.BackOffice.Controllers
ViewData.SetExternalSignInProviderErrors(
new BackOfficeExternalLoginProviderErrors(
loginInfo.LoginProvider,
new[] { "The requested provider (" + loginInfo.LoginProvider + ") has not been linked to an account" }));
new[] { "The requested provider (" + loginInfo.LoginProvider + ") has not been linked to an account, the provider must be linked from the back office." }));
}
//Remove the cookie otherwise this message will keep appearing
@@ -462,7 +462,7 @@ namespace Umbraco.Web.BackOffice.Controllers
if (autoLinkOptions.AutoLinkExternalAccount == false)
{
return true; // TODO: This seems weird to return true, but it was like that before so must be a reason?
return false;
}
var email = loginInfo.Principal.FindFirstValue(ClaimTypes.Email);