Updates to v12

Author: mhopkins-msft

ImageResizeWebApp/ImageResizeWebApp/Controllers/ImagesController.cs

@@ -29,17 +29,13 @@ public async Task<IActionResult> Upload(ICollection<IFormFile> files)
 
             try
             {
-
                 if (files.Count == 0)
-
                     return BadRequest("No files received from the upload");
 
                 if (storageConfig.AccountKey == string.Empty || storageConfig.AccountName == string.Empty)
-
                     return BadRequest("sorry, can't retrieve your azure storage details from appsettings.js, make sure that you add azure storage details there");
 
                 if (storageConfig.ImageContainer == string.Empty)
-
                     return BadRequest("Please provide a name for your image container in the azure blob storage");
 
                 foreach (var formFile in files)
@@ -63,18 +59,12 @@ public async Task<IActionResult> Upload(ICollection<IFormFile> files)
                 if (isUploaded)
                 {
                     if (storageConfig.ThumbnailContainer != string.Empty)
-
                         return new AcceptedAtActionResult("GetThumbNails", "Images", null, null);
-
                     else
-
                         return new AcceptedResult();
                 }
                 else
-
                     return BadRequest("Look like the image couldnt upload to the storage");
-
-
             }
             catch (Exception ex)
             {
@@ -86,28 +76,21 @@ public async Task<IActionResult> Upload(ICollection<IFormFile> files)
         [HttpGet("thumbnails")]
         public async Task<IActionResult> GetThumbNails()
         {
-
             try
             {
                 if (storageConfig.AccountKey == string.Empty || storageConfig.AccountName == string.Empty)
-
-                    return BadRequest("sorry, can't retrieve your azure storage details from appsettings.js, make sure that you add azure storage details there");
+                    return BadRequest("Sorry, can't retrieve your Azure storage details from appsettings.js, make sure that you add Azure storage details there.");
 
                 if (storageConfig.ImageContainer == string.Empty)
-
-                    return BadRequest("Please provide a name for your image container in the azure blob storage");
+                    return BadRequest("Please provide a name for your image container in Azure blob storage.");
 
                 List<string> thumbnailUrls = await StorageHelper.GetThumbNailUrls(storageConfig);
-
-                return new ObjectResult(thumbnailUrls);
-            
+                return new ObjectResult(thumbnailUrls);            
             }
             catch (Exception ex)
             {
                 return BadRequest(ex.Message);
             }
-
         }
-
     }
 }

ImageResizeWebApp/ImageResizeWebApp/Helpers/StorageHelper.cs

@@ -1,14 +1,17 @@
 using ImageResizeWebApp.Models;
 using Microsoft.AspNetCore.Http;
+using Azure;
 using Azure.Storage;
 using Azure.Storage.Blobs;
+using Azure.Storage.Sas;
 
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Azure.Storage.Blobs.Models;
+using System.Diagnostics;
 
 namespace ImageResizeWebApp.Helpers
 {
@@ -31,15 +34,15 @@ public static async Task<bool> UploadFileToStorage(Stream fileStream, string fil
                                                             AzureStorageConfig _storageConfig)
         {
             // Create a URI to the blob
-            Uri blobUri = new Uri("https://" + 
-                                  _storageConfig.AccountName + 
-                                  ".blob.core.windows.net/" + 
-                                  _storageConfig.ImageContainer + 
+            Uri blobUri = new Uri("https://" +
+                                  _storageConfig.AccountName +
+                                  ".blob.core.windows.net/" +
+                                  _storageConfig.ImageContainer +
                                   "/" + fileName);
 
             // Create StorageSharedKeyCredentials object by reading
             // the values from the configuration (appsettings.json)
-            StorageSharedKeyCredential storageCredentials = 
+            StorageSharedKeyCredential storageCredentials =
                 new StorageSharedKeyCredential(_storageConfig.AccountName, _storageConfig.AccountKey);
 
             // Create the blob client.
@@ -64,9 +67,12 @@ public static async Task<List<string>> GetThumbNailUrls(AzureStorageConfig _stor
             // Get reference to the container
             BlobContainerClient container = blobServiceClient.GetBlobContainerClient(_storageConfig.ThumbnailContainer);
 
-            foreach (BlobItem blobItem in container.GetBlobs())
+            if (container.Exists())
             {
-                thumbnailUrls.Add(container.Uri + "/" + blobItem.Name);
+                foreach (BlobItem blobItem in container.GetBlobs())
+                {
+                    thumbnailUrls.Add(container.Uri + "/" + blobItem.Name);
+                }
             }
 
             return await Task.FromResult(thumbnailUrls);