Updeted Session Model and Session Opener Service

renamed RefreshToken in model to RefreshTokenHash - now we have a hash of token, not a token

Govor.API/Common/Extensions/ConfigurationProgramExtensions.cs

@@ -45,6 +45,7 @@ public static class ConfigurationProgramExtensions
     public static void AddServices(this IServiceCollection services)
     {
         services.AddScoped<IPasswordHasher, PasswordHasher>();
+        services.AddScoped<IJwtTokenHasher, JwtTokenHasher>();
         services.AddScoped<IJwtService, JwtService>();
         services.AddScoped<IAccountService, AuthService>();
         services.AddScoped<IUsersAdministration, UsersService>();

Govor.API/Controllers/ProfileController.cs

@@ -41,7 +41,6 @@ public class ProfileController : ControllerBase
         _mapper = mapper;
     }
     
-    [RequestSizeLimit(40_000)]
     [HttpPost("avatar")] // api/profile/avatar
     public async Task<IActionResult> UploadAvatar([FromForm] AvatarUploadRequest request)
     {
@@ -96,7 +95,7 @@ public class ProfileController : ControllerBase
         return ms.ToArray();
     }
     
-    [HttpGet("dowload/me")]
+    [HttpGet("download/me")]
     public async Task<IActionResult> DownloadProfile()
     {
         try

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

@@ -0,0 +1,51 @@
+using AutoFixture;
+using Govor.Application.Interfaces.Authentication;
+using Govor.Application.Services.Authentication;
+
+namespace Govor.Application.Tests.Services.Authentication;
+
+[TestFixture]
+public class JwtTokenHasherTests
+{
+    private IJwtTokenHasher _jwtTokenHasher;
+    private Fixture _fixture;
+    
+    [SetUp]
+    public void StarUp()
+    {
+        _fixture = new Fixture();
+        _jwtTokenHasher = new JwtTokenHasher();
+    }
+    
+    [Test]
+    public void Given_Token_When_Hash_Then_Hash_And_Verify_Then_Result_Should_Be_True()
+    {
+        // Arrange
+        string token = _fixture.Create<string>();
+        
+        // Act 
+        string hash = _jwtTokenHasher.HashToken(token);
+        
+        var result = _jwtTokenHasher.VerifyToken(token, hash);
+        
+        // Assert 
+        Assert.That(hash, Is.Not.EqualTo(token));
+        Assert.That(result, Is.True);
+    }
+
+    [Test]
+    public void Given_Token_NotToken_When_Hash_Should_Not_Be_True_Then_Result_Should_Be_False()
+    {
+        // Arrange 
+        string token = _fixture.Create<string>();
+        string notToken = _fixture.Create<string>();
+        
+        // Act 
+        string hash = _jwtTokenHasher.HashToken(token);
+        
+        var result = _jwtTokenHasher.VerifyToken(notToken, hash);
+        
+        // Assert 
+        Assert.That(result, Is.False);
+    }
+}

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

@@ -6,6 +6,7 @@ using Microsoft.Extensions.Options;
 using Moq;
 using Govor.Application.Interfaces.Authentication;
 using Govor.Application.Services.Authentication;
+using Govor.Data.Repositories.Exceptions;
 
 namespace Govor.Application.Tests.Services.UserSessions;
 
@@ -14,138 +15,141 @@ public class UserSessionOpenerTests
 {
     private Mock<IUserSessionsRepository> _repositoryMock;
     private Mock<IJwtService> _jwtServiceMock;
-    private Mock<ILogger<UserSessionOpener>> _loggerMock;
+    private Mock<IJwtTokenHasher> _jwtTokenHasherMock;
-    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 RefreshToken = "new-refresh-token";
-    private const string NewAccessToken = "new-access-token";
+    private const string AccessToken = "new-access-token";
+    private const string TokenHash = "hashed-refresh-token";
 
     [SetUp]
     public void Setup()
     {
         _repositoryMock = new Mock<IUserSessionsRepository>();
         _jwtServiceMock = new Mock<IJwtService>();
-        _loggerMock = new Mock<ILogger<UserSessionOpener>>();
+        var loggerMock = new Mock<ILogger<UserSessionOpener>>();
-        _options = Options.Create(new JwtRefreshOption { RefreshTokenLifetimeDays = 30 });
+        _jwtTokenHasherMock = new Mock<IJwtTokenHasher>();
-        
+        var options = Options.Create(new JwtRefreshOption { RefreshTokenLifetimeDays = 30 });
-        _sessionId = Guid.NewGuid();
         
         _user = new User
         {
             Id = Guid.NewGuid(),
             Username = "test",
-            PasswordHash = "hashed",
+            Description = "some description",
+            PasswordHash = "hashed-password",
             IconId = Guid.NewGuid(),
-            CreatedOn = DateOnly.FromDateTime(DateTime.UtcNow),
+            CreatedOn = DateOnly.FromDateTime(DateTime.Now),
-            WasOnline = DateTime.UtcNow,
+            WasOnline = DateTime.Now,
-            InviteId = Guid.NewGuid()
+            InviteId =  Guid.NewGuid(),
+            // ... 
         };
         
-        _jwtServiceMock.Setup(j => j.GenerateRefreshTokenAsync(_user)).ReturnsAsync(GeneratedToken);
+        _jwtServiceMock.Setup(j => j.GenerateRefreshTokenAsync(_user)).ReturnsAsync(RefreshToken);
-        _jwtServiceMock.Setup(j => j.GenerateAccessTokenAsync(_user, _sessionId)).ReturnsAsync(NewAccessToken);
+        _jwtTokenHasherMock.Setup(h => h.HashToken(RefreshToken)).Returns(TokenHash);
+        
+        _jwtServiceMock.Setup(j => j.GenerateAccessTokenAsync(_user, It.IsAny<Guid>())).ReturnsAsync(AccessToken);
+
 
         _service = new UserSessionOpener(
             _repositoryMock.Object,
             _jwtServiceMock.Object,
-            _options,
+            _jwtTokenHasherMock.Object,
-            _loggerMock.Object
+            options,
+            loggerMock.Object
         );
     }
     
+    // UpdateExistingSessionAsync
     [Test]
-    public async Task OpenSessionAsync_ShouldReturnExistingToken_IfSessionValid()
+    public async Task OpenSessionAsync_ShouldUpdateExistingSession_WhenFoundByDeviceInfo()
     {
         // Arrange 
-        var session = new UserSession
+        var existingSessionId = Guid.NewGuid();
+        var existingSession = new UserSession
         {
-            Id = _sessionId,
+            Id = existingSessionId,
             UserId = _user.Id,
             DeviceInfo = DeviceInfo,
-            RefreshToken = "valid-token",
+            RefreshTokenHash = "old-hash",
             CreatedAt = DateTime.UtcNow.AddDays(-10),
             ExpiresAt = DateTime.UtcNow.AddDays(10),
-            IsRevoked = false
+            IsRevoked = true
         };
 
-        _repositoryMock.Setup(r => r.GetByUserIdAsync(_user.Id)).ReturnsAsync(new List<UserSession> { session });
+        _repositoryMock.Setup(r => r.GetByUserIdAsync(_user.Id)).ReturnsAsync(new List<UserSession> { existingSession });
         
         // Act 
         var result = await _service.OpenSessionAsync(_user, DeviceInfo);
 
         // Assert 
-        Assert.That(result.refreshToken, Is.EqualTo(GeneratedToken));
+        Assert.Multiple(() =>
-        Assert.That(result.accessToken, Is.EqualTo(NewAccessToken));
+        {
+            Assert.That(result.refreshToken, Is.EqualTo(RefreshToken), "Должен быть возвращен новый RefreshToken.");
+            Assert.That(result.accessToken, Is.EqualTo(AccessToken), "Должен быть возвращен новый AccessToken.");
+        });
+        
         _repositoryMock.Verify(r => r.UpdateAsync(It.Is<UserSession>(s => 
-            s.RefreshToken == GeneratedToken &&
+            s.Id == existingSessionId &&
-            s.IsRevoked == false)), Times.Once);
+            s.RefreshTokenHash == TokenHash &&
+            s.IsRevoked == false && 
+            s.ExpiresAt > DateTime.UtcNow 
+        )), Times.Once, "Должен быть вызван метод UpdateAsync с новыми данными.");
+        
+        _repositoryMock.Verify(r => r.AddAsync(It.IsAny<UserSession>()), Times.Never);
     }
 
-    [Test]
+    // CreateNewSessionAsync
-    public async Task OpenSessionAsync_ShouldUpdateSession_IfExpiredOrRevoked()
-    {
-        // Arrange 
-        var session = new UserSession
-        {
-            Id = _sessionId,
-            UserId = _user.Id,
-            DeviceInfo = DeviceInfo,
-            RefreshToken = "old-token",
-            CreatedAt = DateTime.UtcNow.AddDays(-40),
-            ExpiresAt = DateTime.UtcNow.AddDays(-1),
-            IsRevoked = false
-        };
-
-        _repositoryMock.Setup(r => r.GetByUserIdAsync(_user.Id)).ReturnsAsync(new List<UserSession> { session });
-
-        // Act 
-        var result = await _service.OpenSessionAsync(_user, DeviceInfo);
-
-        // Assert 
-        Assert.That(result.refreshToken, Is.EqualTo(GeneratedToken));
-        Assert.That(result.accessToken, Is.EqualTo(NewAccessToken));
-        _repositoryMock.Verify(r => r.UpdateAsync(It.Is<UserSession>(s =>
-            s.RefreshToken == GeneratedToken &&
-            s.IsRevoked == false)), Times.Once);
-    }
     
     [Test]
-    public async Task OpenSessionAsync_ShouldCreateNewSession_IfNoneExists()
+    public async Task OpenSessionAsync_ShouldCreateNewSession_IfNoneFound()
     {
         // 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);
 
         // Assert 
-        Assert.That(result.refreshToken, Is.EqualTo(GeneratedToken));
+        Assert.Multiple(() =>
-        Assert.That(result.accessToken, Is.EqualTo(NewAccessToken));
+        {
+            Assert.That(result.refreshToken, Is.EqualTo(RefreshToken), "Должен быть возвращен новый RefreshToken.");
+            Assert.That(result.accessToken, Is.EqualTo(AccessToken), "Должен быть возвращен новый AccessToken.");
+        });
+        
         _repositoryMock.Verify(r => r.AddAsync(It.Is<UserSession>(s =>
             s.UserId == _user.Id &&
             s.DeviceInfo == DeviceInfo &&
-            s.RefreshToken == GeneratedToken
+            s.RefreshTokenHash == TokenHash &&
-        )), Times.Once);
+            s.IsRevoked == false
+        )), Times.Once, "Должен быть вызван метод AddAsync для создания новой сессии.");
+        
+        _repositoryMock.Verify(r => r.UpdateAsync(It.IsAny<UserSession>()), Times.Never);
     }
 
     [Test]
-    public async Task OpenSessionAsync_ShouldCreateNewSession_WhenNotFoundByKeyExceptionThrown()
+    public async Task OpenSessionAsync_ShouldCreateNewSession_WhenRepositoryThrowsNotFoundByKeyException()
     {
         // Arrange
         _repositoryMock
             .Setup(r => r.GetByUserIdAsync(_user.Id))
-            .ThrowsAsync(new Govor.Data.Repositories.Exceptions.NotFoundByKeyException<Guid>(_user.Id, "userId"));
+            .ThrowsAsync(new NotFoundByKeyException<Guid>(_user.Id, "userId")); 
-        _jwtServiceMock.Setup(j => j.GenerateAccessTokenAsync(_user, It.IsAny<Guid>())).ReturnsAsync(NewAccessToken);
         
         // Act
         var result = await _service.OpenSessionAsync(_user, DeviceInfo);
 
         // Assert 
-        Assert.That(result.refreshToken, Is.EqualTo(GeneratedToken));
+        Assert.Multiple(() =>
-        Assert.That(result.accessToken, Is.EqualTo(NewAccessToken));
+        {
-        _repositoryMock.Verify(r => r.AddAsync(It.IsAny<UserSession>()), Times.Once);
+            Assert.That(result.refreshToken, Is.EqualTo(RefreshToken), "Должен быть возвращен новый RefreshToken.");
+            Assert.That(result.accessToken, Is.EqualTo(AccessToken), "Должен быть возвращен новый AccessToken.");
+        });
+        
+        _repositoryMock.Verify(r => r.AddAsync(It.Is<UserSession>(s =>
+            s.RefreshTokenHash == TokenHash 
+        )), Times.Once, "Должен быть вызван AddAsync после перехвата исключения.");
+        
+        _repositoryMock.Verify(r => r.UpdateAsync(It.IsAny<UserSession>()), Times.Never);
     }
 }

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

@@ -58,7 +58,7 @@ public class UserSessionRefresherTests
 
         _session = new UserSession
         {
-            RefreshToken = OldRefreshToken,
+            RefreshTokenHash = OldRefreshToken,
             UserId = _user.Id,
             DeviceInfo = "Chrome",
             CreatedAt = DateTime.UtcNow.AddDays(-5),
@@ -71,7 +71,7 @@ public class UserSessionRefresherTests
     public async Task RefreshTokenAsync_ValidToken_ReturnsNewTokensAndCreatesNewSession()
     {
         // Arrange
-        _sessionsRepoMock.Setup(r => r.GetByRefreshTokenAsync(OldRefreshToken)).ReturnsAsync(_session);
+        _sessionsRepoMock.Setup(r => r.GetByHashedRefreshTokenAsync(OldRefreshToken)).ReturnsAsync(_session);
         _usersRepoMock.Setup(r => r.FindByIdAsync(_user.Id)).ReturnsAsync(_user);
         _jwtServiceMock.Setup(j => j.GenerateAccessTokenAsync(_user, _session.Id)).ReturnsAsync(NewAccessToken);
         _jwtServiceMock.Setup(j => j.GenerateRefreshTokenAsync(_user)).ReturnsAsync(NewRefreshToken);
@@ -87,7 +87,7 @@ public class UserSessionRefresherTests
         _sessionsRepoMock.Verify(r => r.UpdateAsync(_session), Times.Once);
         _sessionsRepoMock.Verify(r => r.AddAsync(It.Is<UserSession>(s =>
             s.UserId == _user.Id &&
-            s.RefreshToken == NewRefreshToken &&
+            s.RefreshTokenHash == NewRefreshToken &&
             s.DeviceInfo == _session.DeviceInfo)), Times.Once);
     }
 
@@ -96,7 +96,7 @@ public class UserSessionRefresherTests
     {
         // Arrange
         _session.IsRevoked = true;
-        _sessionsRepoMock.Setup(r => r.GetByRefreshTokenAsync(OldRefreshToken)).ReturnsAsync(_session);
+        _sessionsRepoMock.Setup(r => r.GetByHashedRefreshTokenAsync(OldRefreshToken)).ReturnsAsync(_session);
         
         // Act & Assert 
         var ex = Assert.ThrowsAsync<UnauthorizedAccessException>(async () =>
@@ -110,7 +110,7 @@ public class UserSessionRefresherTests
     {
         // Arrange 
         _session.ExpiresAt = DateTime.UtcNow.AddMinutes(-1);
-        _sessionsRepoMock.Setup(r => r.GetByRefreshTokenAsync(OldRefreshToken)).ReturnsAsync(_session);
+        _sessionsRepoMock.Setup(r => r.GetByHashedRefreshTokenAsync(OldRefreshToken)).ReturnsAsync(_session);
         
         // Act & Assert 
         var ex = Assert.ThrowsAsync<UnauthorizedAccessException>(async () =>
@@ -123,7 +123,7 @@ public class UserSessionRefresherTests
     public void RefreshTokenAsync_TokenNotFound_ThrowsUnauthorizedAccessException()
     {
         // Arrange 
-        _sessionsRepoMock.Setup(r => r.GetByRefreshTokenAsync(OldRefreshToken))
+        _sessionsRepoMock.Setup(r => r.GetByHashedRefreshTokenAsync(OldRefreshToken))
             .ThrowsAsync(new NotFoundByKeyException<string>("token", OldRefreshToken));
         // Act & Assert 
         var ex = Assert.ThrowsAsync<UnauthorizedAccessException>(async () =>

Govor.Application/Interfaces/Authentication/IJwtTokenHasher.cs

@@ -0,0 +1,7 @@
+namespace Govor.Application.Interfaces.Authentication;
+
+public interface IJwtTokenHasher
+{
+    string HashToken(string token);
+    bool VerifyToken(string token, string storedHash);
+}

Govor.Application/Services/Authentication/JwtTokenHasher.cs

@@ -0,0 +1,16 @@
+using Govor.Application.Interfaces.Authentication;
+
+namespace Govor.Application.Services.Authentication;
+
+public class JwtTokenHasher : IJwtTokenHasher
+{
+    public string HashToken(string token)
+    {
+        return BCrypt.Net.BCrypt.HashPassword(token, workFactor: 13);
+    }
+
+    public bool VerifyToken(string token, string storedHash)
+    {
+        return BCrypt.Net.BCrypt.Verify(token, storedHash);
+    }
+}

Govor.Application/Services/UserSessions/UserSessionOpener.cs

@@ -7,23 +7,26 @@ using Govor.Data.Repositories.Exceptions;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-namespace Govor.Application.Services.UserSessions
+namespace Govor.Application.Services.UserSessions;
+
+public class UserSessionOpener : IUserSessionOpener
 {
-    public class UserSessionOpener : IUserSessionOpener
-    {
     private readonly IUserSessionsRepository _repository;
     private readonly ILogger<UserSessionOpener> _logger;
+    private readonly IJwtTokenHasher _jwtTokenHasher;
     private readonly JwtRefreshOption _options;
     private readonly IJwtService _jwtService;
     
     public UserSessionOpener(
         IUserSessionsRepository repository,
         IJwtService jwtService,
+        IJwtTokenHasher jwtTokenHasher,
         IOptions<JwtRefreshOption> options,
         ILogger<UserSessionOpener> logger)
     {
         _jwtService = jwtService;
         _repository = repository;
+        _jwtTokenHasher = jwtTokenHasher;
         _logger = logger;
         _options = options.Value;
     }
@@ -35,15 +38,27 @@ namespace Govor.Application.Services.UserSessions
         try
         {
             var sessions = await _repository.GetByUserIdAsync(user.Id);
-                var session = sessions.FirstOrDefault(s => s.DeviceInfo == deviceInfo);
+            var existingSession = sessions.FirstOrDefault(s => s.DeviceInfo == deviceInfo);
 
-                if (session is not null)
+            if (existingSession is not null)
+                return await UpdateExistingSessionAsync(user, deviceInfo, existingSession);
+        }
+        catch (NotFoundByKeyException<Guid> ex)
         {
-                    var newExpiresAt = DateTime.UtcNow.AddDays(_options.RefreshTokenLifetimeDays);
-                    var accessToken = await _jwtService.GenerateAccessTokenAsync(user, session.Id);
-                    var newRefreshToken = await _jwtService.GenerateRefreshTokenAsync(user);
            
-                    session.RefreshToken = newRefreshToken;
+        }
+        
+        return await CreateNewSessionAsync(user, deviceInfo);
+    }
+    
+    private async Task<RefreshResult> UpdateExistingSessionAsync(User user, string deviceInfo, UserSession session)
+    {
+        var (accessToken, refreshToken) = await GenerateTokensAsync(user, session.Id);
+
+        var newTokenHash = _jwtTokenHasher.HashToken(refreshToken);
+        var newExpiresAt = DateTime.UtcNow.AddDays(_options.RefreshTokenLifetimeDays);
+
+        session.RefreshTokenHash = newTokenHash;
         session.ExpiresAt = newExpiresAt;
         session.CreatedAt = DateTime.UtcNow;
         session.IsRevoked = false;
@@ -51,29 +66,22 @@ namespace Govor.Application.Services.UserSessions
         await _repository.UpdateAsync(session);
         _logger.LogInformation($"Updated session for user {user.Id} on device '{deviceInfo}'");
         
-                    return new RefreshResult(session.RefreshToken, accessToken);
+        return new RefreshResult(refreshToken, accessToken);
     }
 
-                return await OpenNewSession();
+    private async Task<RefreshResult> CreateNewSessionAsync(User user, string deviceInfo)
-            }
-            catch (NotFoundByKeyException<Guid> ex)
-            {
-                return await OpenNewSession();
-            }
-        
-            async Task<RefreshResult> OpenNewSession()
     {
         var sessionId = Guid.NewGuid();
+        var (accessToken, refreshToken) = await GenerateTokensAsync(user, sessionId);
 
-                var accessToken = await _jwtService.GenerateAccessTokenAsync(user, sessionId);
+        var refreshTokenHash = _jwtTokenHasher.HashToken(refreshToken);
-                var refreshToken = await _jwtService.GenerateRefreshTokenAsync(user);
 
         var newSession = new UserSession
         {
             Id = sessionId,
             UserId = user.Id,
             DeviceInfo = deviceInfo,
-                    RefreshToken = refreshToken,
+            RefreshTokenHash = refreshTokenHash,
             CreatedAt = DateTime.UtcNow,
             ExpiresAt = DateTime.UtcNow.AddDays(_options.RefreshTokenLifetimeDays),
             IsRevoked = false
@@ -86,7 +94,10 @@ namespace Govor.Application.Services.UserSessions
         return new RefreshResult(refreshToken, accessToken);
     }
     
-        }
+    private async Task<(string accessToken, string refreshToken)> GenerateTokensAsync(User user, Guid sessionId)
+    {
+        var accessToken = await _jwtService.GenerateAccessTokenAsync(user, sessionId);
+        var refreshToken = await _jwtService.GenerateRefreshTokenAsync(user);
+        return (accessToken, refreshToken);
     }
 }
-

Govor.Application/Services/UserSessions/UserSessionRefresher.cs

@@ -36,7 +36,7 @@ public class UserSessionRefresher : IUserSessionRefresher
     {
         try
         {
-            var session = await _sessionsRepository.GetByRefreshTokenAsync(refreshToken);
+            var session = await _sessionsRepository.GetByHashedRefreshTokenAsync(refreshToken);
 
             if (session.IsRevoked || session.ExpiresAt <= DateTime.UtcNow)
                 throw new UnauthorizedAccessException("Refresh token is invalid or expired");
@@ -55,7 +55,7 @@ public class UserSessionRefresher : IUserSessionRefresher
             var newSession = new UserSession
             {
                 UserId = user.Id,
-                RefreshToken = newRefreshToken,
+                RefreshTokenHash = newRefreshToken,
                 DeviceInfo = session.DeviceInfo,
                 CreatedAt = DateTime.UtcNow,
                 ExpiresAt = DateTime.UtcNow.AddDays(_options.RefreshTokenLifetimeDays)

Govor.Core/Models/Users/UserSession.cs

@@ -6,7 +6,7 @@ public class UserSession
 {
     public Guid Id { get; set; } = Guid.NewGuid();
     public Guid UserId { get; set; }
-    public string RefreshToken { get; set; } = string.Empty;
+    public string RefreshTokenHash { get; set; } = string.Empty;
     public string DeviceInfo { get; set; } = string.Empty; // "Chrome on Windows" 
     public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
     public DateTime ExpiresAt { get; set; }
@@ -21,7 +21,7 @@ public class UserSession
         
         return Id == userSession.Id &&
                UserId == userSession.UserId &&
-               RefreshToken == userSession.RefreshToken &&
+               RefreshTokenHash == userSession.RefreshTokenHash &&
                DeviceInfo == userSession.DeviceInfo &&
                CreatedAt == userSession.CreatedAt &&
                ExpiresAt == userSession.ExpiresAt &&

Govor.Core/Repositories/UserSessionsRepository/IUserSessionsExist.cs

@@ -5,6 +5,6 @@ namespace Govor.Core.Repositories.UserSessionsRepository;
 public interface IUserSessionsExist
 {
     public bool Exist(Guid sessionId);
-    public bool Exist(string refresh);
+    public bool Exist(string hashedToken);
     public bool Exist(UserSession userSession);
 }

Govor.Core/Repositories/UserSessionsRepository/IUserSessionsReader.cs

@@ -10,5 +10,5 @@ public interface IUserSessionsReader
     public Task<List<UserSession>> GetByCreatedAtAsync(DateTime createdAt);
     public Task<List<UserSession>> GetByExpiresAtAsync(DateTime createdAt);
     public Task<List<UserSession>> GetByRevokedAsync(bool isRevoked);
-    public Task<UserSession> GetByRefreshTokenAsync(string refreshToken);
+    public Task<UserSession> GetByHashedRefreshTokenAsync(string hash);
 }

Govor.Data.Tests/Repositories/UserSessionsRepositoryTests.cs

@@ -212,7 +212,7 @@ public class UserSessionsRepositoryTests
             .With(f => f.IsRevoked, true)
             .CreateMany(random.Next(2, 10)).ToList();
         
-        var token = sessions.First().RefreshToken;
+        var token = sessions.First().RefreshTokenHash;
         
         await using var context = new GovorDbContext(_options);
         var repository = new UserSessionsRepository(context);
@@ -221,7 +221,7 @@ public class UserSessionsRepositoryTests
         await context.SaveChangesAsync();
         
         // Act 
-        var result = await repository.GetByRefreshTokenAsync(token);
+        var result = await repository.GetByHashedRefreshTokenAsync(token);
         
         // Assert 
         Assert.That(result, Is.Not.Null);
@@ -235,7 +235,7 @@ public class UserSessionsRepositoryTests
         using var context = new GovorDbContext(_options);
         var repository = new UserSessionsRepository(context);
         // Act & Assert 
-        Assert.ThrowsAsync<NotFoundByKeyException<string>>(async () => await repository.GetByRefreshTokenAsync(_fixture.Create<string>()));
+        Assert.ThrowsAsync<NotFoundByKeyException<string>>(async () => await repository.GetByHashedRefreshTokenAsync(_fixture.Create<string>()));
     }
     
     [Test]
@@ -281,7 +281,7 @@ public class UserSessionsRepositoryTests
         // Act 
         var result1 = repository.Exist(session);
         var result2 = repository.Exist(session.Id);
-        var result3 = repository.Exist(session.RefreshToken);
+        var result3 = repository.Exist(session.RefreshTokenHash);
         
         // Assert 
         Assert.That(result1, Is.True);
@@ -301,7 +301,7 @@ public class UserSessionsRepositoryTests
         // Act 
         var result1 = repository.Exist(session);
         var result2 = repository.Exist(session.Id);
-        var result3 = repository.Exist(session.RefreshToken);
+        var result3 = repository.Exist(session.RefreshTokenHash);
         // Assert 
         Assert.That(result1, Is.False);
         Assert.That(result2, Is.False);

Govor.Data/Configurations/UserSessionConfiguration.cs

@@ -12,7 +12,7 @@ public class UserSessionConfiguration : IEntityTypeConfiguration<UserSession>
     {
         builder.HasKey(us => us.Id);
 
-        builder.Property(us => us.RefreshToken)
+        builder.Property(us => us.RefreshTokenHash)
             .IsRequired();
 
         builder.Property(us => us.DeviceInfo)

Govor.Data/Migrations/20251214065852_update_sessions_model.Designer.cs

@@ -0,0 +1,774 @@
+// <auto-generated />
+using System;
+using Govor.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace Govor.Data.Migrations
+{
+    [DbContext(typeof(GovorDbContext))]
+    [Migration("20251214065852_update_sessions_model")]
+    partial class update_sessions_model
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.6")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Govor.Core.Models.ChatGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("character varying(500)");
+
+                    b.Property<Guid>("ImageId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsChannel")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsPrivate")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ChatGroups");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Friendship", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AddresseeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("RequesterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AddresseeId");
+
+                    b.HasIndex("RequesterId");
+
+                    b.ToTable("Friendships");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.GroupAdmins", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.ToTable("GroupAdmins");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.GroupInvitation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("character varying(500)");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("InvitationCode")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<int>("MaxParticipants")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("UserMakerId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.HasIndex("UserMakerId");
+
+                    b.ToTable("GroupInvitations");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.GroupMembership", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("InvitationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsBanned")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime>("MemberSince")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.HasIndex("InvitationId");
+
+                    b.ToTable("GroupMemberships");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Invitation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Code")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsAdmin")
+                        .HasColumnType("boolean");
+
+                    b.Property<int>("MaxParticipants")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Invitations");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.MediaFile", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("MediaType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("MineType")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<Guid?>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("OwnerType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("UploaderId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Url")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MediaFiles");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Messages.MediaAttachments", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("MediaFileId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("MessageId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MediaFileId");
+
+                    b.HasIndex("MessageId");
+
+                    b.ToTable("MediaAttachments");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Messages.Message", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ChatGroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("EditedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("EncryptedContent")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsEdited")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("PrivateChatId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("RecipientId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("RecipientType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("ReplyToMessageId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("SenderId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("SentAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChatGroupId");
+
+                    b.HasIndex("PrivateChatId");
+
+                    b.ToTable("Messages");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Messages.MessageReaction", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("MessageId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("ReactedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("ReactionCode")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.HasIndex("MessageId", "UserId")
+                        .IsUnique();
+
+                    b.ToTable("MessageReactions");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Messages.MessageView", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("MessageId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("ViewedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MessageId", "UserId")
+                        .IsUnique();
+
+                    b.ToTable("MessageViews");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.PrivateChat", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("UserAId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("UserBId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PrivateChats");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Users.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("UserId");
+
+                    b.ToTable("Admins");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Users.Crypto.OneTimePreKey", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsUsed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false);
+
+                    b.Property<byte[]>("PublicKey")
+                        .IsRequired()
+                        .HasColumnType("bytea");
+
+                    b.Property<DateTime>("UploadedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid>("UserCryptoSessionId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UploadedAt");
+
+                    b.HasIndex("UserCryptoSessionId", "IsUsed");
+
+                    b.ToTable("OneTimePreKeys");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Users.Crypto.SignedPreKey", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<byte[]>("PublicSignedPreKey")
+                        .IsRequired()
+                        .HasColumnType("bytea");
+
+                    b.Property<byte[]>("SignedPreKeySignature")
+                        .IsRequired()
+                        .HasColumnType("bytea");
+
+                    b.Property<Guid>("UserCryptoSessionId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserCryptoSessionId")
+                        .IsUnique();
+
+                    b.ToTable("SignedPreKeys");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Users.Crypto.UserCryptoSession", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<byte[]>("PublicIdentityKey")
+                        .IsRequired()
+                        .HasColumnType("bytea");
+
+                    b.Property<Guid>("UserSessionId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserSessionId")
+                        .IsUnique();
+
+                    b.ToTable("UserCryptoSessions");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Users.User", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateOnly>("CreatedOn")
+                        .HasColumnType("date");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(500)
+                        .HasColumnType("character varying(500)");
+
+                    b.Property<Guid>("IconId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("InviteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("PasswordHash")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("Username")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime>("WasOnline")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InviteId");
+
+                    b.HasIndex("Username")
+                        .IsUnique();
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Users.UserSession", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("DeviceInfo")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<DateTime>("ExpiresAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<bool>("IsRevoked")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("RefreshTokenHash")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("UserSessions");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Friendship", b =>
+                {
+                    b.HasOne("Govor.Core.Models.Users.User", "Addressee")
+                        .WithMany("ReceivedFriendRequests")
+                        .HasForeignKey("AddresseeId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Govor.Core.Models.Users.User", "Requester")
+                        .WithMany("SentFriendRequests")
+                        .HasForeignKey("RequesterId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Addressee");
+
+                    b.Navigation("Requester");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.GroupAdmins", b =>
+                {
+                    b.HasOne("Govor.Core.Models.ChatGroup", null)
+                        .WithMany("Admins")
+                        .HasForeignKey("GroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.GroupInvitation", b =>
+                {
+                    b.HasOne("Govor.Core.Models.ChatGroup", null)
+                        .WithMany("InviteCodes")
+                        .HasForeignKey("GroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Govor.Core.Models.Users.User", "UserMaker")
+                        .WithMany()
+                        .HasForeignKey("UserMakerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("UserMaker");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.GroupMembership", b =>
+                {
+                    b.HasOne("Govor.Core.Models.ChatGroup", null)
+                        .WithMany("Members")
+                        .HasForeignKey("GroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Govor.Core.Models.GroupInvitation", null)
+                        .WithMany()
+                        .HasForeignKey("InvitationId")
+                        .OnDelete(DeleteBehavior.SetNull);
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Messages.MediaAttachments", b =>
+                {
+                    b.HasOne("Govor.Core.Models.MediaFile", "MediaFile")
+                        .WithMany()
+                        .HasForeignKey("MediaFileId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Govor.Core.Models.Messages.Message", "Message")
+                        .WithMany("MediaAttachments")
+                        .HasForeignKey("MessageId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("MediaFile");
+
+                    b.Navigation("Message");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Messages.Message", b =>
+                {
+                    b.HasOne("Govor.Core.Models.ChatGroup", null)
+                        .WithMany("Messages")
+                        .HasForeignKey("ChatGroupId");
+
+                    b.HasOne("Govor.Core.Models.PrivateChat", null)
+                        .WithMany("Messages")
+                        .HasForeignKey("PrivateChatId");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Messages.MessageReaction", b =>
+                {
+                    b.HasOne("Govor.Core.Models.Messages.Message", "Message")
+                        .WithMany("Reactions")
+                        .HasForeignKey("MessageId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Govor.Core.Models.Users.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Message");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Messages.MessageView", b =>
+                {
+                    b.HasOne("Govor.Core.Models.Messages.Message", null)
+                        .WithMany("MessageViews")
+                        .HasForeignKey("MessageId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Users.Admin", b =>
+                {
+                    b.HasOne("Govor.Core.Models.Users.User", "User")
+                        .WithOne()
+                        .HasForeignKey("Govor.Core.Models.Users.Admin", "UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Users.Crypto.OneTimePreKey", b =>
+                {
+                    b.HasOne("Govor.Core.Models.Users.Crypto.UserCryptoSession", "UserCryptoSession")
+                        .WithMany("OneTimePreKeys")
+                        .HasForeignKey("UserCryptoSessionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("UserCryptoSession");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Users.Crypto.SignedPreKey", b =>
+                {
+                    b.HasOne("Govor.Core.Models.Users.Crypto.UserCryptoSession", "UserCryptoSession")
+                        .WithOne("SignedPreKey")
+                        .HasForeignKey("Govor.Core.Models.Users.Crypto.SignedPreKey", "UserCryptoSessionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("UserCryptoSession");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Users.Crypto.UserCryptoSession", b =>
+                {
+                    b.HasOne("Govor.Core.Models.Users.UserSession", "UserSession")
+                        .WithOne("CryptoSession")
+                        .HasForeignKey("Govor.Core.Models.Users.Crypto.UserCryptoSession", "UserSessionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("UserSession");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Users.User", b =>
+                {
+                    b.HasOne("Govor.Core.Models.Invitation", "Invite")
+                        .WithMany("Users")
+                        .HasForeignKey("InviteId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Invite");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Users.UserSession", b =>
+                {
+                    b.HasOne("Govor.Core.Models.Users.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.ChatGroup", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("InviteCodes");
+
+                    b.Navigation("Members");
+
+                    b.Navigation("Messages");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Invitation", b =>
+                {
+                    b.Navigation("Users");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Messages.Message", b =>
+                {
+                    b.Navigation("MediaAttachments");
+
+                    b.Navigation("MessageViews");
+
+                    b.Navigation("Reactions");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.PrivateChat", b =>
+                {
+                    b.Navigation("Messages");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Users.Crypto.UserCryptoSession", b =>
+                {
+                    b.Navigation("OneTimePreKeys");
+
+                    b.Navigation("SignedPreKey")
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Users.User", b =>
+                {
+                    b.Navigation("ReceivedFriendRequests");
+
+                    b.Navigation("SentFriendRequests");
+                });
+
+            modelBuilder.Entity("Govor.Core.Models.Users.UserSession", b =>
+                {
+                    b.Navigation("CryptoSession")
+                        .IsRequired();
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Govor.Data/Migrations/20251214065852_update_sessions_model.cs

@@ -0,0 +1,94 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Govor.Data.Migrations
+{
+    /// <inheritdoc />
+    public partial class update_sessions_model : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "RefreshToken",
+                table: "UserSessions",
+                newName: "RefreshTokenHash");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Username",
+                table: "Users",
+                type: "character varying(50)",
+                maxLength: 50,
+                nullable: false,
+                oldClrType: typeof(string),
+                oldType: "text");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "PasswordHash",
+                table: "Users",
+                type: "character varying(128)",
+                maxLength: 128,
+                nullable: false,
+                oldClrType: typeof(string),
+                oldType: "text");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Description",
+                table: "Users",
+                type: "character varying(500)",
+                maxLength: 500,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "text");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Users_Username",
+                table: "Users",
+                column: "Username",
+                unique: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_Users_Username",
+                table: "Users");
+
+            migrationBuilder.RenameColumn(
+                name: "RefreshTokenHash",
+                table: "UserSessions",
+                newName: "RefreshToken");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Username",
+                table: "Users",
+                type: "text",
+                nullable: false,
+                oldClrType: typeof(string),
+                oldType: "character varying(50)",
+                oldMaxLength: 50);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "PasswordHash",
+                table: "Users",
+                type: "text",
+                nullable: false,
+                oldClrType: typeof(string),
+                oldType: "character varying(128)",
+                oldMaxLength: 128);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Description",
+                table: "Users",
+                type: "text",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "character varying(500)",
+                oldMaxLength: 500,
+                oldNullable: true);
+        }
+    }
+}

Govor.Data/Migrations/GovorDbContextModelSnapshot.cs

@@ -468,8 +468,8 @@ namespace Govor.Data.Migrations
                         .HasColumnType("date");
 
                     b.Property<string>("Description")
-                        .IsRequired()
+                        .HasMaxLength(500)
-                        .HasColumnType("text");
+                        .HasColumnType("character varying(500)");
 
                     b.Property<Guid>("IconId")
                         .HasColumnType("uuid");
@@ -479,11 +479,13 @@ namespace Govor.Data.Migrations
 
                     b.Property<string>("PasswordHash")
                         .IsRequired()
-                        .HasColumnType("text");
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
 
                     b.Property<string>("Username")
                         .IsRequired()
-                        .HasColumnType("text");
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
 
                     b.Property<DateTime>("WasOnline")
                         .HasColumnType("timestamp with time zone");
@@ -492,6 +494,9 @@ namespace Govor.Data.Migrations
 
                     b.HasIndex("InviteId");
 
+                    b.HasIndex("Username")
+                        .IsUnique();
+
                     b.ToTable("Users");
                 });
 
@@ -515,7 +520,7 @@ namespace Govor.Data.Migrations
                     b.Property<bool>("IsRevoked")
                         .HasColumnType("boolean");
 
-                    b.Property<string>("RefreshToken")
+                    b.Property<string>("RefreshTokenHash")
                         .IsRequired()
                         .HasColumnType("text");
 

Govor.Data/Repositories/UserSessionsRepository.cs

@@ -62,12 +62,12 @@ public class UserSessionsRepository : IUserSessionsRepository
             .ToListOrThrowIfEmpty(new NotFoundByKeyException<bool>(isRevoked, "Sessions is revoked does not exist"));
     }
 
-    public async Task<UserSession> GetByRefreshTokenAsync(string refreshToken)
+    public async Task<UserSession> GetByHashedRefreshTokenAsync(string hash)
     {
         return await _context.UserSessions
             .AsNoTracking()
-            .FirstOrDefaultAsync(session => session.RefreshToken == refreshToken)
+            .FirstOrDefaultAsync(session => session.RefreshTokenHash == hash)
-                ?? throw new NotFoundByKeyException<string>(refreshToken, "Session with given refresh token does not exist");
+                ?? throw new NotFoundByKeyException<string>(hash, "Session with given refresh token does not exist");
     }
 
     public async Task AddAsync(UserSession userSession)
@@ -93,7 +93,7 @@ public class UserSessionsRepository : IUserSessionsRepository
                 .Where(u => u.Id == userSession.Id)
                 .ExecuteUpdateAsync(u => u
                     .SetProperty(a => a.UserId, userSession.UserId)
-                    .SetProperty(u => u.RefreshToken, userSession.RefreshToken)
+                    .SetProperty(u => u.RefreshTokenHash, userSession.RefreshTokenHash)
                     .SetProperty(u => u.DeviceInfo, userSession.DeviceInfo)
                     .SetProperty(u => u.CreatedAt, userSession.CreatedAt)
                     .SetProperty(u => u.ExpiresAt, userSession.ExpiresAt)
@@ -154,15 +154,15 @@ public class UserSessionsRepository : IUserSessionsRepository
         return _context.UserSessions.Any(session => session.Id == sessionId);
     }
 
-    public bool Exist(string refresh)
+    public bool Exist(string hashedToken)
     {
-        return _context.UserSessions.Any(session => session.RefreshToken == refresh);
+        return _context.UserSessions.Any(session => session.RefreshTokenHash == hashedToken);
     }
 
     public bool Exist(UserSession userSession)
     {
         return _context.UserSessions.Any(session => session.Id == userSession.Id &&
-                                                    session.RefreshToken == userSession.RefreshToken &&
+                                                    session.RefreshTokenHash == userSession.RefreshTokenHash &&
                                                     session.IsRevoked == userSession.IsRevoked &&
                                                     session.CreatedAt == userSession.CreatedAt &&
                                                     session.ExpiresAt == userSession.ExpiresAt &&