♻️ Still don't know what I am doing

DysonNetwork.Pass/Account/AccountService.cs

@@ -402,16 +402,17 @@ public class AccountService(
                     return;
                 }
 
-                                await mailer.SendTemplatedEmailAsync<DysonNetwork.Pass.Pages.Emails.VerificationEmail, VerificationEmailModel>(
-                    account.Nick,
-                    contact.Content,
-                    localizer["VerificationEmail"],
-                    new VerificationEmailModel
-                    {
-                        Name = account.Name,
-                        Code = code
-                    }
-                );
+                await mailer
+                    .SendTemplatedEmailAsync<Pages.Emails.VerificationEmail, VerificationEmailModel>(
+                        account.Nick,
+                        contact.Content,
+                        localizer["VerificationEmail"],
+                        new VerificationEmailModel
+                        {
+                            Name = account.Name,
+                            Code = code
+                        }
+                    );
 
                 await _SetFactorCode(factor, code, TimeSpan.FromMinutes(30));
                 break;
@@ -496,7 +497,10 @@ public class AccountService(
             .ToListAsync();
 
         if (session.Challenge.DeviceId is not null)
-            await pusher.UnsubscribePushNotifications(session.Challenge.DeviceId);
+            await pusher.UnsubscribePushNotificationsAsync(new UnsubscribePushNotificationsRequest()
+            {
+                DeviceId = session.Challenge.DeviceId
+            });
 
         // The current session should be included in the sessions' list
         await db.AuthSessions
@@ -655,7 +659,8 @@ public class AccountService(
 
         if (missingId.Count != 0)
         {
-            var newProfiles = missingId.Select(id => new AccountProfile { Id = Guid.NewGuid(), AccountId = id }).ToList();
+            var newProfiles = missingId.Select(id => new AccountProfile { Id = Guid.NewGuid(), AccountId = id })
+                .ToList();
             await db.BulkInsertAsync(newProfiles);
         }
     }

DysonNetwork.Pass/Account/AccountServiceGrpc.cs

@@ -36,6 +36,24 @@ public class AccountServiceGrpc(
         return account.ToProtoValue();
     }
 
+    public override async Task<GetAccountBatchResponse> GetAccountBatch(GetAccountBatchRequest request, ServerCallContext context)
+    {
+        var accountIds = request.Id
+            .Select(id => Guid.TryParse(id, out var accountId) ? accountId : (Guid?)null)
+            .Where(id => id.HasValue)
+            .Select(id => id!.Value)
+            .ToList();
+
+        var accounts = await _db.Accounts
+            .AsNoTracking()
+            .Where(a => accountIds.Contains(a.Id))
+            .ToListAsync();
+
+        var response = new GetAccountBatchResponse();
+        response.Accounts.AddRange(accounts.Select(a => a.ToProtoValue()));
+        return response;
+    }
+
     public override async Task<Shared.Proto.Account> CreateAccount(CreateAccountRequest request,
         ServerCallContext context)
     {

DysonNetwork.Pass/Email/EmailService.cs

@@ -6,18 +6,11 @@ using Microsoft.AspNetCore.Components;
 namespace DysonNetwork.Pass.Email;
 
 public class EmailService(
-    IEtcdClient etcd,
+    PusherService.PusherServiceClient pusher,
     RazorViewRenderer viewRenderer,
-    IConfiguration configuration,
     ILogger<EmailService> logger
 )
 {
-    private readonly PusherService.PusherServiceClient _client = GrpcClientHelper.CreatePusherServiceClient(
-        etcd,
-        configuration["Service:CertPath"]!,
-        configuration["Service:KeyPath"]!
-    ).GetAwaiter().GetResult();
-
     public async Task SendEmailAsync(
         string? recipientName,
         string recipientEmail,
@@ -27,7 +20,7 @@ public class EmailService(
     {
         subject = $"[Solarpass] {subject}";
 
-        await _client.SendEmailAsync(
+        await pusher.SendEmailAsync(
             new SendEmailRequest()
             {
                 Email = new EmailMessage()

DysonNetwork.Pass/Permission/PermissionMiddleware.cs

@@ -2,7 +2,7 @@ namespace DysonNetwork.Pass.Permission;
 
 using System;
 
-[AttributeUsage(AttributeTargets.Method, Inherited = true)]
+[AttributeUsage(AttributeTargets.Method)]
 public class RequiredPermissionAttribute(string area, string key) : Attribute
 {
     public string Area { get; set; } = area;

DysonNetwork.Pass/Startup/ServiceCollectionExtensions.cs

@@ -19,6 +19,7 @@ using DysonNetwork.Pass.Handlers;
 using DysonNetwork.Pass.Wallet.PaymentHandlers;
 using DysonNetwork.Shared.Cache;
 using DysonNetwork.Shared.GeoIp;
+using DysonNetwork.Shared.Registry;
 
 namespace DysonNetwork.Pass.Startup;
 
@@ -48,9 +49,8 @@ public static class ServiceCollectionExtensions
             options.MaxSendMessageSize = 16 * 1024 * 1024; // 16MB
         });
         
-        // Register gRPC reflection for service discovery
-        services.AddGrpc();
-
+        services.AddPusherService();
+        
         // Register gRPC services
         services.AddScoped<AccountServiceGrpc>();
         services.AddScoped<AuthServiceGrpc>();
@@ -194,7 +194,6 @@ public static class ServiceCollectionExtensions
         services.AddScoped<ActionLogService>();
         services.AddScoped<RelationshipService>();
         services.AddScoped<MagicSpellService>();
-        services.AddScoped<NotificationService>();
         services.AddScoped<AuthService>();
         services.AddScoped<AccountUsernameService>();
         services.AddScoped<WalletService>();

DysonNetwork.Pass/Wallet/PaymentService.cs

@@ -1,17 +1,18 @@
 using System.Globalization;
-using DysonNetwork.Pass.Account;
 using DysonNetwork.Pass.Localization;
+using DysonNetwork.Shared.Proto;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.Extensions.Localization;
 using NodaTime;
+using AccountService = DysonNetwork.Pass.Account.AccountService;
 
 namespace DysonNetwork.Pass.Wallet;
 
 public class PaymentService(
     AppDatabase db,
     WalletService wat,
-    NotificationService nty,
+    PusherService.PusherServiceClient pusher,
     IStringLocalizer<NotificationResource> localizer
 )
 {
@@ -205,16 +206,19 @@ public class PaymentService(
         var readableOrderId = order.Id.ToString().Replace("-", "")[..8];
         var readableOrderRemark = order.Remarks ?? $"#{readableOrderId}";
 
-        await nty.SendNotification(
-            account,
-            "wallets.orders.paid",
-            localizer["OrderPaidTitle", $"#{readableOrderId}"],
-            null,
-            localizer["OrderPaidBody", order.Amount.ToString(CultureInfo.InvariantCulture), order.Currency,
-                readableOrderRemark],
-            new Dictionary<string, object>()
+        
+        await pusher.SendPushNotificationToUserAsync(
+            new SendPushNotificationToUserRequest
             {
-                ["order_id"] = order.Id.ToString()
+                UserId = account.Id.ToString(),
+                Notification = new PushNotification
+                {
+                    Topic = "wallets.orders.paid",
+                    Title = localizer["OrderPaidTitle", $"#{readableOrderId}"],
+                    Body = localizer["OrderPaidBody", order.Amount.ToString(CultureInfo.InvariantCulture), order.Currency,
+                        readableOrderRemark],
+                    IsSavable = false
+                }
             }
         );
     }

DysonNetwork.Pass/Wallet/SubscriptionService.cs

@@ -1,11 +1,14 @@
 using System.Text.Json;
-using DysonNetwork.Pass.Account;
 using DysonNetwork.Pass.Localization;
 using DysonNetwork.Pass.Wallet.PaymentHandlers;
 using DysonNetwork.Shared.Cache;
+using DysonNetwork.Shared.Proto;
+using Google.Protobuf.WellKnownTypes;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Localization;
 using NodaTime;
+using AccountService = DysonNetwork.Pass.Account.AccountService;
+using Duration = NodaTime.Duration;
 
 namespace DysonNetwork.Pass.Wallet;
 
@@ -13,7 +16,7 @@ public class SubscriptionService(
     AppDatabase db,
     PaymentService payment,
     AccountService accounts,
-    NotificationService nty,
+    PusherService.PusherServiceClient pusher,
     IStringLocalizer<NotificationResource> localizer,
     IConfiguration configuration,
     ICacheService cache,
@@ -352,15 +355,19 @@ public class SubscriptionService(
             ? subscription.EndedAt.Value.Minus(subscription.BegunAt).Days.ToString()
             : "infinite";
 
-        await nty.SendNotification(
-            account,
-            "subscriptions.begun",
-            localizer["SubscriptionAppliedTitle", humanReadableName],
-            null,
-            localizer["SubscriptionAppliedBody", duration, humanReadableName],
-            new Dictionary<string, object>()
+        var notification = new PushNotification
+        {
+            Topic = "subscriptions.begun",
+            Title = localizer["SubscriptionAppliedTitle", humanReadableName],
+            Body = localizer["SubscriptionAppliedBody", duration, humanReadableName],
+            IsSavable = false,
+        };
+        notification.Meta.Add("subscription_id", Value.ForString(subscription.Id.ToString()));
+        await pusher.SendPushNotificationToUserAsync(
+            new SendPushNotificationToUserRequest
             {
-                ["subscription_id"] = subscription.Id.ToString(),
+                UserId = account.Id.ToString(),
+                Notification = notification
             }
         );
     }