Add sessionId to JWT and update session handling

The JwtService now includes sessionId in access tokens, and all usages have been updated to pass sessionId when generating tokens. UserSession now supports public encryption and signing keys. Tests and session management logic have been updated to reflect these changes, ensuring session-specific claims in JWTs and improved session tracking.

Govor.Application.Tests/Services/Authentication/JwtServiceTests.cs

@@ -56,22 +56,51 @@ public class JwtServiceTests
     }
 
     [Test]
-    public async Task GenerateJwtToken_ShouldReturnValidJwtString()
+    public async Task GenerateJwtToken_ShouldReturnValidJwtString_WithCorrectClaims()
     {
         // Arrange
         var user = _fixture.Create<User>();
+        var sessionId = Guid.NewGuid();
         var expectedRole = "User";
-        _invitesServiceMock.Setup(s => s.GetRoleAsync(user)).Returns(Task.FromResult(expectedRole));
-        // Act 
-        var tokenString = await _jwtService.GenerateAccessTokenAsync(user);
+        _invitesServiceMock.Setup(s => s.GetRoleAsync(user)).ReturnsAsync(expectedRole);
+    
+        // Act
+        var tokenString = await _jwtService.GenerateAccessTokenAsync(user, sessionId);
+    
+        // Assert
+        var handler = new JwtSecurityTokenHandler();
+        var jwt = handler.ReadJwtToken(tokenString);
+
+        var claims = jwt.Claims.ToDictionary(c => c.Type, c => c.Value);
+
+        Assert.That(claims["userId"], Is.EqualTo(user.Id.ToString()));
+        Assert.That(claims["sid"], Is.EqualTo(sessionId.ToString()));
+        Assert.That(claims[ClaimTypes.Role], Is.EqualTo(expectedRole));
+        Assert.That(jwt.ValidTo, Is.GreaterThan(DateTime.UtcNow));
+    }
+    
+    [Test]
+    public async Task GenerateAccessTokenAsync_ShouldIncludeSessionIdAndRole()
+    {
+        // Arrange
+        var user = new User { Id = Guid.NewGuid(), Username = "TestUser" };
+        var sessionId = Guid.NewGuid();
+        var role = "Admin";
+        _invitesServiceMock.Setup(s => s.GetRoleAsync(user)).ReturnsAsync(role);
+
+        // Act
+        var token = await _jwtService.GenerateAccessTokenAsync(user, sessionId);
+        var handler = new JwtSecurityTokenHandler();
+        var jwt = handler.ReadJwtToken(token);
 
         // Assert
-        Assert.That(tokenString, Is.Not.Null.And.Not.Empty);
-        
-        // Attempt to parse the token to ensure it's a JWT
-        var handler = new JwtSecurityTokenHandler();
-        Assert.DoesNotThrow(() => handler.ReadJwtToken(tokenString));
+        var sidClaim = jwt.Claims.FirstOrDefault(c => c.Type == "sid");
+        var roleClaim = jwt.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Role);
+
+        Assert.That(sidClaim?.Value, Is.EqualTo(sessionId.ToString()));
+        Assert.That(roleClaim?.Value, Is.EqualTo(role));
     }
+
     
     [Test]
     public async Task GenerateRefreshTokenAsync_ReturnsValidRefreshToken()

Govor.Application.Tests/Services/UserSessions/UserSessionOpenerTests.cs

@@ -1,5 +1,4 @@
 using Govor.Application.Services.UserSessions;
-using Govor.Core.Models;
 using Govor.Core.Models.Users;
 using Govor.Core.Repositories.UserSessionsRepository;
 using Microsoft.Extensions.Logging;
@@ -19,6 +18,7 @@ public class UserSessionOpenerTests
     private IOptions<JwtRefreshOption> _options;
     private UserSessionOpener _service;
     private User _user;
+    private Guid _sessionId;
     private const string DeviceInfo = "Chrome on Windows";
     private const string GeneratedToken = "new-refresh-token";
     private const string NewAccessToken = "new-access-token";
@@ -30,8 +30,9 @@ public class UserSessionOpenerTests
         _jwtServiceMock = new Mock<IJwtService>();
         _loggerMock = new Mock<ILogger<UserSessionOpener>>();
         _options = Options.Create(new JwtRefreshOption { RefreshTokenLifetimeDays = 30 });
-
-        // Инициализируем пользователя ДО моков, чтобы не было null в Setup
+        
+        _sessionId = Guid.NewGuid();
+        
         _user = new User
         {
             Id = Guid.NewGuid(),
@@ -44,7 +45,7 @@ public class UserSessionOpenerTests
         };
 
         _jwtServiceMock.Setup(j => j.GenerateRefreshTokenAsync(_user)).ReturnsAsync(GeneratedToken);
-        _jwtServiceMock.Setup(j => j.GenerateAccessTokenAsync(_user)).ReturnsAsync(NewAccessToken);
+        _jwtServiceMock.Setup(j => j.GenerateAccessTokenAsync(_user, _sessionId)).ReturnsAsync(NewAccessToken);
 
         _service = new UserSessionOpener(
             _repositoryMock.Object,
@@ -60,6 +61,7 @@ public class UserSessionOpenerTests
         // Arrange 
         var session = new UserSession
         {
+            Id = _sessionId,
             UserId = _user.Id,
             DeviceInfo = DeviceInfo,
             RefreshToken = "valid-token",
@@ -87,6 +89,7 @@ public class UserSessionOpenerTests
         // Arrange 
         var session = new UserSession
         {
+            Id = _sessionId,
             UserId = _user.Id,
             DeviceInfo = DeviceInfo,
             RefreshToken = "old-token",
@@ -113,7 +116,8 @@ public class UserSessionOpenerTests
     {
         // Arrange 
         _repositoryMock.Setup(r => r.GetByUserIdAsync(_user.Id)).ReturnsAsync(new List<UserSession>());
-
+        _jwtServiceMock.Setup(j => j.GenerateAccessTokenAsync(_user, It.IsAny<Guid>())).ReturnsAsync(NewAccessToken);
+        
         // Act 
         var result = await _service.OpenSessionAsync(_user, DeviceInfo);
 
@@ -134,7 +138,8 @@ public class UserSessionOpenerTests
         _repositoryMock
             .Setup(r => r.GetByUserIdAsync(_user.Id))
             .ThrowsAsync(new Govor.Data.Repositories.Exceptions.NotFoundByKeyException<Guid>(_user.Id, "userId"));
-
+        _jwtServiceMock.Setup(j => j.GenerateAccessTokenAsync(_user, It.IsAny<Guid>())).ReturnsAsync(NewAccessToken);
+        
         // Act
         var result = await _service.OpenSessionAsync(_user, DeviceInfo);
 

Govor.Application.Tests/Services/UserSessions/UserSessionRefresherTests.cs

@@ -73,7 +73,7 @@ public class UserSessionRefresherTests
         // Arrange
         _sessionsRepoMock.Setup(r => r.GetByRefreshTokenAsync(OldRefreshToken)).ReturnsAsync(_session);
         _usersRepoMock.Setup(r => r.FindByIdAsync(_user.Id)).ReturnsAsync(_user);
-        _jwtServiceMock.Setup(j => j.GenerateAccessTokenAsync(_user)).ReturnsAsync(NewAccessToken);
+        _jwtServiceMock.Setup(j => j.GenerateAccessTokenAsync(_user, _session.Id)).ReturnsAsync(NewAccessToken);
         _jwtServiceMock.Setup(j => j.GenerateRefreshTokenAsync(_user)).ReturnsAsync(NewRefreshToken);
 
         // Act