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

🐛 Fix logout

Browse Source
This commit is contained in:
LittleSheep
2025-08-18 17:57:14 +08:00
parent 2cea391ebf
commit 1bb0012c40
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
DysonNetwork.Pass/Account/AccountService.cs
View File

@@ -478,10 +478,11 @@ public class AccountService(
} }
// The current session should be included in the sessions' list // The current session should be included in the sessions' list
var now = SystemClock.Instance.GetCurrentInstant();
await db.AuthSessions await db.AuthSessions
.Include(s => s.Challenge) .Include(s => s.Challenge)
.Where(s => s.Challenge.DeviceId == session.Challenge.DeviceId) .Where(s => s.Challenge.DeviceId == session.Challenge.DeviceId)
.ExecuteDeleteAsync(); .ExecuteUpdateAsync(p => p.SetProperty(s => s.DeletedAt, s => now));
await cache.RemoveAsync($"{AuthService.AuthCachePrefix}{session.Id}"); await cache.RemoveAsync($"{AuthService.AuthCachePrefix}{session.Id}");
} }
@@ -494,22 +495,23 @@ public class AccountService(
throw new InvalidOperationException("Device not found."); throw new InvalidOperationException("Device not found.");
await pusher.UnsubscribePushNotificationsAsync( await pusher.UnsubscribePushNotificationsAsync(
new UnsubscribePushNotificationsRequest() { DeviceId = device.DeviceId } new UnsubscribePushNotificationsRequest { DeviceId = device.DeviceId }
); );
db.AuthClients.Remove(device);
await db.SaveChangesAsync();
var sessions = await db.AuthSessions var sessions = await db.AuthSessions
.Include(s => s.Challenge) .Include(s => s.Challenge)
.Where(s => s.Challenge.ClientId == device.Id) .Where(s => s.Challenge.ClientId == device.Id && s.AccountId == account.Id)
.ToListAsync(); .ToListAsync();
// The current session should be included in the sessions' list // The current session should be included in the sessions' list
var now = SystemClock.Instance.GetCurrentInstant();
await db.AuthSessions await db.AuthSessions
.Include(s => s.Challenge) .Include(s => s.Challenge)
.Where(s => s.Challenge.DeviceId == device.DeviceId) .Where(s => s.Challenge.DeviceId == device.DeviceId)
.ExecuteDeleteAsync(); .ExecuteUpdateAsync(p => p.SetProperty(s => s.DeletedAt, s => now));
db.AuthClients.Remove(device);
await db.SaveChangesAsync();
foreach (var item in sessions) foreach (var item in sessions)
await cache.RemoveAsync($"{AuthService.AuthCachePrefix}{item.Id}"); await cache.RemoveAsync($"{AuthService.AuthCachePrefix}{item.Id}");