From 6cc87fc80ab52f203c6817945574baeba02a9796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduard=20Tom=C3=A0s?= Date: Thu, 15 Feb 2018 17:30:39 +0100 Subject: [PATCH] renaming of PurchaseBff to Aggregator --- docker-compose.override.yml | 6 +- docker-compose.prod.yml | 2 +- docker-compose.yml | 6 +- eShopOnContainers-ServicesAndWebApps.sln | 104 +++++++++--------- .../Config/UrlsConfig.cs | 2 +- .../Controllers/BasketController.cs | 6 +- .../Controllers/HomeController.cs | 2 +- .../Controllers/OrderController.cs | 4 +- .../Dockerfile | 4 +- .../Filters/AuthorizeCheckOperationFilter.cs | 4 +- .../Mobile.Shopping.HttpAggregator.csproj} | 4 +- .../Models/AddBasketItemRequest.cs | 2 +- .../Models/BasketData.cs | 2 +- .../Models/CatalogItem.cs | 2 +- .../Models/OrderData.cs | 2 +- .../Models/OrderItemData.cs | 2 +- .../Models/UpdateBasketItemsRequest.cs | 2 +- .../Models/UpdateBasketRequest.cs | 2 +- .../Program.cs | 2 +- .../Properties/launchSettings.json | 0 .../Services/BasketService.cs | 6 +- .../Services/CatalogService.cs | 6 +- .../Services/IBasketService.cs | 4 +- .../Services/ICatalogService.cs | 4 +- .../Services/IOrderApiClient.cs | 4 +- .../Services/OrderApiClient.cs | 6 +- .../Startup.cs | 14 +-- .../appsettings.json | 0 .../appsettings.localhost.json | 0 src/Apigw/OcelotApiGw/Startup.cs | 2 +- .../configuration/configuration.json | 10 +- .../Basket.API/Properties/launchSettings.json | 2 +- .../Identity.API/Configuration/Config.cs | 20 ++-- .../Data/ConfigurationDbContextSeed.cs | 2 +- src/Web/WebMVC/Controllers/TestController.cs | 2 +- src/Web/WebMVC/Startup.cs | 2 +- .../Client/modules/basket/basket.service.ts | 6 +- .../Client/modules/catalog/catalog.service.ts | 6 +- .../Client/modules/orders/orders.service.ts | 4 +- .../shared/services/security.service.ts | 2 +- src/Web/WebSPA/Properties/launchSettings.json | 2 +- 41 files changed, 132 insertions(+), 132 deletions(-) rename src/{BFFs/PurchaseBff => Aggregators/Mobile.Shopping.HttpAggregator}/Config/UrlsConfig.cs (92%) rename src/{BFFs/PurchaseBff => Aggregators/Mobile.Shopping.HttpAggregator}/Controllers/BasketController.cs (95%) rename src/{BFFs/PurchaseBff => Aggregators/Mobile.Shopping.HttpAggregator}/Controllers/HomeController.cs (80%) rename src/{BFFs/PurchaseBff => Aggregators/Mobile.Shopping.HttpAggregator}/Controllers/OrderController.cs (88%) rename src/{BFFs/PurchaseBff => Aggregators/Mobile.Shopping.HttpAggregator}/Dockerfile (74%) rename src/{BFFs/PurchaseBff => Aggregators/Mobile.Shopping.HttpAggregator}/Filters/AuthorizeCheckOperationFilter.cs (86%) rename src/{BFFs/PurchaseBff/PurchaseBff.csproj => Aggregators/Mobile.Shopping.HttpAggregator/Mobile.Shopping.HttpAggregator.csproj} (82%) rename src/{BFFs/PurchaseBff => Aggregators/Mobile.Shopping.HttpAggregator}/Models/AddBasketItemRequest.cs (83%) rename src/{BFFs/PurchaseBff => Aggregators/Mobile.Shopping.HttpAggregator}/Models/BasketData.cs (90%) rename src/{BFFs/PurchaseBff => Aggregators/Mobile.Shopping.HttpAggregator}/Models/CatalogItem.cs (80%) rename src/{BFFs/PurchaseBff => Aggregators/Mobile.Shopping.HttpAggregator}/Models/OrderData.cs (93%) rename src/{BFFs/PurchaseBff => Aggregators/Mobile.Shopping.HttpAggregator}/Models/OrderItemData.cs (84%) rename src/{BFFs/PurchaseBff => Aggregators/Mobile.Shopping.HttpAggregator}/Models/UpdateBasketItemsRequest.cs (89%) rename src/{BFFs/PurchaseBff => Aggregators/Mobile.Shopping.HttpAggregator}/Models/UpdateBasketRequest.cs (87%) rename src/{BFFs/PurchaseBff => Aggregators/Mobile.Shopping.HttpAggregator}/Program.cs (93%) rename src/{BFFs/PurchaseBff => Aggregators/Mobile.Shopping.HttpAggregator}/Properties/launchSettings.json (100%) rename src/{BFFs/PurchaseBff => Aggregators/Mobile.Shopping.HttpAggregator}/Services/BasketService.cs (89%) rename src/{BFFs/PurchaseBff => Aggregators/Mobile.Shopping.HttpAggregator}/Services/CatalogService.cs (85%) rename src/{BFFs/PurchaseBff => Aggregators/Mobile.Shopping.HttpAggregator}/Services/IBasketService.cs (61%) rename src/{BFFs/PurchaseBff => Aggregators/Mobile.Shopping.HttpAggregator}/Services/ICatalogService.cs (64%) rename src/{BFFs/PurchaseBff => Aggregators/Mobile.Shopping.HttpAggregator}/Services/IOrderApiClient.cs (58%) rename src/{BFFs/PurchaseBff => Aggregators/Mobile.Shopping.HttpAggregator}/Services/OrderApiClient.cs (84%) rename src/{BFFs/PurchaseBff => Aggregators/Mobile.Shopping.HttpAggregator}/Startup.cs (88%) rename src/{BFFs/PurchaseBff => Aggregators/Mobile.Shopping.HttpAggregator}/appsettings.json (100%) rename src/{BFFs/PurchaseBff => Aggregators/Mobile.Shopping.HttpAggregator}/appsettings.localhost.json (100%) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index cfff01732..b6347824f 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -57,7 +57,7 @@ services: - MarketingApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5110 - BasketApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5103 - OrderingApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5102 - - PurchaseBFFClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5120 + - MobileShoppingAggClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5120 - UseCustomizationData=True - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY} - OrchestratorType=${ORCHESTRATOR_TYPE} @@ -132,7 +132,7 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_URLS=http://0.0.0.0:80 - - PurchaseUrl=http://apigw/purchase-bff + - PurchaseUrl=http://apigw/shopping - LocationsUrl=http://locations.api - IdentityUrl=http://10.0.75.1:5105 # Local Mac: Use http://docker.for.mac.localhost:5105 || Local Windows: Use 10.0.75.1 in a "Docker for Windows" environment, if using "localhost" from browser. || #Remote access: Use ${ESHOP_EXTERNAL_DNS_NAME_OR_IP} if using external IP or DNS name from browser. - MarketingUrl=http://marketing.api @@ -225,7 +225,7 @@ services: ports: - "5200:80" - purchasebff: + mobileshoppingagg: environment: - ASPNETCORE_ENVIRONMENT=Development - urls__basket=http://basket.api diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 8c8d67b5d..68e02e4da 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -64,7 +64,7 @@ services: - MarketingApiClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5110 - BasketApiClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5103 - OrderingApiClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5102 - - PurchaseBFFClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5120 + - MobileShoppingAggClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5120 - UseCustomizationData=True - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY} - OrchestratorType=${ORCHESTRATOR_TYPE} diff --git a/docker-compose.yml b/docker-compose.yml index 18a3273f8..672790166 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -114,9 +114,9 @@ services: context: . dockerfile: src/Apigw/OcelotApiGw/Dockerfile - purchasebff: - image: eshop/purchasebff + mobileshoppingagg: + image: eshop/mobileshoppingagg build: context: . - dockerfile: src/BFFs/PurchaseBff/Dockerfile + dockerfile: src/Aggregators/Mobile.Shopping.HttpAggregator/Dockerfile diff --git a/eShopOnContainers-ServicesAndWebApps.sln b/eShopOnContainers-ServicesAndWebApps.sln index 7d25f9b3a..fc72b85f6 100644 --- a/eShopOnContainers-ServicesAndWebApps.sln +++ b/eShopOnContainers-ServicesAndWebApps.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.27004.2009 +VisualStudioVersion = 15.0.27130.2027 MinimumVisualStudioVersion = 10.0.40219.1 Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{FEA0C318-FFED-4D39-8781-265718CA43DD}" EndProject @@ -101,9 +101,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ApiGw", "ApiGw", "{7A58AA20 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OcelotApiGw", "src\Apigw\OcelotApiGw\OcelotApiGw.csproj", "{E0C5162E-DF26-4341-9E51-14AE800D7505}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BFFs", "BFFs", "{EA378316-9D49-4A6B-858E-D4A25F948A74}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Aggregators", "Aggregators", "{EA378316-9D49-4A6B-858E-D4A25F948A74}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PurchaseBff", "src\BFFs\PurchaseBff\PurchaseBff.csproj", "{F77054A6-5808-45D7-88EB-CD92B3FDB889}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mobile.Shopping.HttpAggregator", "src\Aggregators\Mobile.Shopping.HttpAggregator\Mobile.Shopping.HttpAggregator.csproj", "{6E99F232-1536-424F-A28C-91692C8FD325}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -1367,54 +1367,54 @@ Global {E0C5162E-DF26-4341-9E51-14AE800D7505}.Release|x64.Build.0 = Release|Any CPU {E0C5162E-DF26-4341-9E51-14AE800D7505}.Release|x86.ActiveCfg = Release|Any CPU {E0C5162E-DF26-4341-9E51-14AE800D7505}.Release|x86.Build.0 = Release|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Ad-Hoc|x64.Build.0 = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Ad-Hoc|x86.Build.0 = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.AppStore|Any CPU.Build.0 = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.AppStore|ARM.ActiveCfg = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.AppStore|ARM.Build.0 = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.AppStore|iPhone.ActiveCfg = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.AppStore|iPhone.Build.0 = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.AppStore|x64.ActiveCfg = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.AppStore|x64.Build.0 = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.AppStore|x86.ActiveCfg = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.AppStore|x86.Build.0 = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Debug|ARM.ActiveCfg = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Debug|ARM.Build.0 = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Debug|iPhone.Build.0 = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Debug|x64.ActiveCfg = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Debug|x64.Build.0 = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Debug|x86.ActiveCfg = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Debug|x86.Build.0 = Debug|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Release|Any CPU.Build.0 = Release|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Release|ARM.ActiveCfg = Release|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Release|ARM.Build.0 = Release|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Release|iPhone.ActiveCfg = Release|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Release|iPhone.Build.0 = Release|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Release|x64.ActiveCfg = Release|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Release|x64.Build.0 = Release|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Release|x86.ActiveCfg = Release|Any CPU - {F77054A6-5808-45D7-88EB-CD92B3FDB889}.Release|x86.Build.0 = Release|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|x64.Build.0 = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|x86.Build.0 = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|Any CPU.Build.0 = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|ARM.ActiveCfg = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|ARM.Build.0 = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|iPhone.ActiveCfg = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|iPhone.Build.0 = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|x64.ActiveCfg = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|x64.Build.0 = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|x86.ActiveCfg = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|x86.Build.0 = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|ARM.ActiveCfg = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|ARM.Build.0 = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|iPhone.Build.0 = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|x64.ActiveCfg = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|x64.Build.0 = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|x86.ActiveCfg = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|x86.Build.0 = Debug|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Release|Any CPU.Build.0 = Release|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Release|ARM.ActiveCfg = Release|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Release|ARM.Build.0 = Release|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Release|iPhone.ActiveCfg = Release|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Release|iPhone.Build.0 = Release|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Release|x64.ActiveCfg = Release|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Release|x64.Build.0 = Release|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Release|x86.ActiveCfg = Release|Any CPU + {6E99F232-1536-424F-A28C-91692C8FD325}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1464,7 +1464,7 @@ Global {7A58AA20-67F3-48F3-88C8-24EBFE621792} = {932D8224-11F6-4D07-B109-DA28AD288A63} {E0C5162E-DF26-4341-9E51-14AE800D7505} = {7A58AA20-67F3-48F3-88C8-24EBFE621792} {EA378316-9D49-4A6B-858E-D4A25F948A74} = {932D8224-11F6-4D07-B109-DA28AD288A63} - {F77054A6-5808-45D7-88EB-CD92B3FDB889} = {EA378316-9D49-4A6B-858E-D4A25F948A74} + {6E99F232-1536-424F-A28C-91692C8FD325} = {EA378316-9D49-4A6B-858E-D4A25F948A74} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {25728519-5F0F-4973-8A64-0A81EB4EA8D9} diff --git a/src/BFFs/PurchaseBff/Config/UrlsConfig.cs b/src/Aggregators/Mobile.Shopping.HttpAggregator/Config/UrlsConfig.cs similarity index 92% rename from src/BFFs/PurchaseBff/Config/UrlsConfig.cs rename to src/Aggregators/Mobile.Shopping.HttpAggregator/Config/UrlsConfig.cs index 58f344aac..e920fbbb2 100644 --- a/src/BFFs/PurchaseBff/Config/UrlsConfig.cs +++ b/src/Aggregators/Mobile.Shopping.HttpAggregator/Config/UrlsConfig.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace PurchaseBff.Config +namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Config { public class UrlsConfig { diff --git a/src/BFFs/PurchaseBff/Controllers/BasketController.cs b/src/Aggregators/Mobile.Shopping.HttpAggregator/Controllers/BasketController.cs similarity index 95% rename from src/BFFs/PurchaseBff/Controllers/BasketController.cs rename to src/Aggregators/Mobile.Shopping.HttpAggregator/Controllers/BasketController.cs index ac8620623..702c805fb 100644 --- a/src/BFFs/PurchaseBff/Controllers/BasketController.cs +++ b/src/Aggregators/Mobile.Shopping.HttpAggregator/Controllers/BasketController.cs @@ -1,13 +1,13 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using PurchaseBff.Models; -using PurchaseBff.Services; +using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models; +using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services; using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace PurchaseBff.Controllers +namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Controllers { [Route("api/v1/[controller]")] [Authorize] diff --git a/src/BFFs/PurchaseBff/Controllers/HomeController.cs b/src/Aggregators/Mobile.Shopping.HttpAggregator/Controllers/HomeController.cs similarity index 80% rename from src/BFFs/PurchaseBff/Controllers/HomeController.cs rename to src/Aggregators/Mobile.Shopping.HttpAggregator/Controllers/HomeController.cs index f54ec94ad..48a71480a 100644 --- a/src/BFFs/PurchaseBff/Controllers/HomeController.cs +++ b/src/Aggregators/Mobile.Shopping.HttpAggregator/Controllers/HomeController.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace PurchaseBff.Controllers +namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Controllers { [Route("")] public class HomeController : Controller diff --git a/src/BFFs/PurchaseBff/Controllers/OrderController.cs b/src/Aggregators/Mobile.Shopping.HttpAggregator/Controllers/OrderController.cs similarity index 88% rename from src/BFFs/PurchaseBff/Controllers/OrderController.cs rename to src/Aggregators/Mobile.Shopping.HttpAggregator/Controllers/OrderController.cs index 91d0062ac..4c18d25ae 100644 --- a/src/BFFs/PurchaseBff/Controllers/OrderController.cs +++ b/src/Aggregators/Mobile.Shopping.HttpAggregator/Controllers/OrderController.cs @@ -1,12 +1,12 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using PurchaseBff.Services; +using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services; using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace PurchaseBff.Controllers +namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Controllers { [Route("api/v1/[controller]")] [Authorize] diff --git a/src/BFFs/PurchaseBff/Dockerfile b/src/Aggregators/Mobile.Shopping.HttpAggregator/Dockerfile similarity index 74% rename from src/BFFs/PurchaseBff/Dockerfile rename to src/Aggregators/Mobile.Shopping.HttpAggregator/Dockerfile index 500f8406f..24df53c80 100644 --- a/src/BFFs/PurchaseBff/Dockerfile +++ b/src/Aggregators/Mobile.Shopping.HttpAggregator/Dockerfile @@ -6,7 +6,7 @@ FROM microsoft/aspnetcore-build:2.0 AS build WORKDIR /src COPY . . RUN dotnet restore -nowarn:msb3202,nu1503 -WORKDIR /src/src/BFFs/PurchaseBff +WORKDIR /src/src/Aggregators/Mobile.Shopping.HttpAggregator RUN dotnet build --no-restore -c Release -o /app FROM build AS publish @@ -15,4 +15,4 @@ RUN dotnet publish --no-restore -c Release -o /app FROM base AS final WORKDIR /app COPY --from=publish /app . -ENTRYPOINT ["dotnet", "PurchaseBff.dll"] +ENTRYPOINT ["dotnet", "Mobile.Shopping.HttpAggregator.dll"] diff --git a/src/BFFs/PurchaseBff/Filters/AuthorizeCheckOperationFilter.cs b/src/Aggregators/Mobile.Shopping.HttpAggregator/Filters/AuthorizeCheckOperationFilter.cs similarity index 86% rename from src/BFFs/PurchaseBff/Filters/AuthorizeCheckOperationFilter.cs rename to src/Aggregators/Mobile.Shopping.HttpAggregator/Filters/AuthorizeCheckOperationFilter.cs index 31b5bf99e..b3a7246aa 100644 --- a/src/BFFs/PurchaseBff/Filters/AuthorizeCheckOperationFilter.cs +++ b/src/Aggregators/Mobile.Shopping.HttpAggregator/Filters/AuthorizeCheckOperationFilter.cs @@ -1,4 +1,4 @@ -namespace PurchaseBff.Filters +namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Filters { using Microsoft.AspNetCore.Authorization; using Swashbuckle.AspNetCore.Swagger; @@ -24,7 +24,7 @@ operation.Security = new List>>(); operation.Security.Add(new Dictionary> { - { "oauth2", new [] { "purchasebff" } } + { "oauth2", new [] { "Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator" } } }); } } diff --git a/src/BFFs/PurchaseBff/PurchaseBff.csproj b/src/Aggregators/Mobile.Shopping.HttpAggregator/Mobile.Shopping.HttpAggregator.csproj similarity index 82% rename from src/BFFs/PurchaseBff/PurchaseBff.csproj rename to src/Aggregators/Mobile.Shopping.HttpAggregator/Mobile.Shopping.HttpAggregator.csproj index dd7a5909e..093e7a370 100644 --- a/src/BFFs/PurchaseBff/PurchaseBff.csproj +++ b/src/Aggregators/Mobile.Shopping.HttpAggregator/Mobile.Shopping.HttpAggregator.csproj @@ -2,8 +2,8 @@ netcoreapp2.0 - PurchaseBff - PurchaseBff + Mobile.Shopping.HttpAggregator + Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator ..\..\..\docker-compose.dcproj diff --git a/src/BFFs/PurchaseBff/Models/AddBasketItemRequest.cs b/src/Aggregators/Mobile.Shopping.HttpAggregator/Models/AddBasketItemRequest.cs similarity index 83% rename from src/BFFs/PurchaseBff/Models/AddBasketItemRequest.cs rename to src/Aggregators/Mobile.Shopping.HttpAggregator/Models/AddBasketItemRequest.cs index 7c589a233..f81842c09 100644 --- a/src/BFFs/PurchaseBff/Models/AddBasketItemRequest.cs +++ b/src/Aggregators/Mobile.Shopping.HttpAggregator/Models/AddBasketItemRequest.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace PurchaseBff.Models +namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models { public class AddBasketItemRequest { diff --git a/src/BFFs/PurchaseBff/Models/BasketData.cs b/src/Aggregators/Mobile.Shopping.HttpAggregator/Models/BasketData.cs similarity index 90% rename from src/BFFs/PurchaseBff/Models/BasketData.cs rename to src/Aggregators/Mobile.Shopping.HttpAggregator/Models/BasketData.cs index 3f14660a7..1b9348c44 100644 --- a/src/BFFs/PurchaseBff/Models/BasketData.cs +++ b/src/Aggregators/Mobile.Shopping.HttpAggregator/Models/BasketData.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace PurchaseBff.Models +namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models { public class BasketData { diff --git a/src/BFFs/PurchaseBff/Models/CatalogItem.cs b/src/Aggregators/Mobile.Shopping.HttpAggregator/Models/CatalogItem.cs similarity index 80% rename from src/BFFs/PurchaseBff/Models/CatalogItem.cs rename to src/Aggregators/Mobile.Shopping.HttpAggregator/Models/CatalogItem.cs index 13b0a65c0..25f766719 100644 --- a/src/BFFs/PurchaseBff/Models/CatalogItem.cs +++ b/src/Aggregators/Mobile.Shopping.HttpAggregator/Models/CatalogItem.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace PurchaseBff.Models +namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models { public class CatalogItem { diff --git a/src/BFFs/PurchaseBff/Models/OrderData.cs b/src/Aggregators/Mobile.Shopping.HttpAggregator/Models/OrderData.cs similarity index 93% rename from src/BFFs/PurchaseBff/Models/OrderData.cs rename to src/Aggregators/Mobile.Shopping.HttpAggregator/Models/OrderData.cs index c561a53ad..e87cc18f0 100644 --- a/src/BFFs/PurchaseBff/Models/OrderData.cs +++ b/src/Aggregators/Mobile.Shopping.HttpAggregator/Models/OrderData.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace PurchaseBff.Models +namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models { public class OrderData { diff --git a/src/BFFs/PurchaseBff/Models/OrderItemData.cs b/src/Aggregators/Mobile.Shopping.HttpAggregator/Models/OrderItemData.cs similarity index 84% rename from src/BFFs/PurchaseBff/Models/OrderItemData.cs rename to src/Aggregators/Mobile.Shopping.HttpAggregator/Models/OrderItemData.cs index bdc7b361e..b0179e470 100644 --- a/src/BFFs/PurchaseBff/Models/OrderItemData.cs +++ b/src/Aggregators/Mobile.Shopping.HttpAggregator/Models/OrderItemData.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace PurchaseBff.Models +namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models { public class OrderItemData { diff --git a/src/BFFs/PurchaseBff/Models/UpdateBasketItemsRequest.cs b/src/Aggregators/Mobile.Shopping.HttpAggregator/Models/UpdateBasketItemsRequest.cs similarity index 89% rename from src/BFFs/PurchaseBff/Models/UpdateBasketItemsRequest.cs rename to src/Aggregators/Mobile.Shopping.HttpAggregator/Models/UpdateBasketItemsRequest.cs index eb63efa23..43cc81b89 100644 --- a/src/BFFs/PurchaseBff/Models/UpdateBasketItemsRequest.cs +++ b/src/Aggregators/Mobile.Shopping.HttpAggregator/Models/UpdateBasketItemsRequest.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace PurchaseBff.Models +namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models { public class UpdateBasketItemsRequest { diff --git a/src/BFFs/PurchaseBff/Models/UpdateBasketRequest.cs b/src/Aggregators/Mobile.Shopping.HttpAggregator/Models/UpdateBasketRequest.cs similarity index 87% rename from src/BFFs/PurchaseBff/Models/UpdateBasketRequest.cs rename to src/Aggregators/Mobile.Shopping.HttpAggregator/Models/UpdateBasketRequest.cs index a6813c788..cb22bf55f 100644 --- a/src/BFFs/PurchaseBff/Models/UpdateBasketRequest.cs +++ b/src/Aggregators/Mobile.Shopping.HttpAggregator/Models/UpdateBasketRequest.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace PurchaseBff.Models +namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models { public class UpdateBasketRequest { diff --git a/src/BFFs/PurchaseBff/Program.cs b/src/Aggregators/Mobile.Shopping.HttpAggregator/Program.cs similarity index 93% rename from src/BFFs/PurchaseBff/Program.cs rename to src/Aggregators/Mobile.Shopping.HttpAggregator/Program.cs index 7c6110260..0c88fcd7d 100644 --- a/src/BFFs/PurchaseBff/Program.cs +++ b/src/Aggregators/Mobile.Shopping.HttpAggregator/Program.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; -namespace PurchaseBff +namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator { public class Program { diff --git a/src/BFFs/PurchaseBff/Properties/launchSettings.json b/src/Aggregators/Mobile.Shopping.HttpAggregator/Properties/launchSettings.json similarity index 100% rename from src/BFFs/PurchaseBff/Properties/launchSettings.json rename to src/Aggregators/Mobile.Shopping.HttpAggregator/Properties/launchSettings.json diff --git a/src/BFFs/PurchaseBff/Services/BasketService.cs b/src/Aggregators/Mobile.Shopping.HttpAggregator/Services/BasketService.cs similarity index 89% rename from src/BFFs/PurchaseBff/Services/BasketService.cs rename to src/Aggregators/Mobile.Shopping.HttpAggregator/Services/BasketService.cs index c1c3a6f9d..b00fbb52c 100644 --- a/src/BFFs/PurchaseBff/Services/BasketService.cs +++ b/src/Aggregators/Mobile.Shopping.HttpAggregator/Services/BasketService.cs @@ -8,10 +8,10 @@ using Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Newtonsoft.Json; -using PurchaseBff.Config; -using PurchaseBff.Models; +using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Config; +using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models; -namespace PurchaseBff.Services +namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services { public class BasketService : IBasketService { diff --git a/src/BFFs/PurchaseBff/Services/CatalogService.cs b/src/Aggregators/Mobile.Shopping.HttpAggregator/Services/CatalogService.cs similarity index 85% rename from src/BFFs/PurchaseBff/Services/CatalogService.cs rename to src/Aggregators/Mobile.Shopping.HttpAggregator/Services/CatalogService.cs index 7030da747..d37b67679 100644 --- a/src/BFFs/PurchaseBff/Services/CatalogService.cs +++ b/src/Aggregators/Mobile.Shopping.HttpAggregator/Services/CatalogService.cs @@ -6,10 +6,10 @@ using Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Newtonsoft.Json; -using PurchaseBff.Config; -using PurchaseBff.Models; +using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Config; +using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models; -namespace PurchaseBff.Services +namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services { public class CatalogService : ICatalogService { diff --git a/src/BFFs/PurchaseBff/Services/IBasketService.cs b/src/Aggregators/Mobile.Shopping.HttpAggregator/Services/IBasketService.cs similarity index 61% rename from src/BFFs/PurchaseBff/Services/IBasketService.cs rename to src/Aggregators/Mobile.Shopping.HttpAggregator/Services/IBasketService.cs index 74f6c21ba..6fd6871c1 100644 --- a/src/BFFs/PurchaseBff/Services/IBasketService.cs +++ b/src/Aggregators/Mobile.Shopping.HttpAggregator/Services/IBasketService.cs @@ -1,10 +1,10 @@ -using PurchaseBff.Models; +using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models; using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace PurchaseBff.Services +namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services { public interface IBasketService { diff --git a/src/BFFs/PurchaseBff/Services/ICatalogService.cs b/src/Aggregators/Mobile.Shopping.HttpAggregator/Services/ICatalogService.cs similarity index 64% rename from src/BFFs/PurchaseBff/Services/ICatalogService.cs rename to src/Aggregators/Mobile.Shopping.HttpAggregator/Services/ICatalogService.cs index b51c0f0cd..d7e605bfa 100644 --- a/src/BFFs/PurchaseBff/Services/ICatalogService.cs +++ b/src/Aggregators/Mobile.Shopping.HttpAggregator/Services/ICatalogService.cs @@ -1,10 +1,10 @@ -using PurchaseBff.Models; +using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models; using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace PurchaseBff.Services +namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services { public interface ICatalogService { diff --git a/src/BFFs/PurchaseBff/Services/IOrderApiClient.cs b/src/Aggregators/Mobile.Shopping.HttpAggregator/Services/IOrderApiClient.cs similarity index 58% rename from src/BFFs/PurchaseBff/Services/IOrderApiClient.cs rename to src/Aggregators/Mobile.Shopping.HttpAggregator/Services/IOrderApiClient.cs index 2d23e71f6..30ac013b9 100644 --- a/src/BFFs/PurchaseBff/Services/IOrderApiClient.cs +++ b/src/Aggregators/Mobile.Shopping.HttpAggregator/Services/IOrderApiClient.cs @@ -1,10 +1,10 @@ -using PurchaseBff.Models; +using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models; using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace PurchaseBff.Services +namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services { public interface IOrderApiClient { diff --git a/src/BFFs/PurchaseBff/Services/OrderApiClient.cs b/src/Aggregators/Mobile.Shopping.HttpAggregator/Services/OrderApiClient.cs similarity index 84% rename from src/BFFs/PurchaseBff/Services/OrderApiClient.cs rename to src/Aggregators/Mobile.Shopping.HttpAggregator/Services/OrderApiClient.cs index 44f33cf71..2659e11cc 100644 --- a/src/BFFs/PurchaseBff/Services/OrderApiClient.cs +++ b/src/Aggregators/Mobile.Shopping.HttpAggregator/Services/OrderApiClient.cs @@ -6,10 +6,10 @@ using Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Newtonsoft.Json; -using PurchaseBff.Config; -using PurchaseBff.Models; +using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Config; +using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models; -namespace PurchaseBff.Services +namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services { public class OrderApiClient : IOrderApiClient { diff --git a/src/BFFs/PurchaseBff/Startup.cs b/src/Aggregators/Mobile.Shopping.HttpAggregator/Startup.cs similarity index 88% rename from src/BFFs/PurchaseBff/Startup.cs rename to src/Aggregators/Mobile.Shopping.HttpAggregator/Startup.cs index d7e9b4e28..083839bd5 100644 --- a/src/BFFs/PurchaseBff/Startup.cs +++ b/src/Aggregators/Mobile.Shopping.HttpAggregator/Startup.cs @@ -12,12 +12,12 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using PurchaseBff.Config; -using PurchaseBff.Filters.Basket.API.Infrastructure.Filters; -using PurchaseBff.Services; +using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Config; +using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Filters.Basket.API.Infrastructure.Filters; +using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services; using Swashbuckle.AspNetCore.Swagger; -namespace PurchaseBff +namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator { public class Startup { @@ -61,7 +61,7 @@ namespace PurchaseBff TokenUrl = $"{Configuration.GetValue("IdentityUrlExternal")}/connect/token", Scopes = new Dictionary() { - { "purchasebff", "Purchase BFF API Gateway" } + { "mobileshoppingagg", "Purchase BFF API Gateway" } } }); @@ -89,7 +89,7 @@ namespace PurchaseBff { options.Authority = identityUrl; options.RequireHttpsMetadata = false; - options.Audience = "purchasebff"; + options.Audience = "mobileshoppingagg"; options.Events = new JwtBearerEvents() { OnAuthenticationFailed = async ctx => @@ -129,7 +129,7 @@ namespace PurchaseBff app.UseSwagger().UseSwaggerUI(c => { c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "Purchase BFF V1"); - c.ConfigureOAuth2("purchasebffwaggerui", "", "", "Purchase BFF Swagger UI"); + c.ConfigureOAuth2("Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregatorwaggerui", "", "", "Purchase BFF Swagger UI"); }); diff --git a/src/BFFs/PurchaseBff/appsettings.json b/src/Aggregators/Mobile.Shopping.HttpAggregator/appsettings.json similarity index 100% rename from src/BFFs/PurchaseBff/appsettings.json rename to src/Aggregators/Mobile.Shopping.HttpAggregator/appsettings.json diff --git a/src/BFFs/PurchaseBff/appsettings.localhost.json b/src/Aggregators/Mobile.Shopping.HttpAggregator/appsettings.localhost.json similarity index 100% rename from src/BFFs/PurchaseBff/appsettings.localhost.json rename to src/Aggregators/Mobile.Shopping.HttpAggregator/appsettings.localhost.json diff --git a/src/Apigw/OcelotApiGw/Startup.cs b/src/Apigw/OcelotApiGw/Startup.cs index 01ffe5139..f0a41c172 100644 --- a/src/Apigw/OcelotApiGw/Startup.cs +++ b/src/Apigw/OcelotApiGw/Startup.cs @@ -45,7 +45,7 @@ namespace OcelotApiGw x.RequireHttpsMetadata = false; x.TokenValidationParameters = new Microsoft.IdentityModel.Tokens.TokenValidationParameters() { - ValidAudiences = new[] { "orders", "basket", "locations", "marketing", "purchasebff" } + ValidAudiences = new[] { "orders", "basket", "locations", "marketing", "mobileshoppingagg" } }; x.Events = new Microsoft.AspNetCore.Authentication.JwtBearer.JwtBearerEvents() { diff --git a/src/Apigw/OcelotApiGw/configuration/configuration.json b/src/Apigw/OcelotApiGw/configuration/configuration.json index 2d5e6c8f7..80d3f1116 100644 --- a/src/Apigw/OcelotApiGw/configuration/configuration.json +++ b/src/Apigw/OcelotApiGw/configuration/configuration.json @@ -9,7 +9,7 @@ "Port": 80 } ], - "UpstreamPathTemplate": "/purchase-bff/api/{version}/c/{everything}", + "UpstreamPathTemplate": "/shopping/api/{version}/c/{everything}", "UpstreamHttpMethod": [ "GET" ] }, { @@ -21,7 +21,7 @@ "Port": 80 } ], - "UpstreamPathTemplate": "/purchase-bff/api/{version}/b/{everything}", + "UpstreamPathTemplate": "/shopping/api/{version}/b/{everything}", "UpstreamHttpMethod": [], "AuthenticationOptions": { "AuthenticationProviderKey": "IdentityApiKey", @@ -37,7 +37,7 @@ "Port": 80 } ], - "UpstreamPathTemplate": "/purchase-bff/api/{version}/o/{everything}", + "UpstreamPathTemplate": "/shopping/api/{version}/o/{everything}", "UpstreamHttpMethod": [], "AuthenticationOptions": { "AuthenticationProviderKey": "IdentityApiKey", @@ -49,11 +49,11 @@ "DownstreamScheme": "http", "DownstreamHostAndPorts": [ { - "Host": "purchasebff", + "Host": "mobileshoppingagg", "Port": 80 } ], - "UpstreamPathTemplate": "/purchase-bff/{everything}", + "UpstreamPathTemplate": "/shopping/{everything}", "UpstreamHttpMethod": [ "POST", "PUT", "GET" ], "AuthenticationOptions": { "AuthenticationProviderKey": "IdentityApiKey", diff --git a/src/Services/Basket/Basket.API/Properties/launchSettings.json b/src/Services/Basket/Basket.API/Properties/launchSettings.json index 382f0584a..60a56b153 100644 --- a/src/Services/Basket/Basket.API/Properties/launchSettings.json +++ b/src/Services/Basket/Basket.API/Properties/launchSettings.json @@ -3,7 +3,7 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:53998/", + "applicationUrl": "http://localhost:58017/", "sslPort": 0 } }, diff --git a/src/Services/Identity/Identity.API/Configuration/Config.cs b/src/Services/Identity/Identity.API/Configuration/Config.cs index 9905a04d3..18e313bf8 100644 --- a/src/Services/Identity/Identity.API/Configuration/Config.cs +++ b/src/Services/Identity/Identity.API/Configuration/Config.cs @@ -15,7 +15,7 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Configuration new ApiResource("basket", "Basket Service"), new ApiResource("marketing", "Marketing Service"), new ApiResource("locations", "Locations Service"), - new ApiResource("purchasebff", "Purchase BFF") + new ApiResource("mobileshoppingagg", "Mobile Shopping Aggregator") }; } @@ -54,7 +54,7 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Configuration "basket", "locations", "marketing", - "purchasebff" + "mobileshoppingagg" } }, new Client @@ -81,7 +81,7 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Configuration "basket", "locations", "marketing", - "purchasebff" + "mobileshoppingagg" }, //Allow requesting refresh tokens for long lived API access AllowOfflineAccess = true, @@ -118,7 +118,7 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Configuration "basket", "locations", "marketing", - "purchasebff" + "mobileshoppingagg" }, }, new Client @@ -151,7 +151,7 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Configuration "basket", "locations", "marketing", - "purchasebff" + "mobileshoppingagg" }, }, new Client @@ -216,17 +216,17 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Configuration }, new Client { - ClientId = "purchasebffwaggerui", - ClientName = "Purchase BFF Swagger UI", + ClientId = "mobileshoppingaggswaggerui", + ClientName = "Mobile Shopping Aggregattor Swagger UI", AllowedGrantTypes = GrantTypes.Implicit, AllowAccessTokensViaBrowser = true, - RedirectUris = { $"{clientsUrl["PurchaseBFF"]}/swagger/o2c.html" }, - PostLogoutRedirectUris = { $"{clientsUrl["PurchaseBFF"]}/swagger/" }, + RedirectUris = { $"{clientsUrl["MobileShoppingAgg"]}/swagger/o2c.html" }, + PostLogoutRedirectUris = { $"{clientsUrl["MobileShoppingAgg"]}/swagger/" }, AllowedScopes = { - "purchasebff" + "mobileshoppingagg" } } diff --git a/src/Services/Identity/Identity.API/Data/ConfigurationDbContextSeed.cs b/src/Services/Identity/Identity.API/Data/ConfigurationDbContextSeed.cs index 0875361be..4757d4743 100644 --- a/src/Services/Identity/Identity.API/Data/ConfigurationDbContextSeed.cs +++ b/src/Services/Identity/Identity.API/Data/ConfigurationDbContextSeed.cs @@ -23,7 +23,7 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Data clientUrls.Add("MarketingApi", configuration.GetValue("MarketingApiClient")); clientUrls.Add("BasketApi", configuration.GetValue("BasketApiClient")); clientUrls.Add("OrderingApi", configuration.GetValue("OrderingApiClient")); - clientUrls.Add("PurchaseBFF", configuration.GetValue("PurchaseBFFClient")); + clientUrls.Add("MobileShoppingAgg", configuration.GetValue("MobileShoppingAggClient")); if (!context.Clients.Any()) { diff --git a/src/Web/WebMVC/Controllers/TestController.cs b/src/Web/WebMVC/Controllers/TestController.cs index 7a2140ea8..1b35d5d2b 100644 --- a/src/Web/WebMVC/Controllers/TestController.cs +++ b/src/Web/WebMVC/Controllers/TestController.cs @@ -32,7 +32,7 @@ namespace WebMVC.Controllers public async Task Ocelot() { - var url = "http://apigw/purchase-bff/api/v1/basket/items"; + var url = "http://apigw/shopping/api/v1/basket/items"; var payload = new TestPayload() { CatalogItemId = 1, diff --git a/src/Web/WebMVC/Startup.cs b/src/Web/WebMVC/Startup.cs index e9e86d1cd..21986b5df 100644 --- a/src/Web/WebMVC/Startup.cs +++ b/src/Web/WebMVC/Startup.cs @@ -130,7 +130,7 @@ namespace Microsoft.eShopOnContainers.WebMVC options.Scope.Add("basket"); options.Scope.Add("marketing"); options.Scope.Add("locations"); - options.Scope.Add("purchasebff"); + options.Scope.Add("mobileshoppingagg"); }); } diff --git a/src/Web/WebSPA/Client/modules/basket/basket.service.ts b/src/Web/WebSPA/Client/modules/basket/basket.service.ts index f59357020..f26cbc2cb 100644 --- a/src/Web/WebSPA/Client/modules/basket/basket.service.ts +++ b/src/Web/WebSPA/Client/modules/basket/basket.service.ts @@ -66,7 +66,7 @@ export class BasketService { } setBasket(basket): Observable { - let url = this.purchaseUrl + '/purchase-bff/api/v1/basket/'; + let url = this.purchaseUrl + '/shopping/api/v1/basket/'; this.basket = basket; return this.service.post(url, basket).map((response: Response) => { return true; @@ -74,7 +74,7 @@ export class BasketService { } setBasketCheckout(basketCheckout): Observable { - let url = this.basketUrl + '/purchase-bff/api/v1/b/basket/checkout'; + let url = this.basketUrl + '/shopping/api/v1/b/basket/checkout'; return this.service.postWithId(url, basketCheckout).map((response: Response) => { this.basketEvents.orderCreated(); return true; @@ -82,7 +82,7 @@ export class BasketService { } getBasket(): Observable { - let url = this.basketUrl + '/purchase-bff/api/v1/b/basket/' + this.basket.buyerId; + let url = this.basketUrl + '/shopping/api/v1/b/basket/' + this.basket.buyerId; return this.service.get(url).map((response: Response) => { if (response.status === 204) { return null; diff --git a/src/Web/WebSPA/Client/modules/catalog/catalog.service.ts b/src/Web/WebSPA/Client/modules/catalog/catalog.service.ts index 672146c9e..8e91ef541 100644 --- a/src/Web/WebSPA/Client/modules/catalog/catalog.service.ts +++ b/src/Web/WebSPA/Client/modules/catalog/catalog.service.ts @@ -21,9 +21,9 @@ export class CatalogService { constructor(private service: DataService, private configurationService: ConfigurationService) { this.configurationService.settingsLoaded$.subscribe(x => { - this.catalogUrl = this.configurationService.serverSettings.purchaseUrl + '/purchase-bff/api/v1/c/catalog/items'; - this.brandUrl = this.configurationService.serverSettings.purchaseUrl + '/purchase-bff/api/v1/c/catalog/catalogbrands'; - this.typesUrl = this.configurationService.serverSettings.purchaseUrl + '/purchase-bff/api/v1/c/catalog/catalogtypes'; + this.catalogUrl = this.configurationService.serverSettings.purchaseUrl + '/shopping/api/v1/c/catalog/items'; + this.brandUrl = this.configurationService.serverSettings.purchaseUrl + '/shopping/api/v1/c/catalog/catalogbrands'; + this.typesUrl = this.configurationService.serverSettings.purchaseUrl + '/shopping/api/v1/c/catalog/catalogtypes'; }); } diff --git a/src/Web/WebSPA/Client/modules/orders/orders.service.ts b/src/Web/WebSPA/Client/modules/orders/orders.service.ts index 8d96602a1..9eabeb1cf 100644 --- a/src/Web/WebSPA/Client/modules/orders/orders.service.ts +++ b/src/Web/WebSPA/Client/modules/orders/orders.service.ts @@ -29,7 +29,7 @@ export class OrdersService { } getOrders(): Observable { - let url = this.ordersUrl + '/purchase-bff/api/v1/o/orders'; + let url = this.ordersUrl + '/shopping/api/v1/o/orders'; return this.service.get(url).map((response: Response) => { return response.json(); @@ -37,7 +37,7 @@ export class OrdersService { } getOrder(id: number): Observable { - let url = this.ordersUrl + '/purchase-bff/api/v1/o/orders/' + id; + let url = this.ordersUrl + '/shopping/api/v1/o/orders/' + id; return this.service.get(url).map((response: Response) => { return response.json(); diff --git a/src/Web/WebSPA/Client/modules/shared/services/security.service.ts b/src/Web/WebSPA/Client/modules/shared/services/security.service.ts index 2b580b5cd..c2ac8e5e2 100644 --- a/src/Web/WebSPA/Client/modules/shared/services/security.service.ts +++ b/src/Web/WebSPA/Client/modules/shared/services/security.service.ts @@ -82,7 +82,7 @@ export class SecurityService { let client_id = 'js'; let redirect_uri = location.origin + '/'; let response_type = 'id_token token'; - let scope = 'openid profile orders basket marketing locations purchasebff'; + let scope = 'openid profile orders basket marketing locations mobileshoppingagg'; let nonce = 'N' + Math.random() + '' + Date.now(); let state = Date.now() + '' + Math.random(); diff --git a/src/Web/WebSPA/Properties/launchSettings.json b/src/Web/WebSPA/Properties/launchSettings.json index bf0fc44d4..eff752f63 100644 --- a/src/Web/WebSPA/Properties/launchSettings.json +++ b/src/Web/WebSPA/Properties/launchSettings.json @@ -3,7 +3,7 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:64923/", + "applicationUrl": "http://localhost:58018/", "sslPort": 0 } },