Merge remote-tracking branch 'origin/main' into main

microsoft · Jul 23, 2020 · 82644e1 · 82644e1
2 parents bc7118e + c189ffc
commit 82644e1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/src/adminTools/adminBlazorWebsite/src/Data/UrlShortenerService.cs b/src/adminTools/adminBlazorWebsite/src/Data/UrlShortenerService.cs
@@ -116,7 +116,7 @@ public async Task<ShortUrlEntity> ArchiveShortUrl(ShortUrlEntity archivedUrl)
             CancellationToken cancellationToken;
 
             using (var client = new HttpClient())
-            using (var request = new HttpRequestMessage(HttpMethod.Delete, url))
+            using (var request = new HttpRequestMessage(HttpMethod.Post, url))
             using (var httpContent = CreateHttpContent(archivedUrl))
             {
                 request.Content = httpContent;

diff --git a/src/shortenerTools/UrlShortener/UrlShortener.cs b/src/shortenerTools/UrlShortener/UrlShortener.cs
@@ -56,6 +56,13 @@ public static async Task<HttpResponseMessage> Run(
                 return req.CreateResponse(HttpStatusCode.NotFound);
             }
 
+
+            // If the Url parameter only contains whitespaces or is empty return with BadRequest.
+            if (string.IsNullOrWhiteSpace(input.Url))
+            {
+                return req.CreateErrorResponse(HttpStatusCode.BadRequest, "The url parameter can not be empty.");
+            }
+
             // Validates if input.url is a valid aboslute url, aka is a complete refrence to the resource, ex: http(s)://google.com
             if (!Uri.IsWellFormedUriString(input.Url, UriKind.Absolute))
             {

diff --git a/src/shortenerTools/UrlUpdate/UrlUpdate.cs b/src/shortenerTools/UrlUpdate/UrlUpdate.cs
@@ -62,6 +62,13 @@ public static async Task<HttpResponseMessage> Run(
                 return req.CreateResponse(HttpStatusCode.NotFound);
             }
 
+
+            // If the Url parameter only contains whitespaces or is empty return with BadRequest.
+            if (string.IsNullOrWhiteSpace(input.Url))
+            {
+                return req.CreateErrorResponse(HttpStatusCode.BadRequest, "The url parameter can not be empty.");
+            }
+
             // Validates if input.url is a valid aboslute url, aka is a complete refrence to the resource, ex: http(s)://google.com
             if (!Uri.IsWellFormedUriString(input.Url, UriKind.Absolute))
             {