♻️ Remove the Sphere project depends on the Pass project. Move to the shared project instead.

.aspire/settings.json

@@ -0,0 +1,3 @@
+{
+  "appHostPath": "../DysonNetwork.Control/DysonNetwork.Control.csproj"
+}

DysonNetwork.Control/AppHost.cs

@@ -32,7 +32,7 @@ var developService = builder.AddProject<Projects.DysonNetwork_Develop>("develop"
 // Extra double-ended references
 ringService.WithReference(passService);
 
-var gateway = builder.AddYarp("gateway")
+builder.AddYarp("gateway")
     .WithHostPort(5000)
     .WithConfiguration(yarp =>
     {
@@ -62,4 +62,6 @@ var gateway = builder.AddYarp("gateway")
             .WithTransformPathPrefix("/api");
     });
 
+builder.AddDockerComposeEnvironment("docker-compose");
+
 builder.Build().Run();

DysonNetwork.Control/DysonNetwork.Control.csproj

@@ -13,6 +13,7 @@
 
     <ItemGroup>
         <PackageReference Include="Aspire.Hosting.AppHost" Version="9.4.2"/>
+        <PackageReference Include="Aspire.Hosting.Docker" Version="9.4.2-preview.1.25428.12" />
         <PackageReference Include="Aspire.Hosting.Nats" Version="9.4.2" />
         <PackageReference Include="Aspire.Hosting.Redis" Version="9.4.2" />
         <PackageReference Include="Aspire.Hosting.Yarp" Version="9.4.2-preview.1.25428.12" />

DysonNetwork.Sphere/Chat/ChatRoom.cs

@@ -2,9 +2,7 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
 using DysonNetwork.Shared.Data;
-using DysonNetwork.Shared.Proto;
 using NodaTime;
-using Account = DysonNetwork.Pass.Account.Account;
 
 namespace DysonNetwork.Sphere.Chat;
 
@@ -75,7 +73,7 @@ public class ChatMember : ModelBase
     public Guid ChatRoomId { get; set; }
     public ChatRoom ChatRoom { get; set; } = null!;
     public Guid AccountId { get; set; }
-    [NotMapped] public Account? Account { get; set; }
+    [NotMapped] public AccountReference? Account { get; set; }
     [NotMapped] public AccountStatusReference? Status { get; set; }
 
     [MaxLength(1024)] public string? Nick { get; set; }
@@ -108,7 +106,7 @@ public class ChatMemberTransmissionObject : ModelBase
     public Guid Id { get; set; }
     public Guid ChatRoomId { get; set; }
     public Guid AccountId { get; set; }
-    [NotMapped] public Account Account { get; set; } = null!;
+    [NotMapped] public AccountReference Account { get; set; } = null!;
 
     [MaxLength(1024)] public string? Nick { get; set; }
 

DysonNetwork.Sphere/Chat/ChatRoomService.cs

@@ -2,7 +2,7 @@ using DysonNetwork.Shared.Cache;
 using DysonNetwork.Shared.Registry;
 using Microsoft.EntityFrameworkCore;
 using NodaTime;
-using Account = DysonNetwork.Pass.Account.Account;
+using Account = DysonNetwork.Shared.Data.AccountReference;
 
 namespace DysonNetwork.Sphere.Chat;
 

DysonNetwork.Sphere/DysonNetwork.Sphere.csproj

@@ -161,7 +161,6 @@
     <ItemGroup>
         <ProjectReference Include="..\DysonNetwork.ServiceDefaults\DysonNetwork.ServiceDefaults.csproj" />
         <ProjectReference Include="..\DysonNetwork.Shared\DysonNetwork.Shared.csproj"/>
-        <ProjectReference Include="..\DysonNetwork.Pass\DysonNetwork.Pass.csproj"/>
     </ItemGroup>
 
 </Project>

DysonNetwork.Sphere/Poll/Poll.cs

@@ -2,7 +2,6 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using DysonNetwork.Pass.Account;
 using DysonNetwork.Shared.Data;
 using NodaTime;
 
@@ -64,5 +63,5 @@ public class PollAnswer : ModelBase
     public Guid AccountId { get; set; }
     public Guid PollId { get; set; }
     [JsonIgnore] public Poll? Poll { get; set; }
-    [NotMapped] public Account? Account { get; set; }
+    [NotMapped] public AccountReference? Account { get; set; }
 }

DysonNetwork.Sphere/Poll/PollController.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json;
+using DysonNetwork.Shared.Data;
 using DysonNetwork.Shared.Proto;
 using DysonNetwork.Shared.Registry;
 using Microsoft.AspNetCore.Authorization;
@@ -116,7 +117,7 @@ public class PollController(
             {
                 var protoValue = answeredAccounts.FirstOrDefault(a => a.Id == answer.AccountId.ToString());
                 if (protoValue is not null)
-                    answer.Account = Pass.Account.Account.FromProtoValue(protoValue);
+                    answer.Account = AccountReference.FromProtoValue(protoValue);
             }
         }
 

DysonNetwork.Sphere/Publisher/Publisher.cs

@@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore;
 using NodaTime;
 using NodaTime.Serialization.Protobuf;
 using VerificationMark = DysonNetwork.Shared.Data.VerificationMark;
-using Account = DysonNetwork.Pass.Account.Account;
+using Account = DysonNetwork.Shared.Data.AccountReference;
 
 namespace DysonNetwork.Sphere.Publisher;
 

DysonNetwork.Sphere/Publisher/PublisherController.cs

@@ -34,7 +34,7 @@ public class PublisherController(
         var account = await accounts.GetAccountAsync(
             new GetAccountRequest { Id = publisher.AccountId.Value.ToString() }
         );
-        publisher.Account = Pass.Account.Account.FromProtoValue(account);
+        publisher.Account = AccountReference.FromProtoValue(account);
 
         return Ok(publisher);
     }

DysonNetwork.Sphere/Publisher/PublisherService.cs

@@ -382,7 +382,7 @@ public class PublisherService(
     public async Task<PublisherMember> LoadMemberAccount(PublisherMember member)
     {
         var account = await accountsHelper.GetAccount(member.AccountId);
-        member.Account = Pass.Account.Account.FromProtoValue(account);
+        member.Account = AccountReference.FromProtoValue(account);
         return member;
     }
 
@@ -394,7 +394,7 @@ public class PublisherService(
         return members.Select(m =>
         {
             if (accounts.TryGetValue(m.AccountId, out var account))
-                m.Account = Pass.Account.Account.FromProtoValue(account);
+                m.Account = AccountReference.FromProtoValue(account);
             return m;
         }).ToList();
     }

DysonNetwork.Sphere/Realm/Realm.cs

@@ -1,7 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
-using DysonNetwork.Pass.Account;
 using DysonNetwork.Shared.Data;
 using DysonNetwork.Sphere.Chat;
 using Microsoft.EntityFrameworkCore;
@@ -48,7 +47,7 @@ public class RealmMember : ModelBase
     public Guid RealmId { get; set; }
     public Realm Realm { get; set; } = null!;
     public Guid AccountId { get; set; }
-    [NotMapped] public Account? Account { get; set; }
+    [NotMapped] public AccountReference? Account { get; set; }
     [NotMapped] public AccountStatusReference? Status { get; set; }
 
     public int Role { get; set; } = RealmMemberRole.Normal;

DysonNetwork.Sphere/Realm/RealmService.cs

@@ -1,5 +1,6 @@
 using DysonNetwork.Shared;
 using DysonNetwork.Shared.Cache;
+using DysonNetwork.Shared.Data;
 using DysonNetwork.Shared.Proto;
 using DysonNetwork.Shared.Registry;
 using DysonNetwork.Sphere.Localization;
@@ -73,7 +74,7 @@ public class RealmService(
     public async Task<RealmMember> LoadMemberAccount(RealmMember member)
     {
         var account = await accountsHelper.GetAccount(member.AccountId);
-        member.Account = Pass.Account.Account.FromProtoValue(account);
+        member.Account = AccountReference.FromProtoValue(account);
         return member;
     }
 
@@ -85,7 +86,7 @@ public class RealmService(
         return members.Select(m =>
         {
             if (accounts.TryGetValue(m.AccountId, out var account))
-                m.Account = Pass.Account.Account.FromProtoValue(account);
+                m.Account = AccountReference.FromProtoValue(account);
             return m;
         }).ToList();
     }

DysonNetwork.Sphere/Sticker/Sticker.cs

@@ -1,7 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
-using DysonNetwork.Pass.Account;
 using DysonNetwork.Shared.Data;
 using Microsoft.EntityFrameworkCore;
 
@@ -46,5 +45,5 @@ public class StickerPackOwnership : ModelBase
     public Guid PackId { get; set; }
     public StickerPack Pack { get; set; } = null!;
     public Guid AccountId { get; set; }
-    [NotMapped] public Account Account { get; set; } = null!;
+    [NotMapped] public AccountReference Account { get; set; } = null!;
 }

DysonNetwork.Sphere/WebReader/WebArticle.cs

@@ -1,7 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
-using DysonNetwork.Pass.Account;
 using DysonNetwork.Shared.Data;
 
 namespace DysonNetwork.Sphere.WebReader;
@@ -54,5 +53,5 @@ public class WebFeedSubscription : ModelBase
     public Guid FeedId { get; set; }
     public WebFeed Feed { get; set; } = null!;
     public Guid AccountId { get; set; }
-    [NotMapped] public Account Account { get; set; } = null!;
+    [NotMapped] public AccountReference Account { get; set; } = null!;
 }