Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

ARCH-001 Phase 25: consolidate Admin/Store PictureController (#826)

Krzysztof Pajaka1c414e80ca5
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BasePictureControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BasePictureControllerTests.cs
new file mode 100644
index 000000000..832787f87
--- /dev/null
+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BasePictureControllerTests.cs
@@ -0,0 +1,169 @@
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Interfaces.Storage;
+using Grand.Domain.Common;
+using Grand.Domain.Media;
+using Grand.Domain.Permissions;
+using Grand.Web.AdminShared.Controllers;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+
+namespace Grand.Web.Admin.Tests.Controllers;
+
+[TestClass]
+public class BasePictureControllerTests
+{
+ // Concrete subclass exists only to instantiate the abstract base for direct-call unit tests -
+ // same pattern as BaseTaxCategoryControllerTests/BaseEmailAccountControllerTests.
+ private class TestPictureController(
+ IPictureService pictureService,
+ IPermissionService permissionService,
+ IMediaFileStore mediaFileStore,
+ MediaSettings mediaSettings)
+ : BasePictureController(pictureService, permissionService, mediaFileStore, mediaSettings);
+
+ private Mock<IPictureService> _pictureServiceMock = null!;
+ private Mock<IPermissionService> _permissionServiceMock = null!;
+ private Mock<IMediaFileStore> _mediaFileStoreMock = null!;
+ private MediaSettings _mediaSettings = null!;
+
+ [TestInitialize]
+ public void Setup()
+ {
+ _pictureServiceMock = new Mock<IPictureService>();
+ _permissionServiceMock = new Mock<IPermissionService>();
+ _mediaFileStoreMock = new Mock<IMediaFileStore>();
+ _mediaSettings = new MediaSettings { AllowedFileTypes = ".jpg,.png" };
+ }
+
+ private TestPictureController CreateController()
+ {
+ return new TestPictureController(
+ _pictureServiceMock.Object,
+ _permissionServiceMock.Object,
+ _mediaFileStoreMock.Object,
+ _mediaSettings);
+ }
+
+ private static Mock<IFormFile> CreateFormFile(string fileName, string contentType = "image/jpeg")
+ {
+ var file = new Mock<IFormFile>();
+ file.Setup(f => f.FileName).Returns(fileName);
+ file.Setup(f => f.ContentType).Returns(contentType);
+ file.Setup(f => f.Length).Returns(1);
+ return file;
+ }
+
+ // The controller's anonymous JSON payloads are internal to Grand.Web.AdminShared - `dynamic`
+ // binding can't reach their properties across the assembly boundary, so read them via
+ // reflection, same pattern as BaseDiscountControllerTests/BaseMerchandiseReturnControllerTests.
+ private static T GetValue<T>(IActionResult result, string propertyName)
+ {
+ var value = ((JsonResult)result).Value!;
+ return (T)value.GetType().GetProperty(propertyName)!.GetValue(value)!;
+ }
+
+ [TestMethod]
+ public async Task AsyncUpload_NullFile_ReturnsFailureJson()
+ {
+ var controller = CreateController();
+
+ var result = await controller.AsyncUpload(null);
+
+ Assert.IsFalse(GetValue<bool>(result, "success"));
+ Assert.AreEqual("No file uploaded", GetValue<string>(result, "message"));
+ _pictureServiceMock.Verify(p => p.InsertPicture(It.IsAny<byte[]>(), It.IsAny<string>(), It.IsAny<string>(),
+ It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<Reference>(), It.IsAny<string>(),
+ It.IsAny<bool>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task AsyncUpload_ReferenceWithoutObjectId_ReturnsFailureJson()
+ {
+ var controller = CreateController();
+ var file = CreateFormFile("picture.jpg");
+
+ var result = await controller.AsyncUpload(file.Object, Reference.Product, "");
+
+ Assert.IsFalse(GetValue<bool>(result, "success"));
+ Assert.AreEqual("Please save form before upload new picture", GetValue<string>(result, "message"));
+ }
+
+ [TestMethod]
+ public async Task AsyncUpload_DisallowedFileType_ReturnsFailureJson()
+ {
+ var controller = CreateController();
+ var file = CreateFormFile("picture.exe");
+
+ var result = await controller.AsyncUpload(file.Object);
+
+ Assert.IsFalse(GetValue<bool>(result, "success"));
+ _pictureServiceMock.Verify(p => p.InsertPicture(It.IsAny<byte[]>(), It.IsAny<string>(), It.IsAny<string>(),
+ It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<Reference>(), It.IsAny<string>(),
+ It.IsAny<bool>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task AsyncUpload_AllowedFileType_InsertsPictureAndReturnsSuccessJson()
+ {
+ var controller = CreateController();
+ var file = CreateFormFile("picture.jpg");
+ using var fileStream = new MemoryStream([1, 2, 3]);
+ file.Setup(f => f.OpenReadStream()).Returns(fileStream);
+ var insertedPicture = new Picture { Id = "pic-1" };
+ _pictureServiceMock
+ .Setup(p => p.InsertPicture(It.IsAny<byte[]>(), "image/jpeg", null,
+ null, null, true, Reference.Product, "obj-1", false))
+ .ReturnsAsync(insertedPicture);
+ _pictureServiceMock
+ .Setup(p => p.GetPictureUrl(insertedPicture, 100, true, null))
+ .ReturnsAsync("/media/pic-1.jpg");
+
+ var result = await controller.AsyncUpload(file.Object, Reference.Product, "obj-1");
+
+ Assert.IsTrue(GetValue<bool>(result, "success"));
+ Assert.AreEqual("pic-1", GetValue<string>(result, "pictureId"));
+ Assert.AreEqual("/media/pic-1.jpg", GetValue<string>(result, "imageUrl"));
+ }
+
+ [TestMethod]
+ public async Task AsyncLogoUpload_PermissionDenied_ReturnsAccessDenied()
+ {
+ _permissionServiceMock.Setup(p => p.Authorize(StandardPermission.ManageSettings)).ReturnsAsync(false);
+ var controller = CreateController();
+ var file = CreateFormFile("logo.jpg");
+
+ var result = await controller.AsyncLogoUpload(file.Object);
+
+ var content = (ContentResult)result;
+ Assert.AreEqual("Access denied", content.Content);
+ _mediaFileStoreMock.Verify(m => m.GetFileInfo(It.IsAny<string>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task AsyncLogoUpload_NullFile_ReturnsFailureJson()
+ {
+ _permissionServiceMock.Setup(p => p.Authorize(StandardPermission.ManageSettings)).ReturnsAsync(true);
+ var controller = CreateController();
+
+ var result = await controller.AsyncLogoUpload(null);
+
+ Assert.IsFalse(GetValue<bool>(result, "success"));
+ Assert.AreEqual("No file uploaded", GetValue<string>(result, "message"));
+ }
+
+ [TestMethod]
+ public async Task AsyncLogoUpload_DisallowedFileType_ReturnsFailureJson()
+ {
+ _permissionServiceMock.Setup(p => p.Authorize(StandardPermission.ManageSettings)).ReturnsAsync(true);
+ var controller = CreateController();
+ var file = CreateFormFile("logo.exe");
+
+ var result = await controller.AsyncLogoUpload(file.Object);
+
+ Assert.IsFalse(GetValue<bool>(result, "success"));
+ Assert.AreEqual("File no allowed", GetValue<string>(result, "message"));
+ _mediaFileStoreMock.Verify(m => m.GetFileInfo(It.IsAny<string>()), Times.Never);
+ }
+}
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/PictureControllerAttributeTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/PictureControllerAttributeTests.cs
new file mode 100644
index 000000000..ef3d0add9
--- /dev/null
+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/PictureControllerAttributeTests.cs
@@ -0,0 +1,50 @@
+using System.Linq;
+using Grand.Web.Admin.Controllers;
+using Grand.Web.AdminShared.Controllers;
+using Grand.Web.Common.Filters;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Grand.Web.Admin.Tests.Controllers;
+
+[TestClass]
+public class PictureControllerAttributeTests
+{
+ [TestMethod]
+ public void IsSubclassOfBasePictureController()
+ {
+ Assert.IsTrue(typeof(BasePictureController).IsAssignableFrom(typeof(PictureController)));
+ Assert.AreEqual(typeof(BasePictureController), typeof(PictureController).BaseType);
+ }
+
+ [TestMethod]
+ public void HasAuthorizeAdminAttribute()
+ {
+ var attr = typeof(PictureController).GetCustomAttributes(typeof(AuthorizeAdminAttribute), inherit: false);
+ Assert.AreEqual(1, attr.Length);
+ }
+
+ [TestMethod]
+ public void HasAreaAdminAttribute()
+ {
+ var attr = typeof(PictureController)
+ .GetCustomAttributes(typeof(AreaAttribute), inherit: false)
+ .Cast<AreaAttribute>().Single();
+ Assert.AreEqual("Admin", attr.RouteValue);
+ }
+
+ [TestMethod]
+ public void HasAutoValidateAntiforgeryTokenAttribute()
+ {
+ var attr = typeof(PictureController)
+ .GetCustomAttributes(typeof(AutoValidateAntiforgeryTokenAttribute), inherit: true);
+ Assert.AreEqual(1, attr.Length);
+ }
+
+ [TestMethod]
+ public void HasAuthorizeMenuAttribute()
+ {
+ var attr = typeof(PictureController).GetCustomAttributes(typeof(AuthorizeMenuAttribute), inherit: false);
+ Assert.AreEqual(1, attr.Length);
+ }
+}
diff --git a/src/Tests/Grand.Web.Store.Tests/Controllers/PictureControllerAttributeTests.cs b/src/Tests/Grand.Web.Store.Tests/Controllers/PictureControllerAttributeTests.cs
new file mode 100644
index 000000000..7fbdcc176
--- /dev/null
+++ b/src/Tests/Grand.Web.Store.Tests/Controllers/PictureControllerAttributeTests.cs
@@ -0,0 +1,50 @@
+using System.Linq;
+using Grand.Web.AdminShared.Controllers;
+using Grand.Web.Common.Filters;
+using Grand.Web.Store.Controllers;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Grand.Web.Store.Tests.Controllers;
+
+[TestClass]
+public class PictureControllerAttributeTests
+{
+ [TestMethod]
+ public void IsSubclassOfBasePictureController()
+ {
+ Assert.IsTrue(typeof(BasePictureController).IsAssignableFrom(typeof(PictureController)));
+ Assert.AreEqual(typeof(BasePictureController), typeof(PictureController).BaseType);
+ }
+
+ [TestMethod]
+ public void HasAuthorizeStoreAttribute()
+ {
+ var attr = typeof(PictureController).GetCustomAttributes(typeof(AuthorizeStoreAttribute), inherit: false);
+ Assert.AreEqual(1, attr.Length);
+ }
+
+ [TestMethod]
+ public void HasAreaStoreAttribute()
+ {
+ var attr = typeof(PictureController)
+ .GetCustomAttributes(typeof(AreaAttribute), inherit: false)
+ .Cast<AreaAttribute>().Single();
+ Assert.AreEqual("Store", attr.RouteValue);
+ }
+
+ [TestMethod]
+ public void HasAutoValidateAntiforgeryTokenAttribute()
+ {
+ var attr = typeof(PictureController)
+ .GetCustomAttributes(typeof(AutoValidateAntiforgeryTokenAttribute), inherit: true);
+ Assert.AreEqual(1, attr.Length);
+ }
+
+ [TestMethod]
+ public void HasAuthorizeMenuAttribute()
+ {
+ var attr = typeof(PictureController).GetCustomAttributes(typeof(AuthorizeMenuAttribute), inherit: false);
+ Assert.AreEqual(1, attr.Length);
+ }
+}
diff --git a/src/Web/Grand.Web.Admin/Controllers/PictureController.cs b/src/Web/Grand.Web.Admin/Controllers/PictureController.cs
index 77914ae02..26d0f84a2 100644
--- a/src/Web/Grand.Web.Admin/Controllers/PictureController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/PictureController.cs
@@ -1,157 +1,28 @@
-using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Business.Core.Interfaces.Storage;
-using Grand.Domain.Permissions;
-using Grand.Domain.Common;
using Grand.Domain.Media;
-using Grand.Web.Common.Extensions;
+using Grand.Web.Admin.Extensions;
+using Grand.Web.AdminShared.Controllers;
+using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.StaticFiles;
-using Grand.SharedKernel.Extensions;
namespace Grand.Web.Admin.Controllers;
-[PermissionAuthorize(PermissionSystemName.Pictures)]
-public class PictureController : BaseAdminController
+// Reduced to a thin subclass of BasePictureController (ARCH-001). Both actions live in the shared
+// base; this class only supplies Admin's DI wiring plus the attributes that used to arrive
+// transitively via BaseAdminController - BasePictureController can't inherit any single host's base
+// controller (it's shared across Admin/Store), so each subclass restates its own host's attribute
+// set explicitly.
+[AuthorizeAdmin]
+[AutoValidateAntiforgeryToken]
+[Area(Constants.AreaAdmin)]
+[AuthorizeMenu]
+public class PictureController(
+ IPictureService pictureService,
+ IPermissionService permissionService,
+ IMediaFileStore mediaFileStore,
+ MediaSettings mediaSettings)
+ : BasePictureController(pictureService, permissionService, mediaFileStore, mediaSettings)
{
- private readonly IMediaFileStore _mediaFileStore;
-
- private readonly MediaSettings _mediaSettings;
- private readonly IPermissionService _permissionService;
- private readonly IPictureService _pictureService;
-
- public PictureController(
- IPictureService pictureService,
- IPermissionService permissionService,
- IMediaFileStore mediaFileStore,
- MediaSettings mediaSettings)
- {
- _pictureService = pictureService;
- _permissionService = permissionService;
- _mediaFileStore = mediaFileStore;
- _mediaSettings = mediaSettings;
- }
-
- [HttpPost]
- public virtual async Task<IActionResult> AsyncUpload(IFormFile file, Reference reference = Reference.None, string objectId = "")
- {
- if (file == null)
- return Json(new {
- success = false,
- message = "No file uploaded",
- downloadGuid = Guid.Empty
- });
- if (reference != Reference.None && string.IsNullOrEmpty(objectId))
- return Json(new {
- success = false,
- message = "Please save form before upload new picture",
- downloadGuid = Guid.Empty
- });
-
- var fileName = Path.GetFileName(file.FileName);
- var contentType = file.ContentType;
- if (!FileExtensions.GetAllowedMediaFileTypes(_mediaSettings.AllowedFileTypes).IsAllowedMediaFileType(Path.GetExtension(fileName)))
- return Json(new {
- success = false,
- pictureId = "",
- imageUrl = ""
- });
- if (string.IsNullOrEmpty(contentType))
- _ = new FileExtensionContentTypeProvider().TryGetContentType(fileName, out contentType);
-
- var fileBinary = file.GetDownloadBits();
- var picture =
- await _pictureService.InsertPicture(fileBinary, contentType, null, reference: reference,
- objectId: objectId);
- //when returning JSON the mime-type must be set to text/plain
- //otherwise some browsers will pop-up a "Save As" dialog.
- return Json(new {
- success = true,
- pictureId = picture.Id,
- imageUrl = await _pictureService.GetPictureUrl(picture, 100)
- });
- }
-
- [HttpPost]
- public virtual async Task<IActionResult> AsyncLogoUpload(IFormFile file)
- {
- if (!await _permissionService.Authorize(StandardPermission.ManageSettings))
- return Content("Access denied");
-
- if (file == null)
- return Json(new {
- success = false,
- message = "No file uploaded"
- });
-
- var fileName = Path.GetFileName(file.FileName);
- var contentType = file.ContentType;
- if (!FileExtensions.GetAllowedMediaFileTypes(_mediaSettings.AllowedFileTypes).IsAllowedMediaFileType(Path.GetExtension(fileName)))
- return Json(new {
- success = false,
- message = "File no allowed"
- });
-
- if (string.IsNullOrEmpty(contentType))
- _ = new FileExtensionContentTypeProvider().TryGetContentType(fileName, out contentType);
- if (string.IsNullOrEmpty(contentType))
- return Json(new {
- success = false,
- message = "Unknown content type"
- });
- fileName = fileName.Replace(" ", "");
- var fileInfo = await _mediaFileStore.GetFileInfo(fileName);
- if (fileInfo == null)
- try
- {
- var filepath = _mediaFileStore.GetDirectoryInfo("");
- if (filepath != null)
- {
- await using (var stream = new FileStream(_mediaFileStore.Combine(filepath.PhysicalPath, fileName),
- FileMode.OpenOrCreate))
- {
- await file.CopyToAsync(stream);
- }
-
- return Json(new {
- success = true,
- imageUrl = fileName
- });
- }
-
- return Json(new {
- success = false,
- message = "Physical path not exist"
- });
- }
- catch (Exception ex)
- {
- return Json(new {
- success = false,
- message = ex.Message
- });
- }
-
- {
- var filepath = _mediaFileStore.GetDirectoryInfo("");
- if (filepath != null)
- {
- await using (var stream = new FileStream(_mediaFileStore.Combine(filepath.PhysicalPath, fileName),
- FileMode.OpenOrCreate))
- {
- await file.CopyToAsync(stream);
- }
-
- return Json(new {
- success = true,
- imageUrl = fileName
- });
- }
-
- return Json(new {
- success = false,
- message = "Physical path not exist"
- });
- }
- }
-}
\ No newline at end of file
+}
diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BasePictureController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BasePictureController.cs
new file mode 100644
index 000000000..b1b7aef81
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Controllers/BasePictureController.cs
@@ -0,0 +1,150 @@
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Interfaces.Storage;
+using Grand.Domain.Common;
+using Grand.Domain.Media;
+using Grand.Domain.Permissions;
+using Grand.SharedKernel.Extensions;
+using Grand.Web.Common.Controllers;
+using Grand.Web.Common.Extensions;
+using Grand.Web.Common.Security.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.StaticFiles;
+
+namespace Grand.Web.AdminShared.Controllers;
+
+// ARCH-001: Admin's and Store's original PictureController were byte-identical (only namespace and
+// base class differed) - no entity, no per-store/per-vendor scope, so no IAdminDataScope is needed
+// here, unlike every other Base*Controller in this initiative. Vendor never had its own copy.
+[PermissionAuthorize(PermissionSystemName.Pictures)]
+[AutoValidateAntiforgeryToken]
+public abstract class BasePictureController(
+ IPictureService pictureService,
+ IPermissionService permissionService,
+ IMediaFileStore mediaFileStore,
+ MediaSettings mediaSettings)
+ : BaseController
+{
+ [HttpPost]
+ public virtual async Task<IActionResult> AsyncUpload(IFormFile file, Reference reference = Reference.None, string objectId = "")
+ {
+ if (file == null)
+ return Json(new {
+ success = false,
+ message = "No file uploaded",
+ downloadGuid = Guid.Empty
+ });
+ if (reference != Reference.None && string.IsNullOrEmpty(objectId))
+ return Json(new {
+ success = false,
+ message = "Please save form before upload new picture",
+ downloadGuid = Guid.Empty
+ });
+
+ var fileName = Path.GetFileName(file.FileName);
+ var contentType = file.ContentType;
+ if (!FileExtensions.GetAllowedMediaFileTypes(mediaSettings.AllowedFileTypes).IsAllowedMediaFileType(Path.GetExtension(fileName)))
+ return Json(new {
+ success = false,
+ pictureId = "",
+ imageUrl = ""
+ });
+ if (string.IsNullOrEmpty(contentType))
+ _ = new FileExtensionContentTypeProvider().TryGetContentType(fileName, out contentType);
+
+ var fileBinary = file.GetDownloadBits();
+ var picture =
+ await pictureService.InsertPicture(fileBinary, contentType, null, reference: reference,
+ objectId: objectId);
+ //when returning JSON the mime-type must be set to text/plain
+ //otherwise some browsers will pop-up a "Save As" dialog.
+ return Json(new {
+ success = true,
+ pictureId = picture.Id,
+ imageUrl = await pictureService.GetPictureUrl(picture, 100)
+ });
+ }
+
+ [HttpPost]
+ public virtual async Task<IActionResult> AsyncLogoUpload(IFormFile file)
+ {
+ if (!await permissionService.Authorize(StandardPermission.ManageSettings))
+ return Content("Access denied");
+
+ if (file == null)
+ return Json(new {
+ success = false,
+ message = "No file uploaded"
+ });
+
+ var fileName = Path.GetFileName(file.FileName);
+ var contentType = file.ContentType;
+ if (!FileExtensions.GetAllowedMediaFileTypes(mediaSettings.AllowedFileTypes).IsAllowedMediaFileType(Path.GetExtension(fileName)))
+ return Json(new {
+ success = false,
+ message = "File no allowed"
+ });
+
+ if (string.IsNullOrEmpty(contentType))
+ _ = new FileExtensionContentTypeProvider().TryGetContentType(fileName, out contentType);
+ if (string.IsNullOrEmpty(contentType))
+ return Json(new {
+ success = false,
+ message = "Unknown content type"
+ });
+ fileName = fileName.Replace(" ", "");
+ var fileInfo = await mediaFileStore.GetFileInfo(fileName);
+ if (fileInfo == null)
+ try
+ {
+ var filepath = mediaFileStore.GetDirectoryInfo("");
+ if (filepath != null)
+ {
+ await using (var stream = new FileStream(mediaFileStore.Combine(filepath.PhysicalPath, fileName),
+ FileMode.OpenOrCreate))
+ {
+ await file.CopyToAsync(stream);
+ }
+
+ return Json(new {
+ success = true,
+ imageUrl = fileName
+ });
+ }
+
+ return Json(new {
+ success = false,
+ message = "Physical path not exist"
+ });
+ }
+ catch (Exception ex)
+ {
+ return Json(new {
+ success = false,
+ message = ex.Message
+ });
+ }
+
+ {
+ var filepath = mediaFileStore.GetDirectoryInfo("");
+ if (filepath != null)
+ {
+ await using (var stream = new FileStream(mediaFileStore.Combine(filepath.PhysicalPath, fileName),
+ FileMode.OpenOrCreate))
+ {
+ await file.CopyToAsync(stream);
+ }
+
+ return Json(new {
+ success = true,
+ imageUrl = fileName
+ });
+ }
+
+ return Json(new {
+ success = false,
+ message = "Physical path not exist"
+ });
+ }
+ }
+}
diff --git a/src/Web/Grand.Web.Store/Controllers/PictureController.cs b/src/Web/Grand.Web.Store/Controllers/PictureController.cs
index 8efde3af4..2a50d5cf2 100644
--- a/src/Web/Grand.Web.Store/Controllers/PictureController.cs
+++ b/src/Web/Grand.Web.Store/Controllers/PictureController.cs
@@ -1,157 +1,27 @@
-using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Business.Core.Interfaces.Storage;
-using Grand.Domain.Permissions;
-using Grand.Domain.Common;
using Grand.Domain.Media;
-using Grand.Web.Common.Extensions;
-using Grand.Web.Common.Security.Authorization;
+using Grand.Web.AdminShared.Controllers;
+using Grand.Web.Common.Filters;
+using Grand.Web.Store.Extensions;
using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.StaticFiles;
-using Grand.SharedKernel.Extensions;
namespace Grand.Web.Store.Controllers;
-[PermissionAuthorize(PermissionSystemName.Pictures)]
-public class PictureController : BaseStoreController
+// Reduced to a thin subclass of BasePictureController (ARCH-001). Both actions live in the shared
+// base; this class only supplies Store's DI wiring plus the attributes that used to arrive
+// transitively via BaseStoreController - BasePictureController can't inherit any single host's base
+// controller (it's shared across Admin/Store), so each subclass restates its own host's attribute
+// set explicitly.
+[AutoValidateAntiforgeryToken]
+[Area(Constants.AreaStore)]
+[AuthorizeStore]
+[AuthorizeMenu]
+public class PictureController(
+ IPictureService pictureService,
+ IPermissionService permissionService,
+ IMediaFileStore mediaFileStore,
+ MediaSettings mediaSettings)
+ : BasePictureController(pictureService, permissionService, mediaFileStore, mediaSettings)
{
- private readonly IMediaFileStore _mediaFileStore;
-
- private readonly MediaSettings _mediaSettings;
- private readonly IPermissionService _permissionService;
- private readonly IPictureService _pictureService;
-
- public PictureController(
- IPictureService pictureService,
- IPermissionService permissionService,
- IMediaFileStore mediaFileStore,
- MediaSettings mediaSettings)
- {
- _pictureService = pictureService;
- _permissionService = permissionService;
- _mediaFileStore = mediaFileStore;
- _mediaSettings = mediaSettings;
- }
-
- [HttpPost]
- public virtual async Task<IActionResult> AsyncUpload(IFormFile file, Reference reference = Reference.None, string objectId = "")
- {
- if (file == null)
- return Json(new {
- success = false,
- message = "No file uploaded",
- downloadGuid = Guid.Empty
- });
- if (reference != Reference.None && string.IsNullOrEmpty(objectId))
- return Json(new {
- success = false,
- message = "Please save form before upload new picture",
- downloadGuid = Guid.Empty
- });
-
- var fileName = Path.GetFileName(file.FileName);
- var contentType = file.ContentType;
- if (!FileExtensions.GetAllowedMediaFileTypes(_mediaSettings.AllowedFileTypes).IsAllowedMediaFileType(Path.GetExtension(fileName)))
- return Json(new {
- success = false,
- pictureId = "",
- imageUrl = ""
- });
- if (string.IsNullOrEmpty(contentType))
- _ = new FileExtensionContentTypeProvider().TryGetContentType(fileName, out contentType);
-
- var fileBinary = file.GetDownloadBits();
- var picture =
- await _pictureService.InsertPicture(fileBinary, contentType, null, reference: reference,
- objectId: objectId);
- //when returning JSON the mime-type must be set to text/plain
- //otherwise some browsers will pop-up a "Save As" dialog.
- return Json(new {
- success = true,
- pictureId = picture.Id,
- imageUrl = await _pictureService.GetPictureUrl(picture, 100)
- });
- }
-
- [HttpPost]
- public virtual async Task<IActionResult> AsyncLogoUpload(IFormFile file)
- {
- if (!await _permissionService.Authorize(StandardPermission.ManageSettings))
- return Content("Access denied");
-
- if (file == null)
- return Json(new {
- success = false,
- message = "No file uploaded"
- });
-
- var fileName = Path.GetFileName(file.FileName);
- var contentType = file.ContentType;
- if (!FileExtensions.GetAllowedMediaFileTypes(_mediaSettings.AllowedFileTypes).IsAllowedMediaFileType(Path.GetExtension(fileName)))
- return Json(new {
- success = false,
- message = "File no allowed"
- });
-
- if (string.IsNullOrEmpty(contentType))
- _ = new FileExtensionContentTypeProvider().TryGetContentType(fileName, out contentType);
- if (string.IsNullOrEmpty(contentType))
- return Json(new {
- success = false,
- message = "Unknown content type"
- });
- fileName = fileName.Replace(" ", "");
- var fileInfo = await _mediaFileStore.GetFileInfo(fileName);
- if (fileInfo == null)
- try
- {
- var filepath = _mediaFileStore.GetDirectoryInfo("");
- if (filepath != null)
- {
- await using (var stream = new FileStream(_mediaFileStore.Combine(filepath.PhysicalPath, fileName),
- FileMode.OpenOrCreate))
- {
- await file.CopyToAsync(stream);
- }
-
- return Json(new {
- success = true,
- imageUrl = fileName
- });
- }
-
- return Json(new {
- success = false,
- message = "Physical path not exist"
- });
- }
- catch (Exception ex)
- {
- return Json(new {
- success = false,
- message = ex.Message
- });
- }
-
- {
- var filepath = _mediaFileStore.GetDirectoryInfo("");
- if (filepath != null)
- {
- await using (var stream = new FileStream(_mediaFileStore.Combine(filepath.PhysicalPath, fileName),
- FileMode.OpenOrCreate))
- {
- await file.CopyToAsync(stream);
- }
-
- return Json(new {
- success = true,
- imageUrl = fileName
- });
- }
-
- return Json(new {
- success = false,
- message = "Physical path not exist"
- });
- }
- }
-}
\ No newline at end of file
+}