diff --git a/docs/web/diagrams/vertical-slice.md b/docs/web/diagrams/vertical-slice.md index 2963d7c8..6bf4e6c3 100644 --- a/docs/web/diagrams/vertical-slice.md +++ b/docs/web/diagrams/vertical-slice.md @@ -98,7 +98,7 @@ see the notes for what else each of those foundation projects pulls in. - **Omitted from the diagram**: - `Domain.Exceptions` (referenced by nearly every project directly, including all of `Shared.Contracts` and each feature slice) - - `Infrastructure.Configuration` (the shared options-binding project + - `Configuration` (the shared options-binding project referenced by `Database.Connection`, `Features.PhotoUpload`, and `Features.Emails` directly) - both are plumbing-level dependencies of nearly everything above, and drawing diff --git a/web/backend/API/API.Core/API.Core.csproj b/web/backend/API/API.Core/API.Core.csproj index de6ff688..f81e1a84 100644 --- a/web/backend/API/API.Core/API.Core.csproj +++ b/web/backend/API/API.Core/API.Core.csproj @@ -22,7 +22,7 @@ - + diff --git a/web/backend/API/API.Core/Authentication/JwtAuthenticationHandler.cs b/web/backend/API/API.Core/Authentication/JwtAuthenticationHandler.cs index b51e808f..49f62a41 100644 --- a/web/backend/API/API.Core/Authentication/JwtAuthenticationHandler.cs +++ b/web/backend/API/API.Core/Authentication/JwtAuthenticationHandler.cs @@ -1,7 +1,7 @@ using System.Security.Claims; using System.Text.Encodings.Web; using Features.Users.Services; -using Infrastructure.Configuration; +using Configuration; using Microsoft.AspNetCore.Authentication; using Microsoft.Extensions.Options; using Microsoft.Extensions.Primitives; diff --git a/web/backend/API/API.Core/Dockerfile b/web/backend/API/API.Core/Dockerfile index 3b88389f..f1af52e9 100644 --- a/web/backend/API/API.Core/Dockerfile +++ b/web/backend/API/API.Core/Dockerfile @@ -33,7 +33,7 @@ COPY ["Features/Features.PhotoUpload/Features.PhotoUpload.csproj", "Features/Fea COPY ["Features/Features.PhotoUpload.Tests/Features.PhotoUpload.Tests.csproj", "Features/Features.PhotoUpload.Tests/"] COPY ["Features/Features.Users/Features.Users.csproj", "Features/Features.Users/"] COPY ["Features/Features.Users.Tests/Features.Users.Tests.csproj", "Features/Features.Users.Tests/"] -COPY ["Infrastructure/Infrastructure.Configuration/Infrastructure.Configuration.csproj", "Infrastructure/Infrastructure.Configuration/"] +COPY ["Configuration/Configuration.csproj", "Configuration/"] COPY ["Shared/Shared.Application/Shared.Application.csproj", "Shared/Shared.Application/"] COPY ["Shared/Shared.Contracts/Shared.Contracts.csproj", "Shared/Shared.Contracts/"] RUN dotnet restore "Biergarten.API.slnx" diff --git a/web/backend/API/API.Specs/API.Specs.csproj b/web/backend/API/API.Specs/API.Specs.csproj index af456d56..6f777279 100644 --- a/web/backend/API/API.Specs/API.Specs.csproj +++ b/web/backend/API/API.Specs/API.Specs.csproj @@ -38,7 +38,7 @@ - + diff --git a/web/backend/API/API.Specs/Dockerfile b/web/backend/API/API.Specs/Dockerfile index bb708481..d303ea1d 100644 --- a/web/backend/API/API.Specs/Dockerfile +++ b/web/backend/API/API.Specs/Dockerfile @@ -23,7 +23,7 @@ COPY ["Features/Features.PhotoUpload/Features.PhotoUpload.csproj", "Features/Fea COPY ["Features/Features.PhotoUpload.Tests/Features.PhotoUpload.Tests.csproj", "Features/Features.PhotoUpload.Tests/"] COPY ["Features/Features.Users/Features.Users.csproj", "Features/Features.Users/"] COPY ["Features/Features.Users.Tests/Features.Users.Tests.csproj", "Features/Features.Users.Tests/"] -COPY ["Infrastructure/Infrastructure.Configuration/Infrastructure.Configuration.csproj", "Infrastructure/Infrastructure.Configuration/"] +COPY ["Configuration/Configuration.csproj", "Configuration/"] COPY ["Shared/Shared.Application/Shared.Application.csproj", "Shared/Shared.Application/"] COPY ["Shared/Shared.Contracts/Shared.Contracts.csproj", "Shared/Shared.Contracts/"] RUN dotnet restore "Biergarten.API.slnx" diff --git a/web/backend/API/API.Specs/Steps/AuthSteps.cs b/web/backend/API/API.Specs/Steps/AuthSteps.cs index 90d6e7c4..45624eca 100644 --- a/web/backend/API/API.Specs/Steps/AuthSteps.cs +++ b/web/backend/API/API.Specs/Steps/AuthSteps.cs @@ -2,7 +2,7 @@ using System.Text; using System.Text.Json; using Features.Users.Services; using FluentAssertions; -using Infrastructure.Configuration; +using Configuration; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Reqnroll; diff --git a/web/backend/Biergarten.API.slnx b/web/backend/Biergarten.API.slnx index 674edbb0..b2734ffb 100644 --- a/web/backend/Biergarten.API.slnx +++ b/web/backend/Biergarten.API.slnx @@ -19,8 +19,8 @@ - - + + diff --git a/web/backend/Infrastructure/Infrastructure.Configuration/Infrastructure.Configuration.csproj b/web/backend/Configuration/Configuration.csproj similarity index 85% rename from web/backend/Infrastructure/Infrastructure.Configuration/Infrastructure.Configuration.csproj rename to web/backend/Configuration/Configuration.csproj index a4fbf1bb..4884c448 100644 --- a/web/backend/Infrastructure/Infrastructure.Configuration/Infrastructure.Configuration.csproj +++ b/web/backend/Configuration/Configuration.csproj @@ -3,7 +3,7 @@ net10.0 enable enable - Infrastructure.Configuration + Configuration diff --git a/web/backend/Infrastructure/Infrastructure.Configuration/ConfigurationHelpers.cs b/web/backend/Configuration/ConfigurationHelpers.cs similarity index 96% rename from web/backend/Infrastructure/Infrastructure.Configuration/ConfigurationHelpers.cs rename to web/backend/Configuration/ConfigurationHelpers.cs index 4238565f..9fe726a0 100644 --- a/web/backend/Infrastructure/Infrastructure.Configuration/ConfigurationHelpers.cs +++ b/web/backend/Configuration/ConfigurationHelpers.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.Configuration; -namespace Infrastructure.Configuration; +namespace Configuration; public static class ConfigurationHelpers { diff --git a/web/backend/Infrastructure/Infrastructure.Configuration/ConfigurationKeys.cs b/web/backend/Configuration/ConfigurationKeys.cs similarity index 97% rename from web/backend/Infrastructure/Infrastructure.Configuration/ConfigurationKeys.cs rename to web/backend/Configuration/ConfigurationKeys.cs index 400a9742..06763a01 100644 --- a/web/backend/Infrastructure/Infrastructure.Configuration/ConfigurationKeys.cs +++ b/web/backend/Configuration/ConfigurationKeys.cs @@ -1,4 +1,4 @@ -namespace Infrastructure.Configuration; +namespace Configuration; public static class ConfigurationKeys { diff --git a/web/backend/Database/Database.Connection/Database.Connection.csproj b/web/backend/Database/Database.Connection/Database.Connection.csproj index e8957e92..d1b6d654 100644 --- a/web/backend/Database/Database.Connection/Database.Connection.csproj +++ b/web/backend/Database/Database.Connection/Database.Connection.csproj @@ -21,6 +21,6 @@ /> - + diff --git a/web/backend/Database/Database.Connection/DefaultSqlConnectionFactory.cs b/web/backend/Database/Database.Connection/DefaultSqlConnectionFactory.cs index 97e7f588..4f7d480d 100644 --- a/web/backend/Database/Database.Connection/DefaultSqlConnectionFactory.cs +++ b/web/backend/Database/Database.Connection/DefaultSqlConnectionFactory.cs @@ -1,4 +1,4 @@ -using Infrastructure.Configuration; +using Configuration; using Microsoft.Data.SqlClient; using Microsoft.Extensions.Configuration; diff --git a/web/backend/Database/Database.Connection/SqlConnectionStringHelper.cs b/web/backend/Database/Database.Connection/SqlConnectionStringHelper.cs index 3c88788d..1dcacb68 100644 --- a/web/backend/Database/Database.Connection/SqlConnectionStringHelper.cs +++ b/web/backend/Database/Database.Connection/SqlConnectionStringHelper.cs @@ -1,4 +1,4 @@ -using Infrastructure.Configuration; +using Configuration; using Microsoft.Data.SqlClient; using Microsoft.Extensions.Configuration; diff --git a/web/backend/Database/Database.Migrations/Database.Migrations.csproj b/web/backend/Database/Database.Migrations/Database.Migrations.csproj index 1e26fcd7..a5262b97 100644 --- a/web/backend/Database/Database.Migrations/Database.Migrations.csproj +++ b/web/backend/Database/Database.Migrations/Database.Migrations.csproj @@ -19,7 +19,7 @@ - + diff --git a/web/backend/Database/Database.Migrations/Program.cs b/web/backend/Database/Database.Migrations/Program.cs index cbded8f0..121705bb 100644 --- a/web/backend/Database/Database.Migrations/Program.cs +++ b/web/backend/Database/Database.Migrations/Program.cs @@ -1,5 +1,5 @@ using Database.Connection; -using Infrastructure.Configuration; +using Configuration; using Microsoft.Data.SqlClient; using Microsoft.Extensions.Configuration; diff --git a/web/backend/Features/Features.Emails/Features.Emails.csproj b/web/backend/Features/Features.Emails/Features.Emails.csproj index 3f7ceaf6..cc04eca8 100644 --- a/web/backend/Features/Features.Emails/Features.Emails.csproj +++ b/web/backend/Features/Features.Emails/Features.Emails.csproj @@ -15,7 +15,7 @@ - + diff --git a/web/backend/Features/Features.Emails/Services/EmailDispatcher.cs b/web/backend/Features/Features.Emails/Services/EmailDispatcher.cs index 10a631ca..8e394c78 100644 --- a/web/backend/Features/Features.Emails/Services/EmailDispatcher.cs +++ b/web/backend/Features/Features.Emails/Services/EmailDispatcher.cs @@ -1,5 +1,5 @@ using Features.Emails.Templates.Rendering; -using Infrastructure.Configuration; +using Configuration; using Microsoft.Extensions.Configuration; namespace Features.Emails.Services; diff --git a/web/backend/Features/Features.Emails/Services/SmtpEmailProvider.cs b/web/backend/Features/Features.Emails/Services/SmtpEmailProvider.cs index 0626a2d7..232e5d58 100644 --- a/web/backend/Features/Features.Emails/Services/SmtpEmailProvider.cs +++ b/web/backend/Features/Features.Emails/Services/SmtpEmailProvider.cs @@ -1,4 +1,4 @@ -using Infrastructure.Configuration; +using Configuration; using MailKit.Net.Smtp; using MailKit.Security; using Microsoft.Extensions.Configuration; diff --git a/web/backend/Features/Features.PhotoUpload/Features.PhotoUpload.csproj b/web/backend/Features/Features.PhotoUpload/Features.PhotoUpload.csproj index 31659a75..a63c6a0a 100644 --- a/web/backend/Features/Features.PhotoUpload/Features.PhotoUpload.csproj +++ b/web/backend/Features/Features.PhotoUpload/Features.PhotoUpload.csproj @@ -22,7 +22,7 @@ - + diff --git a/web/backend/Features/Features.PhotoUpload/Services/S3FileStorageProvider.cs b/web/backend/Features/Features.PhotoUpload/Services/S3FileStorageProvider.cs index ccbe0b7f..236d851a 100644 --- a/web/backend/Features/Features.PhotoUpload/Services/S3FileStorageProvider.cs +++ b/web/backend/Features/Features.PhotoUpload/Services/S3FileStorageProvider.cs @@ -1,6 +1,6 @@ using Amazon.S3; using Amazon.S3.Model; -using Infrastructure.Configuration; +using Configuration; using Microsoft.Extensions.Configuration; namespace Features.ImageUploads.Services; diff --git a/web/backend/Features/Features.Users.Tests/Features.Users.Tests.csproj b/web/backend/Features/Features.Users.Tests/Features.Users.Tests.csproj index b7e9339b..8ad14ef5 100644 --- a/web/backend/Features/Features.Users.Tests/Features.Users.Tests.csproj +++ b/web/backend/Features/Features.Users.Tests/Features.Users.Tests.csproj @@ -22,6 +22,6 @@ - + diff --git a/web/backend/Features/Features.Users.Tests/Services/TokenServiceRefreshTests.cs b/web/backend/Features/Features.Users.Tests/Services/TokenServiceRefreshTests.cs index 04c9b242..d1a5bf63 100644 --- a/web/backend/Features/Features.Users.Tests/Services/TokenServiceRefreshTests.cs +++ b/web/backend/Features/Features.Users.Tests/Services/TokenServiceRefreshTests.cs @@ -5,7 +5,7 @@ using Features.Users.Identity; using Features.Users.Services; using Features.Users.Tests.TestSupport; using FluentAssertions; -using Infrastructure.Configuration; +using Configuration; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Configuration; using Moq; diff --git a/web/backend/Features/Features.Users.Tests/Services/TokenServiceValidationTests.cs b/web/backend/Features/Features.Users.Tests/Services/TokenServiceValidationTests.cs index e4782b1a..9c066391 100644 --- a/web/backend/Features/Features.Users.Tests/Services/TokenServiceValidationTests.cs +++ b/web/backend/Features/Features.Users.Tests/Services/TokenServiceValidationTests.cs @@ -4,7 +4,7 @@ using Domain.Exceptions; using Features.Users.Services; using Features.Users.Tests.TestSupport; using FluentAssertions; -using Infrastructure.Configuration; +using Configuration; using Microsoft.Extensions.Configuration; using Moq; diff --git a/web/backend/Features/Features.Users/Features.Users.csproj b/web/backend/Features/Features.Users/Features.Users.csproj index 6bbd0552..e18009e5 100644 --- a/web/backend/Features/Features.Users/Features.Users.csproj +++ b/web/backend/Features/Features.Users/Features.Users.csproj @@ -14,7 +14,7 @@ - + diff --git a/web/backend/Features/Features.Users/Services/TokenService.cs b/web/backend/Features/Features.Users/Services/TokenService.cs index 2566c8b3..16b110b3 100644 --- a/web/backend/Features/Features.Users/Services/TokenService.cs +++ b/web/backend/Features/Features.Users/Services/TokenService.cs @@ -2,7 +2,7 @@ using System.IdentityModel.Tokens.Jwt; using System.Security.Claims; using Domain.Exceptions; using Features.Users.Identity; -using Infrastructure.Configuration; +using Configuration; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Configuration;