SolarNetwork/Swarm
2
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

💥 Moved the /id to /pass and bug fixes of moved realms

Browse Source
This commit is contained in:
LittleSheep
2025-10-22 22:52:09 +08:00
parent cf87fdfb49
commit dd5929c691
13 changed files with 163 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DysonNetwork.Develop/Program.cs
View File

@@ -35,6 +35,6 @@ using (var scope = app.Services.CreateScope())
app.ConfigureAppMiddleware(builder.Configuration); app.ConfigureAppMiddleware(builder.Configuration);
app.UseSwaggerManifest(); app.UseSwaggerManifest("DysonNetwork.Develop");
app.Run(); app.Run();

2
DysonNetwork.Drive/Program.cs
View File

@@ -48,6 +48,6 @@ app.ConfigureAppMiddleware(tusDiskStore);
// Configure gRPC // Configure gRPC
app.ConfigureGrpcServices(); app.ConfigureGrpcServices();
app.UseSwaggerManifest(); app.UseSwaggerManifest("DysonNetwork.Drive");
app.Run(); app.Run();

3
DysonNetwork.Gateway/Program.cs
View File

@@ -90,7 +90,6 @@ var apiRoutes = serviceNames.Select(serviceName =>
{ {
var apiPath = serviceName switch var apiPath = serviceName switch
{ {
"pass" => "/id",
_ => $"/{serviceName}" _ => $"/{serviceName}"
}; };
return new RouteConfig return new RouteConfig
@@ -162,8 +161,6 @@ app.UseForwardedHeaders(forwardedHeadersOptions);
app.UseCors(); app.UseCors();
app.UseRateLimiter();
app.MapReverseProxy().RequireRateLimiting("fixed"); app.MapReverseProxy().RequireRateLimiting("fixed");
app.MapControllers(); app.MapControllers();

4
DysonNetwork.Pass/Account/AccountServiceGrpc.cs
View File

@@ -12,13 +12,11 @@ public class AccountServiceGrpc(
AccountEventService accountEvents, AccountEventService accountEvents,
RelationshipService relationships, RelationshipService relationships,
SubscriptionService subscriptions, SubscriptionService subscriptions,
IClock clock,
ILogger<AccountServiceGrpc> logger ILogger<AccountServiceGrpc> logger
) )
: Shared.Proto.AccountService.AccountServiceBase : Shared.Proto.AccountService.AccountServiceBase
{ {
private readonly AppDatabase _db = db ?? throw new ArgumentNullException(nameof(db)); private readonly AppDatabase _db = db ?? throw new ArgumentNullException(nameof(db));
private readonly IClock _clock = clock ?? throw new ArgumentNullException(nameof(clock));
private readonly ILogger<AccountServiceGrpc> private readonly ILogger<AccountServiceGrpc>
_logger = logger ?? throw new ArgumentNullException(nameof(logger)); _logger = logger ?? throw new ArgumentNullException(nameof(logger));
@@ -266,7 +264,7 @@ public class AccountServiceGrpc(
public override async Task<BoolValue> HasRelationship(GetRelationshipRequest request, ServerCallContext context) public override async Task<BoolValue> HasRelationship(GetRelationshipRequest request, ServerCallContext context)
{ {
var hasRelationship = false; bool hasRelationship;
if (!request.HasStatus) if (!request.HasStatus)
hasRelationship = await relationships.HasExistingRelationship( hasRelationship = await relationships.HasExistingRelationship(
Guid.Parse(request.AccountId), Guid.Parse(request.AccountId),

4
DysonNetwork.Pass/Auth/OidcProvider/Controllers/OidcProviderController.cs
View File

@@ -343,8 +343,8 @@ public class OidcProviderController(
{ {
issuer, issuer,
authorization_endpoint = $"{siteUrl}/auth/authorize", authorization_endpoint = $"{siteUrl}/auth/authorize",
token_endpoint = $"{baseUrl}/id/auth/open/token", token_endpoint = $"{baseUrl}/pass/auth/open/token",
userinfo_endpoint = $"{baseUrl}/id/auth/open/userinfo", userinfo_endpoint = $"{baseUrl}/pass/auth/open/userinfo",
jwks_uri = $"{baseUrl}/.well-known/jwks", jwks_uri = $"{baseUrl}/.well-known/jwks",
scopes_supported = new[] { "openid", "profile", "email" }, scopes_supported = new[] { "openid", "profile", "email" },
response_types_supported = new[] response_types_supported = new[]

2
DysonNetwork.Pass/Program.cs
View File

@@ -51,6 +51,6 @@ app.ConfigureAppMiddleware(builder.Configuration);
// Configure gRPC // Configure gRPC
app.ConfigureGrpcServices(); app.ConfigureGrpcServices();
app.UseSwaggerManifest(); app.UseSwaggerManifest("DysonNetwork.Pass");
app.Run(); app.Run();

333
DysonNetwork.Pass/Realm/RealmController.cs
View File

@@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using DysonNetwork.Pass.Account;
using DysonNetwork.Shared.Models; using DysonNetwork.Shared.Models;
using DysonNetwork.Shared.Proto; using DysonNetwork.Shared.Proto;
using DysonNetwork.Shared.Registry; using DysonNetwork.Shared.Registry;
@@ -7,6 +8,8 @@ using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using NodaTime; using NodaTime;
using AccountService = DysonNetwork.Pass.Account.AccountService;
using ActionLogService = DysonNetwork.Pass.Account.ActionLogService;
namespace DysonNetwork.Pass.Realm; namespace DysonNetwork.Pass.Realm;
@@ -17,9 +20,9 @@ public class RealmController(
RealmService rs, RealmService rs,
FileService.FileServiceClient files, FileService.FileServiceClient files,
FileReferenceService.FileReferenceServiceClient fileRefs, FileReferenceService.FileReferenceServiceClient fileRefs,
ActionLogService.ActionLogServiceClient als, ActionLogService als,
AccountService.AccountServiceClient accounts, RelationshipService rels,
RemoteAccountService remoteAccountsHelper AccountEventService accountEvents
) : Controller ) : Controller
{ {
[HttpGet("{slug}")] [HttpGet("{slug}")]
@@ -37,8 +40,8 @@ public class RealmController(
[Authorize] [Authorize]
public async Task<ActionResult<List<SnRealm>>> ListJoinedRealms() public async Task<ActionResult<List<SnRealm>>> ListJoinedRealms()
{ {
if (HttpContext.Items["CurrentUser"] is not Shared.Proto.Account currentUser) return Unauthorized(); if (HttpContext.Items["CurrentUser"] is not SnAccount currentUser) return Unauthorized();
var accountId = Guid.Parse(currentUser.Id); var accountId = currentUser.Id;
var members = await db.RealmMembers var members = await db.RealmMembers
.Where(m => m.AccountId == accountId) .Where(m => m.AccountId == accountId)
@@ -54,8 +57,8 @@ public class RealmController(
[Authorize] [Authorize]
public async Task<ActionResult<List<SnRealmMember>>> ListInvites() public async Task<ActionResult<List<SnRealmMember>>> ListInvites()
{ {
if (HttpContext.Items["CurrentUser"] is not Shared.Proto.Account currentUser) return Unauthorized(); if (HttpContext.Items["CurrentUser"] is not SnAccount currentUser) return Unauthorized();
var accountId = Guid.Parse(currentUser.Id); var accountId = currentUser.Id;
var members = await db.RealmMembers var members = await db.RealmMembers
.Where(m => m.AccountId == accountId) .Where(m => m.AccountId == accountId)
@@ -77,20 +80,18 @@ public class RealmController(
public async Task<ActionResult<SnRealmMember>> InviteMember(string slug, public async Task<ActionResult<SnRealmMember>> InviteMember(string slug,
[FromBody] RealmMemberRequest request) [FromBody] RealmMemberRequest request)
{ {
if (HttpContext.Items["CurrentUser"] is not Shared.Proto.Account currentUser) return Unauthorized(); if (HttpContext.Items["CurrentUser"] is not SnAccount currentUser) return Unauthorized();
var accountId = Guid.Parse(currentUser.Id); var accountId = currentUser.Id;
var relatedUser = var relatedUser = await db.Accounts.Where(a => a.Id == request.RelatedUserId).FirstOrDefaultAsync();
await accounts.GetAccountAsync(new GetAccountRequest { Id = request.RelatedUserId.ToString() });
if (relatedUser == null) return BadRequest("Related user was not found"); if (relatedUser == null) return BadRequest("Related user was not found");
var hasBlocked = await accounts.HasRelationshipAsync(new GetRelationshipRequest() var hasBlocked = await rels.HasRelationshipWithStatus(
{ currentUser.Id,
AccountId = currentUser.Id, request.RelatedUserId,
RelatedId = request.RelatedUserId.ToString(), RelationshipStatus.Blocked
Status = -100 );
}); if (hasBlocked)
if (hasBlocked?.Value ?? false)
return StatusCode(403, "You cannot invite a user that blocked you."); return StatusCode(403, "You cannot invite a user that blocked you.");
var realm = await db.Realms var realm = await db.Realms
@@ -102,7 +103,7 @@ public class RealmController(
return StatusCode(403, "You cannot invite member has higher permission than yours."); return StatusCode(403, "You cannot invite member has higher permission than yours.");
var existingMember = await db.RealmMembers var existingMember = await db.RealmMembers
.Where(m => m.AccountId == Guid.Parse(relatedUser.Id)) .Where(m => m.AccountId == relatedUser.Id)
.Where(m => m.RealmId == realm.Id) .Where(m => m.RealmId == realm.Id)
.FirstOrDefaultAsync(); .FirstOrDefaultAsync();
if (existingMember != null) if (existingMember != null)
@@ -116,26 +117,23 @@ public class RealmController(
await db.SaveChangesAsync(); await db.SaveChangesAsync();
await rs.SendInviteNotify(existingMember); await rs.SendInviteNotify(existingMember);
_ = als.CreateActionLogAsync(new CreateActionLogRequest als.CreateActionLogFromRequest(
{ "realms.members.invite",
Action = "realms.members.invite", new Dictionary<string, object>()
Meta = {
{ { "realm_id", Value.ForString(realm.Id.ToString()) },
{ "realm_id", Value.ForString(realm.Id.ToString()) }, { "account_id", Value.ForString(existingMember.AccountId.ToString()) },
{ "account_id", Value.ForString(existingMember.AccountId.ToString()) }, { "role", Value.ForNumber(request.Role) }
{ "role", Value.ForNumber(request.Role) } },
}, Request
AccountId = currentUser.Id, );
UserAgent = Request.Headers.UserAgent.ToString(),
IpAddress = Request.HttpContext.Connection.RemoteIpAddress?.ToString() ?? ""
});
return Ok(existingMember); return Ok(existingMember);
} }
var member = new SnRealmMember var member = new SnRealmMember
{ {
AccountId = Guid.Parse(relatedUser.Id), AccountId = relatedUser.Id,
RealmId = realm.Id, RealmId = realm.Id,
Role = request.Role, Role = request.Role,
}; };
@@ -143,21 +141,18 @@ public class RealmController(
db.RealmMembers.Add(member); db.RealmMembers.Add(member);
await db.SaveChangesAsync(); await db.SaveChangesAsync();
_ = als.CreateActionLogAsync(new CreateActionLogRequest als.CreateActionLogFromRequest(
{ "realms.members.invite",
Action = "realms.members.invite", new Dictionary<string, object>()
Meta =
{ {
{ "realm_id", Value.ForString(realm.Id.ToString()) }, { "realm_id", Value.ForString(realm.Id.ToString()) },
{ "account_id", Value.ForString(member.AccountId.ToString()) }, { "account_id", Value.ForString(member.AccountId.ToString()) },
{ "role", Value.ForNumber(request.Role) } { "role", Value.ForNumber(request.Role) }
}, },
AccountId = currentUser.Id, Request
UserAgent = Request.Headers.UserAgent.ToString(), );
IpAddress = Request.HttpContext.Connection.RemoteIpAddress?.ToString() ?? ""
});
member.AccountId = Guid.Parse(relatedUser.Id); member.AccountId = relatedUser.Id;
member.Realm = realm; member.Realm = realm;
await rs.SendInviteNotify(member); await rs.SendInviteNotify(member);
@@ -168,8 +163,8 @@ public class RealmController(
[Authorize] [Authorize]
public async Task<ActionResult<SnRealm>> AcceptMemberInvite(string slug) public async Task<ActionResult<SnRealm>> AcceptMemberInvite(string slug)
{ {
if (HttpContext.Items["CurrentUser"] is not Shared.Proto.Account currentUser) return Unauthorized(); if (HttpContext.Items["CurrentUser"] is not SnAccount currentUser) return Unauthorized();
var accountId = Guid.Parse(currentUser.Id); var accountId = currentUser.Id;
var member = await db.RealmMembers var member = await db.RealmMembers
.Where(m => m.AccountId == accountId) .Where(m => m.AccountId == accountId)
@@ -182,18 +177,15 @@ public class RealmController(
db.Update(member); db.Update(member);
await db.SaveChangesAsync(); await db.SaveChangesAsync();
_ = als.CreateActionLogAsync(new CreateActionLogRequest als.CreateActionLogFromRequest(
{ "realms.members.join",
Action = "realms.members.join", new Dictionary<string, object>()
Meta =
{ {
{ "realm_id", Value.ForString(member.RealmId.ToString()) }, { "realm_id", member.RealmId.ToString() },
{ "account_id", Value.ForString(member.AccountId.ToString()) } { "account_id", member.AccountId.ToString() }
}, },
AccountId = currentUser.Id, Request
UserAgent = Request.Headers.UserAgent.ToString(), );
IpAddress = Request.HttpContext.Connection.RemoteIpAddress?.ToString() ?? ""
});
return Ok(member); return Ok(member);
} }
@@ -202,8 +194,8 @@ public class RealmController(
[Authorize] [Authorize]
public async Task<ActionResult> DeclineMemberInvite(string slug) public async Task<ActionResult> DeclineMemberInvite(string slug)
{ {
if (HttpContext.Items["CurrentUser"] is not Shared.Proto.Account currentUser) return Unauthorized(); if (HttpContext.Items["CurrentUser"] is not SnAccount currentUser) return Unauthorized();
var accountId = Guid.Parse(currentUser.Id); var accountId = currentUser.Id;
var member = await db.RealmMembers var member = await db.RealmMembers
.Where(m => m.AccountId == accountId) .Where(m => m.AccountId == accountId)
@@ -215,19 +207,16 @@ public class RealmController(
member.LeaveAt = SystemClock.Instance.GetCurrentInstant(); member.LeaveAt = SystemClock.Instance.GetCurrentInstant();
await db.SaveChangesAsync(); await db.SaveChangesAsync();
_ = als.CreateActionLogAsync(new CreateActionLogRequest als.CreateActionLogFromRequest(
{ "realms.members.decline_invite",
Action = "realms.members.decline_invite", new Dictionary<string, object>()
Meta =
{ {
{ "realm_id", Value.ForString(member.RealmId.ToString()) }, { "realm_id", Value.ForString(member.RealmId.ToString()) },
{ "account_id", Value.ForString(member.AccountId.ToString()) }, { "account_id", Value.ForString(member.AccountId.ToString()) },
{ "decliner_id", Value.ForString(currentUser.Id) } { "decliner_id", Value.ForString(currentUser.Id.ToString()) }
}, },
AccountId = currentUser.Id, Request
UserAgent = Request.Headers.UserAgent.ToString(), );
IpAddress = Request.HttpContext.Connection.RemoteIpAddress?.ToString() ?? ""
});
return NoContent(); return NoContent();
} }
@@ -248,8 +237,8 @@ public class RealmController(
if (!realm.IsPublic) if (!realm.IsPublic)
{ {
if (HttpContext.Items["CurrentUser"] is not Shared.Proto.Account currentUser) return Unauthorized(); if (HttpContext.Items["CurrentUser"] is not SnAccount currentUser) return Unauthorized();
if (!await rs.IsMemberWithRole(realm.Id, Guid.Parse(currentUser.Id), RealmMemberRole.Normal)) if (!await rs.IsMemberWithRole(realm.Id, currentUser.Id, RealmMemberRole.Normal))
return StatusCode(403, "You must be a member to view this realm's members."); return StatusCode(403, "You must be a member to view this realm's members.");
} }
@@ -263,7 +252,7 @@ public class RealmController(
.OrderBy(m => m.JoinedAt) .OrderBy(m => m.JoinedAt)
.ToListAsync(); .ToListAsync();
var memberStatuses = await remoteAccountsHelper.GetAccountStatusBatch( var memberStatuses = await accountEvents.GetStatuses(
members.Select(m => m.AccountId).ToList() members.Select(m => m.AccountId).ToList()
); );
@@ -306,8 +295,8 @@ public class RealmController(
[Authorize] [Authorize]
public async Task<ActionResult<SnRealmMember>> GetCurrentIdentity(string slug) public async Task<ActionResult<SnRealmMember>> GetCurrentIdentity(string slug)
{ {
if (HttpContext.Items["CurrentUser"] is not Shared.Proto.Account currentUser) return Unauthorized(); if (HttpContext.Items["CurrentUser"] is not SnAccount currentUser) return Unauthorized();
var accountId = Guid.Parse(currentUser.Id); var accountId = currentUser.Id;
var member = await db.RealmMembers var member = await db.RealmMembers
.Where(m => m.AccountId == accountId) .Where(m => m.AccountId == accountId)
@@ -323,8 +312,8 @@ public class RealmController(
[Authorize] [Authorize]
public async Task<ActionResult> LeaveRealm(string slug) public async Task<ActionResult> LeaveRealm(string slug)
{ {
if (HttpContext.Items["CurrentUser"] is not Shared.Proto.Account currentUser) return Unauthorized(); if (HttpContext.Items["CurrentUser"] is not SnAccount currentUser) return Unauthorized();
var accountId = Guid.Parse(currentUser.Id); var accountId = currentUser.Id;
var member = await db.RealmMembers var member = await db.RealmMembers
.Where(m => m.AccountId == accountId) .Where(m => m.AccountId == accountId)
@@ -339,19 +328,16 @@ public class RealmController(
member.LeaveAt = SystemClock.Instance.GetCurrentInstant(); member.LeaveAt = SystemClock.Instance.GetCurrentInstant();
await db.SaveChangesAsync(); await db.SaveChangesAsync();
_ = als.CreateActionLogAsync(new CreateActionLogRequest als.CreateActionLogFromRequest(
{ "realms.members.leave",
Action = "realms.members.leave", new Dictionary<string, object>()
Meta =
{ {
{ "realm_id", Value.ForString(member.RealmId.ToString()) }, { "realm_id", member.RealmId.ToString() },
{ "account_id", Value.ForString(member.AccountId.ToString()) }, { "account_id", member.AccountId.ToString() },
{ "leaver_id", Value.ForString(currentUser.Id) } { "leaver_id", currentUser.Id }
}, },
AccountId = currentUser.Id, Request
UserAgent = Request.Headers.UserAgent.ToString(), );
IpAddress = Request.HttpContext.Connection.RemoteIpAddress?.ToString() ?? ""
});
return NoContent(); return NoContent();
} }
@@ -371,7 +357,7 @@ public class RealmController(
[Authorize] [Authorize]
public async Task<ActionResult<SnRealm>> CreateRealm(RealmRequest request) public async Task<ActionResult<SnRealm>> CreateRealm(RealmRequest request)
{ {
if (HttpContext.Items["CurrentUser"] is not Shared.Proto.Account currentUser) return Unauthorized(); if (HttpContext.Items["CurrentUser"] is not SnAccount currentUser) return Unauthorized();
if (string.IsNullOrWhiteSpace(request.Name)) return BadRequest("You cannot create a realm without a name."); if (string.IsNullOrWhiteSpace(request.Name)) return BadRequest("You cannot create a realm without a name.");
if (string.IsNullOrWhiteSpace(request.Slug)) return BadRequest("You cannot create a realm without a slug."); if (string.IsNullOrWhiteSpace(request.Slug)) return BadRequest("You cannot create a realm without a slug.");
@@ -383,7 +369,7 @@ public class RealmController(
Name = request.Name!, Name = request.Name!,
Slug = request.Slug!, Slug = request.Slug!,
Description = request.Description!, Description = request.Description!,
AccountId = Guid.Parse(currentUser.Id), AccountId = currentUser.Id,
IsCommunity = request.IsCommunity ?? false, IsCommunity = request.IsCommunity ?? false,
IsPublic = request.IsPublic ?? false, IsPublic = request.IsPublic ?? false,
Members = new List<SnRealmMember> Members = new List<SnRealmMember>
@@ -391,7 +377,7 @@ public class RealmController(
new() new()
{ {
Role = RealmMemberRole.Owner, Role = RealmMemberRole.Owner,
AccountId = Guid.Parse(currentUser.Id), AccountId = currentUser.Id,
JoinedAt = NodaTime.Instant.FromDateTimeUtc(DateTime.UtcNow) JoinedAt = NodaTime.Instant.FromDateTimeUtc(DateTime.UtcNow)
} }
} }
@@ -414,21 +400,18 @@ public class RealmController(
db.Realms.Add(realm); db.Realms.Add(realm);
await db.SaveChangesAsync(); await db.SaveChangesAsync();
_ = als.CreateActionLogAsync(new CreateActionLogRequest als.CreateActionLogFromRequest(
{ "realms.create",
Action = "realms.create", new Dictionary<string, object>()
Meta =
{ {
{ "realm_id", Value.ForString(realm.Id.ToString()) }, { "realm_id", realm.Id.ToString() },
{ "name", Value.ForString(realm.Name) }, { "name", realm.Name },
{ "slug", Value.ForString(realm.Slug) }, { "slug", realm.Slug },
{ "is_community", Value.ForBool(realm.IsCommunity) }, { "is_community", realm.IsCommunity },
{ "is_public", Value.ForBool(realm.IsPublic) } { "is_public", realm.IsPublic }
}, },
AccountId = currentUser.Id, Request
UserAgent = Request.Headers.UserAgent.ToString(), );
IpAddress = Request.HttpContext.Connection.RemoteIpAddress?.ToString() ?? ""
});
var realmResourceId = $"realm:{realm.Id}"; var realmResourceId = $"realm:{realm.Id}";
@@ -459,14 +442,14 @@ public class RealmController(
[Authorize] [Authorize]
public async Task<ActionResult<SnRealm>> Update(string slug, [FromBody] RealmRequest request) public async Task<ActionResult<SnRealm>> Update(string slug, [FromBody] RealmRequest request)
{ {
if (HttpContext.Items["CurrentUser"] is not Shared.Proto.Account currentUser) return Unauthorized(); if (HttpContext.Items["CurrentUser"] is not SnAccount currentUser) return Unauthorized();
var realm = await db.Realms var realm = await db.Realms
.Where(r => r.Slug == slug) .Where(r => r.Slug == slug)
.FirstOrDefaultAsync(); .FirstOrDefaultAsync();
if (realm is null) return NotFound(); if (realm is null) return NotFound();
var accountId = Guid.Parse(currentUser.Id); var accountId = currentUser.Id;
var member = await db.RealmMembers var member = await db.RealmMembers
.Where(m => m.AccountId == accountId && m.RealmId == realm.Id && m.JoinedAt != null && m.LeaveAt == null) .Where(m => m.AccountId == accountId && m.RealmId == realm.Id && m.JoinedAt != null && m.LeaveAt == null)
.FirstOrDefaultAsync(); .FirstOrDefaultAsync();
@@ -542,24 +525,21 @@ public class RealmController(
db.Realms.Update(realm); db.Realms.Update(realm);
await db.SaveChangesAsync(); await db.SaveChangesAsync();
_ = als.CreateActionLogAsync(new CreateActionLogRequest als.CreateActionLogFromRequest(
{ "realms.update",
Action = "realms.update", new Dictionary<string, object>()
Meta =
{ {
{ "realm_id", Value.ForString(realm.Id.ToString()) }, { "realm_id", realm.Id.ToString() },
{ "name_updated", Value.ForBool(request.Name != null) }, { "name_updated", request.Name != null },
{ "slug_updated", Value.ForBool(request.Slug != null) }, { "slug_updated", request.Slug != null },
{ "description_updated", Value.ForBool(request.Description != null) }, { "description_updated", request.Description != null },
{ "picture_updated", Value.ForBool(request.PictureId != null) }, { "picture_updated", request.PictureId != null },
{ "background_updated", Value.ForBool(request.BackgroundId != null) }, { "background_updated", request.BackgroundId != null },
{ "is_community_updated", Value.ForBool(request.IsCommunity != null) }, { "is_community_updated", request.IsCommunity != null },
{ "is_public_updated", Value.ForBool(request.IsPublic != null) } { "is_public_updated", request.IsPublic != null }
}, },
AccountId = currentUser.Id, Request
UserAgent = Request.Headers.UserAgent.ToString(), );
IpAddress = Request.HttpContext.Connection.RemoteIpAddress?.ToString() ?? ""
});
return Ok(realm); return Ok(realm);
} }
@@ -568,7 +548,7 @@ public class RealmController(
[Authorize] [Authorize]
public async Task<ActionResult<SnRealmMember>> JoinRealm(string slug) public async Task<ActionResult<SnRealmMember>> JoinRealm(string slug)
{ {
if (HttpContext.Items["CurrentUser"] is not Shared.Proto.Account currentUser) return Unauthorized(); if (HttpContext.Items["CurrentUser"] is not SnAccount currentUser) return Unauthorized();
var realm = await db.Realms var realm = await db.Realms
.Where(r => r.Slug == slug) .Where(r => r.Slug == slug)
@@ -579,7 +559,7 @@ public class RealmController(
return StatusCode(403, "Only community realms can be joined without invitation."); return StatusCode(403, "Only community realms can be joined without invitation.");
var existingMember = await db.RealmMembers var existingMember = await db.RealmMembers
.Where(m => m.AccountId == Guid.Parse(currentUser.Id) && m.RealmId == realm.Id) .Where(m => m.AccountId == currentUser.Id && m.RealmId == realm.Id)
.FirstOrDefaultAsync(); .FirstOrDefaultAsync();
if (existingMember is not null) if (existingMember is not null)
{ {
@@ -592,26 +572,23 @@ public class RealmController(
db.Update(existingMember); db.Update(existingMember);
await db.SaveChangesAsync(); await db.SaveChangesAsync();
_ = als.CreateActionLogAsync(new CreateActionLogRequest als.CreateActionLogFromRequest(
{ "realms.members.join",
Action = "realms.members.join", new Dictionary<string, object>()
Meta = {
{ { "realm_id", existingMember.RealmId.ToString() },
{ "realm_id", Value.ForString(realm.Id.ToString()) }, { "account_id", currentUser.Id },
{ "account_id", Value.ForString(currentUser.Id) }, { "is_community", realm.IsCommunity }
{ "is_community", Value.ForBool(realm.IsCommunity) } },
}, Request
AccountId = currentUser.Id, );
UserAgent = Request.Headers.UserAgent.ToString(),
IpAddress = Request.HttpContext.Connection.RemoteIpAddress?.ToString() ?? ""
});
return Ok(existingMember); return Ok(existingMember);
} }
var member = new SnRealmMember var member = new SnRealmMember
{ {
AccountId = Guid.Parse(currentUser.Id), AccountId = currentUser.Id,
RealmId = realm.Id, RealmId = realm.Id,
Role = RealmMemberRole.Normal, Role = RealmMemberRole.Normal,
JoinedAt = NodaTime.Instant.FromDateTimeUtc(DateTime.UtcNow) JoinedAt = NodaTime.Instant.FromDateTimeUtc(DateTime.UtcNow)
@@ -620,19 +597,16 @@ public class RealmController(
db.RealmMembers.Add(member); db.RealmMembers.Add(member);
await db.SaveChangesAsync(); await db.SaveChangesAsync();
_ = als.CreateActionLogAsync(new CreateActionLogRequest als.CreateActionLogFromRequest(
{ "realms.members.join",
Action = "realms.members.join", new Dictionary<string, object>()
Meta =
{ {
{ "realm_id", Value.ForString(realm.Id.ToString()) }, { "realm_id", realm.Id.ToString() },
{ "account_id", Value.ForString(currentUser.Id) }, { "account_id", currentUser.Id },
{ "is_community", Value.ForBool(realm.IsCommunity) } { "is_community", realm.IsCommunity }
}, },
AccountId = currentUser.Id, Request
UserAgent = Request.Headers.UserAgent.ToString(), );
IpAddress = Request.HttpContext.Connection.RemoteIpAddress?.ToString() ?? ""
});
return Ok(member); return Ok(member);
} }
@@ -641,7 +615,7 @@ public class RealmController(
[Authorize] [Authorize]
public async Task<ActionResult> RemoveMember(string slug, Guid memberId) public async Task<ActionResult> RemoveMember(string slug, Guid memberId)
{ {
if (HttpContext.Items["CurrentUser"] is not Shared.Proto.Account currentUser) return Unauthorized(); if (HttpContext.Items["CurrentUser"] is not SnAccount currentUser) return Unauthorized();
var realm = await db.Realms var realm = await db.Realms
.Where(r => r.Slug == slug) .Where(r => r.Slug == slug)
@@ -653,25 +627,22 @@ public class RealmController(
.FirstOrDefaultAsync(); .FirstOrDefaultAsync();
if (member is null) return NotFound(); if (member is null) return NotFound();
if (!await rs.IsMemberWithRole(realm.Id, Guid.Parse(currentUser.Id), RealmMemberRole.Moderator, member.Role)) if (!await rs.IsMemberWithRole(realm.Id, currentUser.Id, RealmMemberRole.Moderator, member.Role))
return StatusCode(403, "You do not have permission to remove members from this realm."); return StatusCode(403, "You do not have permission to remove members from this realm.");
member.LeaveAt = SystemClock.Instance.GetCurrentInstant(); member.LeaveAt = SystemClock.Instance.GetCurrentInstant();
await db.SaveChangesAsync(); await db.SaveChangesAsync();
_ = als.CreateActionLogAsync(new CreateActionLogRequest als.CreateActionLogFromRequest(
{ "realms.members.kick",
Action = "realms.members.kick", new Dictionary<string, object>()
Meta =
{ {
{ "realm_id", Value.ForString(realm.Id.ToString()) }, { "realm_id", realm.Id.ToString() },
{ "account_id", Value.ForString(memberId.ToString()) }, { "account_id", memberId.ToString() },
{ "kicker_id", Value.ForString(currentUser.Id) } { "kicker_id", currentUser.Id }
}, },
AccountId = currentUser.Id, Request
UserAgent = Request.Headers.UserAgent.ToString(), );
IpAddress = Request.HttpContext.Connection.RemoteIpAddress?.ToString() ?? ""
});
return NoContent(); return NoContent();
} }
@@ -681,7 +652,7 @@ public class RealmController(
public async Task<ActionResult<SnRealmMember>> UpdateMemberRole(string slug, Guid memberId, [FromBody] int newRole) public async Task<ActionResult<SnRealmMember>> UpdateMemberRole(string slug, Guid memberId, [FromBody] int newRole)
{ {
if (newRole >= RealmMemberRole.Owner) return BadRequest("Unable to set realm member to owner or greater role."); if (newRole >= RealmMemberRole.Owner) return BadRequest("Unable to set realm member to owner or greater role.");
if (HttpContext.Items["CurrentUser"] is not Shared.Proto.Account currentUser) return Unauthorized(); if (HttpContext.Items["CurrentUser"] is not SnAccount currentUser) return Unauthorized();
var realm = await db.Realms var realm = await db.Realms
.Where(r => r.Slug == slug) .Where(r => r.Slug == slug)
@@ -693,7 +664,7 @@ public class RealmController(
.FirstOrDefaultAsync(); .FirstOrDefaultAsync();
if (member is null) return NotFound(); if (member is null) return NotFound();
if (!await rs.IsMemberWithRole(realm.Id, Guid.Parse(currentUser.Id), RealmMemberRole.Moderator, member.Role, if (!await rs.IsMemberWithRole(realm.Id, currentUser.Id, RealmMemberRole.Moderator, member.Role,
newRole)) newRole))
return StatusCode(403, "You do not have permission to update member roles in this realm."); return StatusCode(403, "You do not have permission to update member roles in this realm.");
@@ -701,20 +672,17 @@ public class RealmController(
db.RealmMembers.Update(member); db.RealmMembers.Update(member);
await db.SaveChangesAsync(); await db.SaveChangesAsync();
_ = als.CreateActionLogAsync(new CreateActionLogRequest als.CreateActionLogFromRequest(
{ "realms.members.role_update",
Action = "realms.members.role_update", new Dictionary<string, object>()
Meta =
{ {
{ "realm_id", Value.ForString(realm.Id.ToString()) }, { "realm_id", realm.Id.ToString() },
{ "account_id", Value.ForString(memberId.ToString()) }, { "account_id", memberId.ToString() },
{ "new_role", Value.ForNumber(newRole) }, { "new_role", newRole },
{ "updater_id", Value.ForString(currentUser.Id) } { "updater_id", currentUser.Id }
}, },
AccountId = currentUser.Id, Request
UserAgent = Request.Headers.UserAgent.ToString(), );
IpAddress = Request.HttpContext.Connection.RemoteIpAddress?.ToString() ?? ""
});
return Ok(member); return Ok(member);
} }
@@ -723,7 +691,7 @@ public class RealmController(
[Authorize] [Authorize]
public async Task<ActionResult> Delete(string slug) public async Task<ActionResult> Delete(string slug)
{ {
if (HttpContext.Items["CurrentUser"] is not Shared.Proto.Account currentUser) return Unauthorized(); if (HttpContext.Items["CurrentUser"] is not SnAccount currentUser) return Unauthorized();
var transaction = await db.Database.BeginTransactionAsync(); var transaction = await db.Database.BeginTransactionAsync();
@@ -732,7 +700,7 @@ public class RealmController(
.FirstOrDefaultAsync(); .FirstOrDefaultAsync();
if (realm is null) return NotFound(); if (realm is null) return NotFound();
if (!await rs.IsMemberWithRole(realm.Id, Guid.Parse(currentUser.Id), RealmMemberRole.Owner)) if (!await rs.IsMemberWithRole(realm.Id, currentUser.Id, RealmMemberRole.Owner))
return StatusCode(403, "Only the owner can delete this realm."); return StatusCode(403, "Only the owner can delete this realm.");
try try
@@ -753,19 +721,16 @@ public class RealmController(
throw; throw;
} }
_ = als.CreateActionLogAsync(new CreateActionLogRequest als.CreateActionLogFromRequest(
{ "realms.delete",
Action = "realms.delete", new Dictionary<string, object>()
Meta =
{ {
{ "realm_id", Value.ForString(realm.Id.ToString()) }, { "realm_id", realm.Id.ToString() },
{ "realm_name", Value.ForString(realm.Name) }, { "realm_name", realm.Name },
{ "realm_slug", Value.ForString(realm.Slug) } { "realm_slug", realm.Slug }
}, },
AccountId = currentUser.Id, Request
UserAgent = Request.Headers.UserAgent.ToString(), );
IpAddress = Request.HttpContext.Connection.RemoteIpAddress?.ToString() ?? ""
});
// Delete all file references for this realm // Delete all file references for this realm
var realmResourceId = $"realm:{realm.Id}"; var realmResourceId = $"realm:{realm.Id}";

1
DysonNetwork.Pass/Startup/ApplicationConfiguration.cs
View File

@@ -22,7 +22,6 @@ public static class ApplicationConfiguration
app.ConfigureForwardedHeaders(configuration); app.ConfigureForwardedHeaders(configuration);
app.UseWebSockets(); app.UseWebSockets();
app.UseRateLimiter();
app.UseAuthentication(); app.UseAuthentication();
app.UseAuthorization(); app.UseAuthorization();
app.UseMiddleware<PermissionMiddleware>(); app.UseMiddleware<PermissionMiddleware>();

2
DysonNetwork.Ring/Program.cs
View File

@@ -44,6 +44,6 @@ app.ConfigureAppMiddleware(builder.Configuration);
// Configure gRPC // Configure gRPC
app.ConfigureGrpcServices(); app.ConfigureGrpcServices();
app.UseSwaggerManifest(); app.UseSwaggerManifest("DysonNetwork.Ring");
app.Run(); app.Run();

1
DysonNetwork.Ring/Startup/ApplicationConfiguration.cs
View File

@@ -12,7 +12,6 @@ public static class ApplicationConfiguration
app.ConfigureForwardedHeaders(configuration); app.ConfigureForwardedHeaders(configuration);
app.UseWebSockets(); app.UseWebSockets();
app.UseRateLimiter();
app.UseAuthentication(); app.UseAuthentication();
app.UseAuthorization(); app.UseAuthorization();

4
DysonNetwork.Shared/Http/SwaggerGen.cs
View File

@@ -56,7 +56,7 @@ public static class SwaggerGen
return builder; return builder;
} }
public static WebApplication UseSwaggerManifest(this WebApplication app) public static WebApplication UseSwaggerManifest(this WebApplication app, string serviceName)
{ {
app.MapOpenApi(); app.MapOpenApi();
@@ -103,7 +103,7 @@ public static class SwaggerGen
var publicBasePath = configuration["Swagger:PublicBasePath"]?.TrimEnd('/') ?? ""; var publicBasePath = configuration["Swagger:PublicBasePath"]?.TrimEnd('/') ?? "";
options.SwaggerEndpoint( options.SwaggerEndpoint(
$"{publicBasePath}/swagger/v1/swagger.json", $"{publicBasePath}/swagger/v1/swagger.json",
"Develop API v1"); $"{serviceName} API v1");
}); });
return app; return app;

2
DysonNetwork.Sphere/Program.cs
View File

@@ -44,6 +44,6 @@ using (var scope = app.Services.CreateScope())
// Configure application middleware pipeline // Configure application middleware pipeline
app.ConfigureAppMiddleware(builder.Configuration); app.ConfigureAppMiddleware(builder.Configuration);
app.UseSwaggerManifest(); app.UseSwaggerManifest("DysonNetwork.Sphere");
app.Run(); app.Run();

3
DysonNetwork.sln.DotSettings.user
View File

@@ -167,6 +167,9 @@
&lt;Assembly Path="/opt/homebrew/Cellar/dotnet/9.0.6/libexec/packs/Microsoft.AspNetCore.App.Ref/9.0.6/ref/net9.0/Microsoft.AspNetCore.RateLimiting.dll" /&gt; &lt;Assembly Path="/opt/homebrew/Cellar/dotnet/9.0.6/libexec/packs/Microsoft.AspNetCore.App.Ref/9.0.6/ref/net9.0/Microsoft.AspNetCore.RateLimiting.dll" /&gt;
&lt;Assembly Path="/Users/littlesheep/.nuget/packages/nodatime/3.2.2/lib/net8.0/NodaTime.dll" /&gt; &lt;Assembly Path="/Users/littlesheep/.nuget/packages/nodatime/3.2.2/lib/net8.0/NodaTime.dll" /&gt;
&lt;/AssemblyExplorer&gt;</s:String> &lt;/AssemblyExplorer&gt;</s:String>
<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=d3d47f4e_002D5d7b_002D4bb3_002D9fd2_002D0e52828cc908/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" Name="All tests from Solution" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;
&lt;Solution /&gt;
&lt;/SessionState&gt;</s:String>
<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=DysonNetwork_002EPass_002FResources_002FLocalization_002FAccountEventResource/@EntryIndexedValue">False</s:Boolean> <s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=DysonNetwork_002EPass_002FResources_002FLocalization_002FAccountEventResource/@EntryIndexedValue">False</s:Boolean>
<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=DysonNetwork_002EPass_002FResources_002FLocalization_002FEmailResource/@EntryIndexedValue">False</s:Boolean> <s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=DysonNetwork_002EPass_002FResources_002FLocalization_002FEmailResource/@EntryIndexedValue">False</s:Boolean>