v0.7.10.2 - Hotfix 2 (#2382)
This commit is contained in:
parent
cf1dc7d42c
commit
b6d4938e22
5 changed files with 17 additions and 12 deletions
|
@ -131,10 +131,13 @@ public class AccountController : BaseApiController
|
|||
var user = new AppUserBuilder(registerDto.Username, registerDto.Email,
|
||||
await _unitOfWork.SiteThemeRepository.GetDefaultTheme()).Build();
|
||||
|
||||
|
||||
var result = await _userManager.CreateAsync(user, registerDto.Password);
|
||||
if (!result.Succeeded) return BadRequest(result.Errors);
|
||||
|
||||
// Assign default streams
|
||||
user.DashboardStreams = Seed.DefaultStreams.ToList();
|
||||
user.SideNavStreams = Seed.DefaultSideNavStreams.ToList();
|
||||
|
||||
var token = await _userManager.GenerateEmailConfirmationTokenAsync(user);
|
||||
if (string.IsNullOrEmpty(token)) return BadRequest(await _localizationService.Get("en", "confirm-token-gen"));
|
||||
if (!await ConfirmEmailToken(token, user)) return BadRequest(await _localizationService.Get("en", "validate-email", token));
|
||||
|
@ -610,6 +613,11 @@ public class AccountController : BaseApiController
|
|||
var result = await _userManager.CreateAsync(user, AccountService.DefaultPassword);
|
||||
if (!result.Succeeded) return BadRequest(result.Errors);
|
||||
|
||||
// Assign default streams
|
||||
user.DashboardStreams = Seed.DefaultStreams.ToList();
|
||||
user.SideNavStreams = Seed.DefaultSideNavStreams.ToList();
|
||||
|
||||
|
||||
// Assign Roles
|
||||
var roles = dto.Roles;
|
||||
var hasAdminRole = dto.Roles.Contains(PolicyConstants.AdminRole);
|
||||
|
@ -666,6 +674,7 @@ public class AccountController : BaseApiController
|
|||
_logger.LogError(ex, "There was an error during invite user flow, unable to create user. Deleting user for retry");
|
||||
_unitOfWork.UserRepository.Delete(user);
|
||||
await _unitOfWork.CommitAsync();
|
||||
return BadRequest(await _localizationService.Translate(User.GetUserId(), "generic-invite-user"));
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -32,8 +32,6 @@ public class AppUserBuilder : IEntityBuilder<AppUser>
|
|||
DashboardStreams = new List<AppUserDashboardStream>(),
|
||||
SideNavStreams = new List<AppUserSideNavStream>()
|
||||
};
|
||||
_appUser.DashboardStreams = Seed.DefaultStreams.ToList();
|
||||
_appUser.SideNavStreams = Seed.DefaultSideNavStreams.ToList();
|
||||
}
|
||||
|
||||
public AppUserBuilder WithLibrary(Library library, bool createSideNavStream = false)
|
||||
|
|
|
@ -27,6 +27,7 @@ public interface IAccountService
|
|||
Task<bool> HasChangeRestrictionRole(AppUser? user);
|
||||
Task<bool> CheckIfAccessible(HttpRequest request);
|
||||
Task<string> GenerateEmailLink(HttpRequest request, string token, string routePart, string email, bool withHost = true);
|
||||
|
||||
}
|
||||
|
||||
public class AccountService : IAccountService
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue