Merge branch 'dev' into feat/VCST-1855

VirtoCommerce · Oct 25, 2024 · 91ecb66 · 91ecb66
2 parents abbf3dc + 1b2d85f
commit 91ecb66
Show file tree

Hide file tree

Showing 40 changed files with 12,320 additions and 1,126 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <VersionPrefix>3.857.0</VersionPrefix>
+    <VersionPrefix>3.860.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
     <NoWarn>$(NoWarn);S3875;S4457</NoWarn>

diff --git a/src/VirtoCommerce.Platform.Web/Controllers/Api/ModulesController.cs b/src/VirtoCommerce.Platform.Web/Controllers/Api/ModulesController.cs
@@ -29,18 +29,30 @@ namespace VirtoCommerce.Platform.Web.Controllers.Api
     [Authorize]
     public class ModulesController : Controller
     {
+        private const string _managementIsDisabledMessage = "Module management is disabled.";
+
         private readonly IExternalModuleCatalog _externalModuleCatalog;
         private readonly IModuleInstaller _moduleInstaller;
         private readonly IPushNotificationManager _pushNotifier;
         private readonly IUserNameResolver _userNameResolver;
         private readonly ISettingsManager _settingsManager;
         private readonly PlatformOptions _platformOptions;
         private readonly ExternalModuleCatalogOptions _externalModuleCatalogOptions;
+        private readonly LocalStorageModuleCatalogOptions _localStorageModuleCatalogOptions;
         private readonly IPlatformRestarter _platformRestarter;
         private static readonly object _lockObject = new object();
         private static readonly FormOptions _defaultFormOptions = new FormOptions();
 
-        public ModulesController(IExternalModuleCatalog externalModuleCatalog, IModuleInstaller moduleInstaller, IPushNotificationManager pushNotifier, IUserNameResolver userNameResolver, ISettingsManager settingsManager, IOptions<PlatformOptions> platformOptions, IOptions<ExternalModuleCatalogOptions> externalModuleCatalogOptions, IPlatformRestarter platformRestarter)
+        public ModulesController(
+            IExternalModuleCatalog externalModuleCatalog,
+            IModuleInstaller moduleInstaller,
+            IPushNotificationManager pushNotifier,
+            IUserNameResolver userNameResolver,
+            ISettingsManager settingsManager,
+            IOptions<PlatformOptions> platformOptions,
+            IOptions<ExternalModuleCatalogOptions> externalModuleCatalogOptions,
+            IOptions<LocalStorageModuleCatalogOptions> localStorageModuleCatalogOptions,
+            IPlatformRestarter platformRestarter)
         {
             _externalModuleCatalog = externalModuleCatalog;
             _moduleInstaller = moduleInstaller;
@@ -49,6 +61,7 @@ public ModulesController(IExternalModuleCatalog externalModuleCatalog, IModuleIn
             _settingsManager = settingsManager;
             _platformOptions = platformOptions.Value;
             _externalModuleCatalogOptions = externalModuleCatalogOptions.Value;
+            _localStorageModuleCatalogOptions = localStorageModuleCatalogOptions.Value;
             _platformRestarter = platformRestarter;
         }
 
@@ -143,22 +156,29 @@ public ActionResult<ModuleDescriptor[]> GetMissingDependencies([FromBody] Module
         public async Task<ActionResult<ModuleDescriptor>> UploadModuleArchive()
         {
             EnsureModulesCatalogInitialized();
-            ModuleDescriptor result = null;
+
+            if (!_localStorageModuleCatalogOptions.RefreshProbingFolderOnStart)
+            {
+                return BadRequest(_managementIsDisabledMessage);
+            }
+
             if (!MultipartRequestHelper.IsMultipartContentType(Request.ContentType))
             {
                 return BadRequest($"Expected a multipart request, but got {Request.ContentType}");
             }
+
             var uploadPath = Path.GetFullPath(_platformOptions.LocalUploadFolderPath);
             if (!Directory.Exists(uploadPath))
             {
                 Directory.CreateDirectory(uploadPath);
             }
-            string targetFilePath = null;
 
+            ModuleDescriptor result = null;
+            string targetFilePath = null;
             var boundary = MultipartRequestHelper.GetBoundary(MediaTypeHeaderValue.Parse(Request.ContentType), _defaultFormOptions.MultipartBoundaryLengthLimit);
             var reader = new MultipartReader(boundary, HttpContext.Request.Body);
-
             var section = await reader.ReadNextSectionAsync();
+
             if (section != null)
             {
                 var hasContentDispositionHeader = ContentDispositionHeaderValue.TryParse(section.ContentDisposition, out var contentDisposition);
@@ -205,6 +225,7 @@ public async Task<ActionResult<ModuleDescriptor>> UploadModuleArchive()
                     }
                 }
             }
+
             return Ok(result);
         }
 
@@ -394,27 +415,42 @@ public void ModuleBackgroundJob(ModuleBackgroundJobOptions options, ModulePushNo
             try
             {
                 notification.Started = DateTime.UtcNow;
-                var moduleInfos = _externalModuleCatalog.Modules.OfType<ManifestModuleInfo>()
-                                     .Where(x => options.Modules.Any(y => y.Identity.Equals(x.Identity)))
-                                     .ToArray();
-                var reportProgress = new Progress<ProgressMessage>(m =>
+
+                if (_localStorageModuleCatalogOptions.RefreshProbingFolderOnStart)
                 {
-                    lock (_lockObject)
+                    var moduleInfos = _externalModuleCatalog.Modules.OfType<ManifestModuleInfo>()
+                        .Where(x => options.Modules.Any(y => y.Identity.Equals(x.Identity)))
+                        .ToArray();
+                    var reportProgress = new Progress<ProgressMessage>(m =>
                     {
-                        notification.Description = m.Message;
-                        notification.ProgressLog.Add(m);
-                        _pushNotifier.Send(notification);
-                    }
-                });
+                        lock (_lockObject)
+                        {
+                            notification.Description = m.Message;
+                            notification.ProgressLog.Add(m);
+                            _pushNotifier.Send(notification);
+                        }
+                    });
 
-                switch (options.Action)
+                    switch (options.Action)
+                    {
+                        case ModuleAction.Install:
+                            _moduleInstaller.Install(moduleInfos, reportProgress);
+                            break;
+                        case ModuleAction.Uninstall:
+                            _moduleInstaller.Uninstall(moduleInfos, reportProgress);
+                            break;
+                    }
+                }
+                else
                 {
-                    case ModuleAction.Install:
-                        _moduleInstaller.Install(moduleInfos, reportProgress);
-                        break;
-                    case ModuleAction.Uninstall:
-                        _moduleInstaller.Uninstall(moduleInfos, reportProgress);
-                        break;
+                    notification.Finished = DateTime.UtcNow;
+                    notification.Description = _managementIsDisabledMessage;
+                    notification.ProgressLog.Add(new ProgressMessage
+                    {
+                        Level = ProgressMessageLevel.Error,
+                        Message = notification.Description,
+                    });
+                    _pushNotifier.Send(notification);
                 }
             }
             catch (Exception ex)
@@ -430,7 +466,7 @@ public void ModuleBackgroundJob(ModuleBackgroundJobOptions options, ModulePushNo
                 _settingsManager.SetValue(PlatformConstants.Settings.Setup.ModulesAutoInstallState.Name, AutoInstallState.Completed);
 
                 notification.Finished = DateTime.UtcNow;
-                notification.Description = "Installation finished.";
+                notification.Description = options.Action == ModuleAction.Install ? "Installation finished." : "Uninstalling finished.";
                 notification.ProgressLog.Add(new ProgressMessage
                 {
                     Level = ProgressMessageLevel.Info,

diff --git a/src/VirtoCommerce.Platform.Web/VirtoCommerce.Platform.Web.csproj b/src/VirtoCommerce.Platform.Web/VirtoCommerce.Platform.Web.csproj
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Core" Version="1.43.0" />
+    <PackageReference Include="Azure.Core" Version="1.44.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.8" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.8" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.8" />