diff --git a/src/Services/Basket/Basket.API/Basket.API.csproj b/src/Services/Basket/Basket.API/Basket.API.csproj
index 57a807d3a..584838c8f 100644
--- a/src/Services/Basket/Basket.API/Basket.API.csproj
+++ b/src/Services/Basket/Basket.API/Basket.API.csproj
@@ -20,16 +20,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Services/Catalog/Catalog.API/Catalog.API.csproj b/src/Services/Catalog/Catalog.API/Catalog.API.csproj
index 62816baf3..4c1edfa22 100644
--- a/src/Services/Catalog/Catalog.API/Catalog.API.csproj
+++ b/src/Services/Catalog/Catalog.API/Catalog.API.csproj
@@ -33,24 +33,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Services/GracePeriod/GracePeriodManager/GracePeriodManager.csproj b/src/Services/GracePeriod/GracePeriodManager/GracePeriodManager.csproj
index 567b61662..c376e88f6 100644
--- a/src/Services/GracePeriod/GracePeriodManager/GracePeriodManager.csproj
+++ b/src/Services/GracePeriod/GracePeriodManager/GracePeriodManager.csproj
@@ -8,15 +8,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/Services/Location/Locations.API/Locations.API.csproj b/src/Services/Location/Locations.API/Locations.API.csproj
index ca1f68f2a..3a53ee826 100644
--- a/src/Services/Location/Locations.API/Locations.API.csproj
+++ b/src/Services/Location/Locations.API/Locations.API.csproj
@@ -13,24 +13,25 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/src/Services/Marketing/Marketing.API/Marketing.API.csproj b/src/Services/Marketing/Marketing.API/Marketing.API.csproj
index 703f82bc6..71adef034 100644
--- a/src/Services/Marketing/Marketing.API/Marketing.API.csproj
+++ b/src/Services/Marketing/Marketing.API/Marketing.API.csproj
@@ -19,27 +19,27 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Services/Ordering/Ordering.API/Ordering.API.csproj b/src/Services/Ordering/Ordering.API/Ordering.API.csproj
index 3f6ce21d4..047579f6d 100644
--- a/src/Services/Ordering/Ordering.API/Ordering.API.csproj
+++ b/src/Services/Ordering/Ordering.API/Ordering.API.csproj
@@ -36,24 +36,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj b/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj
index f37446084..fdd0bfa53 100644
--- a/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj
+++ b/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj
@@ -15,9 +15,9 @@
-
-
-
+
+
+
diff --git a/src/Services/Payment/Payment.API/Payment.API.csproj b/src/Services/Payment/Payment.API/Payment.API.csproj
index 9b1442c8e..46f2d81b9 100644
--- a/src/Services/Payment/Payment.API/Payment.API.csproj
+++ b/src/Services/Payment/Payment.API/Payment.API.csproj
@@ -12,14 +12,14 @@
-
-
-
-
-
+
+
+
+
+
-
-
+
+
diff --git a/src/Web/WebMVC/Startup.cs b/src/Web/WebMVC/Startup.cs
index 0a9bd99e2..315be8973 100644
--- a/src/Web/WebMVC/Startup.cs
+++ b/src/Web/WebMVC/Startup.cs
@@ -83,26 +83,28 @@ namespace Microsoft.eShopOnContainers.WebMVC
var useLoadTest = Configuration.GetValue("UseLoadTest");
var identityUrl = Configuration.GetValue("IdentityUrl");
var callBackUrl = Configuration.GetValue("CallBackUrl");
- // Add Authentication services
- services.AddCookieAuthentication(CookieAuthenticationDefaults.AuthenticationScheme);
- services.AddOpenIdConnectAuthentication(OpenIdConnectDefaults.AuthenticationScheme, options =>
- {
- options.SignInScheme = CookieAuthenticationDefaults.AuthenticationScheme;
- options.Authority = identityUrl.ToString();
- options.PostLogoutRedirectUri = callBackUrl.ToString();
- options.ClientId = useLoadTest ? "mvctest" : "mvc";
- options.ClientSecret = "secret";
- options.ResponseType = useLoadTest ? "code id_token token" : "code id_token";
- options.SaveTokens = true;
- options.GetClaimsFromUserInfoEndpoint = true;
- options.RequireHttpsMetadata = false;
- options.Scope.Add("openid");
- options.Scope.Add("profile");
- options.Scope.Add("orders");
- options.Scope.Add("basket");
- options.Scope.Add("marketing");
- options.Scope.Add("locations");
- });
+
+ // Add Authentication services
+
+ services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
+ .AddCookie(CookieAuthenticationDefaults.AuthenticationScheme)
+ .AddOpenIdConnect(options => {
+ options.SignInScheme = CookieAuthenticationDefaults.AuthenticationScheme;
+ options.Authority = identityUrl.ToString();
+ options.SignedOutRedirectUri = callBackUrl.ToString();
+ options.ClientId = useLoadTest ? "mvctest" : "mvc";
+ options.ClientSecret = "secret";
+ options.ResponseType = useLoadTest ? "code id_token token" : "code id_token";
+ options.SaveTokens = true;
+ options.GetClaimsFromUserInfoEndpoint = true;
+ options.RequireHttpsMetadata = false;
+ options.Scope.Add("openid");
+ options.Scope.Add("profile");
+ options.Scope.Add("orders");
+ options.Scope.Add("basket");
+ options.Scope.Add("marketing");
+ options.Scope.Add("locations");
+ });
services.AddAuthentication(options => {
options.DefaultChallengeScheme = OpenIdConnectDefaults.AuthenticationScheme;
diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj
index ddd35c889..e6e11cb99 100644
--- a/src/Web/WebMVC/WebMVC.csproj
+++ b/src/Web/WebMVC/WebMVC.csproj
@@ -36,26 +36,27 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
diff --git a/src/Web/WebSPA/WebSPA.csproj b/src/Web/WebSPA/WebSPA.csproj
index ca26a394b..1e3b2630a 100644
--- a/src/Web/WebSPA/WebSPA.csproj
+++ b/src/Web/WebSPA/WebSPA.csproj
@@ -28,26 +28,26 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Web/WebStatus/WebStatus.csproj b/src/Web/WebStatus/WebStatus.csproj
index 56c5766f5..7939b146a 100644
--- a/src/Web/WebStatus/WebStatus.csproj
+++ b/src/Web/WebStatus/WebStatus.csproj
@@ -5,11 +5,10 @@
..\..\..\docker-compose.dcproj
-
-
+
-
+