House rules: primary constructors, a cancellation token on every async call, and the rules fail the build
Build / Build (push) Successful in 30s
Build / Build (push) Successful in 30s
- Services, controllers and jobs take their dependencies through primary constructors and use them directly; where a method already named a local after a dependency, the dependency takes its type's name. - Every async method takes a CancellationToken last and passes it down to MongoDB, HTTP and the job queue. The setup claim is still given back when a request is cancelled. - The federation and media options are read through IOptionsMonitor. - The Mastodon entities keep sending "" for empty strings, and every model field where null means something says so. - The inbox's 503 with Retry-After, which other servers retry, is the one server error left, and says why. - Arasaka.HouseRules.Analyzers checks all of this in every build, here and in PrivaPub.ClientModels as decePubClient builds it. Checked against GoToSocial in the pasture: 64 passed, 0 failed. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01W4YtEJrgxG12Pc39Fai8Bd
This commit is contained in:
1 parent
f0a14c737f
commit
0f73f69239
176 files changed
+2789
-3974
No files matched your search
@@ -28,90 +28,68 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
{
|
||||
[ApiController,
|
||||
Route("clientapi/user")]
|
||||
public class RootUserController : ControllerBase
|
||||
public class RootUserController(
|
||||
IRootUsersService usersService,
|
||||
IGroupUsersService groupUsersService,
|
||||
IPrivateAvatarUsersService avatarUsersService,
|
||||
ILocalActorService localActors,
|
||||
AuthTokenManager authTokenManager,
|
||||
IOptionsMonitor<AppConfiguration> appConfiguration,
|
||||
IOptionsMonitor<RegistrationOptions> registrations,
|
||||
IStringLocalizer<GenericRes> localizer,
|
||||
ILogger<RootUserController> logger) : ControllerBase
|
||||
{
|
||||
readonly IRootUsersService UsersService;
|
||||
readonly IGroupUsersService GroupUsersService;
|
||||
readonly IPrivateAvatarUsersService AvatarUsersService;
|
||||
readonly ILocalActorService LocalActors;
|
||||
readonly AuthTokenManager AuthTokenManager;
|
||||
readonly IOptionsMonitor<AppConfiguration> AppConfiguration;
|
||||
readonly IOptionsMonitor<RegistrationOptions> Registrations;
|
||||
readonly ILogger<RootUserController> Logger;
|
||||
readonly IStringLocalizer Localizer;
|
||||
|
||||
public RootUserController(IRootUsersService usersService,
|
||||
IGroupUsersService groupUsersService,
|
||||
IPrivateAvatarUsersService avatarUsersService,
|
||||
ILocalActorService localActors,
|
||||
AuthTokenManager authTokenManager,
|
||||
IOptionsMonitor<AppConfiguration> appConfiguration,
|
||||
IOptionsMonitor<RegistrationOptions> registrations,
|
||||
IStringLocalizer<GenericRes> localizer,
|
||||
ILogger<RootUserController> logger)
|
||||
{
|
||||
Registrations = registrations;
|
||||
UsersService = usersService;
|
||||
GroupUsersService = groupUsersService;
|
||||
AvatarUsersService = avatarUsersService;
|
||||
LocalActors = localActors;
|
||||
AuthTokenManager = authTokenManager;
|
||||
AppConfiguration = appConfiguration;
|
||||
Localizer = localizer;
|
||||
Logger = logger;
|
||||
}
|
||||
|
||||
#region User endpoints
|
||||
|
||||
[HttpPost, Route("/clientapi/user/signup"), EnableRateLimiting(RateLimiting.Accounts), Authorize(Policy = Policies.IsUser), AllowAnonymous]
|
||||
public async Task<IActionResult> SignUp(LoginForm signUpForm)
|
||||
public async Task<IActionResult> SignUp(LoginForm signUpForm, CancellationToken token = default)
|
||||
{
|
||||
if (User.Identity?.IsAuthenticated ?? false) return Redirect("/");
|
||||
var result = new WebResult();
|
||||
if (!Registrations.CurrentValue.IsOpen)
|
||||
return StatusCode(StatusCodes.Status403Forbidden, result.Invalidate(Localizer[RegistrationOptions.ClosedMessage], StatusCodes.Status403Forbidden));
|
||||
if (!registrations.CurrentValue.IsOpen)
|
||||
return StatusCode(StatusCodes.Status403Forbidden, result.Invalidate(localizer[RegistrationOptions.ClosedMessage], StatusCodes.Status403Forbidden));
|
||||
if (!ModelState.IsValid)
|
||||
return BadRequest(result.Invalidate(Localizer["Invalid model."]));
|
||||
return BadRequest(result.Invalidate(localizer["Invalid model."]));
|
||||
try
|
||||
{
|
||||
result = await UsersService.SignUpAsync(signUpForm);
|
||||
result = await usersService.SignUpAsync(signUpForm, token);
|
||||
if (!result.IsValid)
|
||||
return StatusCode(result.StatusCode, result);
|
||||
|
||||
(var user, var userSettings) = ((RootUser, ViewUserSettings))result.Data;
|
||||
var jwtUser = AuthTokenManager.GenerateToken(user, userSettings);
|
||||
var jwtUser = authTokenManager.GenerateToken(user, userSettings);
|
||||
return Ok(jwtUser);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.LogError(ex, $"{nameof(User)}.{nameof(SignUp)}()");
|
||||
return BadRequest(result.Invalidate(Localizer["Something went wrong."]));
|
||||
logger.LogError(ex, $"{nameof(User)}.{nameof(SignUp)}()");
|
||||
return BadRequest(result.Invalidate(localizer["Something went wrong."]));
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPost, Route("/clientapi/user/login"), EnableRateLimiting(RateLimiting.Accounts), Authorize(Policy = Policies.IsUser), AllowAnonymous]
|
||||
public async Task<IActionResult> Login(LoginForm loginForm)
|
||||
public async Task<IActionResult> Login(LoginForm loginForm, CancellationToken token = default)
|
||||
{
|
||||
if (User.Identity?.IsAuthenticated ?? false) return Redirect("/");
|
||||
var result = new WebResult();
|
||||
if (!ModelState.IsValid)
|
||||
return BadRequest(result.Invalidate(Localizer["Invalid model."]));
|
||||
return BadRequest(result.Invalidate(localizer["Invalid model."]));
|
||||
try
|
||||
{
|
||||
result = await UsersService.LoginAsync(loginForm);
|
||||
result = await usersService.LoginAsync(loginForm, token);
|
||||
if (!result.IsValid)
|
||||
return StatusCode(result.StatusCode, result);
|
||||
|
||||
var (user, userSettings) =
|
||||
((RootUser, ViewUserSettings))result.Data;
|
||||
var jwtUser = AuthTokenManager.GenerateToken(user, userSettings);
|
||||
var jwtUser = authTokenManager.GenerateToken(user, userSettings);
|
||||
|
||||
return Ok(jwtUser);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.LogError(ex, $"{nameof(User)}.{nameof(Login)}()");
|
||||
return BadRequest(result.Invalidate(Localizer["Something went wrong."]));
|
||||
logger.LogError(ex, $"{nameof(User)}.{nameof(Login)}()");
|
||||
return BadRequest(result.Invalidate(localizer["Something went wrong."]));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -120,10 +98,10 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
{
|
||||
var result = new WebResult();
|
||||
if (!ModelState.IsValid)
|
||||
return BadRequest(result.Invalidate(Localizer["Invalid model."]));
|
||||
return BadRequest(result.Invalidate(localizer["Invalid model."]));
|
||||
try
|
||||
{
|
||||
var invitation = await GroupUsersService.GetInvitation(signUpForm.InvitationCode, signUpForm.InvitationPassword, token);
|
||||
var invitation = await groupUsersService.GetInvitation(signUpForm.InvitationCode, signUpForm.InvitationPassword, token);
|
||||
if (!invitation.IsValid)
|
||||
return StatusCode(invitation.StatusCode, invitation);
|
||||
|
||||
@@ -132,16 +110,16 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
if (personaProblem != default)
|
||||
return BadRequest(result.Invalidate(personaProblem));
|
||||
|
||||
result = await UsersService.SignUpAsync(signUpForm);
|
||||
result = await usersService.SignUpAsync(signUpForm, token);
|
||||
if (!result.IsValid)
|
||||
return StatusCode(result.StatusCode, result);
|
||||
var (user, userSettings) = ((RootUser, ViewUserSettings))result.Data;
|
||||
|
||||
var avatar = await InsertPersona(user.ID, avatarUserName, signUpForm.AvatarName);
|
||||
var avatar = await InsertPersona(user.ID, avatarUserName, signUpForm.AvatarName, token);
|
||||
if (!avatar.IsValid)
|
||||
return StatusCode(avatar.StatusCode, avatar);
|
||||
|
||||
var joined = await GroupUsersService.JoinGroup(user.ID, new JoinGroupForm
|
||||
var joined = await groupUsersService.JoinGroup(user.ID, new JoinGroupForm
|
||||
{
|
||||
AvatarId = ((ViewAvatar)avatar.Data).Id,
|
||||
InvitationCode = signUpForm.InvitationCode,
|
||||
@@ -150,12 +128,12 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
if (!joined.IsValid)
|
||||
return StatusCode(joined.StatusCode, joined);
|
||||
|
||||
return Ok(AuthTokenManager.GenerateToken(user, userSettings));
|
||||
return Ok(authTokenManager.GenerateToken(user, userSettings));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.LogError(ex, $"{nameof(User)}.{nameof(InvitationSignUp)}()");
|
||||
return BadRequest(result.Invalidate(Localizer["Something went wrong."]));
|
||||
logger.LogError(ex, $"{nameof(User)}.{nameof(InvitationSignUp)}()");
|
||||
return BadRequest(result.Invalidate(localizer["Something went wrong."]));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -164,19 +142,19 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
{
|
||||
var result = new WebResult();
|
||||
if (!ModelState.IsValid)
|
||||
return BadRequest(result.Invalidate(Localizer["Invalid model."]));
|
||||
return BadRequest(result.Invalidate(localizer["Invalid model."]));
|
||||
try
|
||||
{
|
||||
var invitation = await GroupUsersService.GetInvitation(loginForm.InvitationCode, loginForm.InvitationPassword, token);
|
||||
var invitation = await groupUsersService.GetInvitation(loginForm.InvitationCode, loginForm.InvitationPassword, token);
|
||||
if (!invitation.IsValid)
|
||||
return StatusCode(invitation.StatusCode, invitation);
|
||||
|
||||
result = await UsersService.LoginAsync(loginForm);
|
||||
result = await usersService.LoginAsync(loginForm, token);
|
||||
if (!result.IsValid)
|
||||
return StatusCode(result.StatusCode, result);
|
||||
var (user, userSettings) = ((RootUser, ViewUserSettings))result.Data;
|
||||
|
||||
var avatars = await AvatarUsersService.GetRootAvatars(user.ID, token);
|
||||
var avatars = await avatarUsersService.GetRootAvatars(user.ID, token);
|
||||
var avatarUserName = loginForm.AvatarUserName?.Trim().ToLowerInvariant();
|
||||
var avatar = string.IsNullOrEmpty(avatarUserName)
|
||||
? (avatars.Data as List<ViewAvatar>)?.FirstOrDefault()
|
||||
@@ -186,13 +164,13 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
var personaProblem = await PersonaProblem(avatarUserName, user.UserName, token);
|
||||
if (personaProblem != default)
|
||||
return BadRequest(new WebResult().Invalidate(personaProblem));
|
||||
var inserted = await InsertPersona(user.ID, avatarUserName, loginForm.AvatarName);
|
||||
var inserted = await InsertPersona(user.ID, avatarUserName, loginForm.AvatarName, token);
|
||||
if (!inserted.IsValid)
|
||||
return StatusCode(inserted.StatusCode, inserted);
|
||||
avatar = (ViewAvatar)inserted.Data;
|
||||
}
|
||||
|
||||
var joined = await GroupUsersService.JoinGroup(user.ID, new JoinGroupForm
|
||||
var joined = await groupUsersService.JoinGroup(user.ID, new JoinGroupForm
|
||||
{
|
||||
AvatarId = avatar.Id,
|
||||
InvitationCode = loginForm.InvitationCode,
|
||||
@@ -201,12 +179,12 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
if (!joined.IsValid)
|
||||
return StatusCode(joined.StatusCode, joined);
|
||||
|
||||
return Ok(AuthTokenManager.GenerateToken(user, userSettings));
|
||||
return Ok(authTokenManager.GenerateToken(user, userSettings));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.LogError(ex, $"{nameof(User)}.{nameof(InvitationLogin)}()");
|
||||
return BadRequest(result.Invalidate(Localizer["Something went wrong."]));
|
||||
logger.LogError(ex, $"{nameof(User)}.{nameof(InvitationLogin)}()");
|
||||
return BadRequest(result.Invalidate(localizer["Something went wrong."]));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -216,14 +194,14 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
|
||||
// The server's first login, made while it has no administrator (owner decision 2026-10-16: first come, first served):
|
||||
// it is made the administrator, with its first persona, and setup closes for good. Sign-up stays closed to everyone
|
||||
// else (Registrations), so NodeInfo and the instance API don't change.
|
||||
// else (registrations), so NodeInfo and the instance API don't change.
|
||||
[HttpPost, Route("/clientapi/user/setup"), EnableRateLimiting(RateLimiting.Accounts), AllowAnonymous]
|
||||
public async Task<IActionResult> SetUp(SetupForm setupForm, CancellationToken token)
|
||||
{
|
||||
if (User.Identity?.IsAuthenticated ?? false) return Redirect("/");
|
||||
var result = new WebResult();
|
||||
if (!ModelState.IsValid)
|
||||
return BadRequest(result.Invalidate(Localizer["Invalid model."]));
|
||||
return BadRequest(result.Invalidate(localizer["Invalid model."]));
|
||||
var claimed = false;
|
||||
var adminId = default(string);
|
||||
try
|
||||
@@ -240,10 +218,10 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
if (!claimed)
|
||||
return SetUpAlready();
|
||||
|
||||
result = await UsersService.SignUpAsync(setupForm);
|
||||
result = await usersService.SignUpAsync(setupForm, token);
|
||||
if (!result.IsValid)
|
||||
{
|
||||
await ServerSetup.Release();
|
||||
await ServerSetup.Release(CancellationToken.None);
|
||||
return StatusCode(result.StatusCode, result);
|
||||
}
|
||||
var (user, userSettings) = ((RootUser, ViewUserSettings))result.Data;
|
||||
@@ -253,42 +231,42 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
await ServerSetup.Claimed(adminId, CancellationToken.None);
|
||||
|
||||
// set up from here, whatever happens to the persona: it can be made in the client's settings
|
||||
var avatar = await InsertPersona(user.ID, avatarUserName, setupForm.AvatarName);
|
||||
var avatar = await InsertPersona(user.ID, avatarUserName, setupForm.AvatarName, token);
|
||||
if (!avatar.IsValid)
|
||||
return StatusCode(avatar.StatusCode, avatar);
|
||||
|
||||
return Ok(AuthTokenManager.GenerateToken(user, userSettings));
|
||||
return Ok(authTokenManager.GenerateToken(user, userSettings));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.LogError(ex, $"{nameof(User)}.{nameof(SetUp)}()");
|
||||
logger.LogError(ex, $"{nameof(User)}.{nameof(SetUp)}()");
|
||||
if (claimed && adminId == default)
|
||||
await ServerSetup.Release();
|
||||
return BadRequest(result.Invalidate(Localizer["Something went wrong."]));
|
||||
await ServerSetup.Release(CancellationToken.None);
|
||||
return BadRequest(result.Invalidate(localizer["Something went wrong."]));
|
||||
}
|
||||
}
|
||||
|
||||
IActionResult SetUpAlready() =>
|
||||
StatusCode(StatusCodes.Status403Forbidden,
|
||||
new WebResult().Invalidate(Localizer["This server is already set up: joining it takes a group invitation."], StatusCodes.Status403Forbidden));
|
||||
new WebResult().Invalidate(localizer["This server is already set up: joining it takes a group invitation."], StatusCodes.Status403Forbidden));
|
||||
|
||||
Task<WebResult> InsertPersona(string rootId, string avatarUserName, string avatarName) =>
|
||||
AvatarUsersService.InsertAvatar(new InsertAvatarForm
|
||||
Task<WebResult> InsertPersona(string rootId, string avatarUserName, string avatarName, CancellationToken token = default) =>
|
||||
avatarUsersService.InsertAvatar(new InsertAvatarForm
|
||||
{
|
||||
RootId = rootId,
|
||||
Name = string.IsNullOrWhiteSpace(avatarName) ? avatarUserName : avatarName.Trim(),
|
||||
UserName = avatarUserName,
|
||||
Biography = string.Empty
|
||||
});
|
||||
}, token);
|
||||
|
||||
async Task<string> PersonaProblem(string avatarUserName, string rootUserName, CancellationToken token)
|
||||
{
|
||||
if (string.IsNullOrEmpty(avatarUserName))
|
||||
return Localizer["Choose a username for your persona."];
|
||||
return localizer["Choose a username for your persona."];
|
||||
if (string.Equals(avatarUserName, rootUserName?.Trim(), StringComparison.OrdinalIgnoreCase))
|
||||
return Localizer["Your persona's username must differ from your login."];
|
||||
if (await LocalActors.IsUserNameTaken(avatarUserName, token))
|
||||
return Localizer["The username '{0}' is already taken.", avatarUserName];
|
||||
return localizer["Your persona's username must differ from your login."];
|
||||
if (await localActors.IsUserNameTaken(avatarUserName, token))
|
||||
return localizer["The username '{0}' is already taken.", avatarUserName];
|
||||
return default;
|
||||
}
|
||||
|
||||
@@ -309,8 +287,8 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.LogError(ex, $"{nameof(User)}.{nameof(Logout)}()");
|
||||
return BadRequest(result.Invalidate(Localizer["Something went wrong."]));
|
||||
logger.LogError(ex, $"{nameof(User)}.{nameof(Logout)}()");
|
||||
return BadRequest(result.Invalidate(localizer["Something went wrong."]));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -325,8 +303,8 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.LogError(ex, $"{nameof(User)}.{nameof(LogoutEverywhere)}()");
|
||||
return BadRequest(result.Invalidate(Localizer["Something went wrong."]));
|
||||
logger.LogError(ex, $"{nameof(User)}.{nameof(LogoutEverywhere)}()");
|
||||
return BadRequest(result.Invalidate(localizer["Something went wrong."]));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -335,82 +313,82 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
[HttpPost, Route("/clientapi/user/update"), Authorize(Policy = Policies.IsUser)]
|
||||
public IActionResult UpdateUser(UserForm userEmailForm) =>
|
||||
StatusCode(StatusCodes.Status422UnprocessableEntity,
|
||||
new WebResult().Invalidate(Localizer["Changing the address takes your password and a code sent to it."], StatusCodes.Status422UnprocessableEntity));
|
||||
new WebResult().Invalidate(localizer["Changing the address takes your password and a code sent to it."], StatusCodes.Status422UnprocessableEntity));
|
||||
|
||||
[HttpGet, Route("/clientapi/user/account"), Authorize(Policy = Policies.IsUser)]
|
||||
public async Task<IActionResult> Account()
|
||||
public async Task<IActionResult> Account(CancellationToken token = default)
|
||||
{
|
||||
var result = await UsersService.AccountAsync(User.GetUserId());
|
||||
var result = await usersService.AccountAsync(User.GetUserId(), token);
|
||||
return result.IsValid ? Ok(result.Data) : StatusCode(result.StatusCode, result);
|
||||
}
|
||||
|
||||
[HttpPost, Route("/clientapi/user/email"), EnableRateLimiting(RateLimiting.Accounts), Authorize(Policy = Policies.IsUser)]
|
||||
public async Task<IActionResult> RequestEmailChange(EmailChangeForm form)
|
||||
public async Task<IActionResult> RequestEmailChange(EmailChangeForm form, CancellationToken token = default)
|
||||
{
|
||||
if (!ModelState.IsValid)
|
||||
return BadRequest(new WebResult().Invalidate(Localizer["Invalid model."]));
|
||||
var result = await UsersService.RequestEmailChangeAsync(User.GetUserId(), form);
|
||||
return BadRequest(new WebResult().Invalidate(localizer["Invalid model."]));
|
||||
var result = await usersService.RequestEmailChangeAsync(User.GetUserId(), form, token);
|
||||
return result.IsValid ? Ok(result.Data) : StatusCode(result.StatusCode, result);
|
||||
}
|
||||
|
||||
[HttpPost, Route("/clientapi/user/email/verify"), EnableRateLimiting(RateLimiting.Accounts), Authorize(Policy = Policies.IsUser)]
|
||||
public async Task<IActionResult> VerifyEmail(EmailCodeForm form)
|
||||
public async Task<IActionResult> VerifyEmail(EmailCodeForm form, CancellationToken token = default)
|
||||
{
|
||||
if (!ModelState.IsValid)
|
||||
return BadRequest(new WebResult().Invalidate(Localizer["Invalid model."]));
|
||||
var result = await UsersService.VerifyEmailAsync(User.GetUserId(), form.Code);
|
||||
return BadRequest(new WebResult().Invalidate(localizer["Invalid model."]));
|
||||
var result = await usersService.VerifyEmailAsync(User.GetUserId(), form.Code, token);
|
||||
return result.IsValid ? Ok(result.Data) : StatusCode(result.StatusCode, result);
|
||||
}
|
||||
|
||||
[HttpPost, Route("/clientapi/user/totp/setup"), EnableRateLimiting(RateLimiting.Accounts), Authorize(Policy = Policies.IsUser)]
|
||||
public async Task<IActionResult> TotpSetup(PasswordForm form)
|
||||
public async Task<IActionResult> TotpSetup(PasswordForm form, CancellationToken token = default)
|
||||
{
|
||||
if (!ModelState.IsValid)
|
||||
return BadRequest(new WebResult().Invalidate(Localizer["Invalid model."]));
|
||||
var result = await UsersService.TotpSetupAsync(User.GetUserId(), form.Password);
|
||||
return BadRequest(new WebResult().Invalidate(localizer["Invalid model."]));
|
||||
var result = await usersService.TotpSetupAsync(User.GetUserId(), form.Password, token);
|
||||
return result.IsValid ? Ok(result.Data) : StatusCode(result.StatusCode, result);
|
||||
}
|
||||
|
||||
// on with the app's first code; every other session ends, and this device goes on with a new one
|
||||
[HttpPost, Route("/clientapi/user/totp/enable"), EnableRateLimiting(RateLimiting.Accounts), Authorize(Policy = Policies.IsUser)]
|
||||
public async Task<IActionResult> TotpEnable(TotpCodeForm form)
|
||||
public async Task<IActionResult> TotpEnable(TotpCodeForm form, CancellationToken token = default)
|
||||
{
|
||||
if (!ModelState.IsValid)
|
||||
return BadRequest(new WebResult().Invalidate(Localizer["Invalid model."]));
|
||||
var result = await UsersService.TotpEnableAsync(User.GetUserId(), form.Code);
|
||||
return BadRequest(new WebResult().Invalidate(localizer["Invalid model."]));
|
||||
var result = await usersService.TotpEnableAsync(User.GetUserId(), form.Code, token);
|
||||
if (!result.IsValid)
|
||||
return StatusCode(result.StatusCode, result);
|
||||
var (user, userSettings, codes) = ((RootUser, ViewUserSettings, List<string>))result.Data;
|
||||
return Ok(new ViewTotpEnabled { RecoveryCodes = codes, Session = AuthTokenManager.GenerateToken(user, userSettings) });
|
||||
return Ok(new ViewTotpEnabled { RecoveryCodes = codes, Session = authTokenManager.GenerateToken(user, userSettings) });
|
||||
}
|
||||
|
||||
[HttpPost, Route("/clientapi/user/totp/disable"), EnableRateLimiting(RateLimiting.Accounts), Authorize(Policy = Policies.IsUser)]
|
||||
public async Task<IActionResult> TotpDisable(TotpDisableForm form)
|
||||
public async Task<IActionResult> TotpDisable(TotpDisableForm form, CancellationToken token = default)
|
||||
{
|
||||
if (!ModelState.IsValid)
|
||||
return BadRequest(new WebResult().Invalidate(Localizer["Invalid model."]));
|
||||
var result = await UsersService.TotpDisableAsync(User.GetUserId(), form.Password, form.Code);
|
||||
return BadRequest(new WebResult().Invalidate(localizer["Invalid model."]));
|
||||
var result = await usersService.TotpDisableAsync(User.GetUserId(), form.Password, form.Code, token);
|
||||
return result.IsValid ? Ok(result.Data) : StatusCode(result.StatusCode, result);
|
||||
}
|
||||
|
||||
[HttpPost, Route("/clientapi/user/email/remove"), EnableRateLimiting(RateLimiting.Accounts), Authorize(Policy = Policies.IsUser)]
|
||||
public async Task<IActionResult> RemoveEmail(PasswordForm form)
|
||||
public async Task<IActionResult> RemoveEmail(PasswordForm form, CancellationToken token = default)
|
||||
{
|
||||
if (!ModelState.IsValid)
|
||||
return BadRequest(new WebResult().Invalidate(Localizer["Invalid model."]));
|
||||
var result = await UsersService.RemoveEmailAsync(User.GetUserId(), form.Password);
|
||||
return BadRequest(new WebResult().Invalidate(localizer["Invalid model."]));
|
||||
var result = await usersService.RemoveEmailAsync(User.GetUserId(), form.Password, token);
|
||||
return result.IsValid ? Ok(result.Data) : StatusCode(result.StatusCode, result);
|
||||
}
|
||||
|
||||
[HttpPost, Route("/clientapi/user/update/settings"), Authorize(Policy = Policies.IsUser)]
|
||||
public async Task<IActionResult> UpdateUserSettings(ViewUserSettings userSettings)
|
||||
public async Task<IActionResult> UpdateUserSettings(ViewUserSettings userSettings, CancellationToken token = default)
|
||||
{
|
||||
var result = new WebResult();
|
||||
if (!ModelState.IsValid)
|
||||
return BadRequest(result.Invalidate(Localizer["Invalid model."]));
|
||||
return BadRequest(result.Invalidate(localizer["Invalid model."]));
|
||||
try
|
||||
{
|
||||
result = await UsersService.UpdateUserSettingsAsync(userSettings, User.GetUserId());
|
||||
result = await usersService.UpdateUserSettingsAsync(userSettings, User.GetUserId(), token);
|
||||
if (!result.IsValid)
|
||||
return StatusCode(result.StatusCode, result);
|
||||
|
||||
@@ -418,31 +396,31 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.LogError(ex, $"{nameof(User)}.{nameof(UpdateUserSettings)}()");
|
||||
return BadRequest(result.Invalidate(Localizer["Something went wrong."]));
|
||||
logger.LogError(ex, $"{nameof(User)}.{nameof(UpdateUserSettings)}()");
|
||||
return BadRequest(result.Invalidate(localizer["Something went wrong."]));
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPost, Route("/clientapi/user/update/password"), Authorize(Policy = Policies.IsUser)]
|
||||
public async Task<IActionResult> UpdatePassword(UserPasswordForm userPasswordForm)
|
||||
public async Task<IActionResult> UpdatePassword(UserPasswordForm userPasswordForm, CancellationToken token = default)
|
||||
{
|
||||
var result = new WebResult();
|
||||
if (!ModelState.IsValid)
|
||||
return BadRequest(result.Invalidate(Localizer["Invalid model."]));
|
||||
return BadRequest(result.Invalidate(localizer["Invalid model."]));
|
||||
try
|
||||
{
|
||||
result = await UsersService.UpdateUserPasswordAsync(userPasswordForm, User.GetUserId());
|
||||
result = await usersService.UpdateUserPasswordAsync(userPasswordForm, User.GetUserId(), token);
|
||||
if (!result.IsValid)
|
||||
return StatusCode(result.StatusCode, result);
|
||||
|
||||
// every session ended with the change; this device goes on with a new one
|
||||
var (user, userSettings) = ((RootUser, ViewUserSettings))result.Data;
|
||||
return Ok(AuthTokenManager.GenerateToken(user, userSettings));
|
||||
return Ok(authTokenManager.GenerateToken(user, userSettings));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.LogError(ex, $"{nameof(User)}.{nameof(UpdatePassword)}()");
|
||||
return BadRequest(result.Invalidate(Localizer["Something went wrong."]));
|
||||
logger.LogError(ex, $"{nameof(User)}.{nameof(UpdatePassword)}()");
|
||||
return BadRequest(result.Invalidate(localizer["Something went wrong."]));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -456,35 +434,35 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
}
|
||||
|
||||
[HttpGet, Route("/clientapi/user/settings"), Authorize(Policy = Policies.IsUser)]
|
||||
public async Task<IActionResult> GetUserSettings()
|
||||
public async Task<IActionResult> GetUserSettings(CancellationToken token = default)
|
||||
{
|
||||
var result = new WebResult();
|
||||
try
|
||||
{
|
||||
result = await UsersService.GetUserSettingsAsync(User.GetUserId());
|
||||
result = await usersService.GetUserSettingsAsync(User.GetUserId(), token: token);
|
||||
if (!result.IsValid)
|
||||
return StatusCode(result.StatusCode, result);
|
||||
return Ok(result.Data);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.LogError(ex, $"{nameof(User)}.{nameof(GetUserSettings)}()");
|
||||
return BadRequest(result.Invalidate(Localizer["Something went wrong."]));
|
||||
logger.LogError(ex, $"{nameof(User)}.{nameof(GetUserSettings)}()");
|
||||
return BadRequest(result.Invalidate(localizer["Something went wrong."]));
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPost, Route("/clientapi/user/recover/password"), EnableRateLimiting(RateLimiting.Accounts), AllowAnonymous]
|
||||
public async Task<IActionResult> RecoverPassword(PasswordRecoveryForm passwordRecoveryForm)
|
||||
public async Task<IActionResult> RecoverPassword(PasswordRecoveryForm passwordRecoveryForm, CancellationToken token = default)
|
||||
{
|
||||
var result = new WebResult();
|
||||
if (!ModelState.IsValid)
|
||||
return BadRequest(result.Invalidate(Localizer["Invalid model."]));
|
||||
return BadRequest(result.Invalidate(localizer["Invalid model."]));
|
||||
try
|
||||
{
|
||||
var host = string.IsNullOrEmpty(AppConfiguration.CurrentValue.FrontendBaseAddress)
|
||||
var host = string.IsNullOrEmpty(appConfiguration.CurrentValue.FrontendBaseAddress)
|
||||
? $"{Request.Scheme}://{Request.Host.Host}"
|
||||
: AppConfiguration.CurrentValue.FrontendBaseAddress.TrimEnd('/');
|
||||
result = await UsersService.SetupAndSendRecoveryEmail(passwordRecoveryForm, host);
|
||||
: appConfiguration.CurrentValue.FrontendBaseAddress.TrimEnd('/');
|
||||
result = await usersService.SetupAndSendRecoveryEmail(passwordRecoveryForm, host, token);
|
||||
if (!result.IsValid)
|
||||
return StatusCode(result.StatusCode, result);
|
||||
|
||||
@@ -492,8 +470,8 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.LogError(ex, $"{nameof(User)}.{nameof(RecoverPassword)}()");
|
||||
return BadRequest(result.Invalidate(Localizer["Something went wrong."]));
|
||||
logger.LogError(ex, $"{nameof(User)}.{nameof(RecoverPassword)}()");
|
||||
return BadRequest(result.Invalidate(localizer["Something went wrong."]));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -502,12 +480,12 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
[FromBody,
|
||||
Required(ErrorMessageResourceName = "Required", ErrorMessageResourceType = typeof(ErrorsResource)),
|
||||
Display(Name = "RecoveryCode", ResourceType = typeof(FieldsNameResource))]
|
||||
string recoveryCode)
|
||||
string recoveryCode, CancellationToken token = default)
|
||||
{
|
||||
var result = new WebResult();
|
||||
try
|
||||
{
|
||||
result = await UsersService.IsValidRecoveryCode(recoveryCode);
|
||||
result = await usersService.IsValidRecoveryCode(recoveryCode, token);
|
||||
if (!result.IsValid)
|
||||
return StatusCode(result.StatusCode, result);
|
||||
|
||||
@@ -515,20 +493,20 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.LogError(ex, $"{nameof(User)}.{nameof(IsValidRecoveryCode)}()");
|
||||
return BadRequest(result.Invalidate(Localizer["Something went wrong."]));
|
||||
logger.LogError(ex, $"{nameof(User)}.{nameof(IsValidRecoveryCode)}()");
|
||||
return BadRequest(result.Invalidate(localizer["Something went wrong."]));
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPost, Route("/clientapi/user/recover/update/password"), EnableRateLimiting(RateLimiting.Accounts), AllowAnonymous]
|
||||
public async Task<IActionResult> ChangePassword(NewPasswordForm newPasswordForm)
|
||||
public async Task<IActionResult> ChangePassword(NewPasswordForm newPasswordForm, CancellationToken token = default)
|
||||
{
|
||||
var result = new WebResult();
|
||||
if (!ModelState.IsValid)
|
||||
return BadRequest(result.Invalidate(Localizer["Invalid model."]));
|
||||
return BadRequest(result.Invalidate(localizer["Invalid model."]));
|
||||
try
|
||||
{
|
||||
result = await UsersService.ChangePassword(newPasswordForm);
|
||||
result = await usersService.ChangePassword(newPasswordForm, token);
|
||||
if (!result.IsValid)
|
||||
return StatusCode(result.StatusCode, result);
|
||||
|
||||
@@ -536,26 +514,26 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.LogError(ex, $"{nameof(User)}.{nameof(ChangePassword)}()");
|
||||
return BadRequest(result.Invalidate(Localizer["Something went wrong."]));
|
||||
logger.LogError(ex, $"{nameof(User)}.{nameof(ChangePassword)}()");
|
||||
return BadRequest(result.Invalidate(localizer["Something went wrong."]));
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPost, Route("/clientapi/user/delete"), EnableRateLimiting(RateLimiting.Accounts), Authorize(Policy = Policies.IsUser)]
|
||||
public async Task<IActionResult> RemoveSelf(RemoveSelfForm form)
|
||||
public async Task<IActionResult> RemoveSelf(RemoveSelfForm form, CancellationToken token = default)
|
||||
{
|
||||
var result = new WebResult();
|
||||
if (!ModelState.IsValid)
|
||||
return BadRequest(result.Invalidate(Localizer["Invalid model."]));
|
||||
return BadRequest(result.Invalidate(localizer["Invalid model."]));
|
||||
try
|
||||
{
|
||||
result = await UsersService.RemoveSelfAsync(User.GetUserId(), form.Password);
|
||||
result = await usersService.RemoveSelfAsync(User.GetUserId(), form.Password, token);
|
||||
return result.IsValid ? Ok() : StatusCode(result.StatusCode, result);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.LogError(ex, $"{nameof(User)}.{nameof(RemoveSelf)}()");
|
||||
return BadRequest(result.Invalidate(Localizer["Something went wrong."]));
|
||||
logger.LogError(ex, $"{nameof(User)}.{nameof(RemoveSelf)}()");
|
||||
return BadRequest(result.Invalidate(localizer["Something went wrong."]));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -571,17 +549,17 @@ namespace PrivaPub.Controllers.ClientToServer
|
||||
{
|
||||
var user = await dbEntities.RootUsers.MatchID(User.GetUserId()).ExecuteFirstAsync(token);
|
||||
if (user is not { IsBanned: false, DeletedAt: null })
|
||||
return Unauthorized(result.Invalidate(Localizer["Unauthorized."], StatusCodes.Status401Unauthorized));
|
||||
result = await UsersService.GetUserSettingsAsync(user.ID);
|
||||
return Unauthorized(result.Invalidate(localizer["Unauthorized."], StatusCodes.Status401Unauthorized));
|
||||
result = await usersService.GetUserSettingsAsync(user.ID, token: token);
|
||||
if (!result.IsValid)
|
||||
return StatusCode(result.StatusCode, result);
|
||||
|
||||
return Ok(AuthTokenManager.GenerateToken(user, (ViewUserSettings)result.Data, User.FindFirst(AuthTokenManager.SessionId)?.Value));
|
||||
return Ok(authTokenManager.GenerateToken(user, (ViewUserSettings)result.Data, User.FindFirst(AuthTokenManager.SessionId)?.Value));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.LogError(ex, $"{nameof(User)}.{nameof(SniffAgain)}()");
|
||||
return BadRequest(result.Invalidate(Localizer["Something went wrong."]));
|
||||
logger.LogError(ex, $"{nameof(User)}.{nameof(SniffAgain)}()");
|
||||
return BadRequest(result.Invalidate(localizer["Something went wrong."]));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user