ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

renaming of PurchaseBff to Aggregator

Browse Source
This commit is contained in:
Eduard Tomàs 2018-02-15 17:30:39 +01:00
parent 0be655d2e0
commit 6cc87fc80a
41 changed files with 132 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker-compose.override.yml
View File

@ -57,7 +57,7 @@ services:
- MarketingApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5110 - MarketingApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5110
- BasketApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5103 - BasketApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5103
- OrderingApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5102 - 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 - UseCustomizationData=True
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY} - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
- OrchestratorType=${ORCHESTRATOR_TYPE} - OrchestratorType=${ORCHESTRATOR_TYPE}
@ -132,7 +132,7 @@ services:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
- PurchaseUrl=http://apigw/purchase-bff - PurchaseUrl=http://apigw/shopping
- LocationsUrl=http://locations.api - 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. - 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 - MarketingUrl=http://marketing.api
@ -225,7 +225,7 @@ services:
ports: ports:
- "5200:80" - "5200:80"
purchasebff: mobileshoppingagg:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_ENVIRONMENT=Development
- urls__basket=http://basket.api - urls__basket=http://basket.api

2
docker-compose.prod.yml
View File

@ -64,7 +64,7 @@ services:
- MarketingApiClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5110 - MarketingApiClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5110
- BasketApiClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5103 - BasketApiClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5103
- OrderingApiClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5102 - 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 - UseCustomizationData=True
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY} - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
- OrchestratorType=${ORCHESTRATOR_TYPE} - OrchestratorType=${ORCHESTRATOR_TYPE}

6
docker-compose.yml
View File

@ -114,9 +114,9 @@ services:
context: . context: .
dockerfile: src/Apigw/OcelotApiGw/Dockerfile dockerfile: src/Apigw/OcelotApiGw/Dockerfile
purchasebff: mobileshoppingagg:
image: eshop/purchasebff image: eshop/mobileshoppingagg
build: build:
context: . context: .
dockerfile: src/BFFs/PurchaseBff/Dockerfile dockerfile: src/Aggregators/Mobile.Shopping.HttpAggregator/Dockerfile

104
eShopOnContainers-ServicesAndWebApps.sln
View File

@ -1,7 +1,7 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15 # Visual Studio 15
VisualStudioVersion = 15.0.27004.2009 VisualStudioVersion = 15.0.27130.2027
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{FEA0C318-FFED-4D39-8781-265718CA43DD}" Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{FEA0C318-FFED-4D39-8781-265718CA43DD}"
EndProject EndProject
@ -101,9 +101,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ApiGw", "ApiGw", "{7A58AA20
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OcelotApiGw", "src\Apigw\OcelotApiGw\OcelotApiGw.csproj", "{E0C5162E-DF26-4341-9E51-14AE800D7505}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OcelotApiGw", "src\Apigw\OcelotApiGw\OcelotApiGw.csproj", "{E0C5162E-DF26-4341-9E51-14AE800D7505}"
EndProject 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 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 EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution 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|x64.Build.0 = Release|Any CPU
{E0C5162E-DF26-4341-9E51-14AE800D7505}.Release|x86.ActiveCfg = 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 {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 {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Ad-Hoc|x64.Build.0 = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Ad-Hoc|x86.Build.0 = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.AppStore|Any CPU.Build.0 = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.AppStore|ARM.ActiveCfg = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|ARM.ActiveCfg = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.AppStore|ARM.Build.0 = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|ARM.Build.0 = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.AppStore|iPhone.ActiveCfg = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.AppStore|iPhone.Build.0 = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|iPhone.Build.0 = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.AppStore|x64.ActiveCfg = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|x64.ActiveCfg = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.AppStore|x64.Build.0 = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|x64.Build.0 = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.AppStore|x86.ActiveCfg = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|x86.ActiveCfg = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.AppStore|x86.Build.0 = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|x86.Build.0 = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Debug|Any CPU.Build.0 = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Debug|ARM.ActiveCfg = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|ARM.ActiveCfg = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Debug|ARM.Build.0 = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|ARM.Build.0 = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Debug|iPhone.ActiveCfg = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Debug|iPhone.Build.0 = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|iPhone.Build.0 = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Debug|x64.ActiveCfg = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|x64.ActiveCfg = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Debug|x64.Build.0 = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|x64.Build.0 = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Debug|x86.ActiveCfg = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|x86.ActiveCfg = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Debug|x86.Build.0 = Debug|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|x86.Build.0 = Debug|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Release|Any CPU.ActiveCfg = Release|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Release|Any CPU.Build.0 = Release|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Release|Any CPU.Build.0 = Release|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Release|ARM.ActiveCfg = Release|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Release|ARM.ActiveCfg = Release|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Release|ARM.Build.0 = Release|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Release|ARM.Build.0 = Release|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Release|iPhone.ActiveCfg = Release|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Release|iPhone.ActiveCfg = Release|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Release|iPhone.Build.0 = Release|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Release|iPhone.Build.0 = Release|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Release|x64.ActiveCfg = Release|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Release|x64.ActiveCfg = Release|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Release|x64.Build.0 = Release|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Release|x64.Build.0 = Release|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Release|x86.ActiveCfg = Release|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Release|x86.ActiveCfg = Release|Any CPU
{F77054A6-5808-45D7-88EB-CD92B3FDB889}.Release|x86.Build.0 = Release|Any CPU {6E99F232-1536-424F-A28C-91692C8FD325}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@ -1464,7 +1464,7 @@ Global
{7A58AA20-67F3-48F3-88C8-24EBFE621792} = {932D8224-11F6-4D07-B109-DA28AD288A63} {7A58AA20-67F3-48F3-88C8-24EBFE621792} = {932D8224-11F6-4D07-B109-DA28AD288A63}
{E0C5162E-DF26-4341-9E51-14AE800D7505} = {7A58AA20-67F3-48F3-88C8-24EBFE621792} {E0C5162E-DF26-4341-9E51-14AE800D7505} = {7A58AA20-67F3-48F3-88C8-24EBFE621792}
{EA378316-9D49-4A6B-858E-D4A25F948A74} = {932D8224-11F6-4D07-B109-DA28AD288A63} {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 EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {25728519-5F0F-4973-8A64-0A81EB4EA8D9} SolutionGuid = {25728519-5F0F-4973-8A64-0A81EB4EA8D9}

2
src/BFFs/PurchaseBff/Config/UrlsConfig.cs → src/Aggregators/Mobile.Shopping.HttpAggregator/Config/UrlsConfig.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace PurchaseBff.Config namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Config
{ {
public class UrlsConfig public class UrlsConfig
{ {

6
src/BFFs/PurchaseBff/Controllers/BasketController.cs → src/Aggregators/Mobile.Shopping.HttpAggregator/Controllers/BasketController.cs
View File

@ -1,13 +1,13 @@
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using PurchaseBff.Models; using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models;
using PurchaseBff.Services; using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace PurchaseBff.Controllers namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Controllers
{ {
[Route("api/v1/[controller]")] [Route("api/v1/[controller]")]
[Authorize] [Authorize]

2
src/BFFs/PurchaseBff/Controllers/HomeController.cs → src/Aggregators/Mobile.Shopping.HttpAggregator/Controllers/HomeController.cs
View File

@ -4,7 +4,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace PurchaseBff.Controllers namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Controllers
{ {
[Route("")] [Route("")]
public class HomeController : Controller public class HomeController : Controller

4
src/BFFs/PurchaseBff/Controllers/OrderController.cs → src/Aggregators/Mobile.Shopping.HttpAggregator/Controllers/OrderController.cs
View File

@ -1,12 +1,12 @@
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using PurchaseBff.Services; using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace PurchaseBff.Controllers namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Controllers
{ {
[Route("api/v1/[controller]")] [Route("api/v1/[controller]")]
[Authorize] [Authorize]

4
src/BFFs/PurchaseBff/Dockerfile → src/Aggregators/Mobile.Shopping.HttpAggregator/Dockerfile
View File

@ -6,7 +6,7 @@ FROM microsoft/aspnetcore-build:2.0 AS build
WORKDIR /src WORKDIR /src
COPY . . COPY . .
RUN dotnet restore -nowarn:msb3202,nu1503 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 RUN dotnet build --no-restore -c Release -o /app
FROM build AS publish FROM build AS publish
@ -15,4 +15,4 @@ RUN dotnet publish --no-restore -c Release -o /app
FROM base AS final FROM base AS final
WORKDIR /app WORKDIR /app
COPY --from=publish /app . COPY --from=publish /app .
ENTRYPOINT ["dotnet", "PurchaseBff.dll"] ENTRYPOINT ["dotnet", "Mobile.Shopping.HttpAggregator.dll"]

4
src/BFFs/PurchaseBff/Filters/AuthorizeCheckOperationFilter.cs → src/Aggregators/Mobile.Shopping.HttpAggregator/Filters/AuthorizeCheckOperationFilter.cs
View File

@ -1,4 +1,4 @@
namespace PurchaseBff.Filters namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Filters
{ {
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Swashbuckle.AspNetCore.Swagger; using Swashbuckle.AspNetCore.Swagger;
@ -24,7 +24,7 @@
operation.Security = new List<IDictionary<string, IEnumerable<string>>>(); operation.Security = new List<IDictionary<string, IEnumerable<string>>>();
operation.Security.Add(new Dictionary<string, IEnumerable<string>> operation.Security.Add(new Dictionary<string, IEnumerable<string>>
{ {
{ "oauth2", new [] { "purchasebff" } } { "oauth2", new [] { "Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator" } }
}); });
} }
} }

4
src/BFFs/PurchaseBff/PurchaseBff.csproj → src/Aggregators/Mobile.Shopping.HttpAggregator/Mobile.Shopping.HttpAggregator.csproj
View File

@ -2,8 +2,8 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp2.0</TargetFramework>
<AssemblyName>PurchaseBff</AssemblyName> <AssemblyName>Mobile.Shopping.HttpAggregator</AssemblyName>
<RootNamespace>PurchaseBff</RootNamespace> <RootNamespace>Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator</RootNamespace>
<DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath> <DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
</PropertyGroup> </PropertyGroup>

2
src/BFFs/PurchaseBff/Models/AddBasketItemRequest.cs → src/Aggregators/Mobile.Shopping.HttpAggregator/Models/AddBasketItemRequest.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace PurchaseBff.Models namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
{ {
public class AddBasketItemRequest public class AddBasketItemRequest
{ {

2
src/BFFs/PurchaseBff/Models/BasketData.cs → src/Aggregators/Mobile.Shopping.HttpAggregator/Models/BasketData.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace PurchaseBff.Models namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
{ {
public class BasketData public class BasketData
{ {

2
src/BFFs/PurchaseBff/Models/CatalogItem.cs → src/Aggregators/Mobile.Shopping.HttpAggregator/Models/CatalogItem.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace PurchaseBff.Models namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
{ {
public class CatalogItem public class CatalogItem
{ {

2
src/BFFs/PurchaseBff/Models/OrderData.cs → src/Aggregators/Mobile.Shopping.HttpAggregator/Models/OrderData.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace PurchaseBff.Models namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
{ {
public class OrderData public class OrderData
{ {

2
src/BFFs/PurchaseBff/Models/OrderItemData.cs → src/Aggregators/Mobile.Shopping.HttpAggregator/Models/OrderItemData.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace PurchaseBff.Models namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
{ {
public class OrderItemData public class OrderItemData
{ {

2
src/BFFs/PurchaseBff/Models/UpdateBasketItemsRequest.cs → src/Aggregators/Mobile.Shopping.HttpAggregator/Models/UpdateBasketItemsRequest.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace PurchaseBff.Models namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
{ {
public class UpdateBasketItemsRequest public class UpdateBasketItemsRequest
{ {

2
src/BFFs/PurchaseBff/Models/UpdateBasketRequest.cs → src/Aggregators/Mobile.Shopping.HttpAggregator/Models/UpdateBasketRequest.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace PurchaseBff.Models namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
{ {
public class UpdateBasketRequest public class UpdateBasketRequest
{ {

2
src/BFFs/PurchaseBff/Program.cs → src/Aggregators/Mobile.Shopping.HttpAggregator/Program.cs
View File

@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace PurchaseBff namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator
{ {
public class Program public class Program
{ {

0
src/BFFs/PurchaseBff/Properties/launchSettings.json → src/Aggregators/Mobile.Shopping.HttpAggregator/Properties/launchSettings.json
View File

6
src/BFFs/PurchaseBff/Services/BasketService.cs → src/Aggregators/Mobile.Shopping.HttpAggregator/Services/BasketService.cs
View File

@ -8,10 +8,10 @@ using Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using Newtonsoft.Json; using Newtonsoft.Json;
using PurchaseBff.Config; using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Config;
using PurchaseBff.Models; using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models;
namespace PurchaseBff.Services namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services
{ {
public class BasketService : IBasketService public class BasketService : IBasketService
{ {

6
src/BFFs/PurchaseBff/Services/CatalogService.cs → src/Aggregators/Mobile.Shopping.HttpAggregator/Services/CatalogService.cs
View File

@ -6,10 +6,10 @@ using Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using Newtonsoft.Json; using Newtonsoft.Json;
using PurchaseBff.Config; using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Config;
using PurchaseBff.Models; using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models;
namespace PurchaseBff.Services namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services
{ {
public class CatalogService : ICatalogService public class CatalogService : ICatalogService
{ {

4
src/BFFs/PurchaseBff/Services/IBasketService.cs → src/Aggregators/Mobile.Shopping.HttpAggregator/Services/IBasketService.cs
View File

@ -1,10 +1,10 @@
using PurchaseBff.Models; using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace PurchaseBff.Services namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services
{ {
public interface IBasketService public interface IBasketService
{ {

4
src/BFFs/PurchaseBff/Services/ICatalogService.cs → src/Aggregators/Mobile.Shopping.HttpAggregator/Services/ICatalogService.cs
View File

@ -1,10 +1,10 @@
using PurchaseBff.Models; using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace PurchaseBff.Services namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services
{ {
public interface ICatalogService public interface ICatalogService
{ {

4
src/BFFs/PurchaseBff/Services/IOrderApiClient.cs → src/Aggregators/Mobile.Shopping.HttpAggregator/Services/IOrderApiClient.cs
View File

@ -1,10 +1,10 @@
using PurchaseBff.Models; using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace PurchaseBff.Services namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services
{ {
public interface IOrderApiClient public interface IOrderApiClient
{ {

6
src/BFFs/PurchaseBff/Services/OrderApiClient.cs → src/Aggregators/Mobile.Shopping.HttpAggregator/Services/OrderApiClient.cs
View File

@ -6,10 +6,10 @@ using Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using Newtonsoft.Json; using Newtonsoft.Json;
using PurchaseBff.Config; using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Config;
using PurchaseBff.Models; using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models;
namespace PurchaseBff.Services namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services
{ {
public class OrderApiClient : IOrderApiClient public class OrderApiClient : IOrderApiClient
{ {

14
src/BFFs/PurchaseBff/Startup.cs → src/Aggregators/Mobile.Shopping.HttpAggregator/Startup.cs
View File

@ -12,12 +12,12 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using PurchaseBff.Config; using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Config;
using PurchaseBff.Filters.Basket.API.Infrastructure.Filters; using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Filters.Basket.API.Infrastructure.Filters;
using PurchaseBff.Services; using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services;
using Swashbuckle.AspNetCore.Swagger; using Swashbuckle.AspNetCore.Swagger;
namespace PurchaseBff namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator
{ {
public class Startup public class Startup
{ {
@ -61,7 +61,7 @@ namespace PurchaseBff
TokenUrl = $"{Configuration.GetValue<string>("IdentityUrlExternal")}/connect/token", TokenUrl = $"{Configuration.GetValue<string>("IdentityUrlExternal")}/connect/token",
Scopes = new Dictionary<string, string>() Scopes = new Dictionary<string, string>()
{ {
{ "purchasebff", "Purchase BFF API Gateway" } { "mobileshoppingagg", "Purchase BFF API Gateway" }
} }
}); });
@ -89,7 +89,7 @@ namespace PurchaseBff
{ {
options.Authority = identityUrl; options.Authority = identityUrl;
options.RequireHttpsMetadata = false; options.RequireHttpsMetadata = false;
options.Audience = "purchasebff"; options.Audience = "mobileshoppingagg";
options.Events = new JwtBearerEvents() options.Events = new JwtBearerEvents()
{ {
OnAuthenticationFailed = async ctx => OnAuthenticationFailed = async ctx =>
@ -129,7 +129,7 @@ namespace PurchaseBff
app.UseSwagger().UseSwaggerUI(c => app.UseSwagger().UseSwaggerUI(c =>
{ {
c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "Purchase BFF V1"); 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");
}); });

0
src/BFFs/PurchaseBff/appsettings.json → src/Aggregators/Mobile.Shopping.HttpAggregator/appsettings.json
View File

0
src/BFFs/PurchaseBff/appsettings.localhost.json → src/Aggregators/Mobile.Shopping.HttpAggregator/appsettings.localhost.json
View File

2
src/Apigw/OcelotApiGw/Startup.cs
View File

@ -45,7 +45,7 @@ namespace OcelotApiGw
x.RequireHttpsMetadata = false; x.RequireHttpsMetadata = false;
x.TokenValidationParameters = new Microsoft.IdentityModel.Tokens.TokenValidationParameters() 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() x.Events = new Microsoft.AspNetCore.Authentication.JwtBearer.JwtBearerEvents()
{ {

10
src/Apigw/OcelotApiGw/configuration/configuration.json
View File

@ -9,7 +9,7 @@
"Port": 80 "Port": 80
} }
], ],
"UpstreamPathTemplate": "/purchase-bff/api/{version}/c/{everything}", "UpstreamPathTemplate": "/shopping/api/{version}/c/{everything}",
"UpstreamHttpMethod": [ "GET" ] "UpstreamHttpMethod": [ "GET" ]
}, },
{ {
@ -21,7 +21,7 @@
"Port": 80 "Port": 80
} }
], ],
"UpstreamPathTemplate": "/purchase-bff/api/{version}/b/{everything}", "UpstreamPathTemplate": "/shopping/api/{version}/b/{everything}",
"UpstreamHttpMethod": [], "UpstreamHttpMethod": [],
"AuthenticationOptions": { "AuthenticationOptions": {
"AuthenticationProviderKey": "IdentityApiKey", "AuthenticationProviderKey": "IdentityApiKey",
@ -37,7 +37,7 @@
"Port": 80 "Port": 80
} }
], ],
"UpstreamPathTemplate": "/purchase-bff/api/{version}/o/{everything}", "UpstreamPathTemplate": "/shopping/api/{version}/o/{everything}",
"UpstreamHttpMethod": [], "UpstreamHttpMethod": [],
"AuthenticationOptions": { "AuthenticationOptions": {
"AuthenticationProviderKey": "IdentityApiKey", "AuthenticationProviderKey": "IdentityApiKey",
@ -49,11 +49,11 @@
"DownstreamScheme": "http", "DownstreamScheme": "http",
"DownstreamHostAndPorts": [ "DownstreamHostAndPorts": [
{ {
"Host": "purchasebff", "Host": "mobileshoppingagg",
"Port": 80 "Port": 80
} }
], ],
"UpstreamPathTemplate": "/purchase-bff/{everything}", "UpstreamPathTemplate": "/shopping/{everything}",
"UpstreamHttpMethod": [ "POST", "PUT", "GET" ], "UpstreamHttpMethod": [ "POST", "PUT", "GET" ],
"AuthenticationOptions": { "AuthenticationOptions": {
"AuthenticationProviderKey": "IdentityApiKey", "AuthenticationProviderKey": "IdentityApiKey",

2
src/Services/Basket/Basket.API/Properties/launchSettings.json
View File

@ -3,7 +3,7 @@
"windowsAuthentication": false, "windowsAuthentication": false,
"anonymousAuthentication": true, "anonymousAuthentication": true,
"iisExpress": { "iisExpress": {
"applicationUrl": "http://localhost:53998/", "applicationUrl": "http://localhost:58017/",
"sslPort": 0 "sslPort": 0
} }
}, },

20
src/Services/Identity/Identity.API/Configuration/Config.cs
View File

@ -15,7 +15,7 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Configuration
new ApiResource("basket", "Basket Service"), new ApiResource("basket", "Basket Service"),
new ApiResource("marketing", "Marketing Service"), new ApiResource("marketing", "Marketing Service"),
new ApiResource("locations", "Locations 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", "basket",
"locations", "locations",
"marketing", "marketing",
"purchasebff" "mobileshoppingagg"
} }
}, },
new Client new Client
@ -81,7 +81,7 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Configuration
"basket", "basket",
"locations", "locations",
"marketing", "marketing",
"purchasebff" "mobileshoppingagg"
}, },
//Allow requesting refresh tokens for long lived API access //Allow requesting refresh tokens for long lived API access
AllowOfflineAccess = true, AllowOfflineAccess = true,
@ -118,7 +118,7 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Configuration
"basket", "basket",
"locations", "locations",
"marketing", "marketing",
"purchasebff" "mobileshoppingagg"
}, },
}, },
new Client new Client
@ -151,7 +151,7 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Configuration
"basket", "basket",
"locations", "locations",
"marketing", "marketing",
"purchasebff" "mobileshoppingagg"
}, },
}, },
new Client new Client
@ -216,17 +216,17 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Configuration
}, },
new Client new Client
{ {
ClientId = "purchasebffwaggerui", ClientId = "mobileshoppingaggswaggerui",
ClientName = "Purchase BFF Swagger UI", ClientName = "Mobile Shopping Aggregattor Swagger UI",
AllowedGrantTypes = GrantTypes.Implicit, AllowedGrantTypes = GrantTypes.Implicit,
AllowAccessTokensViaBrowser = true, AllowAccessTokensViaBrowser = true,
RedirectUris = { $"{clientsUrl["PurchaseBFF"]}/swagger/o2c.html" }, RedirectUris = { $"{clientsUrl["MobileShoppingAgg"]}/swagger/o2c.html" },
PostLogoutRedirectUris = { $"{clientsUrl["PurchaseBFF"]}/swagger/" }, PostLogoutRedirectUris = { $"{clientsUrl["MobileShoppingAgg"]}/swagger/" },
AllowedScopes = AllowedScopes =
{ {
"purchasebff" "mobileshoppingagg"
} }
} }

2
src/Services/Identity/Identity.API/Data/ConfigurationDbContextSeed.cs
View File

@ -23,7 +23,7 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Data
clientUrls.Add("MarketingApi", configuration.GetValue<string>("MarketingApiClient")); clientUrls.Add("MarketingApi", configuration.GetValue<string>("MarketingApiClient"));
clientUrls.Add("BasketApi", configuration.GetValue<string>("BasketApiClient")); clientUrls.Add("BasketApi", configuration.GetValue<string>("BasketApiClient"));
clientUrls.Add("OrderingApi", configuration.GetValue<string>("OrderingApiClient")); clientUrls.Add("OrderingApi", configuration.GetValue<string>("OrderingApiClient"));
clientUrls.Add("PurchaseBFF", configuration.GetValue<string>("PurchaseBFFClient")); clientUrls.Add("MobileShoppingAgg", configuration.GetValue<string>("MobileShoppingAggClient"));
if (!context.Clients.Any()) if (!context.Clients.Any())
{ {

2
src/Web/WebMVC/Controllers/TestController.cs
View File

@ -32,7 +32,7 @@ namespace WebMVC.Controllers
public async Task<IActionResult> Ocelot() public async Task<IActionResult> Ocelot()
{ {
var url = "http://apigw/purchase-bff/api/v1/basket/items"; var url = "http://apigw/shopping/api/v1/basket/items";
var payload = new TestPayload() var payload = new TestPayload()
{ {
CatalogItemId = 1, CatalogItemId = 1,

2
src/Web/WebMVC/Startup.cs
View File

@ -130,7 +130,7 @@ namespace Microsoft.eShopOnContainers.WebMVC
options.Scope.Add("basket"); options.Scope.Add("basket");
options.Scope.Add("marketing"); options.Scope.Add("marketing");
options.Scope.Add("locations"); options.Scope.Add("locations");
options.Scope.Add("purchasebff"); options.Scope.Add("mobileshoppingagg");
}); });
} }

6
src/Web/WebSPA/Client/modules/basket/basket.service.ts
View File

@ -66,7 +66,7 @@ export class BasketService {
} }
setBasket(basket): Observable<boolean> { setBasket(basket): Observable<boolean> {
let url = this.purchaseUrl + '/purchase-bff/api/v1/basket/'; let url = this.purchaseUrl + '/shopping/api/v1/basket/';
this.basket = basket; this.basket = basket;
return this.service.post(url, basket).map((response: Response) => { return this.service.post(url, basket).map((response: Response) => {
return true; return true;
@ -74,7 +74,7 @@ export class BasketService {
} }
setBasketCheckout(basketCheckout): Observable<boolean> { setBasketCheckout(basketCheckout): Observable<boolean> {
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) => { return this.service.postWithId(url, basketCheckout).map((response: Response) => {
this.basketEvents.orderCreated(); this.basketEvents.orderCreated();
return true; return true;
@ -82,7 +82,7 @@ export class BasketService {
} }
getBasket(): Observable<IBasket> { getBasket(): Observable<IBasket> {
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) => { return this.service.get(url).map((response: Response) => {
if (response.status === 204) { if (response.status === 204) {
return null; return null;

6
src/Web/WebSPA/Client/modules/catalog/catalog.service.ts
View File

@ -21,9 +21,9 @@ export class CatalogService {
constructor(private service: DataService, private configurationService: ConfigurationService) { constructor(private service: DataService, private configurationService: ConfigurationService) {
this.configurationService.settingsLoaded$.subscribe(x => { this.configurationService.settingsLoaded$.subscribe(x => {
this.catalogUrl = this.configurationService.serverSettings.purchaseUrl + '/purchase-bff/api/v1/c/catalog/items'; this.catalogUrl = this.configurationService.serverSettings.purchaseUrl + '/shopping/api/v1/c/catalog/items';
this.brandUrl = this.configurationService.serverSettings.purchaseUrl + '/purchase-bff/api/v1/c/catalog/catalogbrands'; this.brandUrl = this.configurationService.serverSettings.purchaseUrl + '/shopping/api/v1/c/catalog/catalogbrands';
this.typesUrl = this.configurationService.serverSettings.purchaseUrl + '/purchase-bff/api/v1/c/catalog/catalogtypes'; this.typesUrl = this.configurationService.serverSettings.purchaseUrl + '/shopping/api/v1/c/catalog/catalogtypes';
}); });
} }

4
src/Web/WebSPA/Client/modules/orders/orders.service.ts
View File

@ -29,7 +29,7 @@ export class OrdersService {
} }
getOrders(): Observable<IOrder[]> { getOrders(): Observable<IOrder[]> {
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 this.service.get(url).map((response: Response) => {
return response.json(); return response.json();
@ -37,7 +37,7 @@ export class OrdersService {
} }
getOrder(id: number): Observable<IOrderDetail> { getOrder(id: number): Observable<IOrderDetail> {
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 this.service.get(url).map((response: Response) => {
return response.json(); return response.json();

2
src/Web/WebSPA/Client/modules/shared/services/security.service.ts
View File

@ -82,7 +82,7 @@ export class SecurityService {
let client_id = 'js'; let client_id = 'js';
let redirect_uri = location.origin + '/'; let redirect_uri = location.origin + '/';
let response_type = 'id_token token'; 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 nonce = 'N' + Math.random() + '' + Date.now();
let state = Date.now() + '' + Math.random(); let state = Date.now() + '' + Math.random();

2
src/Web/WebSPA/Properties/launchSettings.json
View File

@ -3,7 +3,7 @@
"windowsAuthentication": false, "windowsAuthentication": false,
"anonymousAuthentication": true, "anonymousAuthentication": true,
"iisExpress": { "iisExpress": {
"applicationUrl": "http://localhost:64923/", "applicationUrl": "http://localhost:58018/",
"sslPort": 0 "sslPort": 0
} }
}, },