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

removes this. convention

Browse Source
This commit is contained in:
Shannon
2017-12-18 15:34:15 +11:00
parent 43f369f96f
commit 6f55b84c65
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Umbraco.Web/Editors/BackOfficeController.cs
View File

@@ -434,33 +434,33 @@ namespace Umbraco.Web.Editors
if (autoLinkOptions == null) if (autoLinkOptions == null)
return false; return false;
if (autoLinkOptions.ShouldAutoLinkExternalAccount(this.UmbracoContext, loginInfo) == false) if (autoLinkOptions.ShouldAutoLinkExternalAccount(UmbracoContext, loginInfo) == false)
return true; return true;
//we are allowing auto-linking/creating of local accounts //we are allowing auto-linking/creating of local accounts
if (loginInfo.Email.IsNullOrWhiteSpace()) if (loginInfo.Email.IsNullOrWhiteSpace())
{ {
this.ViewData[TokenExternalSignInError] = new[] { "The requested provider (" + loginInfo.Login.LoginProvider + ") has not provided an email address, the account cannot be linked." }; ViewData[TokenExternalSignInError] = new[] { "The requested provider (" + loginInfo.Login.LoginProvider + ") has not provided an email address, the account cannot be linked." };
} }
else else
{ {
//Now we need to perform the auto-link, so first we need to lookup/create a user with the email address //Now we need to perform the auto-link, so first we need to lookup/create a user with the email address
var foundByEmail = this.Services.UserService.GetByEmail(loginInfo.Email); var foundByEmail = Services.UserService.GetByEmail(loginInfo.Email);
if (foundByEmail != null) if (foundByEmail != null)
{ {
this.ViewData[TokenExternalSignInError] = new[] { "A user with this email address already exists locally. You will need to login locally to Umbraco and link this external provider: " + loginInfo.Login.LoginProvider }; ViewData[TokenExternalSignInError] = new[] { "A user with this email address already exists locally. You will need to login locally to Umbraco and link this external provider: " + loginInfo.Login.LoginProvider };
} }
else else
{ {
if (loginInfo.Email.IsNullOrWhiteSpace()) throw new InvalidOperationException("The Email value cannot be null"); if (loginInfo.Email.IsNullOrWhiteSpace()) throw new InvalidOperationException("The Email value cannot be null");
if (loginInfo.ExternalIdentity.Name.IsNullOrWhiteSpace()) throw new InvalidOperationException("The Name value cannot be null"); if (loginInfo.ExternalIdentity.Name.IsNullOrWhiteSpace()) throw new InvalidOperationException("The Name value cannot be null");
var groups = this.Services.UserService.GetUserGroupsByAlias(autoLinkOptions.GetDefaultUserGroups(this.UmbracoContext, loginInfo)); var groups = Services.UserService.GetUserGroupsByAlias(autoLinkOptions.GetDefaultUserGroups(UmbracoContext, loginInfo));
var autoLinkUser = BackOfficeIdentityUser.CreateNew( var autoLinkUser = BackOfficeIdentityUser.CreateNew(
loginInfo.Email, loginInfo.Email,
loginInfo.Email, loginInfo.Email,
autoLinkOptions.GetDefaultCulture(this.UmbracoContext, loginInfo)); autoLinkOptions.GetDefaultCulture(UmbracoContext, loginInfo));
autoLinkUser.Name = loginInfo.ExternalIdentity.Name; autoLinkUser.Name = loginInfo.ExternalIdentity.Name;
foreach (var userGroup in groups) foreach (var userGroup in groups)
{ {
@@ -473,31 +473,31 @@ namespace Umbraco.Web.Editors
autoLinkOptions.OnAutoLinking(autoLinkUser, loginInfo); autoLinkOptions.OnAutoLinking(autoLinkUser, loginInfo);
} }
var userCreationResult = await this.UserManager.CreateAsync(autoLinkUser); var userCreationResult = await UserManager.CreateAsync(autoLinkUser);
if (userCreationResult.Succeeded == false) if (userCreationResult.Succeeded == false)
{ {
this.ViewData[TokenExternalSignInError] = userCreationResult.Errors; ViewData[TokenExternalSignInError] = userCreationResult.Errors;
} }
else else
{ {
var linkResult = await this.UserManager.AddLoginAsync(autoLinkUser.Id, loginInfo.Login); var linkResult = await UserManager.AddLoginAsync(autoLinkUser.Id, loginInfo.Login);
if (linkResult.Succeeded == false) if (linkResult.Succeeded == false)
{ {
this.ViewData[TokenExternalSignInError] = linkResult.Errors; ViewData[TokenExternalSignInError] = linkResult.Errors;
//If this fails, we should really delete the user since it will be in an inconsistent state! //If this fails, we should really delete the user since it will be in an inconsistent state!
var deleteResult = await this.UserManager.DeleteAsync(autoLinkUser); var deleteResult = await UserManager.DeleteAsync(autoLinkUser);
if (deleteResult.Succeeded == false) if (deleteResult.Succeeded == false)
{ {
//DOH! ... this isn't good, combine all errors to be shown //DOH! ... this isn't good, combine all errors to be shown
this.ViewData[TokenExternalSignInError] = linkResult.Errors.Concat(deleteResult.Errors); ViewData[TokenExternalSignInError] = linkResult.Errors.Concat(deleteResult.Errors);
} }
} }
else else
{ {
//sign in //sign in
await this.SignInManager.SignInAsync(autoLinkUser, isPersistent: false, rememberBrowser: false); await SignInManager.SignInAsync(autoLinkUser, isPersistent: false, rememberBrowser: false);
} }
} }
} }