From 1c46899a4494cd78fc65dd295f35d04d00cd5b7c Mon Sep 17 00:00:00 2001 From: DavidEggenberger Date: Sat, 25 May 2024 22:17:44 +0200 Subject: [PATCH] removed redis dependencies --- .../ChannelAggregate/Channel.cs | 1 - .../Exceptions/InvalidVoteCastException.cs | 1 - .../ChannelAggregate/Message.cs | 1 - .../Components/ChannelComponent.razor.cs | 1 - .../Client/Modals/CreateChannelModal.razor.cs | 9 +-- .../Server/Controllers/ChannelsController.cs | 1 - .../Server/Components/SignInModal.razor.cs | 1 - .../Server/Components/SignUpModal.razor.cs | 1 - .../Web/Server/LandingPagesLayout.razor.cs | 1 - .../Web/Server/Pages/LandingPage.razor.cs | 3 - .../Web/Server/Pages/PricingPage.razor.cs | 1 - .../Aplication/Queries/GetStripeCustomer.cs | 3 +- .../StripeCustomerAggregate/StripeCustomer.cs | 1 - .../StripeSubscriptionPlan.cs | 1 - .../SubscriptionsConfiguration.cs | 1 - .../CreateStripeCheckoutSession.cs | 1 - .../StripePayments/StripeSubscriptionPlan.cs | 3 +- .../Controllers/StripeSessionController.cs | 4 +- .../Queries/GetAllTenantMembershipsOfUser.cs | 3 +- .../Application/Queries/GetTenantById.cs | 3 +- .../Queries/GetTenantMembershipQuery.cs | 3 +- .../DomainFeatures/TenantAggregate/Tenant.cs | 2 - .../TenantAggregate/TenantInvitation.cs | 1 - .../TenantAggregate/TenantMembership.cs | 1 - .../TenantAggregate/TenantSettings.cs | 1 - .../TenantAggregate/TenantStyling.cs | 1 - .../TenantAggregate/TenantSubscription.cs | 1 - .../UserAggregate/ApplicationUser.cs | 1 - .../EFCore/TenantIdentityDbContext.cs | 1 - .../UserEmailUpdatedIntegrationEvent.cs | 5 -- .../ExternalLoginCallbackController.cs | 1 - .../Web/Server/TenantIdentityModuleStartup.cs | 27 ++++---- Source/Shared/Client/BaseComponent.razor.cs | 5 -- .../Shared/Features/EFCore/BaseDbContext.cs | 3 - .../MultiTenancyEntityConfiguration.cs | 2 - .../DomainEvent/DomainEventDispatcher.cs | 1 - .../RedisCache/RedisCacheConfiguration.cs | 8 --- .../Shared/Features/RedisCache/Registrator.cs | 21 ------ .../ServerExecutionContext.cs | 1 - .../SignalR/NotificationHubService.cs | 7 -- .../Auth/Constants/AuthConstant.cs | 7 ++ .../Auth/CreatorPolicyHandler.cs | 1 - .../BuildingBlocks/IIntegrationEvent.cs | 8 +-- .../Modules/SubscriptionsEndpointConstants.cs | 8 +-- .../Modules/TenantIdentityEndpointContants.cs | 8 +-- .../ClaimsPrincipalExtensions.cs | 3 +- Source/Web/Client/Pages/Topic.razor.cs | 1 - Source/Web/Server/Pages/Error.cshtml | 26 -------- Source/Web/Server/Pages/Error.cshtml.cs | 28 -------- Source/Web/Server/Pages/Shared/_Layout.cshtml | 63 ------------------ .../Server/Pages/Shared/_Layout.cshtml.css | 31 --------- .../Shared/_ValidationScriptsPartial.cshtml | 2 - Source/Web/Server/Pages/_Host.cshtml | 66 ++++++++----------- Source/Web/Server/Pages/_ViewImports.cshtml | 2 - Source/Web/Server/Pages/_ViewStart.cshtml | 3 - Source/Web/Server/Web.Server.csproj | 19 ------ .../Web/Server/appsettings.Development.json | 18 +++-- docker-compose.yml | 10 --- 58 files changed, 70 insertions(+), 368 deletions(-) delete mode 100644 Source/Shared/Features/RedisCache/RedisCacheConfiguration.cs delete mode 100644 Source/Shared/Features/RedisCache/Registrator.cs create mode 100644 Source/Shared/Kernel/BuildingBlocks/Auth/Constants/AuthConstant.cs delete mode 100644 Source/Web/Server/Pages/Error.cshtml delete mode 100644 Source/Web/Server/Pages/Error.cshtml.cs delete mode 100644 Source/Web/Server/Pages/Shared/_Layout.cshtml delete mode 100644 Source/Web/Server/Pages/Shared/_Layout.cshtml.css delete mode 100644 Source/Web/Server/Pages/Shared/_ValidationScriptsPartial.cshtml delete mode 100644 Source/Web/Server/Pages/_ViewStart.cshtml diff --git a/Source/Modules/Channels/Features/DomainFeatures/ChannelAggregate/Channel.cs b/Source/Modules/Channels/Features/DomainFeatures/ChannelAggregate/Channel.cs index 608a6a2b..03a5ecfc 100644 --- a/Source/Modules/Channels/Features/DomainFeatures/ChannelAggregate/Channel.cs +++ b/Source/Modules/Channels/Features/DomainFeatures/ChannelAggregate/Channel.cs @@ -1,6 +1,5 @@ using Modules.Channels.Features.DomainFeatures.ChannelAggregate.Events; using Shared.Features.Domain; -using Shared.Features.DomainKernel; namespace Modules.Channels.Features.DomainFeatures.ChannelAggregate { diff --git a/Source/Modules/Channels/Features/DomainFeatures/ChannelAggregate/Exceptions/InvalidVoteCastException.cs b/Source/Modules/Channels/Features/DomainFeatures/ChannelAggregate/Exceptions/InvalidVoteCastException.cs index 8ddc7fc2..d1c0bfe9 100644 --- a/Source/Modules/Channels/Features/DomainFeatures/ChannelAggregate/Exceptions/InvalidVoteCastException.cs +++ b/Source/Modules/Channels/Features/DomainFeatures/ChannelAggregate/Exceptions/InvalidVoteCastException.cs @@ -1,5 +1,4 @@ using Shared.Features.Domain.Exceptions; -using Shared.Features.DomainKernel; namespace Modules.Channels.Features.DomainFeatures.ChannelAggregate.Exceptions { diff --git a/Source/Modules/Channels/Features/DomainFeatures/ChannelAggregate/Message.cs b/Source/Modules/Channels/Features/DomainFeatures/ChannelAggregate/Message.cs index d02e5c4e..ca6b03c6 100644 --- a/Source/Modules/Channels/Features/DomainFeatures/ChannelAggregate/Message.cs +++ b/Source/Modules/Channels/Features/DomainFeatures/ChannelAggregate/Message.cs @@ -1,6 +1,5 @@ using Modules.Channels.Features.DomainFeatures.ChannelAggregate.Events; using Shared.Features.Domain; -using Shared.Features.DomainKernel; namespace Modules.Channels.Features.DomainFeatures.ChannelAggregate { diff --git a/Source/Modules/Channels/Web/Client/Components/ChannelComponent.razor.cs b/Source/Modules/Channels/Web/Client/Components/ChannelComponent.razor.cs index 23a975dd..debb6fed 100644 --- a/Source/Modules/Channels/Web/Client/Components/ChannelComponent.razor.cs +++ b/Source/Modules/Channels/Web/Client/Components/ChannelComponent.razor.cs @@ -1,6 +1,5 @@ using Microsoft.AspNetCore.Components; using Modules.Channels.Web.Shared.DTOs.ChannelAggregate; -using Shared.Client; namespace Modules.Channels.Web.Client.Components { diff --git a/Source/Modules/Channels/Web/Client/Modals/CreateChannelModal.razor.cs b/Source/Modules/Channels/Web/Client/Modals/CreateChannelModal.razor.cs index ca0698ed..f34c2fda 100644 --- a/Source/Modules/Channels/Web/Client/Modals/CreateChannelModal.razor.cs +++ b/Source/Modules/Channels/Web/Client/Modals/CreateChannelModal.razor.cs @@ -1,11 +1,4 @@ -using Blazored.Modal; -using FluentValidation.Results; -using Microsoft.AspNetCore.Components; -using Modules.Channels.Web.Shared.DTOs.ChannelAggregate; -using Shared.Client; -using Shared.Kernel.BuildingBlocks.Services.Http; - -namespace Modules.Channels.Web.Web.Client.Modals +namespace Modules.Channels.Web.Web.Client.Modals { //public partial class CreateChannelModal : BaseComponent //{ diff --git a/Source/Modules/Channels/Web/Server/Controllers/ChannelsController.cs b/Source/Modules/Channels/Web/Server/Controllers/ChannelsController.cs index 9978ae7d..978754b4 100644 --- a/Source/Modules/Channels/Web/Server/Controllers/ChannelsController.cs +++ b/Source/Modules/Channels/Web/Server/Controllers/ChannelsController.cs @@ -8,7 +8,6 @@ using Modules.Channels.Features.DomainFeatures.ChannelAggregate.Application.Commands; using Modules.Channels.Features.DomainFeatures.ChannelAggregate.Application.Queries; using Shared.Kernel.BuildingBlocks.Authorization.Attributes; -using Shared.Kernel.BuildingBlocks.Auth.Constants; using Modules.Channels.Web.Shared.DTOs.ChannelAggregate; namespace Modules.Channels.Web.Server.Controllers diff --git a/Source/Modules/LandingPages/Web/Server/Components/SignInModal.razor.cs b/Source/Modules/LandingPages/Web/Server/Components/SignInModal.razor.cs index 8aaa3be8..71abfb42 100644 --- a/Source/Modules/LandingPages/Web/Server/Components/SignInModal.razor.cs +++ b/Source/Modules/LandingPages/Web/Server/Components/SignInModal.razor.cs @@ -1,5 +1,4 @@ using Microsoft.AspNetCore.Components; -using System.Threading.Tasks; namespace Modules.LandingPages.Web.Server.Components { diff --git a/Source/Modules/LandingPages/Web/Server/Components/SignUpModal.razor.cs b/Source/Modules/LandingPages/Web/Server/Components/SignUpModal.razor.cs index 12711c15..538d7990 100644 --- a/Source/Modules/LandingPages/Web/Server/Components/SignUpModal.razor.cs +++ b/Source/Modules/LandingPages/Web/Server/Components/SignUpModal.razor.cs @@ -1,5 +1,4 @@ using Microsoft.AspNetCore.Components; -using System.Threading.Tasks; namespace Modules.LandingPages.Web.Server.Components { diff --git a/Source/Modules/LandingPages/Web/Server/LandingPagesLayout.razor.cs b/Source/Modules/LandingPages/Web/Server/LandingPagesLayout.razor.cs index afbeb15e..078fe162 100644 --- a/Source/Modules/LandingPages/Web/Server/LandingPagesLayout.razor.cs +++ b/Source/Modules/LandingPages/Web/Server/LandingPagesLayout.razor.cs @@ -1,7 +1,6 @@ using Blazored.Modal; using Blazored.Modal.Services; using Microsoft.AspNetCore.Components; -using Modules.LandingPages.Web.Server.Components; namespace Modules.LandingPages.Web.Server { diff --git a/Source/Modules/LandingPages/Web/Server/Pages/LandingPage.razor.cs b/Source/Modules/LandingPages/Web/Server/Pages/LandingPage.razor.cs index 2c645bbd..6888fd58 100644 --- a/Source/Modules/LandingPages/Web/Server/Pages/LandingPage.razor.cs +++ b/Source/Modules/LandingPages/Web/Server/Pages/LandingPage.razor.cs @@ -1,9 +1,6 @@ using Blazored.Modal; using Blazored.Modal.Services; using Microsoft.AspNetCore.Components; -using Modules.LandingPages.Web.Server.Components; -using System.Collections.Generic; -using System.Threading.Tasks; namespace Modules.LandingPages.Web.Server.Pages { diff --git a/Source/Modules/LandingPages/Web/Server/Pages/PricingPage.razor.cs b/Source/Modules/LandingPages/Web/Server/Pages/PricingPage.razor.cs index ec78892c..5718041f 100644 --- a/Source/Modules/LandingPages/Web/Server/Pages/PricingPage.razor.cs +++ b/Source/Modules/LandingPages/Web/Server/Pages/PricingPage.razor.cs @@ -1,7 +1,6 @@ using Blazored.Modal.Services; using Blazored.Modal; using Microsoft.AspNetCore.Components; -using Modules.LandingPages.Web.Server.Components; namespace Modules.LandingPages.Web.Server.Pages { diff --git a/Source/Modules/Subscription/Features/Modules.Subscription.Features/DomainFeatures/StripeCustomerAggregate/Aplication/Queries/GetStripeCustomer.cs b/Source/Modules/Subscription/Features/Modules.Subscription.Features/DomainFeatures/StripeCustomerAggregate/Aplication/Queries/GetStripeCustomer.cs index a929bb91..cbe30660 100644 --- a/Source/Modules/Subscription/Features/Modules.Subscription.Features/DomainFeatures/StripeCustomerAggregate/Aplication/Queries/GetStripeCustomer.cs +++ b/Source/Modules/Subscription/Features/Modules.Subscription.Features/DomainFeatures/StripeCustomerAggregate/Aplication/Queries/GetStripeCustomer.cs @@ -1,5 +1,4 @@ -using Modules.Subscriptions.Features.DomainFeatures.StripeCustomerAggregate; -using Shared.Features.Messaging.Query; +using Shared.Features.Messaging.Query; namespace Modules.Subscriptions.Features.DomainFeatures.StripeCustomerAggregate.Aplication.Queries { diff --git a/Source/Modules/Subscription/Features/Modules.Subscription.Features/DomainFeatures/StripeCustomerAggregate/StripeCustomer.cs b/Source/Modules/Subscription/Features/Modules.Subscription.Features/DomainFeatures/StripeCustomerAggregate/StripeCustomer.cs index b6357422..6722df25 100644 --- a/Source/Modules/Subscription/Features/Modules.Subscription.Features/DomainFeatures/StripeCustomerAggregate/StripeCustomer.cs +++ b/Source/Modules/Subscription/Features/Modules.Subscription.Features/DomainFeatures/StripeCustomerAggregate/StripeCustomer.cs @@ -1,5 +1,4 @@ using Shared.Features.Domain; -using Shared.Features.DomainKernel; namespace Modules.Subscriptions.Features.DomainFeatures.StripeCustomerAggregate { diff --git a/Source/Modules/Subscription/Features/Modules.Subscription.Features/DomainFeatures/StripeSubscriptionAggregate/StripeSubscriptionPlan.cs b/Source/Modules/Subscription/Features/Modules.Subscription.Features/DomainFeatures/StripeSubscriptionAggregate/StripeSubscriptionPlan.cs index 4f1d3caa..30a9b224 100644 --- a/Source/Modules/Subscription/Features/Modules.Subscription.Features/DomainFeatures/StripeSubscriptionAggregate/StripeSubscriptionPlan.cs +++ b/Source/Modules/Subscription/Features/Modules.Subscription.Features/DomainFeatures/StripeSubscriptionAggregate/StripeSubscriptionPlan.cs @@ -1,5 +1,4 @@ using Shared.Kernel.BuildingBlocks.Auth.DomainKernel; -using Shared.Kernel.BuildingBlocks.Authorization; namespace Modules.Subscriptions.Features.DomainFeatures.SubscriptionAggregate { diff --git a/Source/Modules/Subscription/Features/Modules.Subscription.Features/Infrastructure/Configuration/SubscriptionsConfiguration.cs b/Source/Modules/Subscription/Features/Modules.Subscription.Features/Infrastructure/Configuration/SubscriptionsConfiguration.cs index 5ecac7a0..5bed48cd 100644 --- a/Source/Modules/Subscription/Features/Modules.Subscription.Features/Infrastructure/Configuration/SubscriptionsConfiguration.cs +++ b/Source/Modules/Subscription/Features/Modules.Subscription.Features/Infrastructure/Configuration/SubscriptionsConfiguration.cs @@ -1,6 +1,5 @@ using Modules.Subscriptions.Features.Infrastructure.StripePayments; using Shared.Features.Modules.Configuration; -using Shared.Kernel.BuildingBlocks.Auth; using Shared.Kernel.BuildingBlocks.Auth.DomainKernel; namespace Modules.Subscriptions.Features.Infrastructure.Configuration diff --git a/Source/Modules/Subscription/Features/Modules.Subscription.Features/Infrastructure/StripePayments/CreateStripeCheckoutSession.cs b/Source/Modules/Subscription/Features/Modules.Subscription.Features/Infrastructure/StripePayments/CreateStripeCheckoutSession.cs index 1da51d82..67906600 100644 --- a/Source/Modules/Subscription/Features/Modules.Subscription.Features/Infrastructure/StripePayments/CreateStripeCheckoutSession.cs +++ b/Source/Modules/Subscription/Features/Modules.Subscription.Features/Infrastructure/StripePayments/CreateStripeCheckoutSession.cs @@ -2,7 +2,6 @@ using Modules.Subscriptions.Features.Infrastructure.Configuration; using Modules.Subscriptions.Features.Infrastructure.EFCore; using Shared.Features.Messaging.Command; -using Shared.Kernel.BuildingBlocks.Auth; using Shared.Kernel.BuildingBlocks.Auth.DomainKernel; using Stripe.Checkout; diff --git a/Source/Modules/Subscription/Features/Modules.Subscription.Features/Infrastructure/StripePayments/StripeSubscriptionPlan.cs b/Source/Modules/Subscription/Features/Modules.Subscription.Features/Infrastructure/StripePayments/StripeSubscriptionPlan.cs index d20c7d74..febd53fd 100644 --- a/Source/Modules/Subscription/Features/Modules.Subscription.Features/Infrastructure/StripePayments/StripeSubscriptionPlan.cs +++ b/Source/Modules/Subscription/Features/Modules.Subscription.Features/Infrastructure/StripePayments/StripeSubscriptionPlan.cs @@ -1,5 +1,4 @@ -using Shared.Kernel.BuildingBlocks.Auth; -using Shared.Kernel.BuildingBlocks.Auth.DomainKernel; +using Shared.Kernel.BuildingBlocks.Auth.DomainKernel; namespace Modules.Subscriptions.Features.Infrastructure.StripePayments { diff --git a/Source/Modules/Subscription/Web/Server/Controllers/StripeSessionController.cs b/Source/Modules/Subscription/Web/Server/Controllers/StripeSessionController.cs index 0ecbf005..7ae492e5 100644 --- a/Source/Modules/Subscription/Web/Server/Controllers/StripeSessionController.cs +++ b/Source/Modules/Subscription/Web/Server/Controllers/StripeSessionController.cs @@ -1,6 +1,4 @@ -using Microsoft.AspNetCore.Mvc; - -namespace Modules.Subscriptions.Web.Server.Controllers +namespace Modules.Subscriptions.Web.Server.Controllers { //[Route("api/[controller]")] //[ApiController] diff --git a/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/Application/Queries/GetAllTenantMembershipsOfUser.cs b/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/Application/Queries/GetAllTenantMembershipsOfUser.cs index 63f0ecc5..113b76b7 100644 --- a/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/Application/Queries/GetAllTenantMembershipsOfUser.cs +++ b/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/Application/Queries/GetAllTenantMembershipsOfUser.cs @@ -1,5 +1,4 @@ -using Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate; -using Shared.Features.Messaging.Query; +using Shared.Features.Messaging.Query; using System; using System.Collections.Generic; diff --git a/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/Application/Queries/GetTenantById.cs b/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/Application/Queries/GetTenantById.cs index 3a8253d3..6f5de876 100644 --- a/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/Application/Queries/GetTenantById.cs +++ b/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/Application/Queries/GetTenantById.cs @@ -1,5 +1,4 @@ -using Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate; -using Shared.Features.Messaging.Query; +using Shared.Features.Messaging.Query; using System; namespace Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Application.Queries diff --git a/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/Application/Queries/GetTenantMembershipQuery.cs b/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/Application/Queries/GetTenantMembershipQuery.cs index f2d3ef73..d00d2150 100644 --- a/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/Application/Queries/GetTenantMembershipQuery.cs +++ b/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/Application/Queries/GetTenantMembershipQuery.cs @@ -1,5 +1,4 @@ -using Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate; -using Modules.TenantIdentity.Features.Infrastructure.EFCore; +using Modules.TenantIdentity.Features.Infrastructure.EFCore; using Shared.Features.Messaging.Query; using System; using System.Linq; diff --git a/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/Tenant.cs b/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/Tenant.cs index d4ac9320..ce3c97da 100644 --- a/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/Tenant.cs +++ b/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/Tenant.cs @@ -1,6 +1,4 @@ using Shared.Features.Domain; -using Shared.Features.DomainKernel; -using Shared.Features.DomainKernel.Attributes; using Shared.Kernel.BuildingBlocks.Auth.DomainKernel; using System; using System.Collections.Generic; diff --git a/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/TenantInvitation.cs b/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/TenantInvitation.cs index 88e20b5d..7e780b79 100644 --- a/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/TenantInvitation.cs +++ b/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/TenantInvitation.cs @@ -1,5 +1,4 @@ using Shared.Features.Domain; -using Shared.Features.DomainKernel; using Shared.Kernel.BuildingBlocks.Auth.DomainKernel; using System; using System.Collections.Generic; diff --git a/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/TenantMembership.cs b/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/TenantMembership.cs index e307a4fd..6f6279a4 100644 --- a/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/TenantMembership.cs +++ b/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/TenantMembership.cs @@ -1,5 +1,4 @@ using Shared.Features.Domain; -using Shared.Features.DomainKernel; using Shared.Kernel.BuildingBlocks.Auth.DomainKernel; using System; diff --git a/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/TenantSettings.cs b/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/TenantSettings.cs index e0c00a5b..abea546c 100644 --- a/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/TenantSettings.cs +++ b/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/TenantSettings.cs @@ -1,5 +1,4 @@ using Shared.Features.Domain; -using Shared.Features.DomainKernel; namespace Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate { diff --git a/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/TenantStyling.cs b/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/TenantStyling.cs index 44a1ef47..aa1d3319 100644 --- a/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/TenantStyling.cs +++ b/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/TenantStyling.cs @@ -1,5 +1,4 @@ using Shared.Features.Domain; -using Shared.Features.DomainKernel; namespace Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate { diff --git a/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/TenantSubscription.cs b/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/TenantSubscription.cs index b789f179..ad5a946f 100644 --- a/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/TenantSubscription.cs +++ b/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/TenantAggregate/TenantSubscription.cs @@ -1,5 +1,4 @@ using Shared.Features.Domain; -using Shared.Features.DomainKernel; using Shared.Kernel.BuildingBlocks.Auth.DomainKernel; using System; diff --git a/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/UserAggregate/ApplicationUser.cs b/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/UserAggregate/ApplicationUser.cs index f0c502a2..2890c30d 100644 --- a/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/UserAggregate/ApplicationUser.cs +++ b/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/DomainFeatures/UserAggregate/ApplicationUser.cs @@ -1,6 +1,5 @@ using Microsoft.AspNetCore.Identity; using Shared.Features.Domain.Exceptions; -using Shared.Features.DomainKernel; using System; using System.Collections.Generic; diff --git a/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/Infrastructure/EFCore/TenantIdentityDbContext.cs b/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/Infrastructure/EFCore/TenantIdentityDbContext.cs index 9ba76479..a6dba261 100644 --- a/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/Infrastructure/EFCore/TenantIdentityDbContext.cs +++ b/Source/Modules/TenantIdentity/Features/Modules.TenantIdentity.Features/Infrastructure/EFCore/TenantIdentityDbContext.cs @@ -2,7 +2,6 @@ using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.AspNetCore.Identity; using Modules.TenantIdentity.Features.Infrastructure.EFCore.Configuration.UserAggregate; -using Shared.Features.DomainKernel.Exceptions; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Shared.Features.EFCore.Configuration; diff --git a/Source/Modules/TenantIdentity/IntegrationEvents/UserEmailUpdatedIntegrationEvent.cs b/Source/Modules/TenantIdentity/IntegrationEvents/UserEmailUpdatedIntegrationEvent.cs index 6ca0ce0d..dbef2d3b 100644 --- a/Source/Modules/TenantIdentity/IntegrationEvents/UserEmailUpdatedIntegrationEvent.cs +++ b/Source/Modules/TenantIdentity/IntegrationEvents/UserEmailUpdatedIntegrationEvent.cs @@ -1,9 +1,4 @@ using Shared.Kernel.BuildingBlocks; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Modules.TenantIdentity.IntegrationEvents { diff --git a/Source/Modules/TenantIdentity/Web/Server/Controllers/ExternalLoginCallbackController.cs b/Source/Modules/TenantIdentity/Web/Server/Controllers/ExternalLoginCallbackController.cs index 23e99fc3..ae151de5 100644 --- a/Source/Modules/TenantIdentity/Web/Server/Controllers/ExternalLoginCallbackController.cs +++ b/Source/Modules/TenantIdentity/Web/Server/Controllers/ExternalLoginCallbackController.cs @@ -1,7 +1,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; -using Shared.SharedKernel.Exstensions; using Shared.Kernel.BuildingBlocks.Auth.Constants; using Modules.TenantIdentity.Features.DomainFeatures.UserAggregate; using Shared.Kernel.Extensions.ClaimsPrincipal; diff --git a/Source/Modules/TenantIdentity/Web/Server/TenantIdentityModuleStartup.cs b/Source/Modules/TenantIdentity/Web/Server/TenantIdentityModuleStartup.cs index ce3e3263..0bf57d0f 100644 --- a/Source/Modules/TenantIdentity/Web/Server/TenantIdentityModuleStartup.cs +++ b/Source/Modules/TenantIdentity/Web/Server/TenantIdentityModuleStartup.cs @@ -4,14 +4,12 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Identity; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Modules.TenantIdentity.Features.Infrastructure.Configuration; using Shared.Features.Modules; using Shared.Kernel.BuildingBlocks.Auth.Constants; -using Shared.Kernel.BuildingBlocks.Authorization.Services; using System.Reflection; using System.Security.Claims; using Shared.Features.Modules.Configuration; @@ -25,14 +23,11 @@ public class TenantIdentityModuleStartup : IModuleStartup public Assembly FeaturesAssembly { get; } = typeof(TenantIdentityModuleStartup).Assembly; public void ConfigureServices(IServiceCollection services, IConfiguration configuration) { - services.AddControllers().AddApplicationPart(typeof(TenantIdentityModuleStartup).Assembly); - services.AddSignalR(); + services.AddSingleton(); + services.AddScoped>(); services.RegisterModuleConfiguration(configuration); - services.AddSingleton(); - //services.AddScoped(); - services.Configure(options => { options.ValidationInterval = TimeSpan.FromSeconds(0); @@ -40,25 +35,27 @@ public void ConfigureServices(IServiceCollection services, IConfiguration config services.AddDbContext(); + var tenantIdentityConfiguration = services.BuildServiceProvider().GetRequiredService(); + AuthenticationBuilder authenticationBuilder = services.AddAuthentication(options => { - options.DefaultScheme = IdentityConstants.ApplicationScheme; - options.DefaultSignInScheme = IdentityConstants.ExternalScheme; + options.DefaultScheme = AuthConstant.ApplicationAuthenticationScheme; + options.DefaultSignInScheme = AuthConstant.ApplicationAuthenticationScheme; }) .AddLinkedIn(options => { - options.ClientId = "test"; - options.ClientSecret = "test"; + options.ClientId = tenantIdentityConfiguration.LinkedinClientId; + options.ClientSecret = tenantIdentityConfiguration.LinkedinClientSecret; }) .AddMicrosoftAccount(options => { - options.ClientId = "test"; - options.ClientSecret = "test"; + options.ClientId = tenantIdentityConfiguration.MicrosoftClientId; + options.ClientSecret = tenantIdentityConfiguration.MicrosoftClientSecret; }) .AddGoogle(options => { - options.ClientId = configuration["SocialLogins:Google:Web.ClientId"]; - options.ClientSecret = configuration["SocialLogins:Google:Web.ClientSecret"]; + options.ClientId = tenantIdentityConfiguration.GoogleClientId; + options.ClientSecret = tenantIdentityConfiguration.GoogleClientSecret; options.Scope.Add("profile"); options.Events.OnCreatingTicket = (context) => { diff --git a/Source/Shared/Client/BaseComponent.razor.cs b/Source/Shared/Client/BaseComponent.razor.cs index e2e3f5b1..234eb97d 100644 --- a/Source/Shared/Client/BaseComponent.razor.cs +++ b/Source/Shared/Client/BaseComponent.razor.cs @@ -1,11 +1,6 @@ using Microsoft.AspNetCore.Components; using Shared.Kernel.BuildingBlocks.Services.Http; using Shared.Kernel.BuildingBlocks.Services.ModelValidation; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Shared.Client { diff --git a/Source/Shared/Features/EFCore/BaseDbContext.cs b/Source/Shared/Features/EFCore/BaseDbContext.cs index 8cfae2f5..9659332d 100644 --- a/Source/Shared/Features/EFCore/BaseDbContext.cs +++ b/Source/Shared/Features/EFCore/BaseDbContext.cs @@ -1,14 +1,11 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.ChangeTracking; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; using Shared.Features.Messaging.DomainEvent; using Shared.Features.Domain; -using Shared.Features.DomainKernel; using Shared.Features.EFCore.Configuration; using Shared.Features.EFCore.MultiTenancy; using Shared.Features.EFCore.MultiTenancy.Exceptions; -using Shared.Kernel.BuildingBlocks; using Shared.SharedKernel.Interfaces; using SharedKernel.Interfaces; diff --git a/Source/Shared/Features/EFCore/MultiTenancy/MultiTenancyEntityConfiguration.cs b/Source/Shared/Features/EFCore/MultiTenancy/MultiTenancyEntityConfiguration.cs index 038196ab..15259885 100644 --- a/Source/Shared/Features/EFCore/MultiTenancy/MultiTenancyEntityConfiguration.cs +++ b/Source/Shared/Features/EFCore/MultiTenancy/MultiTenancyEntityConfiguration.cs @@ -1,7 +1,5 @@ using Microsoft.EntityFrameworkCore; using Shared.Features.Domain; -using Shared.Features.DomainKernel; -using Shared.Features.DomainKernel.Attributes; using System.Reflection; namespace Shared.Features.EFCore.MultiTenancy diff --git a/Source/Shared/Features/Messaging/DomainEvent/DomainEventDispatcher.cs b/Source/Shared/Features/Messaging/DomainEvent/DomainEventDispatcher.cs index f9c6958d..4ace671a 100644 --- a/Source/Shared/Features/Messaging/DomainEvent/DomainEventDispatcher.cs +++ b/Source/Shared/Features/Messaging/DomainEvent/DomainEventDispatcher.cs @@ -1,6 +1,5 @@ using Microsoft.Extensions.DependencyInjection; using Shared.Features.Domain; -using Shared.Kernel.BuildingBlocks; namespace Shared.Features.Messaging.DomainEvent { diff --git a/Source/Shared/Features/RedisCache/RedisCacheConfiguration.cs b/Source/Shared/Features/RedisCache/RedisCacheConfiguration.cs deleted file mode 100644 index c27925e8..00000000 --- a/Source/Shared/Features/RedisCache/RedisCacheConfiguration.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Shared.Features.RedisCache -{ - public class RedisCacheConfiguration - { - public string Password { get; set; } - public string ConnectionString { get; set; } - } -} diff --git a/Source/Shared/Features/RedisCache/Registrator.cs b/Source/Shared/Features/RedisCache/Registrator.cs deleted file mode 100644 index 9e5af0a4..00000000 --- a/Source/Shared/Features/RedisCache/Registrator.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; - -namespace Shared.Features.RedisCache -{ - public static class Registrator - { - public static IServiceCollection RegisterRedisCache(this IServiceCollection serviceCollection, IConfiguration configuration) - { - //var redisCacheConfiguration = configuration.GetSection("Redis").Get(); - - ////registers Redis as IDistributedCache - //return serviceCollection.AddStackExchangeRedisCache(options => - //{ - // options.Configuration = $"{redisCacheConfiguration.ConnectionString},ssl=True,password={redisCacheConfiguration.Password},abortConnect=false,connectTimeout=30000,responseTimeout=30000"; - // options.InstanceName = "RedisCache-CrispyCollab"; - //}); - return serviceCollection; - } - } -} diff --git a/Source/Shared/Features/Server/ExecutionContext/ServerExecutionContext.cs b/Source/Shared/Features/Server/ExecutionContext/ServerExecutionContext.cs index edc88d45..33c234fc 100644 --- a/Source/Shared/Features/Server/ExecutionContext/ServerExecutionContext.cs +++ b/Source/Shared/Features/Server/ExecutionContext/ServerExecutionContext.cs @@ -4,7 +4,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Shared.Kernel.BuildingBlocks; -using Shared.Kernel.BuildingBlocks.Auth; using Shared.Kernel.BuildingBlocks.Auth.DomainKernel; using Shared.Kernel.Extensions.ClaimsPrincipal; diff --git a/Source/Shared/Features/SignalR/NotificationHubService.cs b/Source/Shared/Features/SignalR/NotificationHubService.cs index d5f3fbac..a01fd2a5 100644 --- a/Source/Shared/Features/SignalR/NotificationHubService.cs +++ b/Source/Shared/Features/SignalR/NotificationHubService.cs @@ -1,11 +1,4 @@ using Microsoft.AspNetCore.SignalR; -using Shared.Kernel.Constants; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Shared.Features.SignalR { diff --git a/Source/Shared/Kernel/BuildingBlocks/Auth/Constants/AuthConstant.cs b/Source/Shared/Kernel/BuildingBlocks/Auth/Constants/AuthConstant.cs new file mode 100644 index 00000000..e0c0ebb3 --- /dev/null +++ b/Source/Shared/Kernel/BuildingBlocks/Auth/Constants/AuthConstant.cs @@ -0,0 +1,7 @@ +namespace Shared.Kernel.BuildingBlocks.Auth.Constants +{ + public class AuthConstant + { + public const string ApplicationAuthenticationScheme = nameof(ApplicationAuthenticationScheme); + } +} diff --git a/Source/Shared/Kernel/BuildingBlocks/Auth/CreatorPolicyHandler.cs b/Source/Shared/Kernel/BuildingBlocks/Auth/CreatorPolicyHandler.cs index 5848c9c6..e800333d 100644 --- a/Source/Shared/Kernel/BuildingBlocks/Auth/CreatorPolicyHandler.cs +++ b/Source/Shared/Kernel/BuildingBlocks/Auth/CreatorPolicyHandler.cs @@ -1,6 +1,5 @@ using Microsoft.AspNetCore.Authorization; using Shared.Kernel.Extensions.ClaimsPrincipal; -using Shared.SharedKernel.Exstensions; using Shared.SharedKernel.Interfaces; namespace Shared.Kernel.BuildingBlocks.Authorization diff --git a/Source/Shared/Kernel/BuildingBlocks/IIntegrationEvent.cs b/Source/Shared/Kernel/BuildingBlocks/IIntegrationEvent.cs index 89bf1aed..630e1939 100644 --- a/Source/Shared/Kernel/BuildingBlocks/IIntegrationEvent.cs +++ b/Source/Shared/Kernel/BuildingBlocks/IIntegrationEvent.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Shared.Kernel.BuildingBlocks +namespace Shared.Kernel.BuildingBlocks { public interface IIntegrationEvent { diff --git a/Source/Shared/Kernel/Constants/Modules/SubscriptionsEndpointConstants.cs b/Source/Shared/Kernel/Constants/Modules/SubscriptionsEndpointConstants.cs index 3a664fef..c9d0e3e5 100644 --- a/Source/Shared/Kernel/Constants/Modules/SubscriptionsEndpointConstants.cs +++ b/Source/Shared/Kernel/Constants/Modules/SubscriptionsEndpointConstants.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Shared.Kernel.Constants.Modules +namespace Shared.Kernel.Constants.Modules { public partial class EndpointConstants { diff --git a/Source/Shared/Kernel/Constants/Modules/TenantIdentityEndpointContants.cs b/Source/Shared/Kernel/Constants/Modules/TenantIdentityEndpointContants.cs index 88fd1dbd..d09c9a26 100644 --- a/Source/Shared/Kernel/Constants/Modules/TenantIdentityEndpointContants.cs +++ b/Source/Shared/Kernel/Constants/Modules/TenantIdentityEndpointContants.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Shared.Kernel.Constants.Modules +namespace Shared.Kernel.Constants.Modules { public partial class EndpointConstants { diff --git a/Source/Shared/Kernel/Extensions/ClaimsPrincipal/ClaimsPrincipalExtensions.cs b/Source/Shared/Kernel/Extensions/ClaimsPrincipal/ClaimsPrincipalExtensions.cs index fb8dc324..b17f7135 100644 --- a/Source/Shared/Kernel/Extensions/ClaimsPrincipal/ClaimsPrincipalExtensions.cs +++ b/Source/Shared/Kernel/Extensions/ClaimsPrincipal/ClaimsPrincipalExtensions.cs @@ -1,5 +1,4 @@ -using Shared.Kernel.BuildingBlocks.Auth; -using Shared.Kernel.BuildingBlocks.Auth.Constants; +using Shared.Kernel.BuildingBlocks.Auth.Constants; using Shared.Kernel.BuildingBlocks.Auth.DomainKernel; using Shared.Kernel.Extensions.ClaimsPrincipal.Exceptions; using System.ComponentModel; diff --git a/Source/Web/Client/Pages/Topic.razor.cs b/Source/Web/Client/Pages/Topic.razor.cs index 8b05cb15..b611ed7c 100644 --- a/Source/Web/Client/Pages/Topic.razor.cs +++ b/Source/Web/Client/Pages/Topic.razor.cs @@ -1,7 +1,6 @@ using Blazor.Diagrams.Core; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Web; -using Shared.Client; namespace Web.Client.Pages { diff --git a/Source/Web/Server/Pages/Error.cshtml b/Source/Web/Server/Pages/Error.cshtml deleted file mode 100644 index 4f134ddf..00000000 --- a/Source/Web/Server/Pages/Error.cshtml +++ /dev/null @@ -1,26 +0,0 @@ -@page -@model Web.Server.Pages.ErrorModel -@{ - ViewData["Title"] = "Error"; -} - -

Error.

-

An error occurred while processing your request.

- -@if (Model.ShowRequestId) -{ -

- Request ID: @Model.RequestId -

-} - -

Development Mode

-

- Swapping to the Development environment displays detailed information about the error that occurred. -

-

- The Development environment shouldn't be enabled for deployed applications. - It can result in displaying sensitive information from exceptions to end users. - For local debugging, enable the Development environment by setting the ASPNETCORE_ENVIRONMENT environment variable to Development - and restarting the app. -

diff --git a/Source/Web/Server/Pages/Error.cshtml.cs b/Source/Web/Server/Pages/Error.cshtml.cs deleted file mode 100644 index aa33e025..00000000 --- a/Source/Web/Server/Pages/Error.cshtml.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.RazorPages; -using Microsoft.Extensions.Logging; -using System.Diagnostics; - -namespace Web.Server.Pages -{ - [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] - [IgnoreAntiforgeryToken] - public class ErrorModel : PageModel - { - public string RequestId { get; set; } - - public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); - - private readonly ILogger _logger; - - public ErrorModel(ILogger logger) - { - _logger = logger; - } - - public void OnGet() - { - RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier; - } - } -} diff --git a/Source/Web/Server/Pages/Shared/_Layout.cshtml b/Source/Web/Server/Pages/Shared/_Layout.cshtml deleted file mode 100644 index 9895e49d..00000000 --- a/Source/Web/Server/Pages/Shared/_Layout.cshtml +++ /dev/null @@ -1,63 +0,0 @@ -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers - - - - - - CrispyCollab - - - - - - -
- -
-
- -
-
- @RenderBody() -
-
-
- -
-
- - - - diff --git a/Source/Web/Server/Pages/Shared/_Layout.cshtml.css b/Source/Web/Server/Pages/Shared/_Layout.cshtml.css deleted file mode 100644 index d6b32191..00000000 --- a/Source/Web/Server/Pages/Shared/_Layout.cshtml.css +++ /dev/null @@ -1,31 +0,0 @@ -.BurgerMenu{ - height: 34px; - width: 34px; - cursor: pointer; -} -.ExpandableNavMenu { - width: 100%; - height: 0; - transition: 0.25s; - z-index: 2; - background-color: orange; -} -.ExpandableMenuIcon { - display: none; -} -@media screen and (max-width: 550px){ - .Links{ - display: none; - } - .ExpandableMenuIcon { - display: block; - } - .ExpandableNavMenu{ - display: block; - } -} -@media screen and (min-width: 550px){ - .ExpandableNavMenu{ - display: none; - } -} \ No newline at end of file diff --git a/Source/Web/Server/Pages/Shared/_ValidationScriptsPartial.cshtml b/Source/Web/Server/Pages/Shared/_ValidationScriptsPartial.cshtml deleted file mode 100644 index 5a16d80a..00000000 --- a/Source/Web/Server/Pages/Shared/_ValidationScriptsPartial.cshtml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/Source/Web/Server/Pages/_Host.cshtml b/Source/Web/Server/Pages/_Host.cshtml index 69ef37dc..bb8ef848 100644 --- a/Source/Web/Server/Pages/_Host.cshtml +++ b/Source/Web/Server/Pages/_Host.cshtml @@ -3,45 +3,35 @@ Layout = null; } - -@if(User.Identity.IsAuthenticated) -{ - - - - CrispyCollab - - - - - - - - - - -
- @Html.AntiForgeryToken() -
-
-
-
-
- -
+ + + + + @ViewData["Title"] ModularMonolith + + + + + + + + + + + + @if (User.Identity.IsAuthenticated) + { + - - - -} -else -{ - Layout = "_Layout"; - - - -} - + } + else + { + + + + } + + \ No newline at end of file diff --git a/Source/Web/Server/Pages/_ViewImports.cshtml b/Source/Web/Server/Pages/_ViewImports.cshtml index deb6ec88..84bff076 100644 --- a/Source/Web/Server/Pages/_ViewImports.cshtml +++ b/Source/Web/Server/Pages/_ViewImports.cshtml @@ -1,8 +1,6 @@ -@using Server @using Microsoft.AspNetCore.Identity @using Microsoft.AspNetCore.Authentication @using Microsoft.AspNetCore.Authorization @using Web.Server.Pages -@using Web.Client @namespace Server.Pages @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/Source/Web/Server/Pages/_ViewStart.cshtml b/Source/Web/Server/Pages/_ViewStart.cshtml deleted file mode 100644 index a5f10045..00000000 --- a/Source/Web/Server/Pages/_ViewStart.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@{ - Layout = "_Layout"; -} diff --git a/Source/Web/Server/Web.Server.csproj b/Source/Web/Server/Web.Server.csproj index 88d4179c..55fb2c50 100644 --- a/Source/Web/Server/Web.Server.csproj +++ b/Source/Web/Server/Web.Server.csproj @@ -7,25 +7,6 @@ ..\..\.. - - - - - - - - - - - - - - - - - - - diff --git a/Source/Web/Server/appsettings.Development.json b/Source/Web/Server/appsettings.Development.json index fcaabab9..74e66de0 100644 --- a/Source/Web/Server/appsettings.Development.json +++ b/Source/Web/Server/appsettings.Development.json @@ -7,12 +7,18 @@ "Microsoft.Hosting.Lifetime": "Information" } }, - "ConnectionStrings": { - "IdentityDbLocalConnectionString": "Data Source=(localdb)\\MSSQLLocalDB;Database=CrispyCollab;Trusted_Connection=True", - "ApplicationDbContextConnection": "Data Source=(localdb)\\MSSQLLocalDB;Database=CrispyCollab;Trusted_Connection=True" + "EFCoreConfiguration": { + "SQLServerConnectionString_Dev": "Server=127.0.0.1,1433;Database=ModularMonolith;User Id=SA;Password=YourSTRONG!Passw0rd;Encrypt=False;" }, - "Redis": { - "Password": "@someThingComplicated1234", - "ConnectionString": "localhost:6379" + "SubscriptionsConfiguration": { + "StripeProfessionalPlanId": "_" + }, + "TenantIdentityConfiguration": { + "GoogleClientId": "_", + "GoogleClientSecret": "_", + "MicrosoftClientId": "_", + "MicrosoftClientSecret": "_", + "LinkedinClientId": "_", + "LinkedinClientSecret": "_" } } diff --git a/docker-compose.yml b/docker-compose.yml index 6012449f..c1db323b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,15 +12,5 @@ services: - ACCEPT_EULA=Y volumes: - sqlserver:/sqlserver - redis: - container_name: RedisCache - image: redis - ports: - - 6379:6379 - environment: - - REDIS_PASSWORD=@someThingComplicated1234 - volumes: - - redis:/redis volumes: sqlserver: - redis: \ No newline at end of file