Image added (#434)

* Image added

* ImageMaximumBytes

* FileController remove Authorized

* ApplicationCore.Constants.AuthorizationConstants.AUTH_KEY

* SavePicture in the interface.

* IFileSystem in Core

* WebFileSystem in Infrastructure

* PictureUri removed from UpdateCatalogItemRequest

* Modal scroll fix

src/PublicApi/CatalogItemEndpoints/Create.CreateCatalogItemRequest.cs

@@ -7,6 +7,8 @@
         public string Description { get; set; }
         public string Name { get; set; }
         public string PictureUri { get; set; }
+        public string PictureBase64 { get; set; }
+        public string PictureName { get; set; }
         public decimal Price { get; set; }
     }
 

src/PublicApi/CatalogItemEndpoints/Create.cs

@@ -1,4 +1,6 @@
-using Ardalis.ApiEndpoints;
+using System;
+using System.IO;
+using Ardalis.ApiEndpoints;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -16,11 +18,13 @@ namespace Microsoft.eShopWeb.PublicApi.CatalogItemEndpoints
     {
         private readonly IAsyncRepository<CatalogItem> _itemRepository;
         private readonly IUriComposer _uriComposer;
+        private readonly IFileSystem _webFileSystem;
 
-        public Create(IAsyncRepository<CatalogItem> itemRepository, IUriComposer uriComposer)
+        public Create(IAsyncRepository<CatalogItem> itemRepository, IUriComposer uriComposer, IFileSystem webFileSystem)
         {
             _itemRepository = itemRepository;
             _uriComposer = uriComposer;
+            _webFileSystem = webFileSystem;
         }
 
         [HttpPost("api/catalog-items")]
@@ -34,10 +38,20 @@ namespace Microsoft.eShopWeb.PublicApi.CatalogItemEndpoints
         {
             var response = new CreateCatalogItemResponse(request.CorrelationId());
 
-            CatalogItem newItem = new CatalogItem(request.CatalogTypeId, request.CatalogBrandId, request.Description, request.Name, request.Price, request.PictureUri);
+            var newItem = new CatalogItem(request.CatalogTypeId, request.CatalogBrandId, request.Description, request.Name, request.Price, request.PictureUri);
 
             newItem = await _itemRepository.AddAsync(newItem);
 
+            if (newItem.Id != 0)
+            {
+                var picName = $"{newItem.Id}{Path.GetExtension(request.PictureName)}";
+                if (await _webFileSystem.SavePicture(picName, request.PictureBase64))
+                {
+                    newItem.UpdatePictureUri(picName);
+                    await _itemRepository.UpdateAsync(newItem);
+                }
+            }
+
             var dto = new CatalogItemDto
             {
                 Id = newItem.Id,
@@ -51,5 +65,7 @@ namespace Microsoft.eShopWeb.PublicApi.CatalogItemEndpoints
             response.CatalogItem = dto;
             return response;
         }
+
+        
     }
 }

src/PublicApi/CatalogItemEndpoints/Update.UpdateCatalogItemRequest.cs

@@ -14,7 +14,8 @@ namespace Microsoft.eShopWeb.PublicApi.CatalogItemEndpoints
         public string Description { get; set; }
         [Required]
         public string Name { get; set; }
-        public string PictureUri { get; set; }
+        public string PictureBase64 { get; set; }
+        public string PictureName { get; set; }
         [Range(0.01, 10000)]
         public decimal Price { get; set; }
     }

src/PublicApi/CatalogItemEndpoints/Update.cs

@@ -2,12 +2,10 @@
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.eShopWeb.ApplicationCore.Constants;
 using Microsoft.eShopWeb.ApplicationCore.Entities;
-using Microsoft.eShopWeb.ApplicationCore.Exceptions;
 using Microsoft.eShopWeb.ApplicationCore.Interfaces;
 using Swashbuckle.AspNetCore.Annotations;
-using System;
+using System.IO;
 using System.Threading.Tasks;
 
 namespace Microsoft.eShopWeb.PublicApi.CatalogItemEndpoints
@@ -17,11 +15,13 @@ namespace Microsoft.eShopWeb.PublicApi.CatalogItemEndpoints
     {
         private readonly IAsyncRepository<CatalogItem> _itemRepository;
         private readonly IUriComposer _uriComposer;
+        private readonly IFileSystem _webFileSystem;
 
-        public Update(IAsyncRepository<CatalogItem> itemRepository, IUriComposer uriComposer)
+        public Update(IAsyncRepository<CatalogItem> itemRepository, IUriComposer uriComposer, IFileSystem webFileSystem)
         {
             _itemRepository = itemRepository;
             _uriComposer = uriComposer;
+            _webFileSystem = webFileSystem;
 
         }
 
@@ -42,6 +42,19 @@ namespace Microsoft.eShopWeb.PublicApi.CatalogItemEndpoints
             existingItem.UpdateBrand(request.CatalogBrandId);
             existingItem.UpdateType(request.CatalogTypeId);
 
+            if (string.IsNullOrEmpty(request.PictureBase64))
+            {
+                existingItem.UpdatePictureUri(string.Empty);
+            }
+            else
+            {
+                var picName = $"{existingItem.Id}{Path.GetExtension(request.PictureName)}";
+                if (await _webFileSystem.SavePicture($"{picName}", request.PictureBase64))
+                {
+                    existingItem.UpdatePictureUri(picName);
+                }
+            }
+
             await _itemRepository.UpdateAsync(existingItem);
 
             var dto = new CatalogItemDto

src/PublicApi/ImageValidators.cs

@@ -0,0 +1,25 @@
+using System;
+using System.IO;
+
+namespace Microsoft.eShopWeb.PublicApi
+{
+    public static class ImageValidators
+    {
+        private const int ImageMaximumBytes = 512000;
+
+        public static bool IsValidImage(this byte[] postedFile, string fileName)
+        {
+            return postedFile != null && postedFile.Length > 0 && postedFile.Length <= ImageMaximumBytes && IsExtensionValid(fileName);
+        }
+
+        private static bool IsExtensionValid(string fileName)
+        {
+            var extension = Path.GetExtension(fileName);
+
+            return string.Equals(extension, ".jpg", StringComparison.OrdinalIgnoreCase) || 
+                   string.Equals(extension, ".png", StringComparison.OrdinalIgnoreCase) || 
+                   string.Equals(extension, ".gif", StringComparison.OrdinalIgnoreCase) || 
+                   string.Equals(extension, ".jpeg", StringComparison.OrdinalIgnoreCase);
+        }
+    }
+}

src/PublicApi/PublicApi.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>

src/PublicApi/Startup.cs

@@ -15,6 +15,7 @@ using Microsoft.eShopWeb.ApplicationCore.Services;
 using Microsoft.eShopWeb.Infrastructure.Data;
 using Microsoft.eShopWeb.Infrastructure.Identity;
 using Microsoft.eShopWeb.Infrastructure.Logging;
+using Microsoft.eShopWeb.Infrastructure.Services;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -88,6 +89,7 @@ namespace Microsoft.eShopWeb.PublicApi
             services.AddSingleton<IUriComposer>(new UriComposer(Configuration.Get<CatalogSettings>()));
             services.AddScoped(typeof(IAppLogger<>), typeof(LoggerAdapter<>));
             services.AddScoped<ITokenClaimsService, IdentityTokenClaimService>();
+            services.AddScoped<IFileSystem, WebFileSystem>(x => new WebFileSystem($"{Constants.GetWebUrlInternal(Startup.InDocker)}File"));
 
             services.AddMemoryCache();