Merge remote-tracking branch 'upstream/dev' into dev

src/Services/Ordering/Ordering.FunctionalTests/appsettings.json

@@ -1,11 +1,12 @@
 {
-  "ConnectionString": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;",
-  "ExternalCatalogBaseUrl": "http://localhost:5101",
-  "IdentityUrl": "http://localhost:5105",
-  "isTest": "true",
-  "EventBusConnection": "localhost",
   "CheckUpdateTime": "30000",
+  "ConnectionString": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;",
+  "EventBusConnection": "localhost",
+  "ExternalCatalogBaseUrl": "http://localhost:5101",
   "GracePeriodTime": "1",
+  "IdentityUrl": "http://localhost:5105",
+  "IdentityUrlExternal": "http://localhost:5105",
+  "isTest": "true",
   "SubscriptionClientName": "Ordering",
-  "SuppressCheckForUnhandledSecurityMetadata":true
+  "SuppressCheckForUnhandledSecurityMetadata": true
 }

src/Web/WebhookClient/Controllers/WebhooksReceivedController.cs

@@ -1,9 +1,6 @@
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using WebhookClient.Models;
@@ -19,7 +16,7 @@ namespace WebhookClient.Controllers
         private readonly Settings _settings;
         private readonly ILogger _logger;
         private readonly IHooksRepository _hooksRepository;
-        
+
         public WebhooksReceivedController(IOptions<Settings> settings, ILogger<WebhooksReceivedController> logger, IHooksRepository hooksRepository)
         {
             _settings = settings.Value;

src/Web/WebhookClient/HeaderNames.cs

@@ -1,9 +1,4 @@
-using System;
+namespace WebhookClient
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace WebhookClient
 {
     static class HeaderNames
     {

src/Web/WebhookClient/HttpClientAuthorizationDelegatingHandler.cs

@@ -1,8 +1,6 @@
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading;

src/Web/WebhookClient/Models/WebHookReceived.cs

@@ -1,13 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace WebhookClient.Models
 {
     public class WebHookReceived
     {
         public DateTime When { get; set; }
+        
         public string Data { get; set; }
 
         public string Token { get; set; }

src/Web/WebhookClient/Models/WebhookData.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace WebhookClient.Models
 {

src/Web/WebhookClient/Models/WebhookResponse.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace WebhookClient.Models
 {

src/Web/WebhookClient/Models/WebhookSubscriptionRequest.cs

@@ -1,9 +1,4 @@
-using System;
+namespace WebhookClient.Models
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace WebhookClient.Models
 {
     public class WebhookSubscriptionRequest
     {

src/Web/WebhookClient/Pages/Error.cshtml.cs

@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
+using System.Diagnostics;
 
 namespace WebhookClient.Pages
 {

src/Web/WebhookClient/Pages/Index.cshtml.cs

@@ -1,10 +1,6 @@
-using System;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
-using Microsoft.AspNetCore.Http;
 using WebhookClient.Models;
 using WebhookClient.Services;
 

src/Web/WebhookClient/Pages/Privacy.cshtml.cs

@@ -1,9 +1,4 @@
-using System;
+using Microsoft.AspNetCore.Mvc.RazorPages;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
 
 namespace WebhookClient.Pages
 {

src/Web/WebhookClient/Pages/RegisterWebhook.cshtml.cs

@@ -1,16 +1,12 @@
-using System;
+using Microsoft.AspNetCore.Authorization;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Formatting;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Formatting;
+using System.Threading.Tasks;
 using WebhookClient.Models;
 
 namespace WebhookClient.Pages

src/Web/WebhookClient/Pages/WebhooksList.cshtml.cs

@@ -1,9 +1,6 @@
-using System;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
 using WebhookClient.Models;
 using WebhookClient.Services;
 

src/Web/WebhookClient/Program.cs

@@ -1,12 +1,5 @@
-using System;
+using Microsoft.AspNetCore;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
 
 namespace WebhookClient
 {

src/Web/WebhookClient/Services/IHooksRepository.cs

@@ -1,6 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using WebhookClient.Models;
 

src/Web/WebhookClient/Services/IWebhooksClient.cs

@@ -1,6 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using WebhookClient.Models;
 

src/Web/WebhookClient/Services/InMemoryHooksRepository.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using WebhookClient.Models;

src/Web/WebhookClient/Services/WebhooksClient.cs

@@ -1,6 +1,5 @@
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
-using System;
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading.Tasks;

src/Web/WebhookClient/Settings.cs

@@ -1,9 +1,4 @@
-using System;
+namespace WebhookClient
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace WebhookClient
 {
     public class Settings
     {