From 89b2eeea6c518cd3ae839350384c78781f1873a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B0=D0=BB=D0=B8=D0=BC=D0=BE=D0=B2=20=D0=A0=D1=83?= =?UTF-8?q?=D1=81=D1=82=D0=B0=D0=BC?= Date: Mon, 30 Mar 2026 00:09:12 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1=D1=82=D1=80=D1=83=D0=BA=D1=82=D1=83?= =?UTF-8?q?=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/Knot.sln | 403 ++++++++++-------- .../ResetUserPasswordCommandHandlerTests.cs | 4 +- .../UnitTests/LoginUserCommandHandlerTests.cs | 4 +- .../SendMessageCommandHandlerTests.cs | 6 +- .../CreateStoryCommandHandlerTests.cs | 4 +- .../UpdateProfileCommandHandlerTests.cs | 4 +- .../Knot.Contracts.Admin.csproj} | 0 .../Abstractions/IAuthDbContext.cs | 4 +- .../Abstractions/IAuthUnitOfWork.cs | 4 +- .../Abstractions/IJwtTokenProvider.cs | 3 +- .../Application/Auth/DTOs/AuthErrors.cs | 4 +- .../Application/Auth/DTOs/AuthResponseDto.cs | 2 +- .../Application/Users/GetMe/GetMeQuery.cs | 6 + .../Users/Login/LoginUserCommand.cs | 4 +- .../Users/Register/RegisterUserCommand.cs | 14 + .../Domain/IUserRepository.cs | 2 +- .../Domain/UserContract.cs | 2 +- .../Knot.Contracts.Auth.csproj} | 1 + .../Knot.Contracts.Conversations.csproj} | 1 + .../Knot.Contracts.Federation.csproj} | 1 + .../Knot.Contracts.Klipy.csproj} | 1 + .../Abstractions/IIdentityDbContext.cs | 9 - .../Abstractions/IIdentityUnitOfWork.cs | 9 - .../Application/Users/GetMe/GetMeQuery.cs | 6 - .../Users/Register/RegisterUserCommand.cs | 14 - .../Knot.Modules.Messaging.Contracts.csproj | 17 - .../Profiles/Search/SearchUsers.cs | 6 - .../Knot.Modules.Profiles.Contracts.csproj | 17 - .../Knot.Modules.Relations.Contracts.csproj | 17 - .../Knot.Modules.Settings.Contracts.csproj | 17 - .../Knot.Modules.Storage.Contracts.csproj | 17 - .../Knot.Modules.Stories.Contracts.csproj | 17 - ...ot.Modules.TelegramImport.Contracts.csproj | 17 - .../Knot.Modules.WebRtc.Contracts.csproj | 17 - .../Messaging/Knot.Contracts.Messaging.csproj | 18 + .../Application/DTOs/ProfilesErrors.cs | 4 +- .../Application/DTOs/ProfilesRequests.cs | 4 +- .../Application/DTOs/UserProfileDto.cs | 2 +- .../Profiles/Avatar/UploadAvatar.cs | 4 +- .../Profiles/GetUser/GetProfile.cs | 4 +- .../Profiles/Search/SearchUsers.cs | 6 + .../Profiles/UpdateProfile/UpdateProfile.cs | 4 +- .../Profiles/UpdateSettings/UpdateSettings.cs | 4 +- .../Domain/IAvatarStorageService.cs | 4 +- .../Domain/IProfileRepository.cs | 4 +- .../Domain/IProfilesUnitOfWork.cs | 4 +- .../Profiles/Knot.Contracts.Profiles.csproj | 18 + .../Relations/Knot.Contracts.Relations.csproj | 18 + .../Abstractions/ISettingsService.cs | 4 +- .../Application/DTOs/SystemSettingsDto.cs | 4 +- .../Settings/Knot.Contracts.Settings.csproj | 18 + .../Storage/Knot.Contracts.Storage.csproj | 18 + .../Stories/Knot.Contracts.Stories.csproj | 18 + .../Knot.Contracts.TelegramImport.csproj | 18 + .../WebRtc/Knot.Contracts.WebRtc.csproj | 18 + backend/src/Host/Program.cs | 2 +- .../Admin/Commands/BanUser/BanUserCommand.cs | 4 +- .../Commands/BanUser/UnbanUserCommand.cs | 4 +- .../ResetUserPasswordCommand.cs | 6 +- .../TestKlipy/TestKlipyConnectionCommand.cs | 4 +- .../UpdateSettings/UpdateSettingsCommand.cs | 4 +- .../Queries/GetSettings/GetSettingsQuery.cs | 4 +- .../GetUserDetails/GetUserDetailsQuery.cs | 4 +- .../Queries/SearchUsers/SearchUsersQuery.cs | 2 +- .../SystemSettingsUpdatedDomainEvent.cs | 4 +- .../Modules/Admin/Knot.Modules.Admin.csproj | 9 +- .../Presentation/Endpoints/AdminEndpoints.cs | 6 +- .../Auth/Application/Users/GetMe/GetMe.cs | 4 +- .../Users/Login/LoginUserCommandHandler.cs | 6 +- .../Register/RegisterUserCommandHandler.cs | 22 +- .../src/Modules/Auth/DependencyInjection.cs | 6 +- backend/src/Modules/Auth/Domain/User.cs | 10 +- .../Authentication/JwtTokenProvider.cs | 7 +- .../Persistence/AuthDbContext.cs | 6 +- .../Persistence/UserRepository.cs | 4 +- .../Services/UserDisplayNameProvider.cs | 4 +- .../src/Modules/Auth/Knot.Modules.Auth.csproj | 11 +- .../20260322191927_InitialAuth.Designer.cs | 2 +- ...27140400_AddUserExtendedFields.Designer.cs | 2 +- ...20270327160000_AddUserBanField.Designer.cs | 2 +- .../Migrations/AuthDbContextModelSnapshot.cs | 2 +- .../AddToFolder/AddToFolderCommand.cs | 2 +- .../Send/SendMessageCommandHandler.cs | 2 +- .../Messages/UploadFile/UploadFileCommand.cs | 4 +- .../Commands/DeleteUser/DeleteUserCommand.cs | 4 +- .../Knot.Modules.Conversations.csproj | 15 +- .../Commands/HandshakeFederationCommand.cs | 4 +- .../Commands/InboundFederationCommand.cs | 22 +- .../Federation/Commands/ResolveUserCommand.cs | 6 +- .../Events/FederatedMessageActionsHandler.cs | 6 +- .../Events/MessageSentDomainEventHandler.cs | 6 +- ...SystemSettingsUpdatedDomainEventHandler.cs | 4 +- .../UserStatusChangedDomainEventHandler.cs | 20 +- .../Services/FederationPacketService.cs | 4 +- .../Services/FederationGateway.cs | 4 +- .../Federation/Knot.Modules.Federation.csproj | 7 +- .../Endpoints/FederationEndpoints.cs | 4 +- .../Klipy/Queries/GetTrendingGifsQuery.cs | 4 +- .../Klipy/Queries/SearchGifsQuery.cs | 4 +- .../Modules/Klipy/Knot.Modules.Klipy.csproj | 2 +- .../Application/Profiles/Avatar/CropAvatar.cs | 4 +- .../Profiles/Avatar/UploadAvatar.cs | 4 +- .../Application/Profiles/GetUser/GetUser.cs | 4 +- .../UserRegisteredDomainEventHandler.cs | 12 +- .../Profiles/Search/SearchUsers.cs | 4 +- .../Profiles/UpdateProfile/UpdateProfile.cs | 4 +- .../Profiles/UpdateSettings/UpdateSettings.cs | 4 +- .../Modules/Profiles/DependencyInjection.cs | 2 +- .../Database/AvatarStorageService.cs | 2 +- .../Database/ProfileRepository.cs | 6 +- .../Database/ProfilesUnitOfWork.cs | 2 +- .../Mappings/ProfileMappings.cs | 2 +- .../Profiles/Knot.Modules.Profiles.csproj | 13 +- .../Commands/UpdateSettingsCommand.cs | 4 +- .../Settings/Queries/GetPublicConfigQuery.cs | 4 +- .../Settings/Queries/GetSettingsQuery.cs | 4 +- .../Modules/Settings/DependencyInjection.cs | 2 +- .../SystemSettingsUpdatedDomainEvent.cs | 2 +- .../Configuration/SettingsService.cs | 4 +- .../Settings/Knot.Modules.Settings.csproj | 8 +- .../Presentation/Endpoints/FilesEndpoints.cs | 4 +- .../CreateStory/CreateStoryCommand.cs | 4 +- .../TelegramImport/AnalyzeImportCommand.cs | 4 +- .../WebRtc/Queries/GetIceServersQuery.cs | 4 +- 124 files changed, 623 insertions(+), 599 deletions(-) rename backend/src/Contracts/{Knot.Modules.Auth.Contracts/Knot.Modules.Auth.Contracts.csproj => Admin/Knot.Contracts.Admin.csproj} (100%) rename backend/src/Contracts/{Knot.Modules.Auth.Contracts => Auth}/Application/Abstractions/IAuthDbContext.cs (60%) rename backend/src/Contracts/{Knot.Modules.Auth.Contracts => Auth}/Application/Abstractions/IAuthUnitOfWork.cs (67%) rename backend/src/Contracts/{Knot.Modules.Auth.Contracts => Auth}/Application/Abstractions/IJwtTokenProvider.cs (67%) rename backend/src/Contracts/{Knot.Modules.Auth.Contracts => Auth}/Application/Auth/DTOs/AuthErrors.cs (84%) rename backend/src/Contracts/{Knot.Modules.Auth.Contracts => Auth}/Application/Auth/DTOs/AuthResponseDto.cs (87%) create mode 100644 backend/src/Contracts/Auth/Application/Users/GetMe/GetMeQuery.cs rename backend/src/Contracts/{Knot.Modules.Auth.Contracts => Auth}/Application/Users/Login/LoginUserCommand.cs (56%) create mode 100644 backend/src/Contracts/Auth/Application/Users/Register/RegisterUserCommand.cs rename backend/src/Contracts/{Knot.Modules.Auth.Contracts => Auth}/Domain/IUserRepository.cs (95%) rename backend/src/Contracts/{Knot.Modules.Auth.Contracts => Auth}/Domain/UserContract.cs (94%) rename backend/src/Contracts/{Knot.Modules.Admin.Contracts/Knot.Modules.Admin.Contracts.csproj => Auth/Knot.Contracts.Auth.csproj} (83%) rename backend/src/Contracts/{Knot.Modules.Conversations.Contracts/Knot.Modules.Conversations.Contracts.csproj => Conversations/Knot.Contracts.Conversations.csproj} (83%) rename backend/src/Contracts/{Knot.Modules.Federation.Contracts/Knot.Modules.Federation.Contracts.csproj => Federation/Knot.Contracts.Federation.csproj} (83%) rename backend/src/Contracts/{Knot.Modules.Klipy.Contracts/Knot.Modules.Klipy.Contracts.csproj => Klipy/Knot.Contracts.Klipy.csproj} (83%) delete mode 100644 backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Abstractions/IIdentityDbContext.cs delete mode 100644 backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Abstractions/IIdentityUnitOfWork.cs delete mode 100644 backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Users/GetMe/GetMeQuery.cs delete mode 100644 backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Users/Register/RegisterUserCommand.cs delete mode 100644 backend/src/Contracts/Knot.Modules.Messaging.Contracts/Knot.Modules.Messaging.Contracts.csproj delete mode 100644 backend/src/Contracts/Knot.Modules.Profiles.Contracts/Application/Profiles/Search/SearchUsers.cs delete mode 100644 backend/src/Contracts/Knot.Modules.Profiles.Contracts/Knot.Modules.Profiles.Contracts.csproj delete mode 100644 backend/src/Contracts/Knot.Modules.Relations.Contracts/Knot.Modules.Relations.Contracts.csproj delete mode 100644 backend/src/Contracts/Knot.Modules.Settings.Contracts/Knot.Modules.Settings.Contracts.csproj delete mode 100644 backend/src/Contracts/Knot.Modules.Storage.Contracts/Knot.Modules.Storage.Contracts.csproj delete mode 100644 backend/src/Contracts/Knot.Modules.Stories.Contracts/Knot.Modules.Stories.Contracts.csproj delete mode 100644 backend/src/Contracts/Knot.Modules.TelegramImport.Contracts/Knot.Modules.TelegramImport.Contracts.csproj delete mode 100644 backend/src/Contracts/Knot.Modules.WebRtc.Contracts/Knot.Modules.WebRtc.Contracts.csproj create mode 100644 backend/src/Contracts/Messaging/Knot.Contracts.Messaging.csproj rename backend/src/Contracts/{Knot.Modules.Profiles.Contracts => Profiles}/Application/DTOs/ProfilesErrors.cs (86%) rename backend/src/Contracts/{Knot.Modules.Profiles.Contracts => Profiles}/Application/DTOs/ProfilesRequests.cs (86%) rename backend/src/Contracts/{Knot.Modules.Profiles.Contracts => Profiles}/Application/DTOs/UserProfileDto.cs (86%) rename backend/src/Contracts/{Knot.Modules.Profiles.Contracts => Profiles}/Application/Profiles/Avatar/UploadAvatar.cs (73%) rename backend/src/Contracts/{Knot.Modules.Profiles.Contracts => Profiles}/Application/Profiles/GetUser/GetProfile.cs (60%) create mode 100644 backend/src/Contracts/Profiles/Application/Profiles/Search/SearchUsers.cs rename backend/src/Contracts/{Knot.Modules.Profiles.Contracts => Profiles}/Application/Profiles/UpdateProfile/UpdateProfile.cs (61%) rename backend/src/Contracts/{Knot.Modules.Profiles.Contracts => Profiles}/Application/Profiles/UpdateSettings/UpdateSettings.cs (67%) rename backend/src/Contracts/{Knot.Modules.Profiles.Contracts => Profiles}/Domain/IAvatarStorageService.cs (82%) rename backend/src/Contracts/{Knot.Modules.Profiles.Contracts => Profiles}/Domain/IProfileRepository.cs (88%) rename backend/src/Contracts/{Knot.Modules.Profiles.Contracts => Profiles}/Domain/IProfilesUnitOfWork.cs (58%) create mode 100644 backend/src/Contracts/Profiles/Knot.Contracts.Profiles.csproj create mode 100644 backend/src/Contracts/Relations/Knot.Contracts.Relations.csproj rename backend/src/Contracts/{Knot.Modules.Settings.Contracts => Settings}/Application/Abstractions/ISettingsService.cs (87%) rename backend/src/Contracts/{Knot.Modules.Settings.Contracts => Settings}/Application/DTOs/SystemSettingsDto.cs (97%) create mode 100644 backend/src/Contracts/Settings/Knot.Contracts.Settings.csproj create mode 100644 backend/src/Contracts/Storage/Knot.Contracts.Storage.csproj create mode 100644 backend/src/Contracts/Stories/Knot.Contracts.Stories.csproj create mode 100644 backend/src/Contracts/TelegramImport/Knot.Contracts.TelegramImport.csproj create mode 100644 backend/src/Contracts/WebRtc/Knot.Contracts.WebRtc.csproj diff --git a/backend/Knot.sln b/backend/Knot.sln index 9a54559..cf3e6c5 100644 --- a/backend/Knot.sln +++ b/backend/Knot.sln @@ -173,31 +173,57 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knot.Modules.Profiles.UnitT EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Contracts", "Contracts", "{FFBE31B8-50B9-B415-22BC-2F92C97CADA3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knot.Modules.Admin.Contracts", "src\Contracts\Knot.Modules.Admin.Contracts\Knot.Modules.Admin.Contracts.csproj", "{1D50E7AA-2378-4114-A3C3-E351D46FB8BF}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Admin", "Admin", "{1C8A9B45-FCC1-A5B3-3601-CB39D7CED4E3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knot.Modules.Auth.Contracts", "src\Contracts\Knot.Modules.Auth.Contracts\Knot.Modules.Auth.Contracts.csproj", "{E8C0F163-735D-44A2-B684-673A0B0D7D2A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knot.Contracts.Admin", "src\Contracts\Admin\Knot.Contracts.Admin.csproj", "{D3C7D267-5646-4907-A451-E7CFA853BBF5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knot.Modules.Conversations.Contracts", "src\Contracts\Knot.Modules.Conversations.Contracts\Knot.Modules.Conversations.Contracts.csproj", "{65E67218-A02C-4C42-8B60-6FDAB737E613}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Auth", "Auth", "{28F8F726-0D9B-F051-A252-088B861055C6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knot.Modules.Federation.Contracts", "src\Contracts\Knot.Modules.Federation.Contracts\Knot.Modules.Federation.Contracts.csproj", "{7226D94C-B9A5-41D7-9E59-50A68F39EE78}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knot.Contracts.Auth", "src\Contracts\Auth\Knot.Contracts.Auth.csproj", "{D65EE034-84B9-4EBE-BC1F-5606AB4524A4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knot.Modules.Klipy.Contracts", "src\Contracts\Knot.Modules.Klipy.Contracts\Knot.Modules.Klipy.Contracts.csproj", "{4AC0C433-475F-4B0C-B160-E4F33779E3CB}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Conversations", "Conversations", "{19B3F750-A3A3-3AEB-CE4F-46FB52BB3151}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knot.Modules.Messaging.Contracts", "src\Contracts\Knot.Modules.Messaging.Contracts\Knot.Modules.Messaging.Contracts.csproj", "{9D86914A-43A8-4451-BEFD-092ABFF793D6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knot.Contracts.Conversations", "src\Contracts\Conversations\Knot.Contracts.Conversations.csproj", "{17B31CB0-F2C5-47A6-9BF2-C55403C97DC7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knot.Modules.Profiles.Contracts", "src\Contracts\Knot.Modules.Profiles.Contracts\Knot.Modules.Profiles.Contracts.csproj", "{1DC69DD3-3348-4375-844C-D44A760D50EC}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Federation", "Federation", "{E97EBA1B-122C-1D64-94D9-187425FF5DF0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knot.Modules.Relations.Contracts", "src\Contracts\Knot.Modules.Relations.Contracts\Knot.Modules.Relations.Contracts.csproj", "{352A455F-AC3F-4D34-BADA-574BF83E131C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knot.Contracts.Federation", "src\Contracts\Federation\Knot.Contracts.Federation.csproj", "{62A821F2-F296-4888-8AB1-A80ED514AC08}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knot.Modules.Settings.Contracts", "src\Contracts\Knot.Modules.Settings.Contracts\Knot.Modules.Settings.Contracts.csproj", "{D10F0FA0-A682-42D4-A23F-46094D14A8F6}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Klipy", "Klipy", "{7555181C-EB04-A6C5-D475-6FC0320F57B5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knot.Modules.Storage.Contracts", "src\Contracts\Knot.Modules.Storage.Contracts\Knot.Modules.Storage.Contracts.csproj", "{F57F6152-A359-4BB5-AC01-5531C85EE47A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knot.Contracts.Klipy", "src\Contracts\Klipy\Knot.Contracts.Klipy.csproj", "{D0CE2D52-EC1C-444E-A5C5-79813E1814D4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knot.Modules.Stories.Contracts", "src\Contracts\Knot.Modules.Stories.Contracts\Knot.Modules.Stories.Contracts.csproj", "{32631ED6-956A-4572-AD7A-B8D0ECE26C78}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Messaging", "Messaging", "{3E835F76-AFEE-6419-1441-2CED62F241B2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knot.Modules.TelegramImport.Contracts", "src\Contracts\Knot.Modules.TelegramImport.Contracts\Knot.Modules.TelegramImport.Contracts.csproj", "{7E22E87D-78D2-411D-AC30-2F090C3F5ED5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knot.Contracts.Messaging", "src\Contracts\Messaging\Knot.Contracts.Messaging.csproj", "{87048157-DF94-49E6-A34F-7DEF3255FA35}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knot.Modules.WebRtc.Contracts", "src\Contracts\Knot.Modules.WebRtc.Contracts\Knot.Modules.WebRtc.Contracts.csproj", "{623330CA-6CA5-4B74-A921-DEAE8002FCC5}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Profiles", "Profiles", "{0286CA1A-73E9-C153-D97B-31BA60AC101B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knot.Contracts.Profiles", "src\Contracts\Profiles\Knot.Contracts.Profiles.csproj", "{D28F8DB7-077E-47F6-B07D-BB93AF950A0D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Relations", "Relations", "{319B016B-E46C-7232-249F-DBE50922C757}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knot.Contracts.Relations", "src\Contracts\Relations\Knot.Contracts.Relations.csproj", "{75CDF4D0-53B2-4FCE-9C2D-06940FD2E817}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Settings", "Settings", "{C91F5B42-26A0-36B8-1C54-AE965E022F68}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knot.Contracts.Settings", "src\Contracts\Settings\Knot.Contracts.Settings.csproj", "{338C69EA-F921-41B3-BB6C-116AADEBF356}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Storage", "Storage", "{6F45E82C-238A-FDE4-59E5-CCCD65D77EB8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knot.Contracts.Storage", "src\Contracts\Storage\Knot.Contracts.Storage.csproj", "{531F88C6-B9A5-4BF6-A121-AAA95DE4A288}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Stories", "Stories", "{3DE423CC-7CB5-260E-2A62-D5E89000EF8F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knot.Contracts.Stories", "src\Contracts\Stories\Knot.Contracts.Stories.csproj", "{613354F0-3B35-4406-8250-C8E88A0DECF6}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TelegramImport", "TelegramImport", "{5C1B4B87-5A65-F9C7-EAA3-6456BCBFD6EC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knot.Contracts.TelegramImport", "src\Contracts\TelegramImport\Knot.Contracts.TelegramImport.csproj", "{A47CCC4C-8B19-4A12-8B05-BE4AAEABB1BA}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebRtc", "WebRtc", "{6DD751EB-CB14-7F42-4B4B-7E4DCC49705A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knot.Contracts.WebRtc", "src\Contracts\WebRtc\Knot.Contracts.WebRtc.csproj", "{D939680D-864D-4FED-A81D-8F30EE6A97A0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -629,162 +655,162 @@ Global {6BD8DC02-2270-4276-952E-E34E973A1237}.Release|x64.Build.0 = Release|Any CPU {6BD8DC02-2270-4276-952E-E34E973A1237}.Release|x86.ActiveCfg = Release|Any CPU {6BD8DC02-2270-4276-952E-E34E973A1237}.Release|x86.Build.0 = Release|Any CPU - {1D50E7AA-2378-4114-A3C3-E351D46FB8BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D50E7AA-2378-4114-A3C3-E351D46FB8BF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D50E7AA-2378-4114-A3C3-E351D46FB8BF}.Debug|x64.ActiveCfg = Debug|Any CPU - {1D50E7AA-2378-4114-A3C3-E351D46FB8BF}.Debug|x64.Build.0 = Debug|Any CPU - {1D50E7AA-2378-4114-A3C3-E351D46FB8BF}.Debug|x86.ActiveCfg = Debug|Any CPU - {1D50E7AA-2378-4114-A3C3-E351D46FB8BF}.Debug|x86.Build.0 = Debug|Any CPU - {1D50E7AA-2378-4114-A3C3-E351D46FB8BF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D50E7AA-2378-4114-A3C3-E351D46FB8BF}.Release|Any CPU.Build.0 = Release|Any CPU - {1D50E7AA-2378-4114-A3C3-E351D46FB8BF}.Release|x64.ActiveCfg = Release|Any CPU - {1D50E7AA-2378-4114-A3C3-E351D46FB8BF}.Release|x64.Build.0 = Release|Any CPU - {1D50E7AA-2378-4114-A3C3-E351D46FB8BF}.Release|x86.ActiveCfg = Release|Any CPU - {1D50E7AA-2378-4114-A3C3-E351D46FB8BF}.Release|x86.Build.0 = Release|Any CPU - {E8C0F163-735D-44A2-B684-673A0B0D7D2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8C0F163-735D-44A2-B684-673A0B0D7D2A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8C0F163-735D-44A2-B684-673A0B0D7D2A}.Debug|x64.ActiveCfg = Debug|Any CPU - {E8C0F163-735D-44A2-B684-673A0B0D7D2A}.Debug|x64.Build.0 = Debug|Any CPU - {E8C0F163-735D-44A2-B684-673A0B0D7D2A}.Debug|x86.ActiveCfg = Debug|Any CPU - {E8C0F163-735D-44A2-B684-673A0B0D7D2A}.Debug|x86.Build.0 = Debug|Any CPU - {E8C0F163-735D-44A2-B684-673A0B0D7D2A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8C0F163-735D-44A2-B684-673A0B0D7D2A}.Release|Any CPU.Build.0 = Release|Any CPU - {E8C0F163-735D-44A2-B684-673A0B0D7D2A}.Release|x64.ActiveCfg = Release|Any CPU - {E8C0F163-735D-44A2-B684-673A0B0D7D2A}.Release|x64.Build.0 = Release|Any CPU - {E8C0F163-735D-44A2-B684-673A0B0D7D2A}.Release|x86.ActiveCfg = Release|Any CPU - {E8C0F163-735D-44A2-B684-673A0B0D7D2A}.Release|x86.Build.0 = Release|Any CPU - {65E67218-A02C-4C42-8B60-6FDAB737E613}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65E67218-A02C-4C42-8B60-6FDAB737E613}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65E67218-A02C-4C42-8B60-6FDAB737E613}.Debug|x64.ActiveCfg = Debug|Any CPU - {65E67218-A02C-4C42-8B60-6FDAB737E613}.Debug|x64.Build.0 = Debug|Any CPU - {65E67218-A02C-4C42-8B60-6FDAB737E613}.Debug|x86.ActiveCfg = Debug|Any CPU - {65E67218-A02C-4C42-8B60-6FDAB737E613}.Debug|x86.Build.0 = Debug|Any CPU - {65E67218-A02C-4C42-8B60-6FDAB737E613}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65E67218-A02C-4C42-8B60-6FDAB737E613}.Release|Any CPU.Build.0 = Release|Any CPU - {65E67218-A02C-4C42-8B60-6FDAB737E613}.Release|x64.ActiveCfg = Release|Any CPU - {65E67218-A02C-4C42-8B60-6FDAB737E613}.Release|x64.Build.0 = Release|Any CPU - {65E67218-A02C-4C42-8B60-6FDAB737E613}.Release|x86.ActiveCfg = Release|Any CPU - {65E67218-A02C-4C42-8B60-6FDAB737E613}.Release|x86.Build.0 = Release|Any CPU - {7226D94C-B9A5-41D7-9E59-50A68F39EE78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7226D94C-B9A5-41D7-9E59-50A68F39EE78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7226D94C-B9A5-41D7-9E59-50A68F39EE78}.Debug|x64.ActiveCfg = Debug|Any CPU - {7226D94C-B9A5-41D7-9E59-50A68F39EE78}.Debug|x64.Build.0 = Debug|Any CPU - {7226D94C-B9A5-41D7-9E59-50A68F39EE78}.Debug|x86.ActiveCfg = Debug|Any CPU - {7226D94C-B9A5-41D7-9E59-50A68F39EE78}.Debug|x86.Build.0 = Debug|Any CPU - {7226D94C-B9A5-41D7-9E59-50A68F39EE78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7226D94C-B9A5-41D7-9E59-50A68F39EE78}.Release|Any CPU.Build.0 = Release|Any CPU - {7226D94C-B9A5-41D7-9E59-50A68F39EE78}.Release|x64.ActiveCfg = Release|Any CPU - {7226D94C-B9A5-41D7-9E59-50A68F39EE78}.Release|x64.Build.0 = Release|Any CPU - {7226D94C-B9A5-41D7-9E59-50A68F39EE78}.Release|x86.ActiveCfg = Release|Any CPU - {7226D94C-B9A5-41D7-9E59-50A68F39EE78}.Release|x86.Build.0 = Release|Any CPU - {4AC0C433-475F-4B0C-B160-E4F33779E3CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4AC0C433-475F-4B0C-B160-E4F33779E3CB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4AC0C433-475F-4B0C-B160-E4F33779E3CB}.Debug|x64.ActiveCfg = Debug|Any CPU - {4AC0C433-475F-4B0C-B160-E4F33779E3CB}.Debug|x64.Build.0 = Debug|Any CPU - {4AC0C433-475F-4B0C-B160-E4F33779E3CB}.Debug|x86.ActiveCfg = Debug|Any CPU - {4AC0C433-475F-4B0C-B160-E4F33779E3CB}.Debug|x86.Build.0 = Debug|Any CPU - {4AC0C433-475F-4B0C-B160-E4F33779E3CB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4AC0C433-475F-4B0C-B160-E4F33779E3CB}.Release|Any CPU.Build.0 = Release|Any CPU - {4AC0C433-475F-4B0C-B160-E4F33779E3CB}.Release|x64.ActiveCfg = Release|Any CPU - {4AC0C433-475F-4B0C-B160-E4F33779E3CB}.Release|x64.Build.0 = Release|Any CPU - {4AC0C433-475F-4B0C-B160-E4F33779E3CB}.Release|x86.ActiveCfg = Release|Any CPU - {4AC0C433-475F-4B0C-B160-E4F33779E3CB}.Release|x86.Build.0 = Release|Any CPU - {9D86914A-43A8-4451-BEFD-092ABFF793D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D86914A-43A8-4451-BEFD-092ABFF793D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D86914A-43A8-4451-BEFD-092ABFF793D6}.Debug|x64.ActiveCfg = Debug|Any CPU - {9D86914A-43A8-4451-BEFD-092ABFF793D6}.Debug|x64.Build.0 = Debug|Any CPU - {9D86914A-43A8-4451-BEFD-092ABFF793D6}.Debug|x86.ActiveCfg = Debug|Any CPU - {9D86914A-43A8-4451-BEFD-092ABFF793D6}.Debug|x86.Build.0 = Debug|Any CPU - {9D86914A-43A8-4451-BEFD-092ABFF793D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D86914A-43A8-4451-BEFD-092ABFF793D6}.Release|Any CPU.Build.0 = Release|Any CPU - {9D86914A-43A8-4451-BEFD-092ABFF793D6}.Release|x64.ActiveCfg = Release|Any CPU - {9D86914A-43A8-4451-BEFD-092ABFF793D6}.Release|x64.Build.0 = Release|Any CPU - {9D86914A-43A8-4451-BEFD-092ABFF793D6}.Release|x86.ActiveCfg = Release|Any CPU - {9D86914A-43A8-4451-BEFD-092ABFF793D6}.Release|x86.Build.0 = Release|Any CPU - {1DC69DD3-3348-4375-844C-D44A760D50EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1DC69DD3-3348-4375-844C-D44A760D50EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1DC69DD3-3348-4375-844C-D44A760D50EC}.Debug|x64.ActiveCfg = Debug|Any CPU - {1DC69DD3-3348-4375-844C-D44A760D50EC}.Debug|x64.Build.0 = Debug|Any CPU - {1DC69DD3-3348-4375-844C-D44A760D50EC}.Debug|x86.ActiveCfg = Debug|Any CPU - {1DC69DD3-3348-4375-844C-D44A760D50EC}.Debug|x86.Build.0 = Debug|Any CPU - {1DC69DD3-3348-4375-844C-D44A760D50EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1DC69DD3-3348-4375-844C-D44A760D50EC}.Release|Any CPU.Build.0 = Release|Any CPU - {1DC69DD3-3348-4375-844C-D44A760D50EC}.Release|x64.ActiveCfg = Release|Any CPU - {1DC69DD3-3348-4375-844C-D44A760D50EC}.Release|x64.Build.0 = Release|Any CPU - {1DC69DD3-3348-4375-844C-D44A760D50EC}.Release|x86.ActiveCfg = Release|Any CPU - {1DC69DD3-3348-4375-844C-D44A760D50EC}.Release|x86.Build.0 = Release|Any CPU - {352A455F-AC3F-4D34-BADA-574BF83E131C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {352A455F-AC3F-4D34-BADA-574BF83E131C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {352A455F-AC3F-4D34-BADA-574BF83E131C}.Debug|x64.ActiveCfg = Debug|Any CPU - {352A455F-AC3F-4D34-BADA-574BF83E131C}.Debug|x64.Build.0 = Debug|Any CPU - {352A455F-AC3F-4D34-BADA-574BF83E131C}.Debug|x86.ActiveCfg = Debug|Any CPU - {352A455F-AC3F-4D34-BADA-574BF83E131C}.Debug|x86.Build.0 = Debug|Any CPU - {352A455F-AC3F-4D34-BADA-574BF83E131C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {352A455F-AC3F-4D34-BADA-574BF83E131C}.Release|Any CPU.Build.0 = Release|Any CPU - {352A455F-AC3F-4D34-BADA-574BF83E131C}.Release|x64.ActiveCfg = Release|Any CPU - {352A455F-AC3F-4D34-BADA-574BF83E131C}.Release|x64.Build.0 = Release|Any CPU - {352A455F-AC3F-4D34-BADA-574BF83E131C}.Release|x86.ActiveCfg = Release|Any CPU - {352A455F-AC3F-4D34-BADA-574BF83E131C}.Release|x86.Build.0 = Release|Any CPU - {D10F0FA0-A682-42D4-A23F-46094D14A8F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D10F0FA0-A682-42D4-A23F-46094D14A8F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D10F0FA0-A682-42D4-A23F-46094D14A8F6}.Debug|x64.ActiveCfg = Debug|Any CPU - {D10F0FA0-A682-42D4-A23F-46094D14A8F6}.Debug|x64.Build.0 = Debug|Any CPU - {D10F0FA0-A682-42D4-A23F-46094D14A8F6}.Debug|x86.ActiveCfg = Debug|Any CPU - {D10F0FA0-A682-42D4-A23F-46094D14A8F6}.Debug|x86.Build.0 = Debug|Any CPU - {D10F0FA0-A682-42D4-A23F-46094D14A8F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D10F0FA0-A682-42D4-A23F-46094D14A8F6}.Release|Any CPU.Build.0 = Release|Any CPU - {D10F0FA0-A682-42D4-A23F-46094D14A8F6}.Release|x64.ActiveCfg = Release|Any CPU - {D10F0FA0-A682-42D4-A23F-46094D14A8F6}.Release|x64.Build.0 = Release|Any CPU - {D10F0FA0-A682-42D4-A23F-46094D14A8F6}.Release|x86.ActiveCfg = Release|Any CPU - {D10F0FA0-A682-42D4-A23F-46094D14A8F6}.Release|x86.Build.0 = Release|Any CPU - {F57F6152-A359-4BB5-AC01-5531C85EE47A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F57F6152-A359-4BB5-AC01-5531C85EE47A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F57F6152-A359-4BB5-AC01-5531C85EE47A}.Debug|x64.ActiveCfg = Debug|Any CPU - {F57F6152-A359-4BB5-AC01-5531C85EE47A}.Debug|x64.Build.0 = Debug|Any CPU - {F57F6152-A359-4BB5-AC01-5531C85EE47A}.Debug|x86.ActiveCfg = Debug|Any CPU - {F57F6152-A359-4BB5-AC01-5531C85EE47A}.Debug|x86.Build.0 = Debug|Any CPU - {F57F6152-A359-4BB5-AC01-5531C85EE47A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F57F6152-A359-4BB5-AC01-5531C85EE47A}.Release|Any CPU.Build.0 = Release|Any CPU - {F57F6152-A359-4BB5-AC01-5531C85EE47A}.Release|x64.ActiveCfg = Release|Any CPU - {F57F6152-A359-4BB5-AC01-5531C85EE47A}.Release|x64.Build.0 = Release|Any CPU - {F57F6152-A359-4BB5-AC01-5531C85EE47A}.Release|x86.ActiveCfg = Release|Any CPU - {F57F6152-A359-4BB5-AC01-5531C85EE47A}.Release|x86.Build.0 = Release|Any CPU - {32631ED6-956A-4572-AD7A-B8D0ECE26C78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32631ED6-956A-4572-AD7A-B8D0ECE26C78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32631ED6-956A-4572-AD7A-B8D0ECE26C78}.Debug|x64.ActiveCfg = Debug|Any CPU - {32631ED6-956A-4572-AD7A-B8D0ECE26C78}.Debug|x64.Build.0 = Debug|Any CPU - {32631ED6-956A-4572-AD7A-B8D0ECE26C78}.Debug|x86.ActiveCfg = Debug|Any CPU - {32631ED6-956A-4572-AD7A-B8D0ECE26C78}.Debug|x86.Build.0 = Debug|Any CPU - {32631ED6-956A-4572-AD7A-B8D0ECE26C78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32631ED6-956A-4572-AD7A-B8D0ECE26C78}.Release|Any CPU.Build.0 = Release|Any CPU - {32631ED6-956A-4572-AD7A-B8D0ECE26C78}.Release|x64.ActiveCfg = Release|Any CPU - {32631ED6-956A-4572-AD7A-B8D0ECE26C78}.Release|x64.Build.0 = Release|Any CPU - {32631ED6-956A-4572-AD7A-B8D0ECE26C78}.Release|x86.ActiveCfg = Release|Any CPU - {32631ED6-956A-4572-AD7A-B8D0ECE26C78}.Release|x86.Build.0 = Release|Any CPU - {7E22E87D-78D2-411D-AC30-2F090C3F5ED5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E22E87D-78D2-411D-AC30-2F090C3F5ED5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E22E87D-78D2-411D-AC30-2F090C3F5ED5}.Debug|x64.ActiveCfg = Debug|Any CPU - {7E22E87D-78D2-411D-AC30-2F090C3F5ED5}.Debug|x64.Build.0 = Debug|Any CPU - {7E22E87D-78D2-411D-AC30-2F090C3F5ED5}.Debug|x86.ActiveCfg = Debug|Any CPU - {7E22E87D-78D2-411D-AC30-2F090C3F5ED5}.Debug|x86.Build.0 = Debug|Any CPU - {7E22E87D-78D2-411D-AC30-2F090C3F5ED5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E22E87D-78D2-411D-AC30-2F090C3F5ED5}.Release|Any CPU.Build.0 = Release|Any CPU - {7E22E87D-78D2-411D-AC30-2F090C3F5ED5}.Release|x64.ActiveCfg = Release|Any CPU - {7E22E87D-78D2-411D-AC30-2F090C3F5ED5}.Release|x64.Build.0 = Release|Any CPU - {7E22E87D-78D2-411D-AC30-2F090C3F5ED5}.Release|x86.ActiveCfg = Release|Any CPU - {7E22E87D-78D2-411D-AC30-2F090C3F5ED5}.Release|x86.Build.0 = Release|Any CPU - {623330CA-6CA5-4B74-A921-DEAE8002FCC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {623330CA-6CA5-4B74-A921-DEAE8002FCC5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {623330CA-6CA5-4B74-A921-DEAE8002FCC5}.Debug|x64.ActiveCfg = Debug|Any CPU - {623330CA-6CA5-4B74-A921-DEAE8002FCC5}.Debug|x64.Build.0 = Debug|Any CPU - {623330CA-6CA5-4B74-A921-DEAE8002FCC5}.Debug|x86.ActiveCfg = Debug|Any CPU - {623330CA-6CA5-4B74-A921-DEAE8002FCC5}.Debug|x86.Build.0 = Debug|Any CPU - {623330CA-6CA5-4B74-A921-DEAE8002FCC5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {623330CA-6CA5-4B74-A921-DEAE8002FCC5}.Release|Any CPU.Build.0 = Release|Any CPU - {623330CA-6CA5-4B74-A921-DEAE8002FCC5}.Release|x64.ActiveCfg = Release|Any CPU - {623330CA-6CA5-4B74-A921-DEAE8002FCC5}.Release|x64.Build.0 = Release|Any CPU - {623330CA-6CA5-4B74-A921-DEAE8002FCC5}.Release|x86.ActiveCfg = Release|Any CPU - {623330CA-6CA5-4B74-A921-DEAE8002FCC5}.Release|x86.Build.0 = Release|Any CPU + {D3C7D267-5646-4907-A451-E7CFA853BBF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D3C7D267-5646-4907-A451-E7CFA853BBF5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D3C7D267-5646-4907-A451-E7CFA853BBF5}.Debug|x64.ActiveCfg = Debug|Any CPU + {D3C7D267-5646-4907-A451-E7CFA853BBF5}.Debug|x64.Build.0 = Debug|Any CPU + {D3C7D267-5646-4907-A451-E7CFA853BBF5}.Debug|x86.ActiveCfg = Debug|Any CPU + {D3C7D267-5646-4907-A451-E7CFA853BBF5}.Debug|x86.Build.0 = Debug|Any CPU + {D3C7D267-5646-4907-A451-E7CFA853BBF5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D3C7D267-5646-4907-A451-E7CFA853BBF5}.Release|Any CPU.Build.0 = Release|Any CPU + {D3C7D267-5646-4907-A451-E7CFA853BBF5}.Release|x64.ActiveCfg = Release|Any CPU + {D3C7D267-5646-4907-A451-E7CFA853BBF5}.Release|x64.Build.0 = Release|Any CPU + {D3C7D267-5646-4907-A451-E7CFA853BBF5}.Release|x86.ActiveCfg = Release|Any CPU + {D3C7D267-5646-4907-A451-E7CFA853BBF5}.Release|x86.Build.0 = Release|Any CPU + {D65EE034-84B9-4EBE-BC1F-5606AB4524A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D65EE034-84B9-4EBE-BC1F-5606AB4524A4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D65EE034-84B9-4EBE-BC1F-5606AB4524A4}.Debug|x64.ActiveCfg = Debug|Any CPU + {D65EE034-84B9-4EBE-BC1F-5606AB4524A4}.Debug|x64.Build.0 = Debug|Any CPU + {D65EE034-84B9-4EBE-BC1F-5606AB4524A4}.Debug|x86.ActiveCfg = Debug|Any CPU + {D65EE034-84B9-4EBE-BC1F-5606AB4524A4}.Debug|x86.Build.0 = Debug|Any CPU + {D65EE034-84B9-4EBE-BC1F-5606AB4524A4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D65EE034-84B9-4EBE-BC1F-5606AB4524A4}.Release|Any CPU.Build.0 = Release|Any CPU + {D65EE034-84B9-4EBE-BC1F-5606AB4524A4}.Release|x64.ActiveCfg = Release|Any CPU + {D65EE034-84B9-4EBE-BC1F-5606AB4524A4}.Release|x64.Build.0 = Release|Any CPU + {D65EE034-84B9-4EBE-BC1F-5606AB4524A4}.Release|x86.ActiveCfg = Release|Any CPU + {D65EE034-84B9-4EBE-BC1F-5606AB4524A4}.Release|x86.Build.0 = Release|Any CPU + {17B31CB0-F2C5-47A6-9BF2-C55403C97DC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {17B31CB0-F2C5-47A6-9BF2-C55403C97DC7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {17B31CB0-F2C5-47A6-9BF2-C55403C97DC7}.Debug|x64.ActiveCfg = Debug|Any CPU + {17B31CB0-F2C5-47A6-9BF2-C55403C97DC7}.Debug|x64.Build.0 = Debug|Any CPU + {17B31CB0-F2C5-47A6-9BF2-C55403C97DC7}.Debug|x86.ActiveCfg = Debug|Any CPU + {17B31CB0-F2C5-47A6-9BF2-C55403C97DC7}.Debug|x86.Build.0 = Debug|Any CPU + {17B31CB0-F2C5-47A6-9BF2-C55403C97DC7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {17B31CB0-F2C5-47A6-9BF2-C55403C97DC7}.Release|Any CPU.Build.0 = Release|Any CPU + {17B31CB0-F2C5-47A6-9BF2-C55403C97DC7}.Release|x64.ActiveCfg = Release|Any CPU + {17B31CB0-F2C5-47A6-9BF2-C55403C97DC7}.Release|x64.Build.0 = Release|Any CPU + {17B31CB0-F2C5-47A6-9BF2-C55403C97DC7}.Release|x86.ActiveCfg = Release|Any CPU + {17B31CB0-F2C5-47A6-9BF2-C55403C97DC7}.Release|x86.Build.0 = Release|Any CPU + {62A821F2-F296-4888-8AB1-A80ED514AC08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {62A821F2-F296-4888-8AB1-A80ED514AC08}.Debug|Any CPU.Build.0 = Debug|Any CPU + {62A821F2-F296-4888-8AB1-A80ED514AC08}.Debug|x64.ActiveCfg = Debug|Any CPU + {62A821F2-F296-4888-8AB1-A80ED514AC08}.Debug|x64.Build.0 = Debug|Any CPU + {62A821F2-F296-4888-8AB1-A80ED514AC08}.Debug|x86.ActiveCfg = Debug|Any CPU + {62A821F2-F296-4888-8AB1-A80ED514AC08}.Debug|x86.Build.0 = Debug|Any CPU + {62A821F2-F296-4888-8AB1-A80ED514AC08}.Release|Any CPU.ActiveCfg = Release|Any CPU + {62A821F2-F296-4888-8AB1-A80ED514AC08}.Release|Any CPU.Build.0 = Release|Any CPU + {62A821F2-F296-4888-8AB1-A80ED514AC08}.Release|x64.ActiveCfg = Release|Any CPU + {62A821F2-F296-4888-8AB1-A80ED514AC08}.Release|x64.Build.0 = Release|Any CPU + {62A821F2-F296-4888-8AB1-A80ED514AC08}.Release|x86.ActiveCfg = Release|Any CPU + {62A821F2-F296-4888-8AB1-A80ED514AC08}.Release|x86.Build.0 = Release|Any CPU + {D0CE2D52-EC1C-444E-A5C5-79813E1814D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D0CE2D52-EC1C-444E-A5C5-79813E1814D4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D0CE2D52-EC1C-444E-A5C5-79813E1814D4}.Debug|x64.ActiveCfg = Debug|Any CPU + {D0CE2D52-EC1C-444E-A5C5-79813E1814D4}.Debug|x64.Build.0 = Debug|Any CPU + {D0CE2D52-EC1C-444E-A5C5-79813E1814D4}.Debug|x86.ActiveCfg = Debug|Any CPU + {D0CE2D52-EC1C-444E-A5C5-79813E1814D4}.Debug|x86.Build.0 = Debug|Any CPU + {D0CE2D52-EC1C-444E-A5C5-79813E1814D4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D0CE2D52-EC1C-444E-A5C5-79813E1814D4}.Release|Any CPU.Build.0 = Release|Any CPU + {D0CE2D52-EC1C-444E-A5C5-79813E1814D4}.Release|x64.ActiveCfg = Release|Any CPU + {D0CE2D52-EC1C-444E-A5C5-79813E1814D4}.Release|x64.Build.0 = Release|Any CPU + {D0CE2D52-EC1C-444E-A5C5-79813E1814D4}.Release|x86.ActiveCfg = Release|Any CPU + {D0CE2D52-EC1C-444E-A5C5-79813E1814D4}.Release|x86.Build.0 = Release|Any CPU + {87048157-DF94-49E6-A34F-7DEF3255FA35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87048157-DF94-49E6-A34F-7DEF3255FA35}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87048157-DF94-49E6-A34F-7DEF3255FA35}.Debug|x64.ActiveCfg = Debug|Any CPU + {87048157-DF94-49E6-A34F-7DEF3255FA35}.Debug|x64.Build.0 = Debug|Any CPU + {87048157-DF94-49E6-A34F-7DEF3255FA35}.Debug|x86.ActiveCfg = Debug|Any CPU + {87048157-DF94-49E6-A34F-7DEF3255FA35}.Debug|x86.Build.0 = Debug|Any CPU + {87048157-DF94-49E6-A34F-7DEF3255FA35}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87048157-DF94-49E6-A34F-7DEF3255FA35}.Release|Any CPU.Build.0 = Release|Any CPU + {87048157-DF94-49E6-A34F-7DEF3255FA35}.Release|x64.ActiveCfg = Release|Any CPU + {87048157-DF94-49E6-A34F-7DEF3255FA35}.Release|x64.Build.0 = Release|Any CPU + {87048157-DF94-49E6-A34F-7DEF3255FA35}.Release|x86.ActiveCfg = Release|Any CPU + {87048157-DF94-49E6-A34F-7DEF3255FA35}.Release|x86.Build.0 = Release|Any CPU + {D28F8DB7-077E-47F6-B07D-BB93AF950A0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D28F8DB7-077E-47F6-B07D-BB93AF950A0D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D28F8DB7-077E-47F6-B07D-BB93AF950A0D}.Debug|x64.ActiveCfg = Debug|Any CPU + {D28F8DB7-077E-47F6-B07D-BB93AF950A0D}.Debug|x64.Build.0 = Debug|Any CPU + {D28F8DB7-077E-47F6-B07D-BB93AF950A0D}.Debug|x86.ActiveCfg = Debug|Any CPU + {D28F8DB7-077E-47F6-B07D-BB93AF950A0D}.Debug|x86.Build.0 = Debug|Any CPU + {D28F8DB7-077E-47F6-B07D-BB93AF950A0D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D28F8DB7-077E-47F6-B07D-BB93AF950A0D}.Release|Any CPU.Build.0 = Release|Any CPU + {D28F8DB7-077E-47F6-B07D-BB93AF950A0D}.Release|x64.ActiveCfg = Release|Any CPU + {D28F8DB7-077E-47F6-B07D-BB93AF950A0D}.Release|x64.Build.0 = Release|Any CPU + {D28F8DB7-077E-47F6-B07D-BB93AF950A0D}.Release|x86.ActiveCfg = Release|Any CPU + {D28F8DB7-077E-47F6-B07D-BB93AF950A0D}.Release|x86.Build.0 = Release|Any CPU + {75CDF4D0-53B2-4FCE-9C2D-06940FD2E817}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {75CDF4D0-53B2-4FCE-9C2D-06940FD2E817}.Debug|Any CPU.Build.0 = Debug|Any CPU + {75CDF4D0-53B2-4FCE-9C2D-06940FD2E817}.Debug|x64.ActiveCfg = Debug|Any CPU + {75CDF4D0-53B2-4FCE-9C2D-06940FD2E817}.Debug|x64.Build.0 = Debug|Any CPU + {75CDF4D0-53B2-4FCE-9C2D-06940FD2E817}.Debug|x86.ActiveCfg = Debug|Any CPU + {75CDF4D0-53B2-4FCE-9C2D-06940FD2E817}.Debug|x86.Build.0 = Debug|Any CPU + {75CDF4D0-53B2-4FCE-9C2D-06940FD2E817}.Release|Any CPU.ActiveCfg = Release|Any CPU + {75CDF4D0-53B2-4FCE-9C2D-06940FD2E817}.Release|Any CPU.Build.0 = Release|Any CPU + {75CDF4D0-53B2-4FCE-9C2D-06940FD2E817}.Release|x64.ActiveCfg = Release|Any CPU + {75CDF4D0-53B2-4FCE-9C2D-06940FD2E817}.Release|x64.Build.0 = Release|Any CPU + {75CDF4D0-53B2-4FCE-9C2D-06940FD2E817}.Release|x86.ActiveCfg = Release|Any CPU + {75CDF4D0-53B2-4FCE-9C2D-06940FD2E817}.Release|x86.Build.0 = Release|Any CPU + {338C69EA-F921-41B3-BB6C-116AADEBF356}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {338C69EA-F921-41B3-BB6C-116AADEBF356}.Debug|Any CPU.Build.0 = Debug|Any CPU + {338C69EA-F921-41B3-BB6C-116AADEBF356}.Debug|x64.ActiveCfg = Debug|Any CPU + {338C69EA-F921-41B3-BB6C-116AADEBF356}.Debug|x64.Build.0 = Debug|Any CPU + {338C69EA-F921-41B3-BB6C-116AADEBF356}.Debug|x86.ActiveCfg = Debug|Any CPU + {338C69EA-F921-41B3-BB6C-116AADEBF356}.Debug|x86.Build.0 = Debug|Any CPU + {338C69EA-F921-41B3-BB6C-116AADEBF356}.Release|Any CPU.ActiveCfg = Release|Any CPU + {338C69EA-F921-41B3-BB6C-116AADEBF356}.Release|Any CPU.Build.0 = Release|Any CPU + {338C69EA-F921-41B3-BB6C-116AADEBF356}.Release|x64.ActiveCfg = Release|Any CPU + {338C69EA-F921-41B3-BB6C-116AADEBF356}.Release|x64.Build.0 = Release|Any CPU + {338C69EA-F921-41B3-BB6C-116AADEBF356}.Release|x86.ActiveCfg = Release|Any CPU + {338C69EA-F921-41B3-BB6C-116AADEBF356}.Release|x86.Build.0 = Release|Any CPU + {531F88C6-B9A5-4BF6-A121-AAA95DE4A288}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {531F88C6-B9A5-4BF6-A121-AAA95DE4A288}.Debug|Any CPU.Build.0 = Debug|Any CPU + {531F88C6-B9A5-4BF6-A121-AAA95DE4A288}.Debug|x64.ActiveCfg = Debug|Any CPU + {531F88C6-B9A5-4BF6-A121-AAA95DE4A288}.Debug|x64.Build.0 = Debug|Any CPU + {531F88C6-B9A5-4BF6-A121-AAA95DE4A288}.Debug|x86.ActiveCfg = Debug|Any CPU + {531F88C6-B9A5-4BF6-A121-AAA95DE4A288}.Debug|x86.Build.0 = Debug|Any CPU + {531F88C6-B9A5-4BF6-A121-AAA95DE4A288}.Release|Any CPU.ActiveCfg = Release|Any CPU + {531F88C6-B9A5-4BF6-A121-AAA95DE4A288}.Release|Any CPU.Build.0 = Release|Any CPU + {531F88C6-B9A5-4BF6-A121-AAA95DE4A288}.Release|x64.ActiveCfg = Release|Any CPU + {531F88C6-B9A5-4BF6-A121-AAA95DE4A288}.Release|x64.Build.0 = Release|Any CPU + {531F88C6-B9A5-4BF6-A121-AAA95DE4A288}.Release|x86.ActiveCfg = Release|Any CPU + {531F88C6-B9A5-4BF6-A121-AAA95DE4A288}.Release|x86.Build.0 = Release|Any CPU + {613354F0-3B35-4406-8250-C8E88A0DECF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {613354F0-3B35-4406-8250-C8E88A0DECF6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {613354F0-3B35-4406-8250-C8E88A0DECF6}.Debug|x64.ActiveCfg = Debug|Any CPU + {613354F0-3B35-4406-8250-C8E88A0DECF6}.Debug|x64.Build.0 = Debug|Any CPU + {613354F0-3B35-4406-8250-C8E88A0DECF6}.Debug|x86.ActiveCfg = Debug|Any CPU + {613354F0-3B35-4406-8250-C8E88A0DECF6}.Debug|x86.Build.0 = Debug|Any CPU + {613354F0-3B35-4406-8250-C8E88A0DECF6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {613354F0-3B35-4406-8250-C8E88A0DECF6}.Release|Any CPU.Build.0 = Release|Any CPU + {613354F0-3B35-4406-8250-C8E88A0DECF6}.Release|x64.ActiveCfg = Release|Any CPU + {613354F0-3B35-4406-8250-C8E88A0DECF6}.Release|x64.Build.0 = Release|Any CPU + {613354F0-3B35-4406-8250-C8E88A0DECF6}.Release|x86.ActiveCfg = Release|Any CPU + {613354F0-3B35-4406-8250-C8E88A0DECF6}.Release|x86.Build.0 = Release|Any CPU + {A47CCC4C-8B19-4A12-8B05-BE4AAEABB1BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A47CCC4C-8B19-4A12-8B05-BE4AAEABB1BA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A47CCC4C-8B19-4A12-8B05-BE4AAEABB1BA}.Debug|x64.ActiveCfg = Debug|Any CPU + {A47CCC4C-8B19-4A12-8B05-BE4AAEABB1BA}.Debug|x64.Build.0 = Debug|Any CPU + {A47CCC4C-8B19-4A12-8B05-BE4AAEABB1BA}.Debug|x86.ActiveCfg = Debug|Any CPU + {A47CCC4C-8B19-4A12-8B05-BE4AAEABB1BA}.Debug|x86.Build.0 = Debug|Any CPU + {A47CCC4C-8B19-4A12-8B05-BE4AAEABB1BA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A47CCC4C-8B19-4A12-8B05-BE4AAEABB1BA}.Release|Any CPU.Build.0 = Release|Any CPU + {A47CCC4C-8B19-4A12-8B05-BE4AAEABB1BA}.Release|x64.ActiveCfg = Release|Any CPU + {A47CCC4C-8B19-4A12-8B05-BE4AAEABB1BA}.Release|x64.Build.0 = Release|Any CPU + {A47CCC4C-8B19-4A12-8B05-BE4AAEABB1BA}.Release|x86.ActiveCfg = Release|Any CPU + {A47CCC4C-8B19-4A12-8B05-BE4AAEABB1BA}.Release|x86.Build.0 = Release|Any CPU + {D939680D-864D-4FED-A81D-8F30EE6A97A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D939680D-864D-4FED-A81D-8F30EE6A97A0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D939680D-864D-4FED-A81D-8F30EE6A97A0}.Debug|x64.ActiveCfg = Debug|Any CPU + {D939680D-864D-4FED-A81D-8F30EE6A97A0}.Debug|x64.Build.0 = Debug|Any CPU + {D939680D-864D-4FED-A81D-8F30EE6A97A0}.Debug|x86.ActiveCfg = Debug|Any CPU + {D939680D-864D-4FED-A81D-8F30EE6A97A0}.Debug|x86.Build.0 = Debug|Any CPU + {D939680D-864D-4FED-A81D-8F30EE6A97A0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D939680D-864D-4FED-A81D-8F30EE6A97A0}.Release|Any CPU.Build.0 = Release|Any CPU + {D939680D-864D-4FED-A81D-8F30EE6A97A0}.Release|x64.ActiveCfg = Release|Any CPU + {D939680D-864D-4FED-A81D-8F30EE6A97A0}.Release|x64.Build.0 = Release|Any CPU + {D939680D-864D-4FED-A81D-8F30EE6A97A0}.Release|x86.ActiveCfg = Release|Any CPU + {D939680D-864D-4FED-A81D-8F30EE6A97A0}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -873,18 +899,31 @@ Global {3A48F700-9635-2216-D291-85337CE5D869} = {553D81D4-666B-BE26-75F9-480CB214ACEE} {6BD8DC02-2270-4276-952E-E34E973A1237} = {3A48F700-9635-2216-D291-85337CE5D869} {FFBE31B8-50B9-B415-22BC-2F92C97CADA3} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} - {1D50E7AA-2378-4114-A3C3-E351D46FB8BF} = {FFBE31B8-50B9-B415-22BC-2F92C97CADA3} - {E8C0F163-735D-44A2-B684-673A0B0D7D2A} = {FFBE31B8-50B9-B415-22BC-2F92C97CADA3} - {65E67218-A02C-4C42-8B60-6FDAB737E613} = {FFBE31B8-50B9-B415-22BC-2F92C97CADA3} - {7226D94C-B9A5-41D7-9E59-50A68F39EE78} = {FFBE31B8-50B9-B415-22BC-2F92C97CADA3} - {4AC0C433-475F-4B0C-B160-E4F33779E3CB} = {FFBE31B8-50B9-B415-22BC-2F92C97CADA3} - {9D86914A-43A8-4451-BEFD-092ABFF793D6} = {FFBE31B8-50B9-B415-22BC-2F92C97CADA3} - {1DC69DD3-3348-4375-844C-D44A760D50EC} = {FFBE31B8-50B9-B415-22BC-2F92C97CADA3} - {352A455F-AC3F-4D34-BADA-574BF83E131C} = {FFBE31B8-50B9-B415-22BC-2F92C97CADA3} - {D10F0FA0-A682-42D4-A23F-46094D14A8F6} = {FFBE31B8-50B9-B415-22BC-2F92C97CADA3} - {F57F6152-A359-4BB5-AC01-5531C85EE47A} = {FFBE31B8-50B9-B415-22BC-2F92C97CADA3} - {32631ED6-956A-4572-AD7A-B8D0ECE26C78} = {FFBE31B8-50B9-B415-22BC-2F92C97CADA3} - {7E22E87D-78D2-411D-AC30-2F090C3F5ED5} = {FFBE31B8-50B9-B415-22BC-2F92C97CADA3} - {623330CA-6CA5-4B74-A921-DEAE8002FCC5} = {FFBE31B8-50B9-B415-22BC-2F92C97CADA3} + {1C8A9B45-FCC1-A5B3-3601-CB39D7CED4E3} = {FFBE31B8-50B9-B415-22BC-2F92C97CADA3} + {D3C7D267-5646-4907-A451-E7CFA853BBF5} = {1C8A9B45-FCC1-A5B3-3601-CB39D7CED4E3} + {28F8F726-0D9B-F051-A252-088B861055C6} = {FFBE31B8-50B9-B415-22BC-2F92C97CADA3} + {D65EE034-84B9-4EBE-BC1F-5606AB4524A4} = {28F8F726-0D9B-F051-A252-088B861055C6} + {19B3F750-A3A3-3AEB-CE4F-46FB52BB3151} = {FFBE31B8-50B9-B415-22BC-2F92C97CADA3} + {17B31CB0-F2C5-47A6-9BF2-C55403C97DC7} = {19B3F750-A3A3-3AEB-CE4F-46FB52BB3151} + {E97EBA1B-122C-1D64-94D9-187425FF5DF0} = {FFBE31B8-50B9-B415-22BC-2F92C97CADA3} + {62A821F2-F296-4888-8AB1-A80ED514AC08} = {E97EBA1B-122C-1D64-94D9-187425FF5DF0} + {7555181C-EB04-A6C5-D475-6FC0320F57B5} = {FFBE31B8-50B9-B415-22BC-2F92C97CADA3} + {D0CE2D52-EC1C-444E-A5C5-79813E1814D4} = {7555181C-EB04-A6C5-D475-6FC0320F57B5} + {3E835F76-AFEE-6419-1441-2CED62F241B2} = {FFBE31B8-50B9-B415-22BC-2F92C97CADA3} + {87048157-DF94-49E6-A34F-7DEF3255FA35} = {3E835F76-AFEE-6419-1441-2CED62F241B2} + {0286CA1A-73E9-C153-D97B-31BA60AC101B} = {FFBE31B8-50B9-B415-22BC-2F92C97CADA3} + {D28F8DB7-077E-47F6-B07D-BB93AF950A0D} = {0286CA1A-73E9-C153-D97B-31BA60AC101B} + {319B016B-E46C-7232-249F-DBE50922C757} = {FFBE31B8-50B9-B415-22BC-2F92C97CADA3} + {75CDF4D0-53B2-4FCE-9C2D-06940FD2E817} = {319B016B-E46C-7232-249F-DBE50922C757} + {C91F5B42-26A0-36B8-1C54-AE965E022F68} = {FFBE31B8-50B9-B415-22BC-2F92C97CADA3} + {338C69EA-F921-41B3-BB6C-116AADEBF356} = {C91F5B42-26A0-36B8-1C54-AE965E022F68} + {6F45E82C-238A-FDE4-59E5-CCCD65D77EB8} = {FFBE31B8-50B9-B415-22BC-2F92C97CADA3} + {531F88C6-B9A5-4BF6-A121-AAA95DE4A288} = {6F45E82C-238A-FDE4-59E5-CCCD65D77EB8} + {3DE423CC-7CB5-260E-2A62-D5E89000EF8F} = {FFBE31B8-50B9-B415-22BC-2F92C97CADA3} + {613354F0-3B35-4406-8250-C8E88A0DECF6} = {3DE423CC-7CB5-260E-2A62-D5E89000EF8F} + {5C1B4B87-5A65-F9C7-EAA3-6456BCBFD6EC} = {FFBE31B8-50B9-B415-22BC-2F92C97CADA3} + {A47CCC4C-8B19-4A12-8B05-BE4AAEABB1BA} = {5C1B4B87-5A65-F9C7-EAA3-6456BCBFD6EC} + {6DD751EB-CB14-7F42-4B4B-7E4DCC49705A} = {FFBE31B8-50B9-B415-22BC-2F92C97CADA3} + {D939680D-864D-4FED-A81D-8F30EE6A97A0} = {6DD751EB-CB14-7F42-4B4B-7E4DCC49705A} EndGlobalSection EndGlobal diff --git a/backend/Tests/Admin/UnitTests/ResetUserPasswordCommandHandlerTests.cs b/backend/Tests/Admin/UnitTests/ResetUserPasswordCommandHandlerTests.cs index 56e5e12..507b694 100644 --- a/backend/Tests/Admin/UnitTests/ResetUserPasswordCommandHandlerTests.cs +++ b/backend/Tests/Admin/UnitTests/ResetUserPasswordCommandHandlerTests.cs @@ -1,7 +1,7 @@ using FluentAssertions; using Knot.Modules.Admin.Application.Admin.Commands; -using Knot.Modules.Auth.Contracts.Application.Abstractions; -using Knot.Modules.Auth.Contracts.Domain; +using Knot.Contracts.Auth.Application.Abstractions; +using Knot.Contracts.Auth.Domain; using Knot.Shared.Kernel; using NSubstitute; using Xunit; diff --git a/backend/Tests/Auth/UnitTests/LoginUserCommandHandlerTests.cs b/backend/Tests/Auth/UnitTests/LoginUserCommandHandlerTests.cs index 40c5272..4a2a0cd 100644 --- a/backend/Tests/Auth/UnitTests/LoginUserCommandHandlerTests.cs +++ b/backend/Tests/Auth/UnitTests/LoginUserCommandHandlerTests.cs @@ -1,8 +1,8 @@ using FluentAssertions; using NSubstitute; -using Knot.Modules.Auth.Contracts.Application.Abstractions; +using Knot.Contracts.Auth.Application.Abstractions; using Knot.Modules.Auth.Application.Users.Login; -using Knot.Modules.Auth.Contracts.Domain; +using Knot.Contracts.Auth.Domain; using Knot.Shared.Kernel; using Knot.Modules.Auth.Application.Users.Auth; using Xunit; diff --git a/backend/Tests/Conversations/UnitTests/Messages/SendMessageCommandHandlerTests.cs b/backend/Tests/Conversations/UnitTests/Messages/SendMessageCommandHandlerTests.cs index 93cfd86..1eb204d 100644 --- a/backend/Tests/Conversations/UnitTests/Messages/SendMessageCommandHandlerTests.cs +++ b/backend/Tests/Conversations/UnitTests/Messages/SendMessageCommandHandlerTests.cs @@ -12,8 +12,8 @@ using Knot.Modules.Conversations.Domain; using Knot.Modules.Messaging.Domain; using Knot.Modules.Conversations.Application.Abstractions; using Knot.Modules.Conversations.Application.Messages.Send; -using Knot.Modules.Settings.Contracts.Application.Abstractions; -using Knot.Modules.Settings.Contracts.Application.DTOs; +using Knot.Contracts.Settings.Application.Abstractions; +using Knot.Contracts.Settings.Application.DTOs; namespace Knot.Modules.Conversations.UnitTests.Messages; @@ -34,7 +34,7 @@ public class SendMessageCommandHandlerTests _mediator = Substitute.For(); _messagesSettings = Substitute.For(); - var config = new Knot.Modules.Settings.Contracts.Application.DTOs.MessagesConfig(); + var config = new Knot.Contracts.Settings.Application.DTOs.MessagesConfig(); _messagesSettings.Current.Returns(config); _handler = new SendMessageCommandHandler(_chatRepository, _messageRepository, _unitOfWork, _mediator, _messagesSettings); diff --git a/backend/Tests/Stories/UnitTests/CreateStoryCommandHandlerTests.cs b/backend/Tests/Stories/UnitTests/CreateStoryCommandHandlerTests.cs index c9f52f2..4d2cab1 100644 --- a/backend/Tests/Stories/UnitTests/CreateStoryCommandHandlerTests.cs +++ b/backend/Tests/Stories/UnitTests/CreateStoryCommandHandlerTests.cs @@ -2,8 +2,8 @@ using FluentAssertions; using Knot.Modules.Stories.Application.Stories.Commands.CreateStory; using Knot.Modules.Stories.Domain; using Knot.Shared.Kernel; -using Knot.Modules.Settings.Contracts.Application.Abstractions; -using Knot.Modules.Settings.Contracts.Application.DTOs; +using Knot.Contracts.Settings.Application.Abstractions; +using Knot.Contracts.Settings.Application.DTOs; using Knot.Modules.Stories.Application.Abstractions; using NSubstitute; using Xunit; diff --git a/backend/Tests/Users/UnitTests/UpdateProfileCommandHandlerTests.cs b/backend/Tests/Users/UnitTests/UpdateProfileCommandHandlerTests.cs index f4628f0..0f27341 100644 --- a/backend/Tests/Users/UnitTests/UpdateProfileCommandHandlerTests.cs +++ b/backend/Tests/Users/UnitTests/UpdateProfileCommandHandlerTests.cs @@ -1,7 +1,7 @@ using FluentAssertions; using Knot.Modules.Profiles.Application.Profiles.UpdateProfile; -using Knot.Modules.Profiles.Contracts.Domain; -using Knot.Modules.Profiles.Contracts.Application.DTOs; +using Knot.Contracts.Profiles.Domain; +using Knot.Contracts.Profiles.Application.DTOs; using Knot.Shared.Kernel; using NSubstitute; using Xunit; diff --git a/backend/src/Contracts/Knot.Modules.Auth.Contracts/Knot.Modules.Auth.Contracts.csproj b/backend/src/Contracts/Admin/Knot.Contracts.Admin.csproj similarity index 100% rename from backend/src/Contracts/Knot.Modules.Auth.Contracts/Knot.Modules.Auth.Contracts.csproj rename to backend/src/Contracts/Admin/Knot.Contracts.Admin.csproj diff --git a/backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Abstractions/IAuthDbContext.cs b/backend/src/Contracts/Auth/Application/Abstractions/IAuthDbContext.cs similarity index 60% rename from backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Abstractions/IAuthDbContext.cs rename to backend/src/Contracts/Auth/Application/Abstractions/IAuthDbContext.cs index 4dfd3b4..3969a1e 100644 --- a/backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Abstractions/IAuthDbContext.cs +++ b/backend/src/Contracts/Auth/Application/Abstractions/IAuthDbContext.cs @@ -1,6 +1,6 @@ -using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; -namespace Knot.Modules.Auth.Contracts.Application.Abstractions; +namespace Knot.Contracts.Auth.Application.Abstractions; public interface IAuthDbContext { diff --git a/backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Abstractions/IAuthUnitOfWork.cs b/backend/src/Contracts/Auth/Application/Abstractions/IAuthUnitOfWork.cs similarity index 67% rename from backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Abstractions/IAuthUnitOfWork.cs rename to backend/src/Contracts/Auth/Application/Abstractions/IAuthUnitOfWork.cs index 6c4134a..ef178ac 100644 --- a/backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Abstractions/IAuthUnitOfWork.cs +++ b/backend/src/Contracts/Auth/Application/Abstractions/IAuthUnitOfWork.cs @@ -1,7 +1,7 @@ -using Knot.Modules.Auth.Contracts.Domain; +using Knot.Contracts.Auth.Domain; using Knot.Shared.Kernel; -namespace Knot.Modules.Auth.Contracts.Application.Abstractions; +namespace Knot.Contracts.Auth.Application.Abstractions; public interface IAuthUnitOfWork : IUnitOfWork { diff --git a/backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Abstractions/IJwtTokenProvider.cs b/backend/src/Contracts/Auth/Application/Abstractions/IJwtTokenProvider.cs similarity index 67% rename from backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Abstractions/IJwtTokenProvider.cs rename to backend/src/Contracts/Auth/Application/Abstractions/IJwtTokenProvider.cs index 454e45f..bf2f35e 100644 --- a/backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Abstractions/IJwtTokenProvider.cs +++ b/backend/src/Contracts/Auth/Application/Abstractions/IJwtTokenProvider.cs @@ -1,8 +1,9 @@ -namespace Knot.Modules.Auth.Contracts.Application.Abstractions; +namespace Knot.Contracts.Auth.Application.Abstractions; public interface IJwtTokenProvider { string GenerateAccessToken(Guid userId, string username); string GenerateRefreshToken(); string Generate(Guid userId, string username, string displayName, string? avatar); + string Generate(Domain.UserContract user); } diff --git a/backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Auth/DTOs/AuthErrors.cs b/backend/src/Contracts/Auth/Application/Auth/DTOs/AuthErrors.cs similarity index 84% rename from backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Auth/DTOs/AuthErrors.cs rename to backend/src/Contracts/Auth/Application/Auth/DTOs/AuthErrors.cs index 217647b..8beb50e 100644 --- a/backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Auth/DTOs/AuthErrors.cs +++ b/backend/src/Contracts/Auth/Application/Auth/DTOs/AuthErrors.cs @@ -1,6 +1,6 @@ -using Knot.Shared.Kernel; +using Knot.Shared.Kernel; -namespace Knot.Modules.Auth.Contracts.Application.Auth.DTOs; +namespace Knot.Contracts.Auth.Application.Auth.DTOs; public static class AuthErrors { diff --git a/backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Auth/DTOs/AuthResponseDto.cs b/backend/src/Contracts/Auth/Application/Auth/DTOs/AuthResponseDto.cs similarity index 87% rename from backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Auth/DTOs/AuthResponseDto.cs rename to backend/src/Contracts/Auth/Application/Auth/DTOs/AuthResponseDto.cs index b2f6b75..f0a7ada 100644 --- a/backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Auth/DTOs/AuthResponseDto.cs +++ b/backend/src/Contracts/Auth/Application/Auth/DTOs/AuthResponseDto.cs @@ -1,4 +1,4 @@ -namespace Knot.Modules.Auth.Contracts.Application.Auth.DTOs; +namespace Knot.Contracts.Auth.Application.Auth.DTOs; public class AuthResponseDto { diff --git a/backend/src/Contracts/Auth/Application/Users/GetMe/GetMeQuery.cs b/backend/src/Contracts/Auth/Application/Users/GetMe/GetMeQuery.cs new file mode 100644 index 0000000..d5e059b --- /dev/null +++ b/backend/src/Contracts/Auth/Application/Users/GetMe/GetMeQuery.cs @@ -0,0 +1,6 @@ +using Knot.Contracts.Auth.Domain; +using MediatR; + +namespace Knot.Contracts.Auth.Application.Users.GetMe; + +public record GetMeQuery() : IRequest; diff --git a/backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Users/Login/LoginUserCommand.cs b/backend/src/Contracts/Auth/Application/Users/Login/LoginUserCommand.cs similarity index 56% rename from backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Users/Login/LoginUserCommand.cs rename to backend/src/Contracts/Auth/Application/Users/Login/LoginUserCommand.cs index 052fde4..e251e87 100644 --- a/backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Users/Login/LoginUserCommand.cs +++ b/backend/src/Contracts/Auth/Application/Users/Login/LoginUserCommand.cs @@ -1,8 +1,8 @@ -using Knot.Modules.Auth.Contracts.Application.Auth.DTOs; +using Knot.Contracts.Auth.Application.Auth.DTOs; using Knot.Shared.Kernel; using MediatR; -namespace Knot.Modules.Auth.Contracts.Application.Users.Login; +namespace Knot.Contracts.Auth.Application.Users.Login; public record LoginUserCommand( string Username, diff --git a/backend/src/Contracts/Auth/Application/Users/Register/RegisterUserCommand.cs b/backend/src/Contracts/Auth/Application/Users/Register/RegisterUserCommand.cs new file mode 100644 index 0000000..4114a4c --- /dev/null +++ b/backend/src/Contracts/Auth/Application/Users/Register/RegisterUserCommand.cs @@ -0,0 +1,14 @@ +using Knot.Contracts.Auth.Application.Auth.DTOs; +using Knot.Contracts.Auth.Domain; +using Knot.Shared.Kernel; +using MediatR; + +namespace Knot.Contracts.Auth.Application.Users.Register; + +public record RegisterUserCommand( + string Username, + string Password, + string DisplayName, + string? Email, + string? Bio +) : IRequest>; diff --git a/backend/src/Contracts/Knot.Modules.Auth.Contracts/Domain/IUserRepository.cs b/backend/src/Contracts/Auth/Domain/IUserRepository.cs similarity index 95% rename from backend/src/Contracts/Knot.Modules.Auth.Contracts/Domain/IUserRepository.cs rename to backend/src/Contracts/Auth/Domain/IUserRepository.cs index 43ff025..e07d588 100644 --- a/backend/src/Contracts/Knot.Modules.Auth.Contracts/Domain/IUserRepository.cs +++ b/backend/src/Contracts/Auth/Domain/IUserRepository.cs @@ -1,4 +1,4 @@ -namespace Knot.Modules.Auth.Contracts.Domain; +namespace Knot.Contracts.Auth.Domain; public interface IUserRepository { diff --git a/backend/src/Contracts/Knot.Modules.Auth.Contracts/Domain/UserContract.cs b/backend/src/Contracts/Auth/Domain/UserContract.cs similarity index 94% rename from backend/src/Contracts/Knot.Modules.Auth.Contracts/Domain/UserContract.cs rename to backend/src/Contracts/Auth/Domain/UserContract.cs index b4b2ff3..657b1a3 100644 --- a/backend/src/Contracts/Knot.Modules.Auth.Contracts/Domain/UserContract.cs +++ b/backend/src/Contracts/Auth/Domain/UserContract.cs @@ -1,4 +1,4 @@ -namespace Knot.Modules.Auth.Contracts.Domain; +namespace Knot.Contracts.Auth.Domain; public class UserContract { diff --git a/backend/src/Contracts/Knot.Modules.Admin.Contracts/Knot.Modules.Admin.Contracts.csproj b/backend/src/Contracts/Auth/Knot.Contracts.Auth.csproj similarity index 83% rename from backend/src/Contracts/Knot.Modules.Admin.Contracts/Knot.Modules.Admin.Contracts.csproj rename to backend/src/Contracts/Auth/Knot.Contracts.Auth.csproj index 52a2860..4bd9c60 100644 --- a/backend/src/Contracts/Knot.Modules.Admin.Contracts/Knot.Modules.Admin.Contracts.csproj +++ b/backend/src/Contracts/Auth/Knot.Contracts.Auth.csproj @@ -12,6 +12,7 @@ + diff --git a/backend/src/Contracts/Knot.Modules.Conversations.Contracts/Knot.Modules.Conversations.Contracts.csproj b/backend/src/Contracts/Conversations/Knot.Contracts.Conversations.csproj similarity index 83% rename from backend/src/Contracts/Knot.Modules.Conversations.Contracts/Knot.Modules.Conversations.Contracts.csproj rename to backend/src/Contracts/Conversations/Knot.Contracts.Conversations.csproj index 52a2860..4bd9c60 100644 --- a/backend/src/Contracts/Knot.Modules.Conversations.Contracts/Knot.Modules.Conversations.Contracts.csproj +++ b/backend/src/Contracts/Conversations/Knot.Contracts.Conversations.csproj @@ -12,6 +12,7 @@ + diff --git a/backend/src/Contracts/Knot.Modules.Federation.Contracts/Knot.Modules.Federation.Contracts.csproj b/backend/src/Contracts/Federation/Knot.Contracts.Federation.csproj similarity index 83% rename from backend/src/Contracts/Knot.Modules.Federation.Contracts/Knot.Modules.Federation.Contracts.csproj rename to backend/src/Contracts/Federation/Knot.Contracts.Federation.csproj index 52a2860..4bd9c60 100644 --- a/backend/src/Contracts/Knot.Modules.Federation.Contracts/Knot.Modules.Federation.Contracts.csproj +++ b/backend/src/Contracts/Federation/Knot.Contracts.Federation.csproj @@ -12,6 +12,7 @@ + diff --git a/backend/src/Contracts/Knot.Modules.Klipy.Contracts/Knot.Modules.Klipy.Contracts.csproj b/backend/src/Contracts/Klipy/Knot.Contracts.Klipy.csproj similarity index 83% rename from backend/src/Contracts/Knot.Modules.Klipy.Contracts/Knot.Modules.Klipy.Contracts.csproj rename to backend/src/Contracts/Klipy/Knot.Contracts.Klipy.csproj index 52a2860..4bd9c60 100644 --- a/backend/src/Contracts/Knot.Modules.Klipy.Contracts/Knot.Modules.Klipy.Contracts.csproj +++ b/backend/src/Contracts/Klipy/Knot.Contracts.Klipy.csproj @@ -12,6 +12,7 @@ + diff --git a/backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Abstractions/IIdentityDbContext.cs b/backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Abstractions/IIdentityDbContext.cs deleted file mode 100644 index d4b4ea4..0000000 --- a/backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Abstractions/IIdentityDbContext.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Microsoft.EntityFrameworkCore; - -namespace Knot.Modules.Auth.Contracts.Application.Abstractions; - -public interface IIdentityDbContext -{ - DbSet Set() where T : class; - Task SaveChangesAsync(CancellationToken cancellationToken = default); -} diff --git a/backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Abstractions/IIdentityUnitOfWork.cs b/backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Abstractions/IIdentityUnitOfWork.cs deleted file mode 100644 index b136d06..0000000 --- a/backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Abstractions/IIdentityUnitOfWork.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Knot.Modules.Auth.Contracts.Domain; -using Knot.Shared.Kernel; - -namespace Knot.Modules.Auth.Contracts.Application.Abstractions; - -public interface IIdentityUnitOfWork : IUnitOfWork -{ - IUserRepository UserRepository { get; } -} diff --git a/backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Users/GetMe/GetMeQuery.cs b/backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Users/GetMe/GetMeQuery.cs deleted file mode 100644 index 93cf6d6..0000000 --- a/backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Users/GetMe/GetMeQuery.cs +++ /dev/null @@ -1,6 +0,0 @@ -using Knot.Modules.Auth.Contracts.Domain; -using MediatR; - -namespace Knot.Modules.Auth.Contracts.Application.Users.GetMe; - -public record GetMeQuery() : IRequest; diff --git a/backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Users/Register/RegisterUserCommand.cs b/backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Users/Register/RegisterUserCommand.cs deleted file mode 100644 index 75e9bd5..0000000 --- a/backend/src/Contracts/Knot.Modules.Auth.Contracts/Application/Users/Register/RegisterUserCommand.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Knot.Modules.Auth.Contracts.Application.Auth.DTOs; -using Knot.Modules.Auth.Contracts.Domain; -using Knot.Shared.Kernel; -using MediatR; - -namespace Knot.Modules.Auth.Contracts.Application.Users.Register; - -public record RegisterUserCommand( - string Username, - string Password, - string DisplayName, - string? PhoneNumber, - bool IsBot = false -) : IRequest>; diff --git a/backend/src/Contracts/Knot.Modules.Messaging.Contracts/Knot.Modules.Messaging.Contracts.csproj b/backend/src/Contracts/Knot.Modules.Messaging.Contracts/Knot.Modules.Messaging.Contracts.csproj deleted file mode 100644 index 52a2860..0000000 --- a/backend/src/Contracts/Knot.Modules.Messaging.Contracts/Knot.Modules.Messaging.Contracts.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - net10.0 - enable - enable - - - - - - - - - - - diff --git a/backend/src/Contracts/Knot.Modules.Profiles.Contracts/Application/Profiles/Search/SearchUsers.cs b/backend/src/Contracts/Knot.Modules.Profiles.Contracts/Application/Profiles/Search/SearchUsers.cs deleted file mode 100644 index bfe8793..0000000 --- a/backend/src/Contracts/Knot.Modules.Profiles.Contracts/Application/Profiles/Search/SearchUsers.cs +++ /dev/null @@ -1,6 +0,0 @@ -using Knot.Modules.Profiles.Contracts.Application.DTOs; -using MediatR; - -namespace Knot.Modules.Profiles.Contracts.Application.Profiles.Search; - -public record SearchProfilesQuery(string Query, int Limit = 20) : IRequest>; diff --git a/backend/src/Contracts/Knot.Modules.Profiles.Contracts/Knot.Modules.Profiles.Contracts.csproj b/backend/src/Contracts/Knot.Modules.Profiles.Contracts/Knot.Modules.Profiles.Contracts.csproj deleted file mode 100644 index 52a2860..0000000 --- a/backend/src/Contracts/Knot.Modules.Profiles.Contracts/Knot.Modules.Profiles.Contracts.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - net10.0 - enable - enable - - - - - - - - - - - diff --git a/backend/src/Contracts/Knot.Modules.Relations.Contracts/Knot.Modules.Relations.Contracts.csproj b/backend/src/Contracts/Knot.Modules.Relations.Contracts/Knot.Modules.Relations.Contracts.csproj deleted file mode 100644 index 52a2860..0000000 --- a/backend/src/Contracts/Knot.Modules.Relations.Contracts/Knot.Modules.Relations.Contracts.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - net10.0 - enable - enable - - - - - - - - - - - diff --git a/backend/src/Contracts/Knot.Modules.Settings.Contracts/Knot.Modules.Settings.Contracts.csproj b/backend/src/Contracts/Knot.Modules.Settings.Contracts/Knot.Modules.Settings.Contracts.csproj deleted file mode 100644 index 52a2860..0000000 --- a/backend/src/Contracts/Knot.Modules.Settings.Contracts/Knot.Modules.Settings.Contracts.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - net10.0 - enable - enable - - - - - - - - - - - diff --git a/backend/src/Contracts/Knot.Modules.Storage.Contracts/Knot.Modules.Storage.Contracts.csproj b/backend/src/Contracts/Knot.Modules.Storage.Contracts/Knot.Modules.Storage.Contracts.csproj deleted file mode 100644 index 52a2860..0000000 --- a/backend/src/Contracts/Knot.Modules.Storage.Contracts/Knot.Modules.Storage.Contracts.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - net10.0 - enable - enable - - - - - - - - - - - diff --git a/backend/src/Contracts/Knot.Modules.Stories.Contracts/Knot.Modules.Stories.Contracts.csproj b/backend/src/Contracts/Knot.Modules.Stories.Contracts/Knot.Modules.Stories.Contracts.csproj deleted file mode 100644 index 52a2860..0000000 --- a/backend/src/Contracts/Knot.Modules.Stories.Contracts/Knot.Modules.Stories.Contracts.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - net10.0 - enable - enable - - - - - - - - - - - diff --git a/backend/src/Contracts/Knot.Modules.TelegramImport.Contracts/Knot.Modules.TelegramImport.Contracts.csproj b/backend/src/Contracts/Knot.Modules.TelegramImport.Contracts/Knot.Modules.TelegramImport.Contracts.csproj deleted file mode 100644 index 52a2860..0000000 --- a/backend/src/Contracts/Knot.Modules.TelegramImport.Contracts/Knot.Modules.TelegramImport.Contracts.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - net10.0 - enable - enable - - - - - - - - - - - diff --git a/backend/src/Contracts/Knot.Modules.WebRtc.Contracts/Knot.Modules.WebRtc.Contracts.csproj b/backend/src/Contracts/Knot.Modules.WebRtc.Contracts/Knot.Modules.WebRtc.Contracts.csproj deleted file mode 100644 index 52a2860..0000000 --- a/backend/src/Contracts/Knot.Modules.WebRtc.Contracts/Knot.Modules.WebRtc.Contracts.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - net10.0 - enable - enable - - - - - - - - - - - diff --git a/backend/src/Contracts/Messaging/Knot.Contracts.Messaging.csproj b/backend/src/Contracts/Messaging/Knot.Contracts.Messaging.csproj new file mode 100644 index 0000000..4bd9c60 --- /dev/null +++ b/backend/src/Contracts/Messaging/Knot.Contracts.Messaging.csproj @@ -0,0 +1,18 @@ + + + + net10.0 + enable + enable + + + + + + + + + + + + diff --git a/backend/src/Contracts/Knot.Modules.Profiles.Contracts/Application/DTOs/ProfilesErrors.cs b/backend/src/Contracts/Profiles/Application/DTOs/ProfilesErrors.cs similarity index 86% rename from backend/src/Contracts/Knot.Modules.Profiles.Contracts/Application/DTOs/ProfilesErrors.cs rename to backend/src/Contracts/Profiles/Application/DTOs/ProfilesErrors.cs index 0c0639f..e690b5e 100644 --- a/backend/src/Contracts/Knot.Modules.Profiles.Contracts/Application/DTOs/ProfilesErrors.cs +++ b/backend/src/Contracts/Profiles/Application/DTOs/ProfilesErrors.cs @@ -1,6 +1,6 @@ -using Knot.Shared.Kernel; +using Knot.Shared.Kernel; -namespace Knot.Modules.Profiles.Contracts.Application.DTOs; +namespace Knot.Contracts.Profiles.Application.DTOs; public static class ProfilesErrors { diff --git a/backend/src/Contracts/Knot.Modules.Profiles.Contracts/Application/DTOs/ProfilesRequests.cs b/backend/src/Contracts/Profiles/Application/DTOs/ProfilesRequests.cs similarity index 86% rename from backend/src/Contracts/Knot.Modules.Profiles.Contracts/Application/DTOs/ProfilesRequests.cs rename to backend/src/Contracts/Profiles/Application/DTOs/ProfilesRequests.cs index eaeeb88..b8f4733 100644 --- a/backend/src/Contracts/Knot.Modules.Profiles.Contracts/Application/DTOs/ProfilesRequests.cs +++ b/backend/src/Contracts/Profiles/Application/DTOs/ProfilesRequests.cs @@ -1,6 +1,6 @@ -using MediatR; +using MediatR; -namespace Knot.Modules.Profiles.Contracts.Application.DTOs; +namespace Knot.Contracts.Profiles.Application.DTOs; public record SearchProfilesRequest(string Query, int Limit = 20) : IRequest>; diff --git a/backend/src/Contracts/Knot.Modules.Profiles.Contracts/Application/DTOs/UserProfileDto.cs b/backend/src/Contracts/Profiles/Application/DTOs/UserProfileDto.cs similarity index 86% rename from backend/src/Contracts/Knot.Modules.Profiles.Contracts/Application/DTOs/UserProfileDto.cs rename to backend/src/Contracts/Profiles/Application/DTOs/UserProfileDto.cs index 4b75ecb..33067ba 100644 --- a/backend/src/Contracts/Knot.Modules.Profiles.Contracts/Application/DTOs/UserProfileDto.cs +++ b/backend/src/Contracts/Profiles/Application/DTOs/UserProfileDto.cs @@ -1,4 +1,4 @@ -namespace Knot.Modules.Profiles.Contracts.Application.DTOs; +namespace Knot.Contracts.Profiles.Application.DTOs; public class UserProfileDto { diff --git a/backend/src/Contracts/Knot.Modules.Profiles.Contracts/Application/Profiles/Avatar/UploadAvatar.cs b/backend/src/Contracts/Profiles/Application/Profiles/Avatar/UploadAvatar.cs similarity index 73% rename from backend/src/Contracts/Knot.Modules.Profiles.Contracts/Application/Profiles/Avatar/UploadAvatar.cs rename to backend/src/Contracts/Profiles/Application/Profiles/Avatar/UploadAvatar.cs index 59d9e2f..855b791 100644 --- a/backend/src/Contracts/Knot.Modules.Profiles.Contracts/Application/Profiles/Avatar/UploadAvatar.cs +++ b/backend/src/Contracts/Profiles/Application/Profiles/Avatar/UploadAvatar.cs @@ -1,7 +1,7 @@ -using Knot.Shared.Kernel; +using Knot.Shared.Kernel; using MediatR; -namespace Knot.Modules.Profiles.Contracts.Application.Profiles.Avatar; +namespace Knot.Contracts.Profiles.Application.Profiles.Avatar; public record UploadAvatarCommand(Stream Stream, string FileName) : IRequest>; diff --git a/backend/src/Contracts/Knot.Modules.Profiles.Contracts/Application/Profiles/GetUser/GetProfile.cs b/backend/src/Contracts/Profiles/Application/Profiles/GetUser/GetProfile.cs similarity index 60% rename from backend/src/Contracts/Knot.Modules.Profiles.Contracts/Application/Profiles/GetUser/GetProfile.cs rename to backend/src/Contracts/Profiles/Application/Profiles/GetUser/GetProfile.cs index 4975f21..264d52d 100644 --- a/backend/src/Contracts/Knot.Modules.Profiles.Contracts/Application/Profiles/GetUser/GetProfile.cs +++ b/backend/src/Contracts/Profiles/Application/Profiles/GetUser/GetProfile.cs @@ -1,8 +1,8 @@ -using Knot.Modules.Profiles.Contracts.Application.DTOs; +using Knot.Contracts.Profiles.Application.DTOs; using Knot.Shared.Kernel; using MediatR; -namespace Knot.Modules.Profiles.Contracts.Application.Profiles.GetUser; +namespace Knot.Contracts.Profiles.Application.Profiles.GetUser; public record GetProfileQuery(Guid UserId) : IRequest>; diff --git a/backend/src/Contracts/Profiles/Application/Profiles/Search/SearchUsers.cs b/backend/src/Contracts/Profiles/Application/Profiles/Search/SearchUsers.cs new file mode 100644 index 0000000..e93ceae --- /dev/null +++ b/backend/src/Contracts/Profiles/Application/Profiles/Search/SearchUsers.cs @@ -0,0 +1,6 @@ +using Knot.Contracts.Profiles.Application.DTOs; +using MediatR; + +namespace Knot.Contracts.Profiles.Application.Profiles.Search; + +public record SearchProfilesQuery(string Query, int Limit = 20) : IRequest>; diff --git a/backend/src/Contracts/Knot.Modules.Profiles.Contracts/Application/Profiles/UpdateProfile/UpdateProfile.cs b/backend/src/Contracts/Profiles/Application/Profiles/UpdateProfile/UpdateProfile.cs similarity index 61% rename from backend/src/Contracts/Knot.Modules.Profiles.Contracts/Application/Profiles/UpdateProfile/UpdateProfile.cs rename to backend/src/Contracts/Profiles/Application/Profiles/UpdateProfile/UpdateProfile.cs index 58abd25..5b83beb 100644 --- a/backend/src/Contracts/Knot.Modules.Profiles.Contracts/Application/Profiles/UpdateProfile/UpdateProfile.cs +++ b/backend/src/Contracts/Profiles/Application/Profiles/UpdateProfile/UpdateProfile.cs @@ -1,8 +1,8 @@ -using Knot.Modules.Profiles.Contracts.Application.DTOs; +using Knot.Contracts.Profiles.Application.DTOs; using Knot.Shared.Kernel; using MediatR; -namespace Knot.Modules.Profiles.Contracts.Application.Profiles.UpdateProfile; +namespace Knot.Contracts.Profiles.Application.Profiles.UpdateProfile; public record UpdateProfileCommand( string? DisplayName, diff --git a/backend/src/Contracts/Knot.Modules.Profiles.Contracts/Application/Profiles/UpdateSettings/UpdateSettings.cs b/backend/src/Contracts/Profiles/Application/Profiles/UpdateSettings/UpdateSettings.cs similarity index 67% rename from backend/src/Contracts/Knot.Modules.Profiles.Contracts/Application/Profiles/UpdateSettings/UpdateSettings.cs rename to backend/src/Contracts/Profiles/Application/Profiles/UpdateSettings/UpdateSettings.cs index a0adfd2..bf84264 100644 --- a/backend/src/Contracts/Knot.Modules.Profiles.Contracts/Application/Profiles/UpdateSettings/UpdateSettings.cs +++ b/backend/src/Contracts/Profiles/Application/Profiles/UpdateSettings/UpdateSettings.cs @@ -1,8 +1,8 @@ -using Knot.Modules.Profiles.Contracts.Application.DTOs; +using Knot.Contracts.Profiles.Application.DTOs; using Knot.Shared.Kernel; using MediatR; -namespace Knot.Modules.Profiles.Contracts.Application.Profiles.UpdateSettings; +namespace Knot.Contracts.Profiles.Application.Profiles.UpdateSettings; public record UpdateSettingsCommand( bool? ShowLastSeen, diff --git a/backend/src/Contracts/Knot.Modules.Profiles.Contracts/Domain/IAvatarStorageService.cs b/backend/src/Contracts/Profiles/Domain/IAvatarStorageService.cs similarity index 82% rename from backend/src/Contracts/Knot.Modules.Profiles.Contracts/Domain/IAvatarStorageService.cs rename to backend/src/Contracts/Profiles/Domain/IAvatarStorageService.cs index c348ed8..b4f5542 100644 --- a/backend/src/Contracts/Knot.Modules.Profiles.Contracts/Domain/IAvatarStorageService.cs +++ b/backend/src/Contracts/Profiles/Domain/IAvatarStorageService.cs @@ -1,6 +1,6 @@ -using Knot.Shared.Kernel.Storage; +using Knot.Shared.Kernel.Storage; -namespace Knot.Modules.Profiles.Contracts.Domain; +namespace Knot.Contracts.Profiles.Domain; public interface IAvatarStorageService { diff --git a/backend/src/Contracts/Knot.Modules.Profiles.Contracts/Domain/IProfileRepository.cs b/backend/src/Contracts/Profiles/Domain/IProfileRepository.cs similarity index 88% rename from backend/src/Contracts/Knot.Modules.Profiles.Contracts/Domain/IProfileRepository.cs rename to backend/src/Contracts/Profiles/Domain/IProfileRepository.cs index 5445bb2..08b40ad 100644 --- a/backend/src/Contracts/Knot.Modules.Profiles.Contracts/Domain/IProfileRepository.cs +++ b/backend/src/Contracts/Profiles/Domain/IProfileRepository.cs @@ -1,7 +1,7 @@ -using Knot.Modules.Profiles.Contracts.Application.DTOs; +using Knot.Contracts.Profiles.Application.DTOs; using Knot.Shared.Kernel; -namespace Knot.Modules.Profiles.Contracts.Domain; +namespace Knot.Contracts.Profiles.Domain; public interface IProfileRepository { diff --git a/backend/src/Contracts/Knot.Modules.Profiles.Contracts/Domain/IProfilesUnitOfWork.cs b/backend/src/Contracts/Profiles/Domain/IProfilesUnitOfWork.cs similarity index 58% rename from backend/src/Contracts/Knot.Modules.Profiles.Contracts/Domain/IProfilesUnitOfWork.cs rename to backend/src/Contracts/Profiles/Domain/IProfilesUnitOfWork.cs index 9ebc664..bf2d0ad 100644 --- a/backend/src/Contracts/Knot.Modules.Profiles.Contracts/Domain/IProfilesUnitOfWork.cs +++ b/backend/src/Contracts/Profiles/Domain/IProfilesUnitOfWork.cs @@ -1,6 +1,6 @@ -using Knot.Shared.Kernel; +using Knot.Shared.Kernel; -namespace Knot.Modules.Profiles.Contracts.Domain; +namespace Knot.Contracts.Profiles.Domain; public interface IProfilesUnitOfWork : IUnitOfWork { diff --git a/backend/src/Contracts/Profiles/Knot.Contracts.Profiles.csproj b/backend/src/Contracts/Profiles/Knot.Contracts.Profiles.csproj new file mode 100644 index 0000000..4bd9c60 --- /dev/null +++ b/backend/src/Contracts/Profiles/Knot.Contracts.Profiles.csproj @@ -0,0 +1,18 @@ + + + + net10.0 + enable + enable + + + + + + + + + + + + diff --git a/backend/src/Contracts/Relations/Knot.Contracts.Relations.csproj b/backend/src/Contracts/Relations/Knot.Contracts.Relations.csproj new file mode 100644 index 0000000..4bd9c60 --- /dev/null +++ b/backend/src/Contracts/Relations/Knot.Contracts.Relations.csproj @@ -0,0 +1,18 @@ + + + + net10.0 + enable + enable + + + + + + + + + + + + diff --git a/backend/src/Contracts/Knot.Modules.Settings.Contracts/Application/Abstractions/ISettingsService.cs b/backend/src/Contracts/Settings/Application/Abstractions/ISettingsService.cs similarity index 87% rename from backend/src/Contracts/Knot.Modules.Settings.Contracts/Application/Abstractions/ISettingsService.cs rename to backend/src/Contracts/Settings/Application/Abstractions/ISettingsService.cs index 0019d9d..3ba33b0 100644 --- a/backend/src/Contracts/Knot.Modules.Settings.Contracts/Application/Abstractions/ISettingsService.cs +++ b/backend/src/Contracts/Settings/Application/Abstractions/ISettingsService.cs @@ -1,6 +1,6 @@ -using Knot.Modules.Settings.Contracts.Application.DTOs; +using Knot.Contracts.Settings.Application.DTOs; -namespace Knot.Modules.Settings.Contracts.Application.Abstractions; +namespace Knot.Contracts.Settings.Application.Abstractions; public interface ISettingsService { diff --git a/backend/src/Contracts/Knot.Modules.Settings.Contracts/Application/DTOs/SystemSettingsDto.cs b/backend/src/Contracts/Settings/Application/DTOs/SystemSettingsDto.cs similarity index 97% rename from backend/src/Contracts/Knot.Modules.Settings.Contracts/Application/DTOs/SystemSettingsDto.cs rename to backend/src/Contracts/Settings/Application/DTOs/SystemSettingsDto.cs index bcb08ef..8cb4388 100644 --- a/backend/src/Contracts/Knot.Modules.Settings.Contracts/Application/DTOs/SystemSettingsDto.cs +++ b/backend/src/Contracts/Settings/Application/DTOs/SystemSettingsDto.cs @@ -1,6 +1,6 @@ -using System.Collections.Generic; +using System.Collections.Generic; -namespace Knot.Modules.Settings.Contracts.Application.DTOs; +namespace Knot.Contracts.Settings.Application.DTOs; public class SystemConfig { diff --git a/backend/src/Contracts/Settings/Knot.Contracts.Settings.csproj b/backend/src/Contracts/Settings/Knot.Contracts.Settings.csproj new file mode 100644 index 0000000..4bd9c60 --- /dev/null +++ b/backend/src/Contracts/Settings/Knot.Contracts.Settings.csproj @@ -0,0 +1,18 @@ + + + + net10.0 + enable + enable + + + + + + + + + + + + diff --git a/backend/src/Contracts/Storage/Knot.Contracts.Storage.csproj b/backend/src/Contracts/Storage/Knot.Contracts.Storage.csproj new file mode 100644 index 0000000..4bd9c60 --- /dev/null +++ b/backend/src/Contracts/Storage/Knot.Contracts.Storage.csproj @@ -0,0 +1,18 @@ + + + + net10.0 + enable + enable + + + + + + + + + + + + diff --git a/backend/src/Contracts/Stories/Knot.Contracts.Stories.csproj b/backend/src/Contracts/Stories/Knot.Contracts.Stories.csproj new file mode 100644 index 0000000..4bd9c60 --- /dev/null +++ b/backend/src/Contracts/Stories/Knot.Contracts.Stories.csproj @@ -0,0 +1,18 @@ + + + + net10.0 + enable + enable + + + + + + + + + + + + diff --git a/backend/src/Contracts/TelegramImport/Knot.Contracts.TelegramImport.csproj b/backend/src/Contracts/TelegramImport/Knot.Contracts.TelegramImport.csproj new file mode 100644 index 0000000..4bd9c60 --- /dev/null +++ b/backend/src/Contracts/TelegramImport/Knot.Contracts.TelegramImport.csproj @@ -0,0 +1,18 @@ + + + + net10.0 + enable + enable + + + + + + + + + + + + diff --git a/backend/src/Contracts/WebRtc/Knot.Contracts.WebRtc.csproj b/backend/src/Contracts/WebRtc/Knot.Contracts.WebRtc.csproj new file mode 100644 index 0000000..4bd9c60 --- /dev/null +++ b/backend/src/Contracts/WebRtc/Knot.Contracts.WebRtc.csproj @@ -0,0 +1,18 @@ + + + + net10.0 + enable + enable + + + + + + + + + + + + diff --git a/backend/src/Host/Program.cs b/backend/src/Host/Program.cs index 308e3c6..2b571fb 100644 --- a/backend/src/Host/Program.cs +++ b/backend/src/Host/Program.cs @@ -190,7 +190,7 @@ using (var scope = app.Services.CreateScope()) Knot.Modules.Messaging.Infrastructure.Persistence.Mongo.EncryptedStringSerializer.EncryptionService = encryptionService; // Initialize Global Settings Cache - var settingsService = scope.ServiceProvider.GetRequiredService(); + var settingsService = scope.ServiceProvider.GetRequiredService(); if (settingsService is Knot.Modules.Settings.Infrastructure.Configuration.SettingsService concreteSettings) { concreteSettings.Initialize(); diff --git a/backend/src/Modules/Admin/Application/Admin/Commands/BanUser/BanUserCommand.cs b/backend/src/Modules/Admin/Application/Admin/Commands/BanUser/BanUserCommand.cs index 0979dd8..16fef17 100644 --- a/backend/src/Modules/Admin/Application/Admin/Commands/BanUser/BanUserCommand.cs +++ b/backend/src/Modules/Admin/Application/Admin/Commands/BanUser/BanUserCommand.cs @@ -1,5 +1,5 @@ -using Knot.Modules.Auth.Contracts.Domain; -using Knot.Modules.Auth.Contracts.Application.Abstractions; +using Knot.Contracts.Auth.Domain; +using Knot.Contracts.Auth.Application.Abstractions; using Knot.Shared.Kernel; using System; using System.Threading; diff --git a/backend/src/Modules/Admin/Application/Admin/Commands/BanUser/UnbanUserCommand.cs b/backend/src/Modules/Admin/Application/Admin/Commands/BanUser/UnbanUserCommand.cs index 26da2cc..48ef80e 100644 --- a/backend/src/Modules/Admin/Application/Admin/Commands/BanUser/UnbanUserCommand.cs +++ b/backend/src/Modules/Admin/Application/Admin/Commands/BanUser/UnbanUserCommand.cs @@ -1,5 +1,5 @@ -using Knot.Modules.Auth.Contracts.Domain; -using Knot.Modules.Auth.Contracts.Application.Abstractions; +using Knot.Contracts.Auth.Domain; +using Knot.Contracts.Auth.Application.Abstractions; using Knot.Shared.Kernel; using System; using System.Threading; diff --git a/backend/src/Modules/Admin/Application/Admin/Commands/ResetUserPassword/ResetUserPasswordCommand.cs b/backend/src/Modules/Admin/Application/Admin/Commands/ResetUserPassword/ResetUserPasswordCommand.cs index e64a1b3..9a2ff3d 100644 --- a/backend/src/Modules/Admin/Application/Admin/Commands/ResetUserPassword/ResetUserPasswordCommand.cs +++ b/backend/src/Modules/Admin/Application/Admin/Commands/ResetUserPassword/ResetUserPasswordCommand.cs @@ -1,6 +1,6 @@ -using Knot.Modules.Auth.Contracts.Domain; -using Knot.Modules.Auth.Contracts.Application.Abstractions; -using Knot.Modules.Auth.Contracts.Application.Auth.DTOs; +using Knot.Contracts.Auth.Domain; +using Knot.Contracts.Auth.Application.Abstractions; +using Knot.Contracts.Auth.Application.Auth.DTOs; using Knot.Modules.Admin.Application.Admin.DTOs; using System; using System.Threading; diff --git a/backend/src/Modules/Admin/Application/Admin/Commands/TestKlipy/TestKlipyConnectionCommand.cs b/backend/src/Modules/Admin/Application/Admin/Commands/TestKlipy/TestKlipyConnectionCommand.cs index e454106..6ade72e 100644 --- a/backend/src/Modules/Admin/Application/Admin/Commands/TestKlipy/TestKlipyConnectionCommand.cs +++ b/backend/src/Modules/Admin/Application/Admin/Commands/TestKlipy/TestKlipyConnectionCommand.cs @@ -2,8 +2,8 @@ using System.Threading; using System.Threading.Tasks; using MediatR; using Knot.Shared.Kernel; -using Knot.Modules.Settings.Contracts.Application.Abstractions; -using Knot.Modules.Settings.Contracts.Application.DTOs; +using Knot.Contracts.Settings.Application.Abstractions; +using Knot.Contracts.Settings.Application.DTOs; using Knot.Modules.Klipy.Application.Abstractions; namespace Knot.Modules.Admin.Application.Admin.Commands.TestKlipy; diff --git a/backend/src/Modules/Admin/Application/Admin/Commands/UpdateSettings/UpdateSettingsCommand.cs b/backend/src/Modules/Admin/Application/Admin/Commands/UpdateSettings/UpdateSettingsCommand.cs index 5affed2..d6e3a06 100644 --- a/backend/src/Modules/Admin/Application/Admin/Commands/UpdateSettings/UpdateSettingsCommand.cs +++ b/backend/src/Modules/Admin/Application/Admin/Commands/UpdateSettings/UpdateSettingsCommand.cs @@ -4,8 +4,8 @@ using System.Threading; using System.Threading.Tasks; using MediatR; using Knot.Shared.Kernel; -using Knot.Modules.Settings.Contracts.Application.Abstractions; -using Knot.Modules.Settings.Contracts.Application.DTOs; +using Knot.Contracts.Settings.Application.Abstractions; +using Knot.Contracts.Settings.Application.DTOs; using System.Security.Cryptography; namespace Knot.Modules.Admin.Application.Admin.Commands; diff --git a/backend/src/Modules/Admin/Application/Admin/Queries/GetSettings/GetSettingsQuery.cs b/backend/src/Modules/Admin/Application/Admin/Queries/GetSettings/GetSettingsQuery.cs index 48a9497..7bbfac4 100644 --- a/backend/src/Modules/Admin/Application/Admin/Queries/GetSettings/GetSettingsQuery.cs +++ b/backend/src/Modules/Admin/Application/Admin/Queries/GetSettings/GetSettingsQuery.cs @@ -4,8 +4,8 @@ using System.Threading; using System.Threading.Tasks; using MediatR; using Knot.Shared.Kernel; -using Knot.Modules.Settings.Contracts.Application.Abstractions; -using Knot.Modules.Settings.Contracts.Application.DTOs; +using Knot.Contracts.Settings.Application.Abstractions; +using Knot.Contracts.Settings.Application.DTOs; namespace Knot.Modules.Admin.Application.Admin.Queries; diff --git a/backend/src/Modules/Admin/Application/Admin/Queries/GetUserDetails/GetUserDetailsQuery.cs b/backend/src/Modules/Admin/Application/Admin/Queries/GetUserDetails/GetUserDetailsQuery.cs index 1c02a99..eb82f1b 100644 --- a/backend/src/Modules/Admin/Application/Admin/Queries/GetUserDetails/GetUserDetailsQuery.cs +++ b/backend/src/Modules/Admin/Application/Admin/Queries/GetUserDetails/GetUserDetailsQuery.cs @@ -1,5 +1,5 @@ -using Knot.Modules.Auth.Contracts.Domain; -using Knot.Modules.Auth.Contracts.Application.Auth.DTOs; +using Knot.Contracts.Auth.Domain; +using Knot.Contracts.Auth.Application.Auth.DTOs; using Knot.Modules.Admin.Application.Admin.DTOs; using Knot.Modules.Messaging.Domain; using System; diff --git a/backend/src/Modules/Admin/Application/Admin/Queries/SearchUsers/SearchUsersQuery.cs b/backend/src/Modules/Admin/Application/Admin/Queries/SearchUsers/SearchUsersQuery.cs index 1b0b817..ea80d91 100644 --- a/backend/src/Modules/Admin/Application/Admin/Queries/SearchUsers/SearchUsersQuery.cs +++ b/backend/src/Modules/Admin/Application/Admin/Queries/SearchUsers/SearchUsersQuery.cs @@ -1,4 +1,4 @@ -using Knot.Modules.Auth.Contracts.Domain; +using Knot.Contracts.Auth.Domain; using Knot.Modules.Admin.Application.Admin.DTOs; using System; using System.Collections.Generic; diff --git a/backend/src/Modules/Admin/Domain/Events/SystemSettingsUpdatedDomainEvent.cs b/backend/src/Modules/Admin/Domain/Events/SystemSettingsUpdatedDomainEvent.cs index 0460fa6..91a8f74 100644 --- a/backend/src/Modules/Admin/Domain/Events/SystemSettingsUpdatedDomainEvent.cs +++ b/backend/src/Modules/Admin/Domain/Events/SystemSettingsUpdatedDomainEvent.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Knot.Shared.Kernel; -using Knot.Modules.Settings.Contracts.Application.Abstractions; -using Knot.Modules.Settings.Contracts.Application.DTOs; +using Knot.Contracts.Settings.Application.Abstractions; +using Knot.Contracts.Settings.Application.DTOs; namespace Knot.Modules.Admin.Domain.Events; diff --git a/backend/src/Modules/Admin/Knot.Modules.Admin.csproj b/backend/src/Modules/Admin/Knot.Modules.Admin.csproj index 8d08e12..549f95b 100644 --- a/backend/src/Modules/Admin/Knot.Modules.Admin.csproj +++ b/backend/src/Modules/Admin/Knot.Modules.Admin.csproj @@ -7,10 +7,11 @@ - - - - + + + + + diff --git a/backend/src/Modules/Admin/Presentation/Endpoints/AdminEndpoints.cs b/backend/src/Modules/Admin/Presentation/Endpoints/AdminEndpoints.cs index 0d8bcfe..337f68a 100644 --- a/backend/src/Modules/Admin/Presentation/Endpoints/AdminEndpoints.cs +++ b/backend/src/Modules/Admin/Presentation/Endpoints/AdminEndpoints.cs @@ -1,8 +1,8 @@ using Carter; -using Knot.Modules.Auth.Contracts.Application.Auth.DTOs; +using Knot.Contracts.Auth.Application.Auth.DTOs; using Knot.Shared.Kernel; -using Knot.Modules.Settings.Contracts.Application.Abstractions; -using Knot.Modules.Settings.Contracts.Application.DTOs; +using Knot.Contracts.Settings.Application.Abstractions; +using Knot.Contracts.Settings.Application.DTOs; using Knot.Modules.Auth.Application.Users.Register; using MediatR; using Knot.Modules.Admin.Application.Admin.Queries; diff --git a/backend/src/Modules/Auth/Application/Users/GetMe/GetMe.cs b/backend/src/Modules/Auth/Application/Users/GetMe/GetMe.cs index f8eaf8b..5a11565 100644 --- a/backend/src/Modules/Auth/Application/Users/GetMe/GetMe.cs +++ b/backend/src/Modules/Auth/Application/Users/GetMe/GetMe.cs @@ -1,6 +1,6 @@ using Knot.Shared.Kernel; -using Knot.Modules.Auth.Contracts.Domain; -using Knot.Modules.Auth.Contracts.Application.Auth.DTOs; +using Knot.Contracts.Auth.Domain; +using Knot.Contracts.Auth.Application.Auth.DTOs; namespace Knot.Modules.Auth.Application.Users.GetMe; diff --git a/backend/src/Modules/Auth/Application/Users/Login/LoginUserCommandHandler.cs b/backend/src/Modules/Auth/Application/Users/Login/LoginUserCommandHandler.cs index 93c62fe..cfbd42e 100644 --- a/backend/src/Modules/Auth/Application/Users/Login/LoginUserCommandHandler.cs +++ b/backend/src/Modules/Auth/Application/Users/Login/LoginUserCommandHandler.cs @@ -1,6 +1,6 @@ -using Knot.Modules.Auth.Contracts.Domain; -using Knot.Modules.Auth.Contracts.Application.Abstractions; -using Knot.Modules.Auth.Contracts.Application.Auth.DTOs; +using Knot.Contracts.Auth.Domain; +using Knot.Contracts.Auth.Application.Abstractions; +using Knot.Contracts.Auth.Application.Auth.DTOs; using Knot.Shared.Kernel; using BCrypt.Net; diff --git a/backend/src/Modules/Auth/Application/Users/Register/RegisterUserCommandHandler.cs b/backend/src/Modules/Auth/Application/Users/Register/RegisterUserCommandHandler.cs index 581865a..710d599 100644 --- a/backend/src/Modules/Auth/Application/Users/Register/RegisterUserCommandHandler.cs +++ b/backend/src/Modules/Auth/Application/Users/Register/RegisterUserCommandHandler.cs @@ -1,16 +1,16 @@ -using Knot.Modules.Auth.Contracts.Domain; -using Knot.Modules.Auth.Contracts.Application.Abstractions; -using Knot.Modules.Auth.Contracts.Application.Auth.DTOs; +using Knot.Contracts.Auth.Domain; +using Knot.Contracts.Auth.Application.Abstractions; +using Knot.Contracts.Auth.Application.Auth.DTOs; using Knot.Modules.Auth.Domain; using Knot.Shared.Kernel; -using Knot.Modules.Settings.Contracts.Application.Abstractions; -using Knot.Modules.Settings.Contracts.Application.DTOs; +using Knot.Contracts.Settings.Application.Abstractions; +using Knot.Contracts.Settings.Application.DTOs; using BCrypt.Net; namespace Knot.Modules.Auth.Application.Users.Register; /// -/// Команда для регистрации нового пользователя. +/// . /// public sealed record RegisterUserCommand( string Username, @@ -20,7 +20,7 @@ public sealed record RegisterUserCommand( string? Bio) : ICommand; /// -/// Обработчик команды регистрации. +/// . /// internal sealed class RegisterUserCommandHandler : ICommandHandler { @@ -48,16 +48,16 @@ internal sealed class RegisterUserCommandHandler : ICommandHandler(AuthErrors.IdentityRegistrationDisabled); } - // 1. Проверка уникальности username + // 1. username if (!await _userRepository.IsUsernameUniqueAsync(request.Username, cancellationToken)) { return Result.Failure(AuthErrors.IdentityUsernameNotUnique); } - // 2. Хеширование пароля + // 2. string passwordHash = BCrypt.Net.BCrypt.HashPassword(request.Password); - // 3. Создание сущности + // 3. var user = User.Create( request.Username, passwordHash, @@ -65,7 +65,7 @@ internal sealed class RegisterUserCommandHandler : ICommandHandler -/// Сущность пользователя в контексте идентификации (Identity). +/// (Identity). /// public sealed class User : AggregateRoot { @@ -44,7 +44,7 @@ public sealed class User : AggregateRoot } /// - /// Фабричный метод для создания нового пользователя. + /// . /// public static User Create(string username, string passwordHash, string displayName, string? email = null, string? bio = null) { @@ -54,7 +54,7 @@ public sealed class User : AggregateRoot } /// - /// Создает "теневого" пользователя для контакта с другого сервера. + /// "" . /// public static User CreateExternal(Guid id, string username, string displayName, string domain, string? avatar = null) { diff --git a/backend/src/Modules/Auth/Infrastructure/Authentication/JwtTokenProvider.cs b/backend/src/Modules/Auth/Infrastructure/Authentication/JwtTokenProvider.cs index 468dadd..9eb35ed 100644 --- a/backend/src/Modules/Auth/Infrastructure/Authentication/JwtTokenProvider.cs +++ b/backend/src/Modules/Auth/Infrastructure/Authentication/JwtTokenProvider.cs @@ -3,8 +3,9 @@ using System.Security.Claims; using System.Text; using Microsoft.Extensions.Configuration; using Microsoft.IdentityModel.Tokens; -using Knot.Modules.Auth.Contracts.Application.Abstractions; -using Knot.Modules.Auth.Domain; +using Knot.Contracts.Auth.Application.Abstractions; +using Knot.Contracts.Auth.Domain; +using DomainUser = Knot.Modules.Auth.Domain.User; namespace Knot.Modules.Auth.Infrastructure.Authentication; @@ -75,7 +76,7 @@ internal sealed class JwtTokenProvider : IJwtTokenProvider return new JwtSecurityTokenHandler().WriteToken(token); } - public string Generate(User user) + public string Generate(UserContract user) { return Generate(user.Id, user.Username, user.DisplayName, user.Avatar); } diff --git a/backend/src/Modules/Auth/Infrastructure/Persistence/AuthDbContext.cs b/backend/src/Modules/Auth/Infrastructure/Persistence/AuthDbContext.cs index 6f6fbb7..f026dde 100644 --- a/backend/src/Modules/Auth/Infrastructure/Persistence/AuthDbContext.cs +++ b/backend/src/Modules/Auth/Infrastructure/Persistence/AuthDbContext.cs @@ -1,8 +1,8 @@ -using MediatR; +using MediatR; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Diagnostics; -using Knot.Modules.Auth.Contracts.Application.Abstractions; -using Knot.Modules.Auth.Contracts.Domain; +using Knot.Contracts.Auth.Application.Abstractions; +using Knot.Contracts.Auth.Domain; using Knot.Shared.Kernel; using Knot.Shared.Kernel.Security; using DomainUser = Knot.Modules.Auth.Domain.User; diff --git a/backend/src/Modules/Auth/Infrastructure/Persistence/UserRepository.cs b/backend/src/Modules/Auth/Infrastructure/Persistence/UserRepository.cs index 92f21cc..fc31570 100644 --- a/backend/src/Modules/Auth/Infrastructure/Persistence/UserRepository.cs +++ b/backend/src/Modules/Auth/Infrastructure/Persistence/UserRepository.cs @@ -1,5 +1,5 @@ -using Microsoft.EntityFrameworkCore; -using Knot.Modules.Auth.Contracts.Domain; +using Microsoft.EntityFrameworkCore; +using Knot.Contracts.Auth.Domain; using Knot.Modules.Auth.Domain; namespace Knot.Modules.Auth.Infrastructure.Persistence; diff --git a/backend/src/Modules/Auth/Infrastructure/Services/UserDisplayNameProvider.cs b/backend/src/Modules/Auth/Infrastructure/Services/UserDisplayNameProvider.cs index 2acc04b..2298bf7 100644 --- a/backend/src/Modules/Auth/Infrastructure/Services/UserDisplayNameProvider.cs +++ b/backend/src/Modules/Auth/Infrastructure/Services/UserDisplayNameProvider.cs @@ -1,6 +1,6 @@ using Knot.Shared.Kernel; -using Knot.Modules.Auth.Contracts.Domain; -using Knot.Modules.Auth.Contracts.Domain; +using Knot.Contracts.Auth.Domain; +using Knot.Contracts.Auth.Domain; namespace Knot.Modules.Auth.Infrastructure.Services; diff --git a/backend/src/Modules/Auth/Knot.Modules.Auth.csproj b/backend/src/Modules/Auth/Knot.Modules.Auth.csproj index 0ac8005..84d1bd5 100644 --- a/backend/src/Modules/Auth/Knot.Modules.Auth.csproj +++ b/backend/src/Modules/Auth/Knot.Modules.Auth.csproj @@ -1,4 +1,4 @@ - + net10.0 @@ -8,9 +8,9 @@ - - - + + + @@ -33,6 +33,3 @@ - - - diff --git a/backend/src/Modules/Auth/Migrations/20260322191927_InitialAuth.Designer.cs b/backend/src/Modules/Auth/Migrations/20260322191927_InitialAuth.Designer.cs index 4ea311f..5e5eaeb 100644 --- a/backend/src/Modules/Auth/Migrations/20260322191927_InitialAuth.Designer.cs +++ b/backend/src/Modules/Auth/Migrations/20260322191927_InitialAuth.Designer.cs @@ -26,7 +26,7 @@ namespace Knot.Modules.Auth.Migrations NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("Knot.Modules.Auth.Contracts.Domain.User", b => + modelBuilder.Entity("Knot.Contracts.Auth.Domain.User", b => { b.Property("Id") .ValueGeneratedOnAdd() diff --git a/backend/src/Modules/Auth/Migrations/20270327140400_AddUserExtendedFields.Designer.cs b/backend/src/Modules/Auth/Migrations/20270327140400_AddUserExtendedFields.Designer.cs index cd09ad9..dbdec0c 100644 --- a/backend/src/Modules/Auth/Migrations/20270327140400_AddUserExtendedFields.Designer.cs +++ b/backend/src/Modules/Auth/Migrations/20270327140400_AddUserExtendedFields.Designer.cs @@ -27,7 +27,7 @@ namespace Knot.Modules.Auth.Migrations NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("Knot.Modules.Auth.Contracts.Domain.User", b => + modelBuilder.Entity("Knot.Contracts.Auth.Domain.User", b => { b.Property("Id") .ValueGeneratedOnAdd() diff --git a/backend/src/Modules/Auth/Migrations/20270327160000_AddUserBanField.Designer.cs b/backend/src/Modules/Auth/Migrations/20270327160000_AddUserBanField.Designer.cs index b9db0ec..ffb072f 100644 --- a/backend/src/Modules/Auth/Migrations/20270327160000_AddUserBanField.Designer.cs +++ b/backend/src/Modules/Auth/Migrations/20270327160000_AddUserBanField.Designer.cs @@ -26,7 +26,7 @@ namespace Knot.Modules.Auth.Migrations NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("Knot.Modules.Auth.Contracts.Domain.User", b => + modelBuilder.Entity("Knot.Contracts.Auth.Domain.User", b => { b.Property("Id") .ValueGeneratedOnAdd() diff --git a/backend/src/Modules/Auth/Migrations/AuthDbContextModelSnapshot.cs b/backend/src/Modules/Auth/Migrations/AuthDbContextModelSnapshot.cs index f8f778d..a5a9fa4 100644 --- a/backend/src/Modules/Auth/Migrations/AuthDbContextModelSnapshot.cs +++ b/backend/src/Modules/Auth/Migrations/AuthDbContextModelSnapshot.cs @@ -23,7 +23,7 @@ namespace Knot.Modules.Auth.Migrations NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("Knot.Modules.Auth.Contracts.Domain.User", b => + modelBuilder.Entity("Knot.Contracts.Auth.Domain.User", b => { b.Property("Id") .ValueGeneratedOnAdd() diff --git a/backend/src/Modules/Conversations/Application/Folders/Commands/AddToFolder/AddToFolderCommand.cs b/backend/src/Modules/Conversations/Application/Folders/Commands/AddToFolder/AddToFolderCommand.cs index 8b87cc4..1be4fec 100644 --- a/backend/src/Modules/Conversations/Application/Folders/Commands/AddToFolder/AddToFolderCommand.cs +++ b/backend/src/Modules/Conversations/Application/Folders/Commands/AddToFolder/AddToFolderCommand.cs @@ -1,6 +1,6 @@ using Knot.Modules.Conversations.Domain; using Knot.Modules.Conversations.Application.Abstractions; -using Knot.Modules.Settings.Contracts.Application.Abstractions; +using Knot.Contracts.Settings.Application.Abstractions; using Knot.Shared.Kernel; using MediatR; diff --git a/backend/src/Modules/Conversations/Application/Messages/Send/SendMessageCommandHandler.cs b/backend/src/Modules/Conversations/Application/Messages/Send/SendMessageCommandHandler.cs index 1eb3666..409f564 100644 --- a/backend/src/Modules/Conversations/Application/Messages/Send/SendMessageCommandHandler.cs +++ b/backend/src/Modules/Conversations/Application/Messages/Send/SendMessageCommandHandler.cs @@ -2,7 +2,7 @@ using Knot.Modules.Messaging.Application.Abstractions; using Knot.Modules.Messaging.Domain; using Knot.Modules.Conversations.Domain; using Knot.Shared.Kernel; -using Knot.Modules.Settings.Contracts.Application.Abstractions; +using Knot.Contracts.Settings.Application.Abstractions; using Knot.Modules.Conversations.Application.Abstractions; namespace Knot.Modules.Conversations.Application.Messages.Send; diff --git a/backend/src/Modules/Conversations/Application/Messages/UploadFile/UploadFileCommand.cs b/backend/src/Modules/Conversations/Application/Messages/UploadFile/UploadFileCommand.cs index c7779eb..236ca92 100644 --- a/backend/src/Modules/Conversations/Application/Messages/UploadFile/UploadFileCommand.cs +++ b/backend/src/Modules/Conversations/Application/Messages/UploadFile/UploadFileCommand.cs @@ -6,8 +6,8 @@ using System.Threading.Tasks; using MediatR; using Knot.Shared.Kernel; using Knot.Shared.Kernel.Storage; -using Knot.Modules.Settings.Contracts.Application.Abstractions; -using Knot.Modules.Settings.Contracts.Application.DTOs; +using Knot.Contracts.Settings.Application.Abstractions; +using Knot.Contracts.Settings.Application.DTOs; using Knot.Modules.Conversations.Application.DTOs; namespace Knot.Modules.Conversations.Application.Messages.UploadFile; diff --git a/backend/src/Modules/Conversations/Application/Users/Commands/DeleteUser/DeleteUserCommand.cs b/backend/src/Modules/Conversations/Application/Users/Commands/DeleteUser/DeleteUserCommand.cs index c2194e6..9fc6ea1 100644 --- a/backend/src/Modules/Conversations/Application/Users/Commands/DeleteUser/DeleteUserCommand.cs +++ b/backend/src/Modules/Conversations/Application/Users/Commands/DeleteUser/DeleteUserCommand.cs @@ -1,5 +1,5 @@ -using Knot.Modules.Auth.Contracts.Domain; -using Knot.Modules.Auth.Contracts.Application.Abstractions; +using Knot.Contracts.Auth.Domain; +using Knot.Contracts.Auth.Application.Abstractions; using Knot.Modules.Conversations.Domain; using Knot.Modules.Messaging.Domain; using Knot.Shared.Kernel; diff --git a/backend/src/Modules/Conversations/Knot.Modules.Conversations.csproj b/backend/src/Modules/Conversations/Knot.Modules.Conversations.csproj index 62887b4..fc68ea3 100644 --- a/backend/src/Modules/Conversations/Knot.Modules.Conversations.csproj +++ b/backend/src/Modules/Conversations/Knot.Modules.Conversations.csproj @@ -1,8 +1,15 @@  + + net10.0 + enable + enable + + - + + @@ -30,10 +37,4 @@ - - net10.0 - enable - enable - - diff --git a/backend/src/Modules/Federation/Application/Federation/Commands/HandshakeFederationCommand.cs b/backend/src/Modules/Federation/Application/Federation/Commands/HandshakeFederationCommand.cs index 0cefdfe..398c42b 100644 --- a/backend/src/Modules/Federation/Application/Federation/Commands/HandshakeFederationCommand.cs +++ b/backend/src/Modules/Federation/Application/Federation/Commands/HandshakeFederationCommand.cs @@ -2,8 +2,8 @@ using Knot.Shared.Kernel.Constants; using System.Security.Cryptography; using MediatR; using Knot.Shared.Kernel; -using Knot.Modules.Settings.Contracts.Application.Abstractions; -using Knot.Modules.Settings.Contracts.Application.DTOs; +using Knot.Contracts.Settings.Application.Abstractions; +using Knot.Contracts.Settings.Application.DTOs; namespace Host.Application.Federation.Commands; diff --git a/backend/src/Modules/Federation/Application/Federation/Commands/InboundFederationCommand.cs b/backend/src/Modules/Federation/Application/Federation/Commands/InboundFederationCommand.cs index d8f8f78..a011fe4 100644 --- a/backend/src/Modules/Federation/Application/Federation/Commands/InboundFederationCommand.cs +++ b/backend/src/Modules/Federation/Application/Federation/Commands/InboundFederationCommand.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using System.Security.Cryptography; using System.Text; @@ -8,11 +8,11 @@ using System.Threading.Tasks; using MediatR; using Knot.Modules.Federation.Application.Abstractions; using Knot.Shared.Kernel; -using Knot.Modules.Auth.Contracts.Domain; +using Knot.Contracts.Auth.Domain; using Knot.Modules.Messaging.Application.Abstractions; using Knot.Modules.Messaging.Domain; -using Knot.Modules.Settings.Contracts.Application.Abstractions; -using Knot.Modules.Settings.Contracts.Application.DTOs; +using Knot.Contracts.Settings.Application.Abstractions; +using Knot.Contracts.Settings.Application.DTOs; using Knot.Shared.Kernel.Constants; namespace Host.Application.Federation.Commands; @@ -52,7 +52,7 @@ internal sealed class InboundFederationCommandHandler : ICommandHandler d.IsEnabled && d.Domain.Equals(packet.SenderDomain, StringComparison.OrdinalIgnoreCase)); if (senderConfig == null || string.IsNullOrEmpty(senderConfig.PublicKey)) return Result.Failure(new Error("Federation.SenderNotAllowed", "Sender domain not in allowlist.")); @@ -67,7 +67,7 @@ internal sealed class InboundFederationCommandHandler : ICommandHandler(plainText); @@ -119,7 +119,7 @@ internal sealed class InboundFederationCommandHandler : ICommandHandler -/// Обработчик изменения статуса пользователя. -/// Рассылает новый статус всем серверам, где у пользователя есть чаты. +/// . +/// , . /// public sealed class UserStatusChangedDomainEventHandler : INotificationHandler { @@ -44,11 +44,11 @@ public sealed class UserStatusChangedDomainEventHandler : INotificationHandler c.Members.Select(m => m.UserId)).Distinct().ToList(); var members = await _userRepository.GetByIdsAsync(allMemberIds, cancellationToken); @@ -60,7 +60,7 @@ public sealed class UserStatusChangedDomainEventHandler : INotificationHandler - - + + + + - diff --git a/backend/src/Modules/Federation/Presentation/Endpoints/FederationEndpoints.cs b/backend/src/Modules/Federation/Presentation/Endpoints/FederationEndpoints.cs index f94d67d..bc3849c 100644 --- a/backend/src/Modules/Federation/Presentation/Endpoints/FederationEndpoints.cs +++ b/backend/src/Modules/Federation/Presentation/Endpoints/FederationEndpoints.cs @@ -9,8 +9,8 @@ using System; using Host.Application.Federation.Commands; using Knot.Modules.Federation.Application.Abstractions; using Knot.Shared.Kernel.Storage; -using Knot.Modules.Settings.Contracts.Application.Abstractions; -using Knot.Modules.Settings.Contracts.Application.DTOs; +using Knot.Contracts.Settings.Application.Abstractions; +using Knot.Contracts.Settings.Application.DTOs; namespace Host.Endpoints; diff --git a/backend/src/Modules/Klipy/Application/Klipy/Queries/GetTrendingGifsQuery.cs b/backend/src/Modules/Klipy/Application/Klipy/Queries/GetTrendingGifsQuery.cs index b2c8dae..ea66a5d 100644 --- a/backend/src/Modules/Klipy/Application/Klipy/Queries/GetTrendingGifsQuery.cs +++ b/backend/src/Modules/Klipy/Application/Klipy/Queries/GetTrendingGifsQuery.cs @@ -1,6 +1,6 @@ using Knot.Shared.Kernel; -using Knot.Modules.Settings.Contracts.Application.Abstractions; -using Knot.Modules.Settings.Contracts.Application.DTOs; +using Knot.Contracts.Settings.Application.Abstractions; +using Knot.Contracts.Settings.Application.DTOs; using Knot.Shared.Kernel.Constants; using Microsoft.Extensions.Caching.Memory; using System; diff --git a/backend/src/Modules/Klipy/Application/Klipy/Queries/SearchGifsQuery.cs b/backend/src/Modules/Klipy/Application/Klipy/Queries/SearchGifsQuery.cs index 45f991d..942b53e 100644 --- a/backend/src/Modules/Klipy/Application/Klipy/Queries/SearchGifsQuery.cs +++ b/backend/src/Modules/Klipy/Application/Klipy/Queries/SearchGifsQuery.cs @@ -1,6 +1,6 @@ using Knot.Shared.Kernel; -using Knot.Modules.Settings.Contracts.Application.Abstractions; -using Knot.Modules.Settings.Contracts.Application.DTOs; +using Knot.Contracts.Settings.Application.Abstractions; +using Knot.Contracts.Settings.Application.DTOs; using Knot.Shared.Kernel.Constants; using Microsoft.Extensions.Caching.Memory; using System; diff --git a/backend/src/Modules/Klipy/Knot.Modules.Klipy.csproj b/backend/src/Modules/Klipy/Knot.Modules.Klipy.csproj index 695b35c..08cddbb 100644 --- a/backend/src/Modules/Klipy/Knot.Modules.Klipy.csproj +++ b/backend/src/Modules/Klipy/Knot.Modules.Klipy.csproj @@ -7,7 +7,7 @@ - + diff --git a/backend/src/Modules/Profiles/Application/Profiles/Avatar/CropAvatar.cs b/backend/src/Modules/Profiles/Application/Profiles/Avatar/CropAvatar.cs index b456421..2020b00 100644 --- a/backend/src/Modules/Profiles/Application/Profiles/Avatar/CropAvatar.cs +++ b/backend/src/Modules/Profiles/Application/Profiles/Avatar/CropAvatar.cs @@ -1,6 +1,6 @@ using Knot.Shared.Kernel; -using Knot.Modules.Profiles.Contracts.Domain; -using Knot.Modules.Profiles.Contracts.Application.DTOs; +using Knot.Contracts.Profiles.Domain; +using Knot.Contracts.Profiles.Application.DTOs; using SixLabors.ImageSharp; using SixLabors.ImageSharp.Processing; using System; diff --git a/backend/src/Modules/Profiles/Application/Profiles/Avatar/UploadAvatar.cs b/backend/src/Modules/Profiles/Application/Profiles/Avatar/UploadAvatar.cs index 5f0f0f2..63383ed 100644 --- a/backend/src/Modules/Profiles/Application/Profiles/Avatar/UploadAvatar.cs +++ b/backend/src/Modules/Profiles/Application/Profiles/Avatar/UploadAvatar.cs @@ -1,6 +1,6 @@ using Knot.Shared.Kernel; -using Knot.Modules.Profiles.Contracts.Domain; -using Knot.Modules.Profiles.Contracts.Application.DTOs; +using Knot.Contracts.Profiles.Domain; +using Knot.Contracts.Profiles.Application.DTOs; using System; using System.IO; using System.Threading; diff --git a/backend/src/Modules/Profiles/Application/Profiles/GetUser/GetUser.cs b/backend/src/Modules/Profiles/Application/Profiles/GetUser/GetUser.cs index dfb66e4..bbd8995 100644 --- a/backend/src/Modules/Profiles/Application/Profiles/GetUser/GetUser.cs +++ b/backend/src/Modules/Profiles/Application/Profiles/GetUser/GetUser.cs @@ -1,6 +1,6 @@ using Knot.Shared.Kernel; -using Knot.Modules.Profiles.Contracts.Domain; -using Knot.Modules.Profiles.Contracts.Application.DTOs; +using Knot.Contracts.Profiles.Domain; +using Knot.Contracts.Profiles.Application.DTOs; using System; using System.Threading; using System.Threading.Tasks; diff --git a/backend/src/Modules/Profiles/Application/Profiles/Integration/UserRegisteredDomainEventHandler.cs b/backend/src/Modules/Profiles/Application/Profiles/Integration/UserRegisteredDomainEventHandler.cs index 9026c79..f54ae53 100644 --- a/backend/src/Modules/Profiles/Application/Profiles/Integration/UserRegisteredDomainEventHandler.cs +++ b/backend/src/Modules/Profiles/Application/Profiles/Integration/UserRegisteredDomainEventHandler.cs @@ -1,17 +1,17 @@ -using MediatR; +using MediatR; using System.Threading; using System.Threading.Tasks; -using Knot.Modules.Profiles.Contracts.Domain; +using Knot.Contracts.Profiles.Domain; using Knot.Modules.Profiles.Domain; using Knot.Shared.Kernel.Events; namespace Knot.Modules.Profiles.Application.Profiles.Integration; /// -/// Auth. -/// . +/// Обработчик события из модуля Auth. +/// Создаёт пустой профиль при регистрации пользователя. /// -internal class UserRegisteredDomainEventHandler : INotificationHandler +public class UserRegisteredDomainEventHandler : INotificationHandler { private readonly IProfileRepository _repository; @@ -26,7 +26,7 @@ internal class UserRegisteredDomainEventHandler : INotificationHandler + net10.0 @@ -8,6 +8,8 @@ + + @@ -19,18 +21,9 @@ - - - - - - - - - diff --git a/backend/src/Modules/Settings/Application/Settings/Commands/UpdateSettingsCommand.cs b/backend/src/Modules/Settings/Application/Settings/Commands/UpdateSettingsCommand.cs index 0e8f828..6dd029a 100644 --- a/backend/src/Modules/Settings/Application/Settings/Commands/UpdateSettingsCommand.cs +++ b/backend/src/Modules/Settings/Application/Settings/Commands/UpdateSettingsCommand.cs @@ -4,8 +4,8 @@ using System.Threading.Tasks; using MediatR; using Knot.Shared.Kernel; using System.Security.Cryptography; -using Knot.Modules.Settings.Contracts.Application.DTOs; -using Knot.Modules.Settings.Contracts.Application.Abstractions; +using Knot.Contracts.Settings.Application.DTOs; +using Knot.Contracts.Settings.Application.Abstractions; namespace Knot.Modules.Settings.Application.Settings.Commands; diff --git a/backend/src/Modules/Settings/Application/Settings/Queries/GetPublicConfigQuery.cs b/backend/src/Modules/Settings/Application/Settings/Queries/GetPublicConfigQuery.cs index f4224d1..e993329 100644 --- a/backend/src/Modules/Settings/Application/Settings/Queries/GetPublicConfigQuery.cs +++ b/backend/src/Modules/Settings/Application/Settings/Queries/GetPublicConfigQuery.cs @@ -2,8 +2,8 @@ using System.Threading; using System.Threading.Tasks; using MediatR; using Knot.Shared.Kernel; -using Knot.Modules.Settings.Contracts.Application.Abstractions; -using Knot.Modules.Settings.Contracts.Application.DTOs; +using Knot.Contracts.Settings.Application.Abstractions; +using Knot.Contracts.Settings.Application.DTOs; namespace Knot.Modules.Settings.Application.Settings.Queries; diff --git a/backend/src/Modules/Settings/Application/Settings/Queries/GetSettingsQuery.cs b/backend/src/Modules/Settings/Application/Settings/Queries/GetSettingsQuery.cs index ce987f5..f00f7a3 100644 --- a/backend/src/Modules/Settings/Application/Settings/Queries/GetSettingsQuery.cs +++ b/backend/src/Modules/Settings/Application/Settings/Queries/GetSettingsQuery.cs @@ -1,6 +1,6 @@ using Knot.Shared.Kernel; -using Knot.Modules.Settings.Contracts.Application.Abstractions; -using Knot.Modules.Settings.Contracts.Application.DTOs; +using Knot.Contracts.Settings.Application.Abstractions; +using Knot.Contracts.Settings.Application.DTOs; using System.Threading; using System.Threading.Tasks; using MediatR; diff --git a/backend/src/Modules/Settings/DependencyInjection.cs b/backend/src/Modules/Settings/DependencyInjection.cs index ef9d016..87e85ca 100644 --- a/backend/src/Modules/Settings/DependencyInjection.cs +++ b/backend/src/Modules/Settings/DependencyInjection.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Configuration; -using Knot.Modules.Settings.Contracts.Application.Abstractions; +using Knot.Contracts.Settings.Application.Abstractions; using Knot.Modules.Settings.Infrastructure.Configuration; namespace Knot.Modules.Settings; diff --git a/backend/src/Modules/Settings/Domain/Events/SystemSettingsUpdatedDomainEvent.cs b/backend/src/Modules/Settings/Domain/Events/SystemSettingsUpdatedDomainEvent.cs index 8c74a13..d09ed76 100644 --- a/backend/src/Modules/Settings/Domain/Events/SystemSettingsUpdatedDomainEvent.cs +++ b/backend/src/Modules/Settings/Domain/Events/SystemSettingsUpdatedDomainEvent.cs @@ -1,4 +1,4 @@ -using Knot.Modules.Settings.Contracts.Application.DTOs; +using Knot.Contracts.Settings.Application.DTOs; using Knot.Shared.Kernel; namespace Knot.Modules.Settings.Domain.Events; diff --git a/backend/src/Modules/Settings/Infrastructure/Configuration/SettingsService.cs b/backend/src/Modules/Settings/Infrastructure/Configuration/SettingsService.cs index 36939c1..fea80c6 100644 --- a/backend/src/Modules/Settings/Infrastructure/Configuration/SettingsService.cs +++ b/backend/src/Modules/Settings/Infrastructure/Configuration/SettingsService.cs @@ -9,8 +9,8 @@ using Microsoft.Extensions.DependencyInjection; using Knot.Shared.Infrastructure.Persistence; using Knot.Shared.Infrastructure.Persistence.Entities; using Knot.Shared.Kernel.Security; -using Knot.Modules.Settings.Contracts.Application.Abstractions; -using Knot.Modules.Settings.Contracts.Application.DTOs; +using Knot.Contracts.Settings.Application.Abstractions; +using Knot.Contracts.Settings.Application.DTOs; namespace Knot.Modules.Settings.Infrastructure.Configuration; diff --git a/backend/src/Modules/Settings/Knot.Modules.Settings.csproj b/backend/src/Modules/Settings/Knot.Modules.Settings.csproj index e23df95..c585e72 100644 --- a/backend/src/Modules/Settings/Knot.Modules.Settings.csproj +++ b/backend/src/Modules/Settings/Knot.Modules.Settings.csproj @@ -1,4 +1,4 @@ - + net10.0 enable @@ -7,13 +7,9 @@ - + - - - - diff --git a/backend/src/Modules/Storage/Presentation/Endpoints/FilesEndpoints.cs b/backend/src/Modules/Storage/Presentation/Endpoints/FilesEndpoints.cs index 39ddc7b..6b76787 100644 --- a/backend/src/Modules/Storage/Presentation/Endpoints/FilesEndpoints.cs +++ b/backend/src/Modules/Storage/Presentation/Endpoints/FilesEndpoints.cs @@ -6,8 +6,8 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Mvc; -using Knot.Modules.Settings.Contracts.Application.Abstractions; -using Knot.Modules.Settings.Contracts.Application.DTOs; +using Knot.Contracts.Settings.Application.Abstractions; +using Knot.Contracts.Settings.Application.DTOs; using System.Text; using System.Security.Cryptography; diff --git a/backend/src/Modules/Stories/Application/Stories/Commands/CreateStory/CreateStoryCommand.cs b/backend/src/Modules/Stories/Application/Stories/Commands/CreateStory/CreateStoryCommand.cs index 3b1a66e..8218f95 100644 --- a/backend/src/Modules/Stories/Application/Stories/Commands/CreateStory/CreateStoryCommand.cs +++ b/backend/src/Modules/Stories/Application/Stories/Commands/CreateStory/CreateStoryCommand.cs @@ -3,8 +3,8 @@ using System.Threading; using System.Threading.Tasks; using MediatR; using Knot.Shared.Kernel; -using Knot.Modules.Settings.Contracts.Application.Abstractions; -using Knot.Modules.Settings.Contracts.Application.DTOs; +using Knot.Contracts.Settings.Application.Abstractions; +using Knot.Contracts.Settings.Application.DTOs; using Knot.Modules.Stories.Domain; diff --git a/backend/src/Modules/TelegramImport/Application/TelegramImport/AnalyzeImportCommand.cs b/backend/src/Modules/TelegramImport/Application/TelegramImport/AnalyzeImportCommand.cs index b53625d..7c510f2 100644 --- a/backend/src/Modules/TelegramImport/Application/TelegramImport/AnalyzeImportCommand.cs +++ b/backend/src/Modules/TelegramImport/Application/TelegramImport/AnalyzeImportCommand.cs @@ -11,8 +11,8 @@ using System.Threading.Tasks; using AngleSharp.Html.Parser; using AngleSharp.Dom; using Knot.Shared.Kernel; -using Knot.Modules.Settings.Contracts.Application.Abstractions; -using Knot.Modules.Settings.Contracts.Application.DTOs; +using Knot.Contracts.Settings.Application.Abstractions; +using Knot.Contracts.Settings.Application.DTOs; using MediatR; namespace Knot.Modules.TelegramImport.Application.TelegramImport; diff --git a/backend/src/Modules/WebRtc/Application/WebRtc/Queries/GetIceServersQuery.cs b/backend/src/Modules/WebRtc/Application/WebRtc/Queries/GetIceServersQuery.cs index c26c7c2..8a795b8 100644 --- a/backend/src/Modules/WebRtc/Application/WebRtc/Queries/GetIceServersQuery.cs +++ b/backend/src/Modules/WebRtc/Application/WebRtc/Queries/GetIceServersQuery.cs @@ -1,6 +1,6 @@ using Knot.Shared.Kernel; -using Knot.Modules.Settings.Contracts.Application.Abstractions; -using Knot.Modules.Settings.Contracts.Application.DTOs; +using Knot.Contracts.Settings.Application.Abstractions; +using Knot.Contracts.Settings.Application.DTOs; using MediatR; using System.Collections.Generic; using System.Threading;