fix: add class context to all loggers, format
This commit is contained in:
parent
fb324e7576
commit
6c9d1c328b
16 changed files with 54 additions and 37 deletions
|
@ -9,11 +9,13 @@ namespace Foxnouns.Backend.Controllers.Authentication;
|
||||||
[Route("/api/v2/auth")]
|
[Route("/api/v2/auth")]
|
||||||
public class AuthController(Config config, KeyCacheService keyCacheSvc, ILogger logger) : ApiControllerBase
|
public class AuthController(Config config, KeyCacheService keyCacheSvc, ILogger logger) : ApiControllerBase
|
||||||
{
|
{
|
||||||
|
private readonly ILogger _logger = logger.ForContext<AuthController>();
|
||||||
|
|
||||||
[HttpPost("urls")]
|
[HttpPost("urls")]
|
||||||
[ProducesResponseType<UrlsResponse>(StatusCodes.Status200OK)]
|
[ProducesResponseType<UrlsResponse>(StatusCodes.Status200OK)]
|
||||||
public async Task<IActionResult> UrlsAsync()
|
public async Task<IActionResult> UrlsAsync()
|
||||||
{
|
{
|
||||||
logger.Debug("Generating auth URLs for Discord: {Discord}, Google: {Google}, Tumblr: {Tumblr}",
|
_logger.Debug("Generating auth URLs for Discord: {Discord}, Google: {Google}, Tumblr: {Tumblr}",
|
||||||
config.DiscordAuth.Enabled,
|
config.DiscordAuth.Enabled,
|
||||||
config.GoogleAuth.Enabled,
|
config.GoogleAuth.Enabled,
|
||||||
config.TumblrAuth.Enabled);
|
config.TumblrAuth.Enabled);
|
||||||
|
|
|
@ -20,6 +20,8 @@ public class DiscordAuthController(
|
||||||
RemoteAuthService remoteAuthSvc,
|
RemoteAuthService remoteAuthSvc,
|
||||||
UserRendererService userRendererSvc) : ApiControllerBase
|
UserRendererService userRendererSvc) : ApiControllerBase
|
||||||
{
|
{
|
||||||
|
private readonly ILogger _logger = logger.ForContext<DiscordAuthController>();
|
||||||
|
|
||||||
[HttpPost("callback")]
|
[HttpPost("callback")]
|
||||||
// TODO: duplicating attribute doesn't work, find another way to mark both as possible response
|
// TODO: duplicating attribute doesn't work, find another way to mark both as possible response
|
||||||
// leaving it here for documentation purposes
|
// leaving it here for documentation purposes
|
||||||
|
@ -34,7 +36,7 @@ public class DiscordAuthController(
|
||||||
var user = await authSvc.AuthenticateUserAsync(AuthType.Discord, remoteUser.Id);
|
var user = await authSvc.AuthenticateUserAsync(AuthType.Discord, remoteUser.Id);
|
||||||
if (user != null) return Ok(await GenerateUserTokenAsync(user));
|
if (user != null) return Ok(await GenerateUserTokenAsync(user));
|
||||||
|
|
||||||
logger.Debug("Discord user {Username} ({Id}) authenticated with no local account", remoteUser.Username,
|
_logger.Debug("Discord user {Username} ({Id}) authenticated with no local account", remoteUser.Username,
|
||||||
remoteUser.Id);
|
remoteUser.Id);
|
||||||
|
|
||||||
var ticket = AuthUtils.RandomToken();
|
var ticket = AuthUtils.RandomToken();
|
||||||
|
@ -51,7 +53,7 @@ public class DiscordAuthController(
|
||||||
if (remoteUser == null) throw new ApiError.BadRequest("Invalid ticket", "ticket", req.Ticket);
|
if (remoteUser == null) throw new ApiError.BadRequest("Invalid ticket", "ticket", req.Ticket);
|
||||||
if (await db.AuthMethods.AnyAsync(a => a.AuthType == AuthType.Discord && a.RemoteId == remoteUser.Id))
|
if (await db.AuthMethods.AnyAsync(a => a.AuthType == AuthType.Discord && a.RemoteId == remoteUser.Id))
|
||||||
{
|
{
|
||||||
logger.Error("Discord user {Id} has valid ticket but is already linked to an existing account",
|
_logger.Error("Discord user {Id} has valid ticket but is already linked to an existing account",
|
||||||
remoteUser.Id);
|
remoteUser.Id);
|
||||||
throw new FoxnounsError("Discord ticket was issued for user with existing link");
|
throw new FoxnounsError("Discord ticket was issued for user with existing link");
|
||||||
}
|
}
|
||||||
|
@ -65,13 +67,13 @@ public class DiscordAuthController(
|
||||||
private async Task<AuthController.AuthResponse> GenerateUserTokenAsync(User user)
|
private async Task<AuthController.AuthResponse> GenerateUserTokenAsync(User user)
|
||||||
{
|
{
|
||||||
var frontendApp = await db.GetFrontendApplicationAsync();
|
var frontendApp = await db.GetFrontendApplicationAsync();
|
||||||
logger.Debug("Logging user {Id} in with Discord", user.Id);
|
_logger.Debug("Logging user {Id} in with Discord", user.Id);
|
||||||
|
|
||||||
var (tokenStr, token) =
|
var (tokenStr, token) =
|
||||||
authSvc.GenerateToken(user, frontendApp, ["*"], clock.GetCurrentInstant() + Duration.FromDays(365));
|
authSvc.GenerateToken(user, frontendApp, ["*"], clock.GetCurrentInstant() + Duration.FromDays(365));
|
||||||
db.Add(token);
|
db.Add(token);
|
||||||
|
|
||||||
logger.Debug("Generated token {TokenId} for {UserId}", user.Id, token.Id);
|
_logger.Debug("Generated token {TokenId} for {UserId}", user.Id, token.Id);
|
||||||
|
|
||||||
await db.SaveChangesAsync();
|
await db.SaveChangesAsync();
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,8 @@ public class EmailAuthController(
|
||||||
IClock clock,
|
IClock clock,
|
||||||
ILogger logger) : ApiControllerBase
|
ILogger logger) : ApiControllerBase
|
||||||
{
|
{
|
||||||
|
private readonly ILogger _logger = logger.ForContext<EmailAuthController>();
|
||||||
|
|
||||||
[HttpPost("login")]
|
[HttpPost("login")]
|
||||||
[ProducesResponseType<AuthController.AuthResponse>(StatusCodes.Status200OK)]
|
[ProducesResponseType<AuthController.AuthResponse>(StatusCodes.Status200OK)]
|
||||||
public async Task<IActionResult> LoginAsync([FromBody] LoginRequest req)
|
public async Task<IActionResult> LoginAsync([FromBody] LoginRequest req)
|
||||||
|
@ -23,13 +25,13 @@ public class EmailAuthController(
|
||||||
|
|
||||||
var frontendApp = await db.GetFrontendApplicationAsync();
|
var frontendApp = await db.GetFrontendApplicationAsync();
|
||||||
|
|
||||||
logger.Debug("Logging user {Id} in with email and password", user.Id);
|
_logger.Debug("Logging user {Id} in with email and password", user.Id);
|
||||||
|
|
||||||
var (tokenStr, token) =
|
var (tokenStr, token) =
|
||||||
authSvc.GenerateToken(user, frontendApp, ["*"], clock.GetCurrentInstant() + Duration.FromDays(365));
|
authSvc.GenerateToken(user, frontendApp, ["*"], clock.GetCurrentInstant() + Duration.FromDays(365));
|
||||||
db.Add(token);
|
db.Add(token);
|
||||||
|
|
||||||
logger.Debug("Generated token {TokenId} for {UserId}", user.Id, token.Id);
|
_logger.Debug("Generated token {TokenId} for {UserId}", token.Id, user.Id);
|
||||||
|
|
||||||
await db.SaveChangesAsync();
|
await db.SaveChangesAsync();
|
||||||
|
|
||||||
|
|
|
@ -14,11 +14,13 @@ public class DebugController(
|
||||||
IClock clock,
|
IClock clock,
|
||||||
ILogger logger) : ApiControllerBase
|
ILogger logger) : ApiControllerBase
|
||||||
{
|
{
|
||||||
|
private readonly ILogger _logger = logger.ForContext<DebugController>();
|
||||||
|
|
||||||
[HttpPost("users")]
|
[HttpPost("users")]
|
||||||
[ProducesResponseType<AuthController.AuthResponse>(StatusCodes.Status200OK)]
|
[ProducesResponseType<AuthController.AuthResponse>(StatusCodes.Status200OK)]
|
||||||
public async Task<IActionResult> CreateUserAsync([FromBody] CreateUserRequest req)
|
public async Task<IActionResult> CreateUserAsync([FromBody] CreateUserRequest req)
|
||||||
{
|
{
|
||||||
logger.Debug("Creating user with username {Username} and email {Email}", req.Username, req.Email);
|
_logger.Debug("Creating user with username {Username} and email {Email}", req.Username, req.Email);
|
||||||
|
|
||||||
var user = await authSvc.CreateUserWithPasswordAsync(req.Username, req.Email, req.Password);
|
var user = await authSvc.CreateUserWithPasswordAsync(req.Username, req.Email, req.Password);
|
||||||
var frontendApp = await db.GetFrontendApplicationAsync();
|
var frontendApp = await db.GetFrontendApplicationAsync();
|
||||||
|
|
|
@ -49,7 +49,8 @@ public static class DatabaseQueryExtensions
|
||||||
throw new ApiError.NotFound("No member with that ID found.", code: ErrorCode.MemberNotFound);
|
throw new ApiError.NotFound("No member with that ID found.", code: ErrorCode.MemberNotFound);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static async Task<Member> ResolveMemberAsync(this DatabaseContext context, string userRef, string memberRef, Token? token)
|
public static async Task<Member> ResolveMemberAsync(this DatabaseContext context, string userRef, string memberRef,
|
||||||
|
Token? token)
|
||||||
{
|
{
|
||||||
var user = await context.ResolveUserAsync(userRef, token);
|
var user = await context.ResolveUserAsync(userRef, token);
|
||||||
return await context.ResolveMemberAsync(user.Id, memberRef);
|
return await context.ResolveMemberAsync(user.Id, memberRef);
|
||||||
|
|
|
@ -110,6 +110,7 @@ public record HttpApiError
|
||||||
|
|
||||||
[JsonConverter(typeof(ScreamingSnakeCaseEnumConverter))]
|
[JsonConverter(typeof(ScreamingSnakeCaseEnumConverter))]
|
||||||
public required ErrorCode Code { get; init; }
|
public required ErrorCode Code { get; init; }
|
||||||
|
|
||||||
[JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
|
[JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
|
||||||
public string? ErrorId { get; init; }
|
public string? ErrorId { get; init; }
|
||||||
|
|
||||||
|
|
|
@ -9,6 +9,8 @@ namespace Foxnouns.Backend.Services;
|
||||||
|
|
||||||
public class KeyCacheService(DatabaseContext db, IClock clock, ILogger logger)
|
public class KeyCacheService(DatabaseContext db, IClock clock, ILogger logger)
|
||||||
{
|
{
|
||||||
|
private readonly ILogger _logger = logger.ForContext<KeyCacheService>();
|
||||||
|
|
||||||
public Task SetKeyAsync(string key, string value, Duration expireAfter) =>
|
public Task SetKeyAsync(string key, string value, Duration expireAfter) =>
|
||||||
SetKeyAsync(key, value, clock.GetCurrentInstant() + expireAfter);
|
SetKeyAsync(key, value, clock.GetCurrentInstant() + expireAfter);
|
||||||
|
|
||||||
|
@ -40,7 +42,7 @@ public class KeyCacheService(DatabaseContext db, IClock clock, ILogger logger)
|
||||||
public async Task DeleteExpiredKeysAsync(CancellationToken ct)
|
public async Task DeleteExpiredKeysAsync(CancellationToken ct)
|
||||||
{
|
{
|
||||||
var count = await db.TemporaryKeys.Where(k => k.Expires < clock.GetCurrentInstant()).ExecuteDeleteAsync(ct);
|
var count = await db.TemporaryKeys.Where(k => k.Expires < clock.GetCurrentInstant()).ExecuteDeleteAsync(ct);
|
||||||
if (count != 0) logger.Information("Removed {Count} expired keys from the database", count);
|
if (count != 0) _logger.Information("Removed {Count} expired keys from the database", count);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task SetKeyAsync<T>(string key, T obj, Duration expiresAt) where T : class =>
|
public Task SetKeyAsync<T>(string key, T obj, Duration expiresAt) where T : class =>
|
||||||
|
|
|
@ -10,18 +10,22 @@ public class ObjectStorageService(ILogger logger, Config config, IMinioClient mi
|
||||||
|
|
||||||
public async Task RemoveObjectAsync(string path)
|
public async Task RemoveObjectAsync(string path)
|
||||||
{
|
{
|
||||||
logger.Debug("Deleting object at path {Path}", path);
|
_logger.Debug("Deleting object at path {Path}", path);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
await minio.RemoveObjectAsync(new RemoveObjectArgs().WithBucket(config.Storage.Bucket).WithObject(path));
|
await minio.RemoveObjectAsync(new RemoveObjectArgs().WithBucket(config.Storage.Bucket).WithObject(path));
|
||||||
}
|
}
|
||||||
catch (InvalidObjectNameException)
|
catch (InvalidObjectNameException)
|
||||||
{
|
{
|
||||||
|
// ignore non-existent objects
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task PutObjectAsync(string path, Stream data, string contentType)
|
public async Task PutObjectAsync(string path, Stream data, string contentType)
|
||||||
{
|
{
|
||||||
|
_logger.Debug("Putting object at path {Path} with length {Length} and content type {ContentType}", path,
|
||||||
|
data.Length, contentType);
|
||||||
|
|
||||||
await minio.PutObjectAsync(new PutObjectArgs()
|
await minio.PutObjectAsync(new PutObjectArgs()
|
||||||
.WithBucket(config.Storage.Bucket)
|
.WithBucket(config.Storage.Bucket)
|
||||||
.WithObject(path)
|
.WithObject(path)
|
||||||
|
|
|
@ -120,7 +120,6 @@ public static class ValidationUtils
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private static readonly string[] DefaultStatusOptions =
|
private static readonly string[] DefaultStatusOptions =
|
||||||
[
|
[
|
||||||
"favourite",
|
"favourite",
|
||||||
|
@ -147,11 +146,13 @@ public static class ValidationUtils
|
||||||
{
|
{
|
||||||
case > Limits.FieldNameLimit:
|
case > Limits.FieldNameLimit:
|
||||||
errors.Add(($"fields.{index}.name",
|
errors.Add(($"fields.{index}.name",
|
||||||
ValidationError.LengthError("Field name is too long", 1, Limits.FieldNameLimit, field.Name.Length)));
|
ValidationError.LengthError("Field name is too long", 1, Limits.FieldNameLimit,
|
||||||
|
field.Name.Length)));
|
||||||
break;
|
break;
|
||||||
case < 1:
|
case < 1:
|
||||||
errors.Add(($"fields.{index}.name",
|
errors.Add(($"fields.{index}.name",
|
||||||
ValidationError.LengthError("Field name is too short", 1, Limits.FieldNameLimit, field.Name.Length)));
|
ValidationError.LengthError("Field name is too short", 1, Limits.FieldNameLimit,
|
||||||
|
field.Name.Length)));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue