fix: remove revoked token

AtomiCloud · Oct 25, 2023 · bd970c9 · bd970c9
1 parent c40505d
commit bd970c9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/App/Modules/Users/API/V1/UserMapper.cs b/App/Modules/Users/API/V1/UserMapper.cs
@@ -9,7 +9,10 @@ public static UserPrincipalResp ToResp(this UserPrincipal userPrincipal)
     => new(userPrincipal.Id, userPrincipal.Record.Username);
 
   public static UserResp ToResp(this User user)
-    => new(user.Principal.ToResp(), user.Tokens.Select(x => x.ToResp()));
+    => new(user.Principal.ToResp(), user
+      .Tokens
+      .Where(x => !x.Record.Revoked)
+      .Select(x => x.ToResp()));
 
   public static UserRecord ToRecord(this CreateUserReq req)
   {

diff --git a/App/Modules/Users/Data/TokenRepository.cs b/App/Modules/Users/Data/TokenRepository.cs
@@ -118,7 +118,7 @@ public async Task<Result<TokenPrincipal>> Create(string userId, string token, To
         .FirstOrDefaultAsync();
       if (v1 == null) return (Unit?)null;
 
-      var v2 = v1 with { Revoked = true };
+      var v2 = v1 with { Revoked = true, User = null! };
       var updated = this._db.Tokens.Update(v2);
       await this._db.SaveChangesAsync();
       return new Unit();