♻️ Refactored authorize device system (wip) (skip ci)

DysonNetwork.Pass/Account/AccountCurrentController.cs

@@ -455,27 +455,11 @@ public class AccountCurrentController(
 
         Response.Headers.Append("X-Auth-Session", currentSession.Id.ToString());
 
-        // Group sessions by the related DeviceId, then create an AuthorizedDevice for each group.
-        var deviceGroups = await db.AuthSessions
-            .Where(s => s.Account.Id == currentUser.Id)
-            .Include(s => s.Challenge)
-            .GroupBy(s => s.Challenge.DeviceId!)
-            .Select(g => new AuthorizedDevice
-            {
-                DeviceId = g.Key!,
-                UserAgent = g.First(x => x.Challenge.UserAgent != null).Challenge.UserAgent!,
-                Platform = g.First().Challenge.Platform!,
-                Label = g.Where(x => !string.IsNullOrWhiteSpace(x.Label)).Select(x => x.Label).FirstOrDefault(),
-                Sessions = g
-                    .OrderByDescending(x => x.LastGrantedAt)
-                    .ToList()
-            })
+        var devices = await db.AuthDevices
+            .Where(device => device.AccountId == currentUser.Id)
             .ToListAsync();
-        deviceGroups = deviceGroups
-            .OrderByDescending(s => s.Sessions.First().LastGrantedAt)
-            .ToList();
 
-        return Ok(deviceGroups);
+        return Ok(devices);
     }
 
     [HttpGet("sessions")]

DysonNetwork.Pass/Account/AccountService.cs

@@ -456,6 +456,11 @@ public class AccountService(
         );
     }
 
+    public async Task<bool> IsDeviceActive(Guid id)
+    {
+        return await db.AuthChallenges.AnyAsync(d => d.DeviceId == id);
+    }
+
     public async Task<AuthSession> UpdateSessionLabel(Account account, Guid sessionId, string label)
     {
         var session = await db.AuthSessions
@@ -483,6 +488,7 @@ public class AccountService(
     {
         var session = await db.AuthSessions
             .Include(s => s.Challenge)
+            .ThenInclude(s => s.Device)
             .Where(s => s.Id == sessionId && s.AccountId == account.Id)
             .FirstOrDefaultAsync();
         if (session is null) throw new InvalidOperationException("Session was not found.");
@@ -492,11 +498,10 @@ public class AccountService(
             .Where(s => s.AccountId == session.Id && s.Challenge.DeviceId == session.Challenge.DeviceId)
             .ToListAsync();
 
-        if (session.Challenge.DeviceId is not null)
+        if (!await IsDeviceActive(session.Challenge.DeviceId))
             await pusher.UnsubscribePushNotificationsAsync(new UnsubscribePushNotificationsRequest()
-            {
-                DeviceId = session.Challenge.DeviceId
-            });
+                { DeviceId = session.Challenge.Device.DeviceId }
+            );
 
         // The current session should be included in the sessions' list
         await db.AuthSessions