nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 23:52:50 -05:00
Code Activity

Update API endpoint to use RegisterResponseModel (#2282)

Browse Source
This commit is contained in:
Addison Beck
2022-09-19 09:35:57 -04:00
committed by GitHub
parent 26fc67eec6
commit d0c793c951
6 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Api/Controllers/AccountsController.cs
View File

@ -35,6 +35,7 @@ public class AccountsController : Controller
private readonly IUserService _userService;
private readonly ISendRepository _sendRepository;
private readonly ISendService _sendService;
private readonly ICaptchaValidationService _captchaValidationService;
public AccountsController(
GlobalSettings globalSettings,
@ -47,7 +48,8 @@ public class AccountsController : Controller
IUserRepository userRepository,
IUserService userService,
ISendRepository sendRepository,
ISendService sendService)
ISendService sendService,
ICaptchaValidationService captchaValidationService)
{
_cipherRepository = cipherRepository;
_folderRepository = folderRepository;
@ -60,11 +62,13 @@ public class AccountsController : Controller
_userService = userService;
_sendRepository = sendRepository;
_sendService = sendService;
_captchaValidationService = captchaValidationService;
}
#region DEPRECATED (Moved to Identity Service)
[Obsolete("2022-01-12 Moved to Identity, left for backwards compatability with older clients")]
// This method is still used by self hosted intalls
[Obsolete("2022-01-12 Moved to Identity, left for backwards compatability with older clients.")]
[HttpPost("prelogin")]
[AllowAnonymous]
public async Task<PreloginResponseModel> PostPrelogin([FromBody] PreloginRequestModel model)
@ -81,17 +85,20 @@ public class AccountsController : Controller
return new PreloginResponseModel(kdfInformation);
}
[Obsolete("2022-01-12 Moved to Identity, left for backwards compatability with older clients")]
// This method is still used by self hosted intalls
[Obsolete("2022-01-12 Moved to Identity, left for backwards compatability with older clients.")]
[HttpPost("register")]
[AllowAnonymous]
[CaptchaProtected]
public async Task PostRegister([FromBody] RegisterRequestModel model)
public async Task<RegisterResponseModel> PostRegister([FromBody] RegisterRequestModel model)
{
var result = await _userService.RegisterUserAsync(model.ToUser(), model.MasterPasswordHash,
var user = model.ToUser();
var result = await _userService.RegisterUserAsync(user, model.MasterPasswordHash,
model.Token, model.OrganizationUserId);
if (result.Succeeded)
{
return;
var captchaBypassToken = _captchaValidationService.GenerateCaptchaBypassToken(user);
return new RegisterResponseModel(captchaBypassToken);
}
foreach (var error in result.Errors.Where(e => e.Code != "DuplicateUserName"))