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

Moves logic back to user service for inviting a user since its much simpler.

Browse Source
This commit is contained in:
Shannon
2017-06-13 18:47:20 +02:00
parent f09f17e496
commit e757868d09
2 changed files with 21 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Web/Editors/AuthenticationController.cs
View File

@@ -69,18 +69,24 @@ namespace Umbraco.Web.Editors
if (decoded.IsNullOrWhiteSpace())
throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
var user = await UserManager.FindByIdAsync(id);
if (user == null)
var identityUser = await UserManager.FindByIdAsync(id);
if (identityUser == null)
throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
var result = await UserManager.ConfirmEmailAsync(id, decoded);
if (result.Succeeded == false)
{
{
throw new HttpResponseException(Request.CreateNotificationValidationErrorResponse(string.Join(", ", result.Errors)));
}
await SignInManager.SignInAsync(user, false, false);
}
Request.TryGetOwinContext().Result.Authentication.SignOut(
Core.Constants.Security.BackOfficeAuthenticationType,
Core.Constants.Security.BackOfficeExternalAuthenticationType);
await SignInManager.SignInAsync(identityUser, false, false);
var user = ApplicationContext.Services.UserService.GetUserById(id);
return Mapper.Map<UserDisplay>(user);
}

49
src/Umbraco.Web/Editors/UsersController.cs
View File

@@ -253,8 +253,6 @@ namespace Umbraco.Web.Editors
/// </remarks>
public async Task<UserDisplay> PostInviteUser(UserInvite userSave)
{
//TODO: Allow re-inviting the user!
if (userSave == null) throw new ArgumentNullException("userSave");
if (ModelState.IsValid == false)
@@ -269,54 +267,25 @@ namespace Umbraco.Web.Editors
Request.CreateNotificationValidationErrorResponse("No Email server is configured"));
}
var identityUser = await UserManager.FindByEmailAsync(userSave.Email);
if (identityUser != null && identityUser.LastLoginDateUtc.HasValue && identityUser.LastLoginDateUtc.Value == default(DateTime))
var user = Services.UserService.GetByEmail(userSave.Email);
if (user != null && (user.LastLoginDate != default(DateTime) || user.EmailConfirmedDate.HasValue))
{
ModelState.AddModelError("Email", "A user with the email already exists");
throw new HttpResponseException(Request.CreateErrorResponse(HttpStatusCode.BadRequest, ModelState));
}
if (identityUser == null)
{
identityUser = new BackOfficeIdentityUser
{
Email = userSave.Email,
Name = userSave.Name,
UserName = userSave.Email
};
//map to new user or map to existing user (if they've already been invited but didn't accept it)
user = user == null ? Mapper.Map<IUser>(userSave) : Mapper.Map(userSave, user);
//Save the user first
var result = await UserManager.CreateAsync(identityUser);
if (result.Succeeded == false)
{
throw new HttpResponseException(
Request.CreateNotificationValidationErrorResponse(string.Join(", ", result.Errors)));
}
}
else
{
identityUser.Name = userSave.Name;
var result = await UserManager.UpdateAsync(identityUser);
if (result.Succeeded == false)
{
throw new HttpResponseException(
Request.CreateNotificationValidationErrorResponse(string.Join(", ", result.Errors)));
}
}
//Save the user first
//Add/Update to roles
var roleResult = await UserManager.AddToRolesAsync(identityUser.Id, userSave.UserGroups.ToArray());
if (roleResult.Succeeded == false)
{
throw new HttpResponseException(
Request.CreateNotificationValidationErrorResponse(string.Join(", ", roleResult.Errors)));
}
Services.UserService.Save(user);
//now send the email
var token = await UserManager.GenerateEmailConfirmationTokenAsync(identityUser.Id);
var token = await UserManager.GenerateEmailConfirmationTokenAsync(user.Id);
var link = string.Format("{0}#/login/false?invite={1}{2}{3}",
ApplicationContext.UmbracoApplicationUrl,
identityUser.Id,
user.Id,
WebUtility.UrlEncode("|"),
token.ToUrlBase64());
@@ -327,7 +296,7 @@ namespace Umbraco.Web.Editors
Subject = "You have been invited to the Umbraco Back Office!"
});
return Mapper.Map<UserDisplay>(identityUser);
return Mapper.Map<UserDisplay>(user);
}
/// <summary>