sam/Foxnouns.NET
sam/Foxnouns.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

feat(backend): add member GET endpoints, POST /users/@me/members endpoint

Browse source
This commit is contained in:
sam 2024-07-13 19:38:40 +02:00
parent 16f230b97d
commit e7ec0e6661
Signed by: sam
GPG key ID: B4EF20DDE721CAA1
10 changed files with 152 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Foxnouns.Backend/Services/AuthService.cs
View file

@ -8,7 +8,7 @@ using NodaTime;
namespace Foxnouns.Backend.Services;
public class AuthService(ILogger logger, IClock clock, DatabaseContext db, ISnowflakeGenerator snowflakeGenerator)
public class AuthService(IClock clock, DatabaseContext db, ISnowflakeGenerator snowflakeGenerator)
{
private readonly PasswordHasher<User> _passwordHasher = new();
@ -140,7 +140,7 @@ public class AuthService(ILogger logger, IClock clock, DatabaseContext db, ISnow
private static (string, byte[]) GenerateToken()
{
var token = AuthUtils.RandomToken(48);
var token = AuthUtils.RandomToken();
var hash = SHA512.HashData(Convert.FromBase64String(token));
return (token, hash);

2
Foxnouns.Backend/Services/KeyCacheService.cs
View file

@ -10,7 +10,7 @@ namespace Foxnouns.Backend.Services;
public class KeyCacheService(DatabaseContext db, IClock clock, ILogger logger)
{
public Task SetKeyAsync(string key, string value, Duration expireAfter) =>
db.SetKeyAsync(key, value, clock.GetCurrentInstant() + expireAfter);
SetKeyAsync(key, value, clock.GetCurrentInstant() + expireAfter);
public async Task SetKeyAsync(string key, string value, Instant expires)
{

48
Foxnouns.Backend/Services/MemberRendererService.cs
View file

@ -1,16 +1,50 @@
using Foxnouns.Backend.Database;
using Foxnouns.Backend.Database.Models;
using Foxnouns.Backend.Utils;
using Microsoft.EntityFrameworkCore;
using Newtonsoft.Json;
namespace Foxnouns.Backend.Services;
public class MemberRendererService(DatabaseContext db, Config config)
{
public async Task<IEnumerable<PartialMember>> RenderUserMembersAsync(User user, Token? token)
{
var canReadHiddenMembers = token != null && token.UserId == user.Id && token.HasScope("member.read");
var canReadMemberList = !user.ListHidden || canReadHiddenMembers;
IEnumerable<Member> members = canReadMemberList
? await db.Members
.Where(m => m.UserId == user.Id)
.OrderBy(m => m.Name)
.ToListAsync()
: [];
if (!canReadHiddenMembers) members = members.Where(m => !m.Unlisted);
return members.Select(RenderPartialMember);
}
public MemberResponse RenderMember(Member member, Token? token)
{
var renderUnlisted = token?.UserId == member.UserId && token.HasScope("user.read_hidden");
return new MemberResponse(
member.Id, member.Name, member.DisplayName, member.Bio,
AvatarUrlFor(member), member.Links, member.Names, member.Pronouns, member.Fields,
RenderPartialUser(member.User), renderUnlisted ? member.Unlisted : null);
}
private UserRendererService.PartialUser RenderPartialUser(User user) =>
new(user.Id, user.Username, user.DisplayName, AvatarUrlFor(user));
public PartialMember RenderPartialMember(Member member) => new(member.Id, member.Name,
member.DisplayName, member.Bio, AvatarUrlFor(member), member.Names, member.Pronouns);
private string? AvatarUrlFor(Member member) =>
member.Avatar != null ? $"{config.MediaBaseUrl}/members/{member.Id}/avatars/{member.Avatar}.webp" : null;
private string? AvatarUrlFor(User user) =>
user.Avatar != null ? $"{config.MediaBaseUrl}/users/{user.Id}/avatars/{user.Avatar}.webp" : null;
public record PartialMember(
Snowflake Id,
string Name,
@ -19,4 +53,18 @@ public class MemberRendererService(DatabaseContext db, Config config)
string? AvatarUrl,
IEnumerable<FieldEntry> Names,
IEnumerable<Pronoun> Pronouns);
public record MemberResponse(
Snowflake Id,
string Name,
string? DisplayName,
string? Bio,
string? AvatarUrl,
string[] Links,
IEnumerable<FieldEntry> Names,
IEnumerable<Pronoun> Pronouns,
IEnumerable<Field> Fields,
UserRendererService.PartialUser User,
[property: JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
bool? Unlisted);
}

16
Foxnouns.Backend/Services/UserRendererService.cs
View file

@ -16,6 +16,7 @@ public class UserRendererService(DatabaseContext db, MemberRendererService membe
{
var isSelfUser = selfUser?.Id == user.Id;
var tokenCanReadHiddenMembers = token.HasScope("member.read") && isSelfUser;
var tokenHidden = token.HasScope("user.read_hidden") && isSelfUser;
var tokenPrivileged = token.HasScope("user.read_privileged") && isSelfUser;
renderMembers = renderMembers &&
@ -45,10 +46,14 @@ public class UserRendererService(DatabaseContext db, MemberRendererService membe
a.RemoteUsername, a.FediverseApplication?.Domain
))
: null,
tokenPrivileged ? user.LastActive : null
tokenHidden ? user.ListHidden : null,
tokenHidden ? user.LastActive : null
);
}
public PartialUser RenderPartialUser(User user) =>
new(user.Id, user.Username, user.DisplayName, AvatarUrlFor(user));
private string? AvatarUrlFor(User user) =>
user.Avatar != null ? $"{config.MediaBaseUrl}/users/{user.Id}/avatars/{user.Avatar}.webp" : null;
@ -68,6 +73,8 @@ public class UserRendererService(DatabaseContext db, MemberRendererService membe
[property: JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
IEnumerable<AuthenticationMethodResponse>? AuthMethods,
[property: JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
bool? MemberListHidden,
[property: JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
Instant? LastActive
);
@ -81,4 +88,11 @@ public class UserRendererService(DatabaseContext db, MemberRendererService membe
[property: JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
string? FediverseInstance
);
public record PartialUser(
Snowflake Id,
string Username,
string? DisplayName,
string? AvatarUrl
);
}