diff --git a/src/Core/API/API.Core/API.Core.csproj b/src/Core/API/API.Core/API.Core.csproj index 5acab8a..739d159 100644 --- a/src/Core/API/API.Core/API.Core.csproj +++ b/src/Core/API/API.Core/API.Core.csproj @@ -18,11 +18,14 @@ - - - - - + + + + + diff --git a/src/Core/API/API.Core/Dockerfile b/src/Core/API/API.Core/Dockerfile index 593fb67..03dd219 100644 --- a/src/Core/API/API.Core/Dockerfile +++ b/src/Core/API/API.Core/Dockerfile @@ -9,8 +9,8 @@ FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["API/API.Core/API.Core.csproj", "API/API.Core/"] -COPY ["Domain.Entities/Domain.Entities.csproj", "Domain.Entities/"] -COPY ["Domain.Exceptions/Domain.Exceptions.csproj", "Domain.Exceptions/"] +COPY ["Domain/Domain.Entities/Domain.Entities.csproj", "Domain.Entities/"] +COPY ["Domain/Domain.Exceptions/Domain.Exceptions.csproj", "Domain.Exceptions/"] COPY ["Infrastructure/Infrastructure.Repository/Infrastructure.Repository.csproj", "Infrastructure/Infrastructure.Repository/"] COPY ["Infrastructure/Infrastructure.Jwt/Infrastructure.Jwt.csproj", "Infrastructure/Infrastructure.Jwt/"] COPY ["Infrastructure/Infrastructure.PasswordHashing/Infrastructure.PasswordHashing.csproj", "Infrastructure/Infrastructure.PasswordHashing/"] diff --git a/src/Core/API/API.Specs/Dockerfile b/src/Core/API/API.Specs/Dockerfile index f82f51b..1f3c815 100644 --- a/src/Core/API/API.Specs/Dockerfile +++ b/src/Core/API/API.Specs/Dockerfile @@ -3,8 +3,8 @@ ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["API/API.Core/API.Core.csproj", "API/API.Core/"] COPY ["API/API.Specs/API.Specs.csproj", "API/API.Specs/"] -COPY ["Domain.Entities/Domain.Entities.csproj", "Domain.Entities/"] -COPY ["Domain.Exceptions/Domain.Exceptions.csproj", "Domain.Exceptions/"] +COPY ["Domain/Domain.Entities/Domain.Entities.csproj", "Domain.Entities/"] +COPY ["Domain/Domain.Exceptions/Domain.Exceptions.csproj", "Domain.Exceptions/"] COPY ["Infrastructure/Infrastructure.Repository/Infrastructure.Repository.csproj", "Infrastructure/Infrastructure.Repository/"] COPY ["Infrastructure/Infrastructure.Jwt/Infrastructure.Jwt.csproj", "Infrastructure/Infrastructure.Jwt/"] COPY ["Infrastructure/Infrastructure.PasswordHashing/Infrastructure.PasswordHashing.csproj", "Infrastructure/Infrastructure.PasswordHashing/"] diff --git a/src/Core/Core.slnx b/src/Core/Core.slnx index 4d6a6f1..b1ff5d5 100644 --- a/src/Core/Core.slnx +++ b/src/Core/Core.slnx @@ -8,16 +8,19 @@ - - + + - + - + - + diff --git a/src/Core/Database/Database.Seed/Database.Seed.csproj b/src/Core/Database/Database.Seed/Database.Seed.csproj index 88bebda..984411c 100644 --- a/src/Core/Database/Database.Seed/Database.Seed.csproj +++ b/src/Core/Database/Database.Seed/Database.Seed.csproj @@ -18,7 +18,8 @@ - - + + diff --git a/src/Core/Domain.Entities/Domain.Entities.csproj b/src/Core/Domain/Domain.Entities/Domain.Entities.csproj similarity index 100% rename from src/Core/Domain.Entities/Domain.Entities.csproj rename to src/Core/Domain/Domain.Entities/Domain.Entities.csproj diff --git a/src/Core/Domain.Entities/Entities/UserAccount.cs b/src/Core/Domain/Domain.Entities/Entities/UserAccount.cs similarity index 100% rename from src/Core/Domain.Entities/Entities/UserAccount.cs rename to src/Core/Domain/Domain.Entities/Entities/UserAccount.cs diff --git a/src/Core/Domain.Entities/Entities/UserCredential.cs b/src/Core/Domain/Domain.Entities/Entities/UserCredential.cs similarity index 100% rename from src/Core/Domain.Entities/Entities/UserCredential.cs rename to src/Core/Domain/Domain.Entities/Entities/UserCredential.cs diff --git a/src/Core/Domain.Entities/Entities/UserVerification.cs b/src/Core/Domain/Domain.Entities/Entities/UserVerification.cs similarity index 100% rename from src/Core/Domain.Entities/Entities/UserVerification.cs rename to src/Core/Domain/Domain.Entities/Entities/UserVerification.cs diff --git a/src/Core/Domain.Exceptions/Domain.Exceptions.csproj b/src/Core/Domain/Domain.Exceptions/Domain.Exceptions.csproj similarity index 100% rename from src/Core/Domain.Exceptions/Domain.Exceptions.csproj rename to src/Core/Domain/Domain.Exceptions/Domain.Exceptions.csproj diff --git a/src/Core/Domain.Exceptions/Exceptions.cs b/src/Core/Domain/Domain.Exceptions/Exceptions.cs similarity index 100% rename from src/Core/Domain.Exceptions/Exceptions.cs rename to src/Core/Domain/Domain.Exceptions/Exceptions.cs diff --git a/src/Core/Infrastructure/Infrastructure.Jwt/Infrastructure.Jwt.csproj b/src/Core/Infrastructure/Infrastructure.Jwt/Infrastructure.Jwt.csproj index aa4e1d8..59caedd 100644 --- a/src/Core/Infrastructure/Infrastructure.Jwt/Infrastructure.Jwt.csproj +++ b/src/Core/Infrastructure/Infrastructure.Jwt/Infrastructure.Jwt.csproj @@ -18,6 +18,6 @@ - + diff --git a/src/Core/Infrastructure/Infrastructure.Repository.Tests/Dockerfile b/src/Core/Infrastructure/Infrastructure.Repository.Tests/Dockerfile index f06bb9e..a995f50 100644 --- a/src/Core/Infrastructure/Infrastructure.Repository.Tests/Dockerfile +++ b/src/Core/Infrastructure/Infrastructure.Repository.Tests/Dockerfile @@ -1,8 +1,8 @@ FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src -COPY ["Domain.Entities/Domain.Entities.csproj", "Domain.Entities/"] -COPY ["Domain.Exceptions/Domain.Exceptions.csproj", "Domain.Exceptions/"] +COPY ["Domain/Domain.Entities/Domain.Entities.csproj", "Domain.Entities/"] +COPY ["Domain/Domain.Exceptions/Domain.Exceptions.csproj", "Domain.Exceptions/"] COPY ["Infrastructure/Infrastructure.Repository/Infrastructure.Repository.csproj", "Infrastructure/Infrastructure.Repository/"] COPY ["Infrastructure/Infrastructure.Repository.Tests/Infrastructure.Repository.Tests.csproj", "Infrastructure/Infrastructure.Repository.Tests/"] RUN dotnet restore "Infrastructure/Infrastructure.Repository.Tests/Infrastructure.Repository.Tests.csproj" diff --git a/src/Core/Infrastructure/Infrastructure.Repository/Infrastructure.Repository.csproj b/src/Core/Infrastructure/Infrastructure.Repository/Infrastructure.Repository.csproj index 4748809..3b418d7 100644 --- a/src/Core/Infrastructure/Infrastructure.Repository/Infrastructure.Repository.csproj +++ b/src/Core/Infrastructure/Infrastructure.Repository/Infrastructure.Repository.csproj @@ -18,6 +18,6 @@ /> - + diff --git a/src/Core/Service/Service.Auth.Tests/Dockerfile b/src/Core/Service/Service.Auth.Tests/Dockerfile index 0d67ee9..5ab1feb 100644 --- a/src/Core/Service/Service.Auth.Tests/Dockerfile +++ b/src/Core/Service/Service.Auth.Tests/Dockerfile @@ -1,8 +1,8 @@ FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src -COPY ["Domain.Entities/Domain.Entities.csproj", "Domain.Entities/"] -COPY ["Domain.Exceptions/Domain.Exceptions.csproj", "Domain.Exceptions/"] +COPY ["Domain/Domain.Entities/Domain.Entities.csproj", "Domain.Entities/"] +COPY ["Domain/Domain.Exceptions/Domain.Exceptions.csproj", "Domain.Exceptions/"] COPY ["Infrastructure/Infrastructure.Email/Infrastructure.Email.csproj", "Infrastructure/Infrastructure.Email/"] COPY ["Infrastructure/Infrastructure.Email.Templates/Infrastructure.Email.Templates.csproj", "Infrastructure/Infrastructure.Email.Templates/"] COPY ["Infrastructure/Infrastructure.Jwt/Infrastructure.Jwt.csproj", "Infrastructure/Infrastructure.Jwt/"] diff --git a/src/Core/Service/Service.Auth/IConfirmationService.cs b/src/Core/Service/Service.Auth/IConfirmationService.cs index 0ab6b12..3f7f1d8 100644 --- a/src/Core/Service/Service.Auth/IConfirmationService.cs +++ b/src/Core/Service/Service.Auth/IConfirmationService.cs @@ -13,6 +13,8 @@ public interface IConfirmationService public class ConfirmationService(IAuthRepository authRepository) : IConfirmationService { + private readonly IAuthRepository _authRepository = authRepository; + public async Task ConfirmUserAsync( string confirmationToken ) diff --git a/src/Core/Service/Service.Auth/Service.Auth.csproj b/src/Core/Service/Service.Auth/Service.Auth.csproj index fd88236..29b1f80 100644 --- a/src/Core/Service/Service.Auth/Service.Auth.csproj +++ b/src/Core/Service/Service.Auth/Service.Auth.csproj @@ -6,13 +6,17 @@ - - - - + + + + - - + + diff --git a/src/Core/Service/Service.Emails/Service.Emails.csproj b/src/Core/Service/Service.Emails/Service.Emails.csproj index 2cdcb2a..df009f9 100644 --- a/src/Core/Service/Service.Emails/Service.Emails.csproj +++ b/src/Core/Service/Service.Emails/Service.Emails.csproj @@ -6,8 +6,10 @@ - - - + + + diff --git a/src/Core/Service/Service.UserManagement/Service.UserManagement.csproj b/src/Core/Service/Service.UserManagement/Service.UserManagement.csproj index 173c0b8..5e93f9d 100644 --- a/src/Core/Service/Service.UserManagement/Service.UserManagement.csproj +++ b/src/Core/Service/Service.UserManagement/Service.UserManagement.csproj @@ -6,7 +6,8 @@ - - + +