From e51bf5d2ce7a707adab893bf6b5ec8298d9c5b9d Mon Sep 17 00:00:00 2001
From: malik masis <malik.masis@gmail.com>
Date: Tue, 13 Sep 2022 16:17:17 +0300
Subject: [PATCH] Configured PublicWeb

---
 apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile |  1 +
 .../EShopOnAbp.PublicWeb.csproj                     |  3 ++-
 .../EShopOnAbpPublicWebModule.cs                    | 13 ++++++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile b/apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile
index 66cf0344..1f6a8c8a 100644
--- a/apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile
+++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile
@@ -28,6 +28,7 @@ COPY "services/basket/src/EShopOnAbp.BasketService/EShopOnAbp.BasketService.cspr
 COPY "services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj" "services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj"
 COPY "services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj" "services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj"
 COPY "services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/EShopOnAbp.PaymentService.HttpApi.Host.csproj" "services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/EShopOnAbp.PaymentService.HttpApi.Host.csproj"
+COPY "services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/EShopOnAbp.CmskitService.HttpApi.Host.csproj" "services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/EShopOnAbp.CmskitService.HttpApi.Host.csproj"
 
 # Gateways
 COPY "gateways/web/src/EShopOnAbp.WebGateway/EShopOnAbp.WebGateway.csproj" "gateways/web/src/EShopOnAbp.WebGateway/EShopOnAbp.WebGateway.csproj"
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbp.PublicWeb.csproj b/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbp.PublicWeb.csproj
index 342de04c..6f7cc765 100644
--- a/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbp.PublicWeb.csproj
+++ b/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbp.PublicWeb.csproj
@@ -28,7 +28,8 @@
         <ProjectReference Include="..\..\..\..\services\catalog\src\EShopOnAbp.CatalogService.HttpApi.Client\EShopOnAbp.CatalogService.HttpApi.Client.csproj" />
         <ProjectReference Include="..\..\..\..\services\basket\src\EShopOnAbp.BasketService.Contracts\EShopOnAbp.BasketService.Contracts.csproj" />
         <ProjectReference Include="..\..\..\..\services\payment\src\EShopOnAbp.PaymentService.HttpApi.Client\EShopOnAbp.PaymentService.HttpApi.Client.csproj" />
-        <ProjectReference Include="..\..\..\..\services\ordering\src\EShopOnAbp.OrderingService.HttpApi.Client\EShopOnAbp.OrderingService.HttpApi.Client.csproj" />
+      <ProjectReference Include="..\..\..\..\services\ordering\src\EShopOnAbp.OrderingService.HttpApi.Client\EShopOnAbp.OrderingService.HttpApi.Client.csproj" />
+      <ProjectReference Include="..\..\..\..\services\cmskit\src\EShopOnAbp.CmskitService.HttpApi.Client\EShopOnAbp.CmskitService.HttpApi.Client.csproj" />
     </ItemGroup>
     
     <ItemGroup>
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicWebModule.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicWebModule.cs
index 765579ff..37690f25 100644
--- a/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicWebModule.cs
+++ b/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicWebModule.cs
@@ -1,5 +1,6 @@
 using EShopOnAbp.BasketService;
 using EShopOnAbp.CatalogService;
+using EShopOnAbp.CmskitService;
 using EShopOnAbp.Localization;
 using EShopOnAbp.OrderingService;
 using EShopOnAbp.PaymentService;
@@ -10,18 +11,18 @@ using EShopOnAbp.PublicWeb.Menus;
 using EShopOnAbp.PublicWeb.PaymentMethods;
 using EShopOnAbp.Shared.Hosting.AspNetCore;
 using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.DataProtection;
+using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
+using Polly;
 using StackExchange.Redis;
 using System;
 using System.Net.Http.Headers;
-using Microsoft.AspNetCore.Authentication.OpenIdConnect;
-using Microsoft.AspNetCore.HttpOverrides;
-using Polly;
 using Volo.Abp;
 using Volo.Abp.Account;
 using Volo.Abp.AspNetCore.Authentication.OpenIdConnect;
@@ -61,6 +62,7 @@ namespace EShopOnAbp.PublicWeb;
     typeof(CatalogServiceHttpApiClientModule),
     typeof(BasketServiceContractsModule),
     typeof(OrderingServiceHttpApiClientModule),
+    typeof(CmskitServiceHttpApiClientModule),
     typeof(AbpAspNetCoreSignalRModule),
     typeof(PaymentServiceHttpApiClientModule),
     typeof(AbpAutoMapperModule)
@@ -76,7 +78,7 @@ public class EShopOnAbpPublicWebModule : AbpModule
                 typeof(EShopOnAbpPublicWebModule).Assembly
             );
         });
-        
+
         PreConfigure<AbpHttpClientBuilderOptions>(options =>
         {
             options.ProxyClientBuildActions.Add((remoteServiceName, clientBuilder) =>
@@ -150,6 +152,7 @@ public class EShopOnAbpPublicWebModule : AbpModule
                 options.Scope.Add("CatalogService");
                 options.Scope.Add("PaymentService");
                 options.Scope.Add("OrderingService");
+                options.Scope.Add("CmskitService");
             });
         if (Convert.ToBoolean(configuration["AuthServer:IsOnProd"]))
         {
@@ -263,7 +266,7 @@ public class EShopOnAbpPublicWebModule : AbpModule
         {
             app.UseErrorPage();
         }
-        
+
         app.UseForwardedHeaders(new ForwardedHeadersOptions
         {
             ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto