Merge branch 'main' into android

backend/Tests/Users/UnitTests/UpdateProfileCommandHandlerTests.cs

@@ -1,13 +1,13 @@
 using FluentAssertions;
 using Knot.Modules.Profiles.Application.Profiles.UpdateProfile;
+using Knot.Modules.Profiles.Domain;
 using Knot.Shared.Kernel;
 using NSubstitute;
 using Xunit;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Knot.Contracts.Profiles.Domain;
-using Knot.Contracts.Profiles.Application.DTOs;
+using Knot.Modules.Profiles.Application.Abstractions;
 
 namespace Knot.Modules.Profiles.UnitTests;
 
@@ -25,11 +25,14 @@ public class UpdateProfileCommandHandlerTests
     [Fact]
     public async Task Handle_ShouldReturnError_WhenProfileNotFound()
     {
-        var command = new UpdateProfileCommand(Guid.NewGuid(), "FirstName", "Bio", null, null);
-        _profileRepository.GetAsync(command.UserId, Arg.Any<CancellationToken>()).Returns((UserProfileDto?)null);
+        // Arrange
+        var command = new UpdateProfileCommand(Guid.NewGuid(), "FirstName", "Bio", null);
+        _profileRepository.GetByIdAsync(command.UserId, Arg.Any<CancellationToken>()).Returns((ProfileDocument?)null);
 
+        // Act
         var result = await _handler.Handle(command, CancellationToken.None);
 
+        // Assert
         result.IsFailure.Should().BeTrue();
     }
 }

backend/src/Contracts/Auth/Application/Abstractions/IJwtTokenProvider.cs

@@ -4,6 +4,7 @@ public interface IJwtTokenProvider
 {
     string GenerateAccessToken(Guid userId, string username);
     string GenerateRefreshToken();
+    DateTime GetRefreshTokenExpiry();
     string Generate(Guid userId, string username, string displayName, string? avatar);
     string Generate(Domain.UserContract user);
 }

backend/src/Contracts/Auth/Application/Auth/DTOs/AuthErrors.cs

@@ -7,8 +7,7 @@ public static class AuthErrors
     public static Error IdentityInvalidCredentials => new("Auth.InvalidCredentials", "Invalid credentials");
     public static Error IdentityRegistrationDisabled => new("Auth.RegistrationDisabled", "Registration is disabled");
     public static Error IdentityUsernameNotUnique => new("Auth.UsernameNotUnique", "Username is already taken");
+    public static Error IdentityRegistrationFailed => new("Auth.RegistrationFailed", "Failed to register user");
+    public static Error RefreshTokenExpired => new("Auth.RefreshTokenExpired", "Refresh token has expired. Please login again.");
     public static Error UserNotFound => new("Auth.UserNotFound", "User not found");
-    public static Error PasswordConfirmationMismatch => new("Auth.PasswordConfirmationMismatch", "Passwords do not match");
-    public static Error PasswordTooShort => new("Auth.PasswordTooShort", "Password must be at least 8 characters");
-    public static Error OldPasswordInvalid => new("Auth.OldPasswordInvalid", "Current password is incorrect");
 }

backend/src/Contracts/Auth/Domain/UserContract.cs

@@ -19,4 +19,12 @@ public class UserContract
     public bool IsExternal { get; set; }
     public string? Domain { get; set; }
     public DateTime? LastSeen { get; set; }
+    public string? RefreshToken { get; set; }
+    public DateTime? RefreshTokenExpiry { get; set; }
+
+    public void SetRefreshToken(string? refreshToken, DateTime? expiry = null)
+    {
+        RefreshToken = refreshToken;
+        RefreshTokenExpiry = expiry;
+    }
 }

backend/src/Contracts/Profiles/Application/DTOs/ProfilesErrors.cs

@@ -9,8 +9,4 @@ public static class ProfilesErrors
     public static Error AvatarNotFound => new("Profiles.AvatarNotFound", "Avatar not found");
     public static Error InvalidAvatarFormat => new("Profiles.InvalidAvatarFormat", "Invalid avatar format");
     public static Error AvatarUploadFailed => new("Profiles.AvatarUploadFailed", "Avatar upload failed");
-    public static Error BioTooLong => new("Profiles.BioTooLong", "Bio must be 200 characters or less");
-    public static Error StatusTextTooLong => new("Profiles.StatusTextTooLong", "Status text must be 50 characters or less");
-    public static Error StatusEmpty => new("Statuses.Empty", "Status emoji or text is required");
-    public static Error InvalidPreset => new("Statuses.InvalidPreset", "Unknown status preset");
 }

backend/src/Contracts/Profiles/Application/DTOs/StatusPresetDto.cs

@@ -1,9 +0,0 @@
-namespace Knot.Contracts.Profiles.Application.DTOs;
-
-public sealed class StatusPresetDto
-{
-    public string Id { get; set; } = "";
-    public string Emoji { get; set; } = "";
-    public string TextRu { get; set; } = "";
-    public string TextEn { get; set; } = "";
-}

backend/src/Contracts/Profiles/Application/DTOs/UserProfileDto.cs

@@ -12,13 +12,5 @@ public class UserProfileDto
     public DateTime? LastSeen { get; set; }
     public DateTime? Birthday { get; set; }
     public bool IsPremium { get; set; }
-    public UserStatusDto? Status { get; set; }
-
-    public Guid? CurrentStatusId { get; set; }
-
-    public string? StatusText { get; set; }
-    public string? StatusEmoji { get; set; }
-    public DateTime? StatusExpiresAt { get; set; }
-    public bool IsInvisible { get; set; }
     public DateTime CreatedAt { get; set; }
 }

backend/src/Contracts/Profiles/Application/DTOs/UserStatusDto.cs

@@ -1,11 +0,0 @@
-namespace Knot.Contracts.Profiles.Application.DTOs;
-
-public sealed class UserStatusDto
-{
-    public Guid Id { get; set; }
-    public string Type { get; set; } = "Custom";
-    public string Emoji { get; set; } = "";
-    public string Text { get; set; } = "";
-    public DateTime CreatedAt { get; set; }
-    public DateTime? ExpiresAt { get; set; }
-}

backend/src/Contracts/Profiles/Domain/IProfileStatusWriter.cs

@@ -1,11 +0,0 @@
-using Knot.Contracts.Profiles.Application.DTOs;
-using Knot.Shared.Kernel;
-
-namespace Knot.Contracts.Profiles.Domain;
-
-public interface IProfileStatusWriter
-{
-    Task<Result<UserProfileDto>> SetCustomAsync(Guid userId, string emoji, string text, DateTime? expiresAt, string? presetKey, CancellationToken cancellationToken = default);
-
-    Task<Result<UserProfileDto>> ClearAsync(Guid userId, CancellationToken cancellationToken = default);
-}

backend/src/Contracts/Profiles/Domain/IUserStatusRepository.cs

@@ -1,14 +0,0 @@
-using Knot.Contracts.Profiles.Application.DTOs;
-
-namespace Knot.Contracts.Profiles.Domain;
-
-public interface IUserStatusRepository
-{
-    Task<UserStatusDto?> GetByIdAsync(Guid id, CancellationToken cancellationToken = default);
-
-    Task<IReadOnlyDictionary<Guid, UserStatusDto>> GetByIdsAsync(IEnumerable<Guid> ids, CancellationToken cancellationToken = default);
-
-    Task InsertAsync(UserStatusDto dto, Guid userId, CancellationToken cancellationToken = default);
-
-    Task DeleteAsync(Guid id, CancellationToken cancellationToken = default);
-}

backend/src/Host/Program.cs

@@ -250,7 +250,6 @@ app.MapStoriesEndpoints();
 app.MapContactsEndpoints();
 app.MapSettingsEndpoints();
 app.MapProfilesEndpoints();
-app.MapStatusesEndpoints();
 app.MapFederationEndpoints();
 app.MapKlipyEndpoints();
 app.MapChatsEndpoints();

backend/src/Host/appsettings.json

@@ -13,7 +13,8 @@
     "Secret": "knot_super_secret_key_1234567890_knot",
     "Issuer": "Knot",
     "Audience": "KnotUsers",
-    "ExpiryInMinutes": 1440
+    "ExpiryInMinutes": 1440,
+    "RefreshExpiryInDays": 30
   },
   "KNOT_MASTER_ENCRYPTION_KEY": "knot_super_secret_key_1234567890_knot"
 }

backend/src/Modules/Auth/Application/Abstractions/IJwtTokenProvider.cs

@@ -5,5 +5,8 @@ namespace Knot.Modules.Auth.Application.Abstractions;
 public interface IJwtTokenProvider
 {
     string Generate(User user);
+    string Generate(Guid userId, string username, string displayName, string? avatar);
+    string GenerateRefreshToken();
+    DateTime GetRefreshTokenExpiry();
 }
 

backend/src/Modules/Auth/Application/Users/ChangePassword/ChangePassword.cs

@@ -1,48 +0,0 @@
-using BCrypt.Net;
-using Knot.Contracts.Auth.Application.Abstractions;
-using Knot.Contracts.Auth.Application.Auth.DTOs;
-using Knot.Modules.Auth.Domain;
-using Knot.Shared.Kernel;
-using Microsoft.EntityFrameworkCore;
-
-namespace Knot.Modules.Auth.Application.Users.ChangePassword;
-
-public sealed record ChangePasswordCommand(
-    Guid UserId,
-    string OldPassword,
-    string NewPassword,
-    string ConfirmPassword) : ICommand;
-
-internal sealed class ChangePasswordCommandHandler : ICommandHandler<ChangePasswordCommand>
-{
-    private readonly IAuthDbContext _dbContext;
-
-    public ChangePasswordCommandHandler(IAuthDbContext dbContext)
-    {
-        _dbContext = dbContext;
-    }
-
-    public async Task<Result> Handle(ChangePasswordCommand request, CancellationToken cancellationToken)
-    {
-        if (request.NewPassword != request.ConfirmPassword)
-            return Result.Failure(AuthErrors.PasswordConfirmationMismatch);
-
-        if (request.NewPassword.Length < 8)
-            return Result.Failure(AuthErrors.PasswordTooShort);
-
-        var user = await _dbContext.Set<User>()
-            .FirstOrDefaultAsync(u => u.Id == request.UserId, cancellationToken);
-
-        if (user is null)
-            return Result.Failure(AuthErrors.UserNotFound);
-
-        if (!BCrypt.Net.BCrypt.Verify(request.OldPassword, user.PasswordHash))
-            return Result.Failure(AuthErrors.OldPasswordInvalid);
-
-        user.ChangePassword(BCrypt.Net.BCrypt.HashPassword(request.NewPassword));
-        user.SetRefreshToken(null);
-
-        await _dbContext.SaveChangesAsync(cancellationToken);
-        return Result.Success();
-    }
-}

backend/src/Modules/Auth/Application/Users/GetMe/GetMe.cs

@@ -1,4 +1,6 @@
-using Knot.Contracts.Auth.Application.Auth.DTOs;
+using System.IdentityModel.Tokens.Jwt;
+using System.Security.Claims;
+using Knot.Contracts.Auth.Application.Abstractions;
 using Knot.Contracts.Auth.Application.Auth.DTOs;
 using Knot.Shared.Kernel;
 
@@ -9,10 +11,12 @@ public sealed record GetMeQuery(Guid UserId) : IQuery<AuthResponseDto>;
 internal sealed class GetMeQueryHandler : IQueryHandler<GetMeQuery, AuthResponseDto>
 {
     private readonly IUserRepository _userRepository;
+    private readonly IJwtTokenProvider _tokenProvider;
 
-    public GetMeQueryHandler(IUserRepository userRepository)
+    public GetMeQueryHandler(IUserRepository userRepository, IJwtTokenProvider tokenProvider)
     {
         _userRepository = userRepository;
+        _tokenProvider = tokenProvider;
     }
 
     public async Task<Result<AuthResponseDto>> Handle(GetMeQuery request, CancellationToken cancellationToken)
@@ -23,9 +27,18 @@ internal sealed class GetMeQueryHandler : IQueryHandler<GetMeQuery, AuthResponse
             return Result.Failure<AuthResponseDto>(AuthErrors.UserNotFound);
         }
 
+        // Check if access token needs to be refreshed (less than 1 hour remaining)
+        string? newAccessToken = null;
+
+        // We can't directly check the current token's expiry here, but we can 
+        // always issue a new token if the user is authenticated
+        // For now, let's issue a new token on every request (simplified approach)
+        // A better approach would be to parse the incoming token and check expiry
+        newAccessToken = _tokenProvider.Generate(user);
+
         var response = new AuthResponseDto
         {
-            AccessToken = string.Empty,
+            AccessToken = newAccessToken,
             RefreshToken = string.Empty,
             UserId = user.Id,
             Username = user.Username,

backend/src/Modules/Auth/Application/Users/Login/LoginUserCommandHandler.cs

@@ -5,9 +5,6 @@ using Knot.Shared.Kernel;
 
 namespace Knot.Modules.Auth.Application.Users.Login;
 
-/// <summary>
-/// ������� ��� ����� ������������. ���������� AuthResponseDto.
-/// </summary>
 public sealed record LoginUserCommand(string Username, string Password) : ICommand<AuthResponseDto>;
 
 public sealed class LoginUserCommandHandler : ICommandHandler<LoginUserCommand, AuthResponseDto>
@@ -31,14 +28,21 @@ public sealed class LoginUserCommandHandler : ICommandHandler<LoginUserCommand,
         }
 
         string token = _tokenProvider.Generate(user.Id, user.Username, user.DisplayName, user.Avatar);
+        string refreshToken = _tokenProvider.GenerateRefreshToken();
+        DateTime refreshExpiry = _tokenProvider.GetRefreshTokenExpiry();
+
+        // Save refresh token to database
+        user.SetRefreshToken(refreshToken, refreshExpiry);
+        await _userRepository.UpdateAsync(user, cancellationToken);
 
         return Result.Success(new AuthResponseDto
         {
             AccessToken = token,
-            RefreshToken = string.Empty,
+            RefreshToken = refreshToken,
             UserId = user.Id,
             Username = user.Username,
             DisplayName = user.DisplayName
         });
     }
 }
+

backend/src/Modules/Auth/Application/Users/RefreshToken/RefreshTokenCommand.cs

@@ -0,0 +1,7 @@
+using Knot.Contracts.Auth.Application.Auth.DTOs;
+using Knot.Shared.Kernel;
+using MediatR;
+
+namespace Knot.Modules.Auth.Application.Users.RefreshToken;
+
+public record RefreshTokenCommand(string RefreshToken) : ICommand<AuthResponseDto>;

backend/src/Modules/Auth/Application/Users/RefreshToken/RefreshTokenCommandHandler.cs

@@ -0,0 +1,65 @@
+using Knot.Contracts.Auth.Application.Abstractions;
+using Knot.Contracts.Auth.Application.Auth.DTOs;
+using Knot.Contracts.Auth.Domain;
+using Knot.Shared.Kernel;
+using MediatR;
+
+namespace Knot.Modules.Auth.Application.Users.RefreshToken;
+
+internal sealed class RefreshTokenCommandHandler : ICommandHandler<RefreshTokenCommand, AuthResponseDto>
+{
+    private readonly IUserRepository _userRepository;
+    private readonly IJwtTokenProvider _tokenProvider;
+
+    public RefreshTokenCommandHandler(
+        IUserRepository userRepository,
+        IJwtTokenProvider tokenProvider)
+    {
+        _userRepository = userRepository;
+        _tokenProvider = tokenProvider;
+    }
+
+    public async Task<Result<AuthResponseDto>> Handle(RefreshTokenCommand request, CancellationToken cancellationToken)
+    {
+        if (string.IsNullOrWhiteSpace(request.RefreshToken))
+        {
+            return Result.Failure<AuthResponseDto>(
+                new Error("Auth.InvalidRefreshToken", "Refresh token is required"));
+        }
+
+        var user = await _userRepository.GetByRefreshTokenAsync(request.RefreshToken, cancellationToken);
+        if (user == null)
+        {
+            return Result.Failure<AuthResponseDto>(
+                new Error("Auth.InvalidRefreshToken", "Invalid or expired refresh token"));
+        }
+
+        // Check if refresh token has expired
+        if (user.RefreshTokenExpiry.HasValue && user.RefreshTokenExpiry.Value < DateTime.UtcNow)
+        {
+            // Clear expired refresh token
+            user.SetRefreshToken(null, null);
+            await _userRepository.UpdateAsync(user, cancellationToken);
+            
+            return Result.Failure<AuthResponseDto>(
+                new Error("Auth.RefreshTokenExpired", "Refresh token has expired. Please login again."));
+        }
+
+        var newAccessToken = _tokenProvider.Generate(user.Id, user.Username, user.DisplayName, user.Avatar);
+
+        var newRefreshToken = _tokenProvider.GenerateRefreshToken();
+        var newRefreshExpiry = _tokenProvider.GetRefreshTokenExpiry();
+        user.SetRefreshToken(newRefreshToken, newRefreshExpiry);
+        await _userRepository.UpdateAsync(user, cancellationToken);
+
+        return Result.Success(new AuthResponseDto
+        {
+            AccessToken = newAccessToken,
+            RefreshToken = newRefreshToken,
+            UserId = user.Id,
+            Username = user.Username,
+            DisplayName = user.DisplayName,
+            Avatar = user.Avatar
+        });
+    }
+}

backend/src/Modules/Auth/Application/Users/Register/RegisterUserCommandHandler.cs

@@ -1,5 +1,4 @@
 using BCrypt.Net;
-using BCrypt.Net;
 using Knot.Contracts.Auth.Application.Abstractions;
 using Knot.Contracts.Auth.Application.Auth.DTOs;
 using Knot.Contracts.Settings.Application.Abstractions;
@@ -9,9 +8,6 @@ using Knot.Shared.Kernel;
 
 namespace Knot.Modules.Auth.Application.Users.Register;
 
-/// <summary>
-/// ������� ��� ����������� ������ ������������.
-/// </summary>
 public sealed record RegisterUserCommand(
     string Username,
     string Password,
@@ -19,9 +15,6 @@ public sealed record RegisterUserCommand(
     string? Email,
     string? Bio) : ICommand<AuthResponseDto>;
 
-/// <summary>
-/// ���������� ������� �����������.
-/// </summary>
 internal sealed class RegisterUserCommandHandler : ICommandHandler<RegisterUserCommand, AuthResponseDto>
 {
     private readonly IUserRepository _userRepository;
@@ -48,16 +41,13 @@ internal sealed class RegisterUserCommandHandler : ICommandHandler<RegisterUserC
             return Result.Failure<AuthResponseDto>(AuthErrors.IdentityRegistrationDisabled);
         }
 
-        // 1. �������� ������������ username
         if (!await _userRepository.IsUsernameUniqueAsync(request.Username, cancellationToken))
         {
             return Result.Failure<AuthResponseDto>(AuthErrors.IdentityUsernameNotUnique);
         }
 
-        // 2. ����������� ������
         string passwordHash = BCrypt.Net.BCrypt.HashPassword(request.Password);
 
-        // 3. �������� ��������
         var user = User.Create(
             request.Username,
             passwordHash,
@@ -65,21 +55,33 @@ internal sealed class RegisterUserCommandHandler : ICommandHandler<RegisterUserC
             request.Email,
             request.Bio);
 
-        // 4. ���������� - ���������� ����� � Domain User
-        var repoWithDomainUserAdd = _userRepository as Infrastructure.Persistence.UserRepository;
-        repoWithDomainUserAdd?.Add(user);
+        var repoImpl = _userRepository as Infrastructure.Persistence.UserRepository;
+        repoImpl?.Add(user);
 
         await _unitOfWork.SaveChangesAsync(cancellationToken);
 
-        string token = _tokenProvider.Generate(user.Id, user.Username, user.DisplayName, user.Avatar);
+        // Get the saved user as contract
+        var userContract = await _userRepository.GetByUsernameAsync(request.Username, cancellationToken);
+        if (userContract == null)
+        {
+            return Result.Failure<AuthResponseDto>(AuthErrors.IdentityRegistrationFailed);
+        }
+
+        string token = _tokenProvider.Generate(userContract.Id, userContract.Username, userContract.DisplayName, userContract.Avatar);
+        string refreshToken = _tokenProvider.GenerateRefreshToken();
+        DateTime refreshExpiry = _tokenProvider.GetRefreshTokenExpiry();
+
+        userContract.SetRefreshToken(refreshToken, refreshExpiry);
+        await _userRepository.UpdateAsync(userContract, cancellationToken);
 
         return Result.Success(new AuthResponseDto
         {
             AccessToken = token,
-            RefreshToken = string.Empty,
-            UserId = user.Id,
-            Username = user.Username,
-            DisplayName = user.DisplayName
+            RefreshToken = refreshToken,
+            UserId = userContract.Id,
+            Username = userContract.Username,
+            DisplayName = userContract.DisplayName
         });
     }
 }
+

backend/src/Modules/Auth/Domain/User.cs

@@ -26,6 +26,7 @@ public sealed class User : AggregateRoot<Guid>
     public bool IsBanned { get; private set; }
     public string? PhoneNumber { get; private set; }
     public string? RefreshToken { get; private set; }
+    public DateTime? RefreshTokenExpiry { get; private set; }
     public DateTime? BannedUntil { get; private set; }
 
     public void Ban() {
@@ -48,9 +49,10 @@ public sealed class User : AggregateRoot<Guid>
         PhoneNumber = phoneNumber;
     }
 
-    public void SetRefreshToken(string? refreshToken)
+    public void SetRefreshToken(string? refreshToken, DateTime? expiry = null)
     {
         RefreshToken = refreshToken;
+        RefreshTokenExpiry = expiry;
     }
 
     public void SetBannedUntil(DateTime? bannedUntil)
@@ -79,6 +81,8 @@ public sealed class User : AggregateRoot<Guid>
         BannedUntil = contract.BannedUntil;
         SetOnline(contract.IsOnline, contract.LastSeen);
         UserDomain = contract.Domain;
+        RefreshToken = contract.RefreshToken;
+        RefreshTokenExpiry = contract.RefreshTokenExpiry;
     }
 
     private User(Guid id, string username, string passwordHash, string displayName, string? email, string? bio = null)
@@ -181,7 +185,9 @@ public sealed class User : AggregateRoot<Guid>
             IsOnline = IsOnline,
             IsExternal = IsExternal,
             Domain = _domain,
-            LastSeen = LastSeen
+            LastSeen = LastSeen,
+            RefreshToken = RefreshToken,
+            RefreshTokenExpiry = RefreshTokenExpiry
         };
     }
 }

backend/src/Modules/Auth/Infrastructure/Authentication/JwtTokenProvider.cs

@@ -50,6 +50,12 @@ internal sealed class JwtTokenProvider : IJwtTokenProvider
         return Convert.ToBase64String(randomBytes);
     }
 
+    public DateTime GetRefreshTokenExpiry()
+    {
+        var expiryInDays = int.Parse(_configuration["Jwt:RefreshExpiryInDays"] ?? "30");
+        return DateTime.UtcNow.AddDays(expiryInDays);
+    }
+
     public string Generate(Guid userId, string username, string displayName, string? avatar)
     {
         var claims = new Claim[]

backend/src/Modules/Auth/Migrations/20270419220000_AddRefreshTokenExpiry.Designer.cs

@@ -0,0 +1,100 @@
+using System;
+using Knot.Modules.Auth.Infrastructure.Persistence;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace Knot.Modules.Auth.Migrations
+{
+    /// <inheritdoc />
+    [DbContext(typeof(AuthDbContext))]
+    [Migration("20270419220000_AddRefreshTokenExpiry")]
+    partial class AddRefreshTokenExpiry
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "10.0.0-rc.1.25451.105")
+                .HasAnnotation("Relational:DefaultSchema", "identity");
+
+            modelBuilder.Entity("Knot.Modules.Auth.Domain.User", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Avatar")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("BannedUntil")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Bio")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("Birthday")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Domain")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("HideStatus")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("HideStoryViews")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsBanned")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsExternal")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsOnline")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastSeen")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RefreshToken")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("RefreshTokenExpiry")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Username")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Username")
+                        .IsUnique();
+
+                    b.ToTable("Users", "identity");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

backend/src/Modules/Auth/Migrations/20270419220000_AddRefreshTokenExpiry.cs

@@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Knot.Modules.Auth.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddRefreshTokenExpiry : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "RefreshTokenExpiry",
+                schema: "identity",
+                table: "Users",
+                type: "timestamp with time zone",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "RefreshTokenExpiry",
+                schema: "identity",
+                table: "Users");
+        }
+    }
+}

backend/src/Modules/Auth/Presentation/Endpoints/AuthEndpoints.cs

@@ -1,20 +1,18 @@
-using Knot.Shared.Kernel;
-using Knot.Modules.Auth.Application.Users.Login;
-using Knot.Modules.Auth.Application.Users.Register;
 using Knot.Modules.Auth.Application.Users.GetMe;
-using Knot.Modules.Auth.Application.Users.ChangePassword;
+using Knot.Modules.Auth.Application.Users.Login;
+using Knot.Modules.Auth.Application.Users.RefreshToken;
+using Knot.Modules.Auth.Application.Users.Register;
+using Knot.Shared.Kernel;
 using MediatR;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 
 namespace Knot.Modules.Auth.Presentation.Endpoints;
 
 public static class AuthEndpoints
 {
-    public sealed record ChangePasswordRequest(string OldPassword, string NewPassword, string ConfirmPassword);
-
     public static void MapAuthEndpoints(this WebApplication app)
     {
         var group = app.MapGroup("api/auth");
@@ -31,24 +29,16 @@ public static class AuthEndpoints
             return result.IsSuccess ? Results.Ok(result.Value) : Results.Unauthorized();
         });
 
+        group.MapPost("refresh", async ([FromBody] RefreshTokenCommand command, ISender sender, CancellationToken ct) =>
+        {
+            var result = await sender.Send(command, ct);
+            return result.IsSuccess ? Results.Ok(result.Value) : Results.Unauthorized();
+        });
+
         group.MapGet("me", async (ISender sender, IUserContext userContext, CancellationToken ct) =>
         {
             var result = await sender.Send(new GetMeQuery(userContext.UserId), ct);
             return result.IsSuccess ? Results.Ok(result.Value) : Results.NotFound();
         }).RequireAuthorization();
-
-        group.MapPost("change-password", async ([FromBody] ChangePasswordRequest request, ISender sender, IUserContext userContext, CancellationToken ct) =>
-        {
-            var result = await sender.Send(
-                new ChangePasswordCommand(userContext.UserId, request.OldPassword, request.NewPassword, request.ConfirmPassword),
-                ct);
-
-            if (result.IsSuccess) return Results.Ok();
-
-            if (result.Error.Code == "Auth.OldPasswordInvalid")
-                return Results.StatusCode(StatusCodes.Status403Forbidden);
-
-            return Results.BadRequest(new { error = result.Error.Code ?? result.Error.Description });
-        }).RequireAuthorization();
     }
 }

backend/src/Modules/Conversations/Application/DTOs/MessageDetailDto.cs

@@ -32,7 +32,8 @@ public record MessageDetailDto(
     bool? PollIsMultipleChoice = null,
     bool? PollIsAnonymous = null,
     bool? PollIsClosed = null,
-    List<Guid>? UserVotedOptionIds = null
+    List<Guid>? UserVotedOptionIds = null,
+    bool IsDeletedForUser = false
 );
 
 public record ReplyToMessageDto(

backend/src/Modules/Conversations/Application/Messages/Delete/DeleteMessagesCommand.cs

@@ -42,10 +42,16 @@ public sealed class DeleteMessagesCommandHandler : ICommandHandler<DeleteMessage
 
             if (request.DeleteForAll)
             {
+                // Only message sender can delete for everyone
                 if (message.SenderId == request.UserId)
                 {
                     message.Delete();
                 }
+                else
+                {
+                    // If not the sender, just delete for current user
+                    message.DeleteForUser(request.UserId);
+                }
             }
             else
             {
@@ -55,24 +61,13 @@ public sealed class DeleteMessagesCommandHandler : ICommandHandler<DeleteMessage
             await _messageRepository.UpdateAsync(message, cancellationToken);
         }
 
-        if (request.DeleteForAll)
+        // Notify all clients in the chat about the deletion
+        await _hubContext.Clients.Group(request.ChatId.ToString()).SendAsync("messages_deleted", new
         {
-            await _hubContext.Clients.Group(request.ChatId.ToString()).SendAsync("messages_deleted", new
-            {
-                chatId = request.ChatId,
-                messageIds = request.MessageIds,
-                deleteForAll = true
-            });
-        }
-        else
-        {
-            await _hubContext.Clients.User(request.UserId.ToString()).SendAsync("messages_deleted", new
-            {
-                chatId = request.ChatId,
-                messageIds = request.MessageIds,
-                deleteForAll = false
-            });
-        }
+            chatId = request.ChatId,
+            messageIds = request.MessageIds,
+            deleteForAll = request.DeleteForAll
+        });
 
         return global::Knot.Shared.Kernel.Result.Success();
     }

backend/src/Modules/Conversations/Application/Messages/GetMessages/GetMessagesQuery.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Knot.Contracts.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Domain;
 using Knot.Contracts.Messaging.Application.Abstractions;
 using Knot.Contracts.Messaging.Domain;
-using Knot.Contracts.Conversations.Application.Abstractions;
 using Knot.Modules.Conversations.Application.DTOs;
-using Knot.Contracts.Conversations.Domain;
 using Knot.Shared.Kernel;
 using MediatR;
 
@@ -115,6 +115,7 @@ internal sealed class GetMessagesQueryHandler : IQueryHandler<GetMessagesQuery,
             senders.TryGetValue(message.SenderId, out var sender);
             reactionsByMessage.TryGetValue(message.Id, out var reactions);
 
+
             Message? replyMsg = null;
             if (message.ReplyToId.HasValue)
             {
@@ -141,7 +142,7 @@ internal sealed class GetMessagesQueryHandler : IQueryHandler<GetMessagesQuery,
                     replyMsg is MediaMessage mm ? mm.Media.Select(m => new MediaDto(m.Id, m.Type, m.Url, m.Filename, m.Size, m.Duration)).ToList() : new List<MediaDto>(),
                     replySender != null ? new MessageSenderDto(replySender.Id, replySender.Username, replySender.DisplayName, replySender.Avatar) : null
                 ) : null,
-                message is TextMessage tm ? tm.Quote : null,
+                (message as TextMessage)?.Quote,
                 message.IsEdited,
                 message.IsDeleted,
                 message.CreatedAt,
@@ -154,19 +155,22 @@ internal sealed class GetMessagesQueryHandler : IQueryHandler<GetMessagesQuery,
                 (message as MediaMessage)?.Media.Select(m => new MediaDto(m.Id, m.Type, m.Url, m.Filename, m.Size, m.Duration)).ToList() ?? new List<MediaDto>(),
                 sender != null ? new MessageSenderDto(sender.Id, sender.Username, sender.DisplayName, sender.Avatar) : new MessageSenderDto(message.SenderId, "unknown", "Unknown", null),
                 new List<ReadByDto>(), // ReadBy not implemented in this detailed view yet
-                reactions?.Select(r => {
+                reactions?.Select(r =>
+                {
                     senders.TryGetValue(r.UserId, out var ru);
                     return new MessageReactionDto(r.Id, r.Emoji, r.UserId, ru != null ? new MessageSenderDto(ru.Id, ru.Username, ru.DisplayName, ru.Avatar) : null);
                 }).ToList() ?? new List<MessageReactionDto>(),
                 (message as CallMessage)?.CallType,
                 (message as CallMessage)?.CallStatus,
                 (message as CallMessage)?.Duration,
-                (message as PollMessage)?.Options.Select(o => {
+                (message as PollMessage)?.Options.Select(o =>
+                {
                     var pm = (PollMessage)message;
                     var voters = pm.IsAnonymous == false
                          ? pm.Votes
                              .Where(v => v.OptionId == o.Id)
-                             .Select(v => {
+                             .Select(v =>
+                             {
                                  senders.TryGetValue(v.UserId, out var vu);
                                  return vu != null
                                      ? new MessageSenderDto(vu.Id, vu.Username, vu.DisplayName, vu.Avatar)
@@ -174,12 +178,13 @@ internal sealed class GetMessagesQueryHandler : IQueryHandler<GetMessagesQuery,
                              })
                              .ToList()
                          : null;
-                     return new PollOptionDto(o.Id, o.Text, o.VoteCount, voters, pm.IsAnonymous == false ? pm.Votes.Where(v => v.OptionId == o.Id).Select(v => v.UserId).ToList() : null);
-                 }).ToList(),
+                    return new PollOptionDto(o.Id, o.Text, o.VoteCount, voters, pm.IsAnonymous == false ? pm.Votes.Where(v => v.OptionId == o.Id).Select(v => v.UserId).ToList() : null);
+                }).ToList(),
                  (message as PollMessage)?.IsMultipleChoice,
                  (message as PollMessage)?.IsAnonymous,
                  (message as PollMessage)?.IsClosed,
-                 (message as PollMessage)?.Votes.Where(v => v.UserId == request.UserId).Select(v => v.OptionId).ToList()
+                 (message as PollMessage)?.Votes.Where(v => v.UserId == request.UserId).Select(v => v.OptionId).ToList(),
+                 message.IsDeletedForUser(request.UserId)
              ));
         }
 

backend/src/Modules/Conversations/Infrastructure/SignalR/ChatHub.cs

@@ -21,7 +21,6 @@ using Knot.Modules.Conversations.Application.DTOs;
 using Knot.Contracts.Messaging.Application.Abstractions;
 using Knot.Contracts.Messaging.Domain;
 using Knot.Contracts.Conversations.Application.Abstractions;
-using Knot.Contracts.Profiles.Domain;
 
 namespace Knot.Modules.Conversations.Infrastructure.SignalR;
 
@@ -52,7 +51,6 @@ public sealed class ChatHub : Hub
     private readonly ILogger<ChatHub> _logger;
     private readonly IMemoryCache _cache;
     private readonly IUserDisplayNameProvider _userProvider;
-    private readonly IProfileRepository _profileRepository;
 
     public ChatHub(
         ISender sender, 
@@ -62,8 +60,7 @@ public sealed class ChatHub : Hub
         IMessageRepository messageRepository,
         ILogger<ChatHub> logger, 
         IMemoryCache cache,
-        IUserDisplayNameProvider userProvider,
-        IProfileRepository profileRepository)
+        IUserDisplayNameProvider userProvider)
     {
         _sender = sender;
         _userContext = userContext;
@@ -73,7 +70,6 @@ public sealed class ChatHub : Hub
         _logger = logger;
         _cache = cache;
         _userProvider = userProvider;
-        _profileRepository = profileRepository;
     }
 
     public override async Task OnConnectedAsync()
@@ -99,15 +95,7 @@ public sealed class ChatHub : Hub
 
                 userId, Context.ConnectionId, userChats.Count);
 
-            var isInvisible = await IsUserInvisibleAsync(_userContext.UserId, Context.ConnectionAborted);
-            if (!isInvisible)
-            {
-                await BroadcastPresenceToVisibleUsersAsync(
-                    "user_online",
-                    new { userId },
-                    _userContext.UserId,
-                    Context.ConnectionAborted);
-            }
+            await Clients.Others.SendAsync("user_online", new { userId });
         }
         await base.OnConnectedAsync();
     }
@@ -123,22 +111,7 @@ public sealed class ChatHub : Hub
                 if (set.Count == 0)
                 {
                     _userConnections.TryRemove(userId, out _);
-                    try
-                    {
-                        var isInvisible = await IsUserInvisibleAsync(_userContext.UserId, CancellationToken.None);
-                        if (!isInvisible)
-                        {
-                            await BroadcastPresenceToVisibleUsersAsync(
-                                "user_offline",
-                                new { userId, lastSeen = DateTime.UtcNow },
-                                _userContext.UserId,
-                                CancellationToken.None);
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogWarning(ex, "Presence broadcast on disconnect failed for {UserId}", userId);
-                    }
+                    await Clients.Others.SendAsync("user_offline", new { userId, lastSeen = DateTime.UtcNow });
                 }
             }
             _cache.Set("Global_OnlineUsersCount", _userConnections.Count);
@@ -147,56 +120,6 @@ public sealed class ChatHub : Hub
         await base.OnDisconnectedAsync(exception);
     }
 
-    private async Task<bool> IsUserInvisibleAsync(Guid userId, CancellationToken ct)
-    {
-        var profile = await _profileRepository.GetAsync(userId, ct);
-        return profile?.IsInvisible ?? false;
-    }
-
-    private async Task BroadcastPresenceToVisibleUsersAsync(
-        string eventName,
-        object payload,
-        Guid sourceUserId,
-        CancellationToken cancellationToken)
-    {
-        var recipients = _userConnections.Keys
-            .Where(id => id != sourceUserId.ToString())
-            .Select(id => Guid.TryParse(id, out var parsed) ? parsed : Guid.Empty)
-            .Where(id => id != Guid.Empty)
-            .Distinct()
-            .ToList();
-
-        if (recipients.Count == 0)
-            return;
-
-        var recipientProfiles = await _profileRepository.GetAsync(recipients, cancellationToken);
-        var invisibleRecipientIds = recipientProfiles
-            .Where(p => p.IsInvisible)
-            .Select(p => p.UserId)
-            .ToHashSet();
-
-        foreach (var kvp in _userConnections)
-        {
-            if (!Guid.TryParse(kvp.Key, out var recipientId))
-                continue;
-            if (recipientId == sourceUserId)
-                continue;
-            if (invisibleRecipientIds.Contains(recipientId))
-                continue;
-
-            string[] connectionIds;
-            lock (kvp.Value)
-            {
-                connectionIds = kvp.Value.ToArray();
-            }
-
-            foreach (var connectionId in connectionIds)
-            {
-                await Clients.Client(connectionId).SendAsync(eventName, payload);
-            }
-        }
-    }
-
     // ────────────────────────────────────────────────────────────────
     // Chat methods
     // ────────────────────────────────────────────────────────────────

backend/src/Modules/Conversations/Knot.Modules.Conversations.csproj

@@ -12,7 +12,6 @@
     <ProjectReference Include="..\..\Contracts\Messaging\Knot.Contracts.Messaging.csproj" />
     <ProjectReference Include="..\..\Contracts\Conversations\Knot.Contracts.Conversations.csproj" />
     <ProjectReference Include="..\..\Contracts\Auth\Knot.Contracts.Auth.csproj" />
-    <ProjectReference Include="..\..\Contracts\Profiles\Knot.Contracts.Profiles.csproj" />
   </ItemGroup>
 
   <ItemGroup>

backend/src/Modules/Profiles/Application/Profiles/DTOs/ProfilesRequests.cs

@@ -2,9 +2,5 @@ using System;
 
 namespace Knot.Modules.Profiles.Application.Profiles.DTOs;
 
-public record UpdateProfileRequest(
-    string? DisplayName,
-    string? Bio,
-    DateTime? Birthday,
-    bool? IsInvisible);
+public record UpdateProfileRequest(string? DisplayName, string? Bio, DateTime? Birthday);
 public record UpdateSettingsRequest(bool? HideStoryViews);

backend/src/Modules/Profiles/Application/Profiles/UpdateProfile/UpdateProfile.cs

@@ -11,8 +11,7 @@ public sealed record UpdateProfileCommand(
     Guid UserId,
     string? DisplayName,
     string? Bio,
-    DateTime? Birthday,
-    bool? IsInvisible) : ICommand<UserProfileDto>;
+    DateTime? Birthday) : ICommand<UserProfileDto>;
 
 internal sealed class UpdateProfileCommandHandler : ICommandHandler<UpdateProfileCommand, UserProfileDto>
 {
@@ -29,13 +28,9 @@ internal sealed class UpdateProfileCommandHandler : ICommandHandler<UpdateProfil
         if (profile is null)
             return Result.Failure<UserProfileDto>(ProfilesErrors.ProfileNotFound);
 
-        if ((request.Bio?.Length ?? 0) > 200)
-            return Result.Failure<UserProfileDto>(ProfilesErrors.BioTooLong);
-
         profile.DisplayName = request.DisplayName ?? profile.DisplayName;
         profile.About = request.Bio;
         profile.Birthday = request.Birthday;
-        profile.IsInvisible = request.IsInvisible ?? profile.IsInvisible;
 
         var result = await _repository.UpdateAsync(profile, cancellationToken);
         if (result.IsFailure)

backend/src/Modules/Profiles/Application/Statuses/ClearUserStatusCommand.cs

@@ -1,21 +0,0 @@
-using Knot.Contracts.Profiles.Application.DTOs;
-using Knot.Contracts.Profiles.Domain;
-using Knot.Shared.Kernel;
-using MediatR;
-
-namespace Knot.Modules.Profiles.Application.Statuses;
-
-public sealed record ClearUserStatusCommand(Guid UserId) : IRequest<Result<UserProfileDto>>;
-
-public sealed class ClearUserStatusCommandHandler : IRequestHandler<ClearUserStatusCommand, Result<UserProfileDto>>
-{
-    private readonly IProfileStatusWriter _writer;
-
-    public ClearUserStatusCommandHandler(IProfileStatusWriter writer)
-    {
-        _writer = writer;
-    }
-
-    public Task<Result<UserProfileDto>> Handle(ClearUserStatusCommand request, CancellationToken cancellationToken)
-        => _writer.ClearAsync(request.UserId, cancellationToken);
-}

backend/src/Modules/Profiles/Application/Statuses/GetStatusPresetsQuery.cs

@@ -1,12 +0,0 @@
-using Knot.Contracts.Profiles.Application.DTOs;
-using MediatR;
-
-namespace Knot.Modules.Profiles.Application.Statuses;
-
-public sealed record GetStatusPresetsQuery : IRequest<IReadOnlyList<StatusPresetDto>>;
-
-public sealed class GetStatusPresetsQueryHandler : IRequestHandler<GetStatusPresetsQuery, IReadOnlyList<StatusPresetDto>>
-{
-    public Task<IReadOnlyList<StatusPresetDto>> Handle(GetStatusPresetsQuery request, CancellationToken cancellationToken)
-        => Task.FromResult(StatusPresetCatalog.All);
-}

backend/src/Modules/Profiles/Application/Statuses/SetCustomUserStatusCommand.cs

@@ -1,53 +0,0 @@
-using Knot.Contracts.Profiles.Application.DTOs;
-using Knot.Contracts.Profiles.Domain;
-using Knot.Shared.Kernel;
-using MediatR;
-
-namespace Knot.Modules.Profiles.Application.Statuses;
-
-public sealed record SetCustomUserStatusCommand(
-    Guid UserId,
-    string? Emoji,
-    string? Text,
-    DateTime? ExpiresAt,
-    string? PresetKey) : IRequest<Result<UserProfileDto>>;
-
-public sealed class SetCustomUserStatusCommandHandler : IRequestHandler<SetCustomUserStatusCommand, Result<UserProfileDto>>
-{
-    private readonly IProfileStatusWriter _writer;
-
-    public SetCustomUserStatusCommandHandler(IProfileStatusWriter writer)
-    {
-        _writer = writer;
-    }
-
-    public async Task<Result<UserProfileDto>> Handle(SetCustomUserStatusCommand request, CancellationToken cancellationToken)
-    {
-        var key = request.PresetKey?.Trim();
-        if (!string.IsNullOrEmpty(key) && key.Equals("online", StringComparison.OrdinalIgnoreCase))
-            return await _writer.ClearAsync(request.UserId, cancellationToken);
-
-        var emoji = request.Emoji?.Trim() ?? string.Empty;
-        var text = request.Text?.Trim() ?? string.Empty;
-
-        if (!string.IsNullOrEmpty(key))
-        {
-            var preset = StatusPresetCatalog.Find(key);
-            if (preset is null)
-                return Result.Failure<UserProfileDto>(ProfilesErrors.InvalidPreset);
-            if (string.IsNullOrEmpty(emoji))
-                emoji = preset.Emoji;
-            if (string.IsNullOrEmpty(text))
-                text = preset.TextRu;
-        }
-
-        if (string.IsNullOrEmpty(emoji) && string.IsNullOrEmpty(text))
-            return Result.Failure<UserProfileDto>(ProfilesErrors.StatusEmpty);
-
-        if (text.Length > 50)
-            return Result.Failure<UserProfileDto>(ProfilesErrors.StatusTextTooLong);
-
-        var presetForWriter = string.IsNullOrWhiteSpace(key) ? null : key;
-        return await _writer.SetCustomAsync(request.UserId, emoji, text, request.ExpiresAt, presetForWriter, cancellationToken);
-    }
-}

backend/src/Modules/Profiles/Application/Statuses/StatusPresetCatalog.cs

@@ -1,24 +0,0 @@
-using Knot.Contracts.Profiles.Application.DTOs;
-
-namespace Knot.Modules.Profiles.Application.Statuses;
-
-public static class StatusPresetCatalog
-{
-    private static readonly StatusPresetDto[] Items =
-    [
-        new() { Id = "online", Emoji = "", TextRu = "Онлайн (стандарт)", TextEn = "Online (standard)" },
-        new() { Id = "away", Emoji = "🕒", TextRu = "В отъезде", TextEn = "Away" },
-        new() { Id = "dnd", Emoji = "⛔", TextRu = "Не беспокоить", TextEn = "Do not disturb" },
-        new() { Id = "sick", Emoji = "🤒", TextRu = "Болен", TextEn = "Sick" },
-        new() { Id = "angry", Emoji = "💢", TextRu = "Злой", TextEn = "Angry" }
-    ];
-
-    public static IReadOnlyList<StatusPresetDto> All => Items;
-
-    public static StatusPresetDto? Find(string presetKey)
-    {
-        if (string.IsNullOrWhiteSpace(presetKey))
-            return null;
-        return Items.FirstOrDefault(x => x.Id.Equals(presetKey.Trim(), StringComparison.OrdinalIgnoreCase));
-    }
-}

backend/src/Modules/Profiles/DependencyInjection.cs

@@ -11,11 +11,10 @@ public static class DependencyInjection
     public static IServiceCollection AddProfilesModule(this IServiceCollection services, IConfiguration configuration)
     {
         services.AddScoped<Knot.Contracts.Profiles.Domain.IProfileRepository, ProfileRepository>();
-        services.AddScoped<Knot.Contracts.Profiles.Domain.IUserStatusRepository, UserStatusMongoRepository>();
-        services.AddScoped<Knot.Contracts.Profiles.Domain.IProfileStatusWriter, ProfileStatusWriter>();
         services.AddScoped<Knot.Contracts.Profiles.Domain.IProfilesUnitOfWork, ProfilesUnitOfWork>();
         services.AddScoped<Knot.Contracts.Profiles.Domain.IAvatarStorageService, AvatarStorageService>();
 
+        // MongoDB Registration
         var mongoConnection = configuration.GetConnectionString("MongoConnection")
                              ?? configuration["MONGO_URL"]
                              ?? "mongodb://mongo:27017";

backend/src/Modules/Profiles/Domain/ProfileDocument.cs

@@ -3,6 +3,10 @@ using MongoDB.Bson.Serialization.Attributes;
 
 namespace Knot.Modules.Profiles.Domain;
 
+/// <summary>
+/// MongoDB-документ профиля пользователя.
+/// Id совпадает с UserId из модуля Auth (Postgres).
+/// </summary>
 public sealed class ProfileDocument
 {
     [BsonId]
@@ -15,23 +19,12 @@ public sealed class ProfileDocument
 
     public string? Bio { get; private set; }
 
-    public string? StatusText { get; private set; }
-
-    public string? StatusEmoji { get; private set; }
-
-    public DateTime? StatusExpiresAt { get; private set; }
-
-    [BsonRepresentation(BsonType.String)]
-    public Guid? CurrentStatusId { get; private set; }
-
     public string? AvatarUrl { get; private set; }
 
     public DateTime? Birthday { get; private set; }
 
     public bool HideStoryViews { get; private set; }
 
-    public bool IsInvisible { get; private set; }
-
     public bool IsBanned { get; private set; }
 
     public bool IsDeleted { get; private set; }
@@ -72,26 +65,6 @@ public sealed class ProfileDocument
     public void UpdateSettings(bool hideStoryViews)
         => HideStoryViews = hideStoryViews;
 
-    public void UpdateInvisible(bool isInvisible)
-        => IsInvisible = isInvisible;
-
-    public void UpdateStatus(string? statusText, string? statusEmoji, DateTime? statusExpiresAt)
-    {
-        StatusText = statusText;
-        StatusEmoji = statusEmoji;
-        StatusExpiresAt = statusExpiresAt;
-    }
-
-    public void SetCurrentStatusId(Guid? statusId)
-        => CurrentStatusId = statusId;
-
-    public void ClearMoodStatusFields()
-    {
-        StatusText = null;
-        StatusEmoji = null;
-        StatusExpiresAt = null;
-    }
-
     public void UpdateStatus(bool isBanned, bool isDeleted)
     {
         IsBanned = isBanned;

backend/src/Modules/Profiles/Domain/UserStatusDocument.cs

@@ -1,26 +0,0 @@
-using MongoDB.Bson;
-using MongoDB.Bson.Serialization.Attributes;
-
-namespace Knot.Modules.Profiles.Domain;
-
-public sealed class UserStatusDocument
-{
-    [BsonId]
-    [BsonRepresentation(BsonType.String)]
-    public Guid Id { get; set; }
-
-    [BsonRepresentation(BsonType.String)]
-    public Guid UserId { get; set; }
-
-    public string Type { get; set; } = "Custom";
-
-    public string Emoji { get; set; } = "";
-
-    public string Text { get; set; } = "";
-
-    public DateTime CreatedAt { get; set; }
-
-    public DateTime? ExpiresAt { get; set; }
-
-    public BsonDocument Metadata { get; set; } = new();
-}

backend/src/Modules/Profiles/Infrastructure/Database/ProfileRepository.cs

@@ -10,39 +10,29 @@ namespace Knot.Modules.Profiles.Infrastructure.Database;
 internal class ProfileRepository : IProfileRepository
 {
     private readonly IMongoCollection<ProfileDocument> _profiles;
-    private readonly IUserStatusRepository _statuses;
 
-    public ProfileRepository(IMongoDatabase database, IUserStatusRepository statuses)
+    public ProfileRepository(IMongoDatabase database)
     {
         _profiles = database.GetCollection<ProfileDocument>("profiles");
-        _statuses = statuses;
     }
 
     public async Task<UserProfileDto?> GetAsync(Guid userId, CancellationToken ct = default)
     {
         var profile = await _profiles.Find(p => p.Id == userId).FirstOrDefaultAsync(ct);
-        return profile is null ? null : await profile.ToDtoAsync(_statuses, ct);
+        return profile?.ToDto();
     }
 
     public async Task<UserProfileDto?> GetByUsernameAsync(string username, CancellationToken ct = default)
     {
         var profile = await _profiles.Find(p => p.Username == username).FirstOrDefaultAsync(ct);
-        return profile is null ? null : await profile.ToDtoAsync(_statuses, ct);
+        return profile?.ToDto();
     }
 
     public async Task<List<UserProfileDto>> GetAsync(IEnumerable<Guid> userIds, CancellationToken ct = default)
     {
         var ids = userIds.ToList();
         var profiles = await _profiles.Find(p => ids.Contains(p.Id)).ToListAsync(ct);
-        var statusIds = profiles
-            .Where(p => p.CurrentStatusId.HasValue)
-            .Select(p => p.CurrentStatusId!.Value)
-            .Distinct()
-            .ToList();
-        var map = statusIds.Count > 0
-            ? await _statuses.GetByIdsAsync(statusIds, ct)
-            : new Dictionary<Guid, UserStatusDto>();
-        return profiles.Select(p => ProfileMappings.ToDtoWithStatusMap(p, map)).ToList();
+        return profiles.Select(p => p.ToDto()).ToList();
     }
 
     public async Task<List<UserProfileDto>> SearchAsync(string query, int limit = 20, CancellationToken ct = default)
@@ -67,16 +57,7 @@ internal class ProfileRepository : IProfileRepository
             var combinedFilter = Builders<ProfileDocument>.Filter.And(baseFilter, searchFilter);
             docs = await _profiles.Find(combinedFilter).Limit(limit).ToListAsync(ct);
         }
-
-        var statusIds = docs
-            .Where(p => p.CurrentStatusId.HasValue)
-            .Select(p => p.CurrentStatusId!.Value)
-            .Distinct()
-            .ToList();
-        var map = statusIds.Count > 0
-            ? await _statuses.GetByIdsAsync(statusIds, ct)
-            : new Dictionary<Guid, UserStatusDto>();
-        return docs.Select(p => ProfileMappings.ToDtoWithStatusMap(p, map)).ToList();
+        return docs.Select(p => p.ToDto()).ToList();
     }
 
     public async Task<Result<UserProfileDto>> CreateAsync(UserProfileDto dto, CancellationToken ct = default)
@@ -84,7 +65,7 @@ internal class ProfileRepository : IProfileRepository
         var profile = ProfileDocument.Create(dto.UserId, dto.Username ?? string.Empty, dto.DisplayName ?? string.Empty, dto.About);
 
         await _profiles.InsertOneAsync(profile, null, ct);
-        return Result.Success(await profile.ToDtoAsync(_statuses, ct));
+        return Result.Success(profile.ToDto());
     }
 
     public async Task<Result<UserProfileDto>> UpdateAsync(UserProfileDto dto, CancellationToken ct = default)
@@ -99,13 +80,9 @@ internal class ProfileRepository : IProfileRepository
             dto.Birthday);
 
         document.UpdateAvatar(dto.Avatar);
-        document.UpdateInvisible(dto.IsInvisible);
 
         await _profiles.ReplaceOneAsync(p => p.Id == dto.UserId, document, cancellationToken: ct);
-        var fresh = await _profiles.Find(p => p.Id == dto.UserId).FirstOrDefaultAsync(ct);
-        if (fresh is null)
-            return Result.Failure<UserProfileDto>(ProfilesErrors.ProfileNotFound);
-        return Result.Success(await fresh.ToDtoAsync(_statuses, ct));
+        return Result.Success(document.ToDto());
     }
 
     public async Task<Result> UpdateStatusAsync(Guid userId, bool isBanned, bool isDeleted, CancellationToken ct = default)

backend/src/Modules/Profiles/Infrastructure/Database/ProfileStatusWriter.cs

@@ -1,73 +0,0 @@
-using Knot.Contracts.Profiles.Application.DTOs;
-using Knot.Contracts.Profiles.Domain;
-using Knot.Modules.Profiles.Domain;
-using Knot.Modules.Profiles.Infrastructure.Mappings;
-using Knot.Shared.Kernel;
-using MongoDB.Driver;
-
-namespace Knot.Modules.Profiles.Infrastructure.Database;
-
-internal sealed class ProfileStatusWriter : IProfileStatusWriter
-{
-    private readonly IMongoCollection<ProfileDocument> _profiles;
-    private readonly IUserStatusRepository _statuses;
-
-    public ProfileStatusWriter(IMongoDatabase database, IUserStatusRepository statuses)
-    {
-        _profiles = database.GetCollection<ProfileDocument>("profiles");
-        _statuses = statuses;
-    }
-
-    public async Task<Result<UserProfileDto>> SetCustomAsync(Guid userId, string emoji, string text, DateTime? expiresAt, string? presetKey, CancellationToken cancellationToken = default)
-    {
-        var profile = await _profiles.Find(p => p.Id == userId).FirstOrDefaultAsync(cancellationToken);
-        if (profile is null)
-            return Result.Failure<UserProfileDto>(ProfilesErrors.ProfileNotFound);
-
-        if (profile.CurrentStatusId is Guid oldId)
-            await _statuses.DeleteAsync(oldId, cancellationToken);
-
-        var newId = Guid.NewGuid();
-        var type = string.IsNullOrWhiteSpace(presetKey) ? "Custom" : "Preset";
-        var dto = new UserStatusDto
-        {
-            Id = newId,
-            Type = type,
-            Emoji = emoji,
-            Text = text,
-            CreatedAt = DateTime.UtcNow,
-            ExpiresAt = expiresAt
-        };
-        await _statuses.InsertAsync(dto, userId, cancellationToken);
-
-        profile.SetCurrentStatusId(newId);
-        profile.ClearMoodStatusFields();
-        await _profiles.ReplaceOneAsync(p => p.Id == userId, profile, cancellationToken: cancellationToken);
-
-        var fresh = await _profiles.Find(p => p.Id == userId).FirstOrDefaultAsync(cancellationToken);
-        if (fresh is null)
-            return Result.Failure<UserProfileDto>(ProfilesErrors.ProfileNotFound);
-
-        return Result.Success(await fresh.ToDtoAsync(_statuses, cancellationToken));
-    }
-
-    public async Task<Result<UserProfileDto>> ClearAsync(Guid userId, CancellationToken cancellationToken = default)
-    {
-        var profile = await _profiles.Find(p => p.Id == userId).FirstOrDefaultAsync(cancellationToken);
-        if (profile is null)
-            return Result.Failure<UserProfileDto>(ProfilesErrors.ProfileNotFound);
-
-        if (profile.CurrentStatusId is Guid oldId)
-            await _statuses.DeleteAsync(oldId, cancellationToken);
-
-        profile.SetCurrentStatusId(null);
-        profile.ClearMoodStatusFields();
-        await _profiles.ReplaceOneAsync(p => p.Id == userId, profile, cancellationToken: cancellationToken);
-
-        var fresh = await _profiles.Find(p => p.Id == userId).FirstOrDefaultAsync(cancellationToken);
-        if (fresh is null)
-            return Result.Failure<UserProfileDto>(ProfilesErrors.ProfileNotFound);
-
-        return Result.Success(await fresh.ToDtoAsync(_statuses, cancellationToken));
-    }
-}

backend/src/Modules/Profiles/Infrastructure/Database/UserStatusMongoRepository.cs

@@ -1,62 +0,0 @@
-using Knot.Contracts.Profiles.Application.DTOs;
-using Knot.Contracts.Profiles.Domain;
-using Knot.Modules.Profiles.Domain;
-using MongoDB.Bson;
-using MongoDB.Driver;
-
-namespace Knot.Modules.Profiles.Infrastructure.Database;
-
-internal sealed class UserStatusMongoRepository : IUserStatusRepository
-{
-    private readonly IMongoCollection<UserStatusDocument> _collection;
-
-    public UserStatusMongoRepository(IMongoDatabase database)
-    {
-        _collection = database.GetCollection<UserStatusDocument>("user_statuses");
-    }
-
-    public async Task<UserStatusDto?> GetByIdAsync(Guid id, CancellationToken cancellationToken = default)
-    {
-        var doc = await _collection.Find(x => x.Id == id).FirstOrDefaultAsync(cancellationToken);
-        return doc is null ? null : ToDto(doc);
-    }
-
-    public async Task<IReadOnlyDictionary<Guid, UserStatusDto>> GetByIdsAsync(IEnumerable<Guid> ids, CancellationToken cancellationToken = default)
-    {
-        var idList = ids.Distinct().ToList();
-        if (idList.Count == 0)
-            return new Dictionary<Guid, UserStatusDto>();
-
-        var docs = await _collection.Find(x => idList.Contains(x.Id)).ToListAsync(cancellationToken);
-        return docs.ToDictionary(d => d.Id, ToDto);
-    }
-
-    public async Task InsertAsync(UserStatusDto dto, Guid userId, CancellationToken cancellationToken = default)
-    {
-        var doc = new UserStatusDocument
-        {
-            Id = dto.Id,
-            UserId = userId,
-            Type = dto.Type,
-            Emoji = dto.Emoji,
-            Text = dto.Text,
-            CreatedAt = dto.CreatedAt,
-            ExpiresAt = dto.ExpiresAt,
-            Metadata = new BsonDocument()
-        };
-        await _collection.InsertOneAsync(doc, cancellationToken: cancellationToken);
-    }
-
-    public Task DeleteAsync(Guid id, CancellationToken cancellationToken = default)
-        => _collection.DeleteOneAsync(x => x.Id == id, cancellationToken);
-
-    private static UserStatusDto ToDto(UserStatusDocument d) => new()
-    {
-        Id = d.Id,
-        Type = d.Type,
-        Emoji = d.Emoji,
-        Text = d.Text,
-        CreatedAt = d.CreatedAt,
-        ExpiresAt = d.ExpiresAt
-    };
-}

backend/src/Modules/Profiles/Infrastructure/Mappings/ProfileMappings.cs

@@ -1,14 +1,13 @@
 using Knot.Contracts.Profiles.Application.DTOs;
-using Knot.Contracts.Profiles.Domain;
 using Knot.Modules.Profiles.Domain;
 
 namespace Knot.Modules.Profiles.Infrastructure.Mappings;
 
 public static class ProfileMappings
 {
-    public static UserProfileDto ToDtoWithStatusMap(ProfileDocument document, IReadOnlyDictionary<Guid, UserStatusDto> statusMap)
+    public static UserProfileDto ToDto(this ProfileDocument document)
     {
-        var dto = new UserProfileDto
+        return new UserProfileDto
         {
             UserId = document.Id,
             DisplayName = document.DisplayName,
@@ -19,59 +18,7 @@ public static class ProfileMappings
             LastSeen = null,
             Birthday = document.Birthday,
             IsPremium = false,
-            IsInvisible = document.IsInvisible,
-            CreatedAt = document.CreatedAt,
-            Status = null,
-            StatusText = null,
-            StatusEmoji = null,
-            StatusExpiresAt = null,
-            CurrentStatusId = null
+            CreatedAt = document.CreatedAt
         };
-
-        UserStatusDto? active = null;
-        if (document.CurrentStatusId is Guid sid && statusMap.TryGetValue(sid, out var loaded) && loaded is not null)
-        {
-            var exp = loaded.ExpiresAt;
-            if (!exp.HasValue || exp.Value > DateTime.UtcNow)
-                active = loaded;
-        }
-
-        if (active is not null)
-        {
-            dto.Status = active;
-            dto.StatusText = active.Text;
-            dto.StatusEmoji = active.Emoji;
-            dto.StatusExpiresAt = active.ExpiresAt;
-            dto.CurrentStatusId = active.Id;
-            return dto;
-        }
-
-        var legacyExpired = document.StatusExpiresAt.HasValue && document.StatusExpiresAt.Value <= DateTime.UtcNow;
-        if (!legacyExpired && (!string.IsNullOrEmpty(document.StatusText) || !string.IsNullOrEmpty(document.StatusEmoji)))
-        {
-            dto.StatusText = document.StatusText;
-            dto.StatusEmoji = document.StatusEmoji;
-            dto.StatusExpiresAt = document.StatusExpiresAt;
-            dto.Status = new UserStatusDto
-            {
-                Id = Guid.Empty,
-                Type = "Custom",
-                Emoji = document.StatusEmoji ?? string.Empty,
-                Text = document.StatusText ?? string.Empty,
-                CreatedAt = document.CreatedAt,
-                ExpiresAt = document.StatusExpiresAt
-            };
-            return dto;
-        }
-
-        return dto;
-    }
-
-    public static async Task<UserProfileDto> ToDtoAsync(this ProfileDocument document, IUserStatusRepository statuses, CancellationToken cancellationToken)
-    {
-        if (document.CurrentStatusId is not Guid sid)
-            return ToDtoWithStatusMap(document, new Dictionary<Guid, UserStatusDto>());
-        var map = await statuses.GetByIdsAsync(new[] { sid }, cancellationToken);
-        return ToDtoWithStatusMap(document, map);
     }
 }

backend/src/Modules/Profiles/Presentation/Endpoints/ProfilesEndpoints.cs

@@ -17,8 +17,6 @@ public static class ProfilesEndpoints
     public static void MapProfilesEndpoints(this WebApplication app)
     {
         var group = app.MapGroup("api/profiles").RequireAuthorization();
-        var userGroup = app.MapGroup("api/user").RequireAuthorization();
-        var usersGroup = app.MapGroup("api/users").RequireAuthorization();
 
         group.MapGet("search", async ([FromQuery] string q, ISender sender, IUserContext userContext, CancellationToken ct) =>
         {
@@ -69,37 +67,16 @@ public static class ProfilesEndpoints
             return result.IsSuccess ? Results.Ok(result.Value) : Results.NotFound(result.Error);
         });
 
-        async Task<IResult> UpdateProfileHandler(
-            [FromBody] Knot.Modules.Profiles.Application.Profiles.DTOs.UpdateProfileRequest request,
-            ISender sender,
-            IUserContext userContext,
-            CancellationToken ct)
+        group.MapPut("profile", async ([FromBody] Knot.Modules.Profiles.Application.Profiles.DTOs.UpdateProfileRequest request, ISender sender, IUserContext userContext, CancellationToken ct) =>
         {
-            var result = await sender.Send(
-                new UpdateProfileCommand(
-                    userContext.UserId,
-                    request.DisplayName,
-                    request.Bio,
-                    request.Birthday,
-                    request.IsInvisible),
-                ct);
+            var result = await sender.Send(new UpdateProfileCommand(userContext.UserId, request.DisplayName, request.Bio, request.Birthday), ct);
             return result.IsSuccess ? Results.Ok(result.Value) : Results.NotFound(result.Error);
-        }
-
-        group.MapPut("profile", UpdateProfileHandler);
-        group.MapPatch("profile", UpdateProfileHandler);
-        userGroup.MapPatch("profile", UpdateProfileHandler);
+        });
 
         group.MapGet("{id:guid}", async (Guid id, ISender sender, CancellationToken ct) =>
         {
             var result = await sender.Send(new GetProfileQuery(id), ct);
             return result.IsSuccess ? Results.Ok(result.Value) : Results.NotFound(result.Error);
         });
-
-        usersGroup.MapGet("{id:guid}", async (Guid id, ISender sender, CancellationToken ct) =>
-        {
-            var result = await sender.Send(new GetProfileQuery(id), ct);
-            return result.IsSuccess ? Results.Ok(result.Value) : Results.NotFound(result.Error);
-        });
     }
 }

backend/src/Modules/Profiles/Presentation/Endpoints/StatusesEndpoints.cs

@@ -1,45 +0,0 @@
-using Knot.Modules.Profiles.Application.Statuses;
-using Knot.Shared.Kernel;
-using MediatR;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Routing;
-
-namespace Knot.Modules.Profiles.Presentation.Endpoints;
-
-public static class StatusesEndpoints
-{
-    public static void MapStatusesEndpoints(this WebApplication app)
-    {
-        var g = app.MapGroup("api/statuses").RequireAuthorization();
-
-        g.MapGet("presets", async (ISender sender, CancellationToken ct) =>
-        {
-            var list = await sender.Send(new GetStatusPresetsQuery(), ct);
-            return Results.Ok(list);
-        });
-
-        g.MapPost("custom", async ([FromBody] SetCustomStatusBody body, ISender sender, IUserContext ctx, CancellationToken ct) =>
-        {
-            var result = await sender.Send(
-                new SetCustomUserStatusCommand(ctx.UserId, body.Emoji, body.Text, body.ExpiresAt, body.PresetKey),
-                ct);
-            return result.IsSuccess ? Results.Ok(result.Value) : Results.BadRequest(result.Error);
-        });
-
-        g.MapDelete("/", async (ISender sender, IUserContext ctx, CancellationToken ct) =>
-        {
-            var result = await sender.Send(new ClearUserStatusCommand(ctx.UserId), ct);
-            return result.IsSuccess ? Results.Ok(result.Value) : Results.BadRequest(result.Error);
-        });
-    }
-
-    public sealed class SetCustomStatusBody
-    {
-        public string? Emoji { get; set; }
-        public string? Text { get; set; }
-        public DateTime? ExpiresAt { get; set; }
-        public string? PresetKey { get; set; }
-    }
-}

client-mobile/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Tue Apr 14 00:27:15 MSK 2026
+gradle.version=8.5

client-mobile/.gradle/config.properties

@@ -0,0 +1,2 @@
+#Tue Apr 14 00:13:58 MSK 2026
+java.home=C\:\\Program Files\\Android\\Android Studio\\jbr

client-mobile/app/build.gradle.kts

@@ -0,0 +1,131 @@
+plugins {
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
+    id("com.google.dagger.hilt.android")
+    id("com.google.gms.google-services")
+    kotlin("kapt")
+}
+
+android {
+    namespace = "ru.knot.messager"
+    compileSdk = 34
+
+    defaultConfig {
+        applicationId = "ru.knot.messager"
+        minSdk = 26
+        targetSdk = 34
+        versionCode = 1
+        versionName = "1.0.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        vectorDrawables {
+            useSupportLibrary = true
+        }
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+    
+    // Подключаем все наши папки с кодом как sourceSets
+    sourceSets {
+        getByName("main") {
+            java.srcDirs(
+                "src/main/kotlin",
+                "../auth",
+                "../chats",
+                "../core",
+                "../calls",
+                "../stories",
+                "../contacts",
+                "../profiles",
+                "../settings",
+                "../navigation"
+            )
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+    buildFeatures {
+        compose = true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.5.8"
+    }
+    packaging {
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        }
+    }
+}
+
+dependencies {
+    // AndroidX & UI
+    implementation("androidx.core:core-ktx:1.12.0")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
+    implementation("androidx.activity:activity-compose:1.8.1")
+    implementation(platform("androidx.compose:compose-bom:2023.10.01"))
+    implementation("androidx.compose.ui:ui")
+    implementation("androidx.compose.ui:ui-graphics")
+    implementation("androidx.compose.ui:ui-tooling-preview")
+    implementation("androidx.compose.material3:material3")
+    implementation("com.google.android.material:material:1.11.0")
+    implementation("androidx.navigation:navigation-compose:2.7.5")
+    implementation("androidx.compose.material:material-icons-extended")
+
+    // Hilt
+    implementation("com.google.dagger:hilt-android:2.48")
+    kapt("com.google.dagger:hilt-android-compiler:2.48")
+    implementation("androidx.hilt:hilt-navigation-compose:1.1.0")
+
+    // Network & SignalR
+    implementation("com.squareup.retrofit2:retrofit:2.9.0")
+    implementation("com.squareup.retrofit2:converter-gson:2.9.0")
+    implementation("com.squareup.okhttp3:logging-interceptor:4.12.0")
+    implementation("com.microsoft.signalr:signalr:7.0.0")
+
+    // WebRTC
+    implementation("com.github.webrtc-sdk:android:104.5112.01")
+
+    // Media3 (ExoPlayer)
+    implementation("androidx.media3:media3-exoplayer:1.2.0")
+    implementation("androidx.media3:media3-ui:1.2.0")
+    implementation("androidx.media3:media3-common:1.2.0")
+
+    // Images & GIF
+    implementation("io.coil-kt:coil-compose:2.5.0")
+    implementation("io.coil-kt:coil-gif:2.5.0")
+    implementation("io.coil-kt:coil-svg:2.5.0")
+    implementation("io.coil-kt:coil-video:2.5.0")
+
+    // Security
+    implementation("androidx.security:security-crypto:1.1.0-alpha06")
+
+    // UCrop (Image Cropping)
+    implementation("com.github.yalantis:ucrop:2.2.8")
+
+    // Firebase (Push Notifications)
+    implementation(platform("com.google.firebase:firebase-bom:32.7.0"))
+    implementation("com.google.firebase:firebase-messaging-ktx")
+    implementation("com.google.firebase:firebase-analytics-ktx")
+
+    // Room
+    val room_version = "2.6.1"
+    implementation("androidx.room:room-runtime:$room_version")
+    implementation("androidx.room:room-ktx:$room_version")
+    kapt("androidx.room:room-compiler:$room_version")
+
+    // Testing
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.1.5")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+}

client-mobile/app/google-services.json

@@ -0,0 +1,29 @@
+{
+  "project_info": {
+    "project_number": "483917912506",
+    "project_id": "knot-bad1a",
+    "storage_bucket": "knot-bad1a.firebasestorage.app"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:483917912506:android:cd39213364869ef9e82583",
+        "android_client_info": {
+          "package_name": "ru.knot.messager"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBAL_bZJYaa7rGERLX63LeFXz-__JXRWQY"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

client-mobile/app/src/main/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="ru.knot.messager">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+
+    <application
+        android:name="com.knot.messenger.MainApplication"
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.KnotMessenger"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:usesCleartextTraffic="true">
+
+        <activity
+            android:name="com.knot.messenger.MainActivity"
+            android:exported="true"
+            android:launchMode="singleTop"
+            android:windowSoftInputMode="adjustResize"
+            android:theme="@style/Theme.KnotMessenger">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <service
+            android:name="core.notifications.data.ForkFirebaseMessagingService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
+
+    </application>
+</manifest>

client-mobile/app/src/main/kotlin/com/knot/messenger/MainActivity.kt

@@ -0,0 +1,58 @@
+package com.knot.messenger
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.ui.Modifier
+import dagger.hilt.android.AndroidEntryPoint
+import navigation.AppNavigation
+import core.presentation.theme.ForkMessengerTheme
+
+@AndroidEntryPoint
+class MainActivity : ComponentActivity() {
+    @javax.inject.Inject
+    lateinit var navigationManager: core.utils.NavigationManager
+
+    @javax.inject.Inject
+    lateinit var signalrNotificationObserver: chats.data.remote.signalr.SignalRNotificationObserver
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        
+        signalrNotificationObserver.start()
+
+        intent.getStringExtra("chatId")?.let { chatId ->
+            navigationManager.navigateToChat(chatId)
+        }
+        
+        // Request notifications permission for Android 13+
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
+            androidx.core.app.ActivityCompat.requestPermissions(
+                this,
+                arrayOf(android.Manifest.permission.POST_NOTIFICATIONS),
+                101
+            )
+        }
+
+        setContent {
+            ForkMessengerTheme {
+                Surface(
+                    modifier = Modifier.fillMaxSize(),
+                    color = MaterialTheme.colorScheme.background
+                ) {
+                    AppNavigation(navigationManager = navigationManager)
+                }
+            }
+        }
+    }
+
+    override fun onNewIntent(intent: android.content.Intent?) {
+        super.onNewIntent(intent)
+        intent?.getStringExtra("chatId")?.let { chatId ->
+            navigationManager.navigateToChat(chatId)
+        }
+    }
+}

client-mobile/app/src/main/kotlin/com/knot/messenger/MainApplication.kt

@@ -0,0 +1,18 @@
+package com.knot.messenger
+
+import android.app.Application
+import coil.ImageLoader
+import coil.ImageLoaderFactory
+import coil.decode.VideoFrameDecoder
+import dagger.hilt.android.HiltAndroidApp
+
+@HiltAndroidApp
+class MainApplication : Application(), ImageLoaderFactory {
+    override fun newImageLoader(): ImageLoader {
+        return ImageLoader.Builder(this)
+            .components {
+                add(VideoFrameDecoder.Factory())
+            }
+            .build()
+    }
+}

client-mobile/app/src/main/res/values-en/strings.xml

@@ -0,0 +1,63 @@
+<resources>
+    <string name="app_name">ForkMessenger</string>
+    <string name="login">Login</string>
+    <string name="register">Register</string>
+    <string name="username">Username</string>
+    <string name="password">Password</string>
+    <string name="display_name">Display Name</string>
+    <string name="settings">Settings</string>
+    <string name="save">Save</string>
+    <string name="back">Back</string>
+    <string name="server_connection">Server Connection</string>
+    <string name="api_base_url">API Base URL</string>
+    <string name="server_features">Server Features</string>
+    <string name="stories">Stories</string>
+    <string name="polls">Polls</string>
+    <string name="calls">Calls</string>
+    <string name="groups">Groups</string>
+    <string name="enabled">Enabled</string>
+    <string name="disabled">Disabled</string>
+    <string name="limits">Limits</string>
+    <string name="max_file_size">Max File Size</string>
+    <string name="max_group_members">Max Group Members</string>
+    <string name="message">Message</string>
+    <string name="call">Call</string>
+    <string name="block">Block</string>
+    <string name="profile">Profile</string>
+    <string name="confirm_password">Confirm Password</string>
+    <string name="passwords_not_match">Passwords do not match</string>
+    <string name="no_account_register">Don\'t have an account? Register</string>
+    <string name="already_have_account">Already have an account? Login</string>
+    <string name="error_occurred">An error occurred</string>
+    <string name="loading">Loading...</string>
+    <string name="chats_title">Chats</string>
+    <string name="contacts_title">Contacts</string>
+    <string name="stories_title">Stories</string>
+    <string name="create_story">Create Story</string>
+    <string name="send_message_hint">Type a message...</string>
+    <string name="reply_to_user">Reply to %1$s...</string>
+    <string name="story_editor">STORY EDITOR</string>
+    <string name="publish">PUBLISH</string>
+    <string name="start_creation">START CREATION</string>
+    <string name="text_tool">TEXT</string>
+    <string name="crop_tool">CROP</string>
+    <string name="stickers_tool">STICKERS</string>
+    <string name="brush_tool">BRUSH</string>
+    <string name="filters_tool">FILTERS</string>
+    <string name="remove">Remove</string>
+    <string name="no_chats_found">No chats found</string>
+    <string name="typing">typing...</string>
+    <string name="video_call">Video Call</string>
+    <string name="emoji">Emoji</string>
+    <string name="attach">Attach</string>
+    <string name="message_placeholder">Message...</string>
+    <string name="voice_message">Voice Message</string>
+    <string name="send">Send</string>
+    <string name="reply_photo">Photo</string>
+    <string name="reply_video">Video</string>
+    <string name="reply_audio">Audio</string>
+    <string name="reply_file">File</string>
+    <string name="reply_gif">GIF</string>
+    <string name="reply_prefix">Reply to </string>
+    <string name="reply_self">yourself</string>
+</resources>

client-mobile/app/src/main/res/values/strings.xml

@@ -0,0 +1,85 @@
+<resources>
+    <string name="app_name">ForkMessenger</string>
+    <string name="login">Войти</string>
+    <string name="register">Регистрация</string>
+    <string name="username">Имя пользователя</string>
+    <string name="password">Пароль</string>
+    <string name="display_name">Отображаемое имя</string>
+    <string name="settings">Настройки</string>
+    <string name="save">Сохранить</string>
+    <string name="back">Назад</string>
+    <string name="server_connection">Подключение к серверу</string>
+    <string name="api_base_url">API Base URL</string>
+    <string name="server_features">Функции сервера</string>
+    <string name="stories">Истории</string>
+    <string name="polls">Опросы</string>
+    <string name="calls">Звонки</string>
+    <string name="groups">Группы</string>
+    <string name="enabled">Включено</string>
+    <string name="disabled">Отключено</string>
+    <string name="limits">Лимиты</string>
+    <string name="max_file_size">Макс. размер файла</string>
+    <string name="max_group_members">Макс. участников в группе</string>
+    <string name="message">Сообщение</string>
+    <string name="call">Позвонить</string>
+    <string name="block">Заблокировать</string>
+    <string name="profile">Профиль</string>
+    <string name="confirm_password">Подтвердите пароль</string>
+    <string name="passwords_not_match">Пароли не совпадают</string>
+    <string name="no_account_register">Нет аккаунта? Зарегистрироваться</string>
+    <string name="already_have_account">Уже есть аккаунт? Войти</string>
+    <string name="error_occurred">Произошла ошибка</string>
+    <string name="loading">Загрузка...</string>
+    <string name="chats_title">Чаты</string>
+    <string name="contacts_title">Контакты</string>
+    <string name="stories_title">Истории</string>
+    <string name="create_story">Создать историю</string>
+    <string name="send_message_hint">Напишите сообщение...</string>
+    <string name="reply_to_user">Ответить %1$s...</string>
+    <string name="story_editor">РЕДАКТОР ИСТОРИЙ</string>
+    <string name="publish">ОПУБЛИКОВАТЬ</string>
+    <string name="start_creation">НАЧАТЬ СОЗДАНИЕ</string>
+    <string name="text_tool">ТЕКСТ</string>
+    <string name="crop_tool">ОБРЕЗКА</string>
+    <string name="stickers_tool">СТИКЕРЫ</string>
+    <string name="brush_tool">КИСТЬ</string>
+    <string name="filters_tool">ФИЛЬТРЫ</string>
+    <string name="remove">Удалить</string>
+    <string name="no_chats_found">Чаты не найдены</string>
+    <string name="typing">печатает...</string>
+    <string name="video_call">Видеозвонок</string>
+    <string name="emoji">Эмодзи</string>
+    <string name="attach">Прикрепить</string>
+    <string name="message_placeholder">Сообщение...</string>
+    <string name="voice_message">Голосовое сообщение</string>
+    <string name="send">Отправить</string>
+    <string name="search_hint">Поиск...</string>
+    <string name="online">В сети</string>
+    <string name="last_seen">Был(а): %1$s</string>
+    <string name="last_seen_recently">недавно</string>
+    <string name="all">Все</string>
+    <string name="online_tab">Онлайн</string>
+    <string name="blocked">Заблокированные</string>
+    <string name="media">Медиа</string>
+    <string name="notifications">Уведомления</string>
+    <string name="mute">Без звука</string>
+    <string name="unmute">Включить звук</string>
+    <string name="log_out">Выйти из аккаунта</string>
+    <string name="bio">О себе</string>
+    <string name="edit_profile">Редактировать профиль</string>
+    <string name="username_label">Имя пользователя</string>
+    <string name="change_photo">Изменить фото</string>
+    <string name="cancel">Отмена</string>
+    <string name="crop">Обрезать</string>
+    <string name="chats">Чаты</string>
+    <string name="contacts_tab">Контакты</string>
+    <string name="profile_tab">Профиль</string>
+    <string name="saving">Сохранение...</string>
+    <string name="reply_photo">Фото</string>
+    <string name="reply_video">Видео</string>
+    <string name="reply_audio">Аудио</string>
+    <string name="reply_file">Файл</string>
+    <string name="reply_gif">GIF</string>
+    <string name="reply_prefix">Ответ </string>
+    <string name="reply_self">самому себе</string>
+</resources>

client-mobile/app/src/main/res/values/styles.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.KnotMessenger" parent="Theme.Material3.DayNight.NoActionBar">
+        <item name="android:statusBarColor">#0F0F10</item>
+        <item name="android:windowBackground">#0F0F10</item>
+    </style>
+</resources>

client-mobile/app/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <!-- Для отладки: доверяем пользовательским сертификатам -->
+    <debug-overrides>
+        <trust-anchors>
+            <certificates src="user" />
+            <certificates src="system" />
+        </trust-anchors>
+    </debug-overrides>
+    
+    <!-- Разрешаем cleartext (HTTP) трафик для локальных IP -->
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">localhost</domain>
+        <domain includeSubdomains="true">127.0.0.1</domain>
+        <domain includeSubdomains="true">10.0.0.0/8</domain>
+        <domain includeSubdomains="true">172.16.0.0/12</domain>
+        <domain includeSubdomains="true">192.168.0.0/16</domain>
+    </domain-config>
+</network-security-config>

client-mobile/auth/data/remote/api/AuthApi.kt

@@ -0,0 +1,27 @@
+package auth.data.remote.api
+
+import auth.data.remote.dto.AuthRequest
+import auth.data.remote.dto.AuthResponse
+import core.domain.model.ServerConfigModel
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.Headers
+import retrofit2.http.POST
+
+interface AuthApi {
+    @POST("auth/login")
+    @Headers("Cache-Control: no-cache")
+    suspend fun login(@Body request: AuthRequest): AuthResponse
+
+    @POST("auth/register")
+    @Headers("Cache-Control: no-cache")
+    suspend fun register(@Body request: AuthRequest): AuthResponse
+
+    @GET("config")
+    @Headers("Cache-Control: no-cache")
+    suspend fun getConfig(): ServerConfigModel
+
+    @POST("auth/push-token")
+    @Headers("Cache-Control: no-cache")
+    suspend fun updatePushToken(@Body token: String): Unit
+}

client-mobile/auth/data/remote/dto/AuthDtos.kt

@@ -0,0 +1,23 @@
+package auth.data.remote.dto
+
+import com.google.gson.annotations.SerializedName
+
+data class AuthRequest(
+    @SerializedName("userName") val userName: String,
+    @SerializedName("password") val password: String
+)
+
+data class AuthResponse(
+    @SerializedName("accessToken") val accessToken: String?,
+    @SerializedName("user") val user: UserDto?,
+    @SerializedName("userId") val userId: String?,
+    @SerializedName("username") val username: String?,
+    @SerializedName("displayName") val displayName: String?
+)
+
+data class UserDto(
+    @SerializedName("id") val id: String,
+    @SerializedName("userName") val userName: String,
+    @SerializedName("displayName") val displayName: String?,
+    @SerializedName("avatarUrl") val avatarUrl: String?
+)

client-mobile/auth/data/repository/AuthRepositoryImpl.kt

@@ -0,0 +1,98 @@
+package auth.data.repository
+
+import auth.data.remote.api.AuthApi
+import auth.data.remote.dto.AuthRequest
+import auth.domain.model.AuthResult
+import auth.domain.repository.AuthRepository
+import core.network.ServerConfig
+import core.security.TokenManager
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import javax.inject.Inject
+
+class AuthRepositoryImpl @Inject constructor(
+    private val api: AuthApi,
+    private val tokenManager: TokenManager,
+    private val serverConfig: ServerConfig
+) : AuthRepository {
+
+    private val _isAuthenticated = kotlinx.coroutines.flow.MutableStateFlow(tokenManager.getToken() != null)
+
+    override suspend fun login(userName: String, password: String): Result<AuthResult> {
+        return try {
+            val response = api.login(AuthRequest(userName, password))
+            val token = response.accessToken ?: return Result.failure(Exception("Token is null"))
+            val userId = response.userId ?: ""
+            
+            tokenManager.saveToken(token, userId)
+            _isAuthenticated.value = true
+            fetchConfig()
+            Result.success(
+                AuthResult(
+                    token = token,
+                    userId = userId,
+                    userName = response.username ?: userName,
+                    displayName = response.displayName ?: response.username ?: userName,
+                    avatarUrl = null
+                )
+            )
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
+    }
+
+    override suspend fun register(userName: String, password: String): Result<AuthResult> {
+        return try {
+            val response = api.register(AuthRequest(userName, password))
+            val token = response.accessToken ?: return Result.failure(Exception("Token is null"))
+            val userId = response.userId ?: ""
+
+            tokenManager.saveToken(token, userId)
+            _isAuthenticated.value = true
+            fetchConfig()
+            Result.success(
+                AuthResult(
+                    token = token,
+                    userId = userId,
+                    userName = response.username ?: userName,
+                    displayName = response.displayName ?: response.username ?: userName,
+                    avatarUrl = null
+                )
+            )
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
+    }
+
+    override suspend fun logout() {
+        tokenManager.deleteToken()
+        _isAuthenticated.value = false
+    }
+
+    override fun isAuthenticated(): Boolean {
+        return _isAuthenticated.value
+    }
+
+    override fun isAuthenticatedFlow(): kotlinx.coroutines.flow.StateFlow<Boolean> {
+        return _isAuthenticated.asStateFlow()
+    }
+
+    override suspend fun fetchConfig(): Result<Unit> {
+        return try {
+            val config = api.getConfig()
+            serverConfig.saveServerConfig(config)
+            Result.success(Unit)
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
+    }
+
+    override suspend fun updatePushToken(token: String) {
+        try {
+            api.updatePushToken(token)
+        } catch (e: Exception) {
+            // Silent fail
+        }
+    }
+}

client-mobile/auth/di/AuthModule.kt

@@ -0,0 +1,34 @@
+package auth.di
+
+import auth.data.remote.api.AuthApi
+import auth.data.repository.AuthRepositoryImpl
+import auth.domain.repository.AuthRepository
+import core.network.ServerConfig
+import core.security.TokenManager
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import retrofit2.Retrofit
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object AuthModule {
+
+    @Provides
+    @Singleton
+    fun provideAuthApi(retrofit: Retrofit): AuthApi {
+        return retrofit.create(AuthApi::class.java)
+    }
+
+    @Provides
+    @Singleton
+    fun provideAuthRepository(
+        api: AuthApi,
+        tokenManager: TokenManager,
+        serverConfig: ServerConfig
+    ): AuthRepository {
+        return AuthRepositoryImpl(api, tokenManager, serverConfig)
+    }
+}

client-mobile/auth/domain/model/AuthModels.kt

@@ -0,0 +1,9 @@
+package auth.domain.model
+
+data class AuthResult(
+    val token: String,
+    val userId: String,
+    val userName: String,
+    val displayName: String,
+    val avatarUrl: String?
+)

client-mobile/auth/domain/repository/AuthRepository.kt

@@ -0,0 +1,13 @@
+package auth.domain.repository
+
+import auth.domain.model.AuthResult
+
+interface AuthRepository {
+    suspend fun login(userName: String, password: String): Result<AuthResult>
+    suspend fun register(userName: String, password: String): Result<AuthResult>
+    suspend fun logout()
+    suspend fun fetchConfig(): Result<Unit>
+    fun isAuthenticated(): Boolean
+    fun isAuthenticatedFlow(): kotlinx.coroutines.flow.StateFlow<Boolean>
+    suspend fun updatePushToken(token: String)
+}