Merge branch 'v2/hotfix/2.0.1' into v2/main

vendrhub · May 3, 2022 · 42fa2b7 · 42fa2b7
2 parents e975993 + 74713f4
commit 42fa2b7
Show file tree

Hide file tree

Showing 21 changed files with 198 additions and 45 deletions.
diff --git a/build/NuGet/Vendr.uSync.targets b/build/NuGet/Vendr.uSync.targets
@@ -0,0 +1,30 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+	<PropertyGroup>
+		<vendruSyncPluginFolder>App_Plugins\Vendr.uSync</vendruSyncPluginFolder>
+		<vendruSyncPackageContentFilesPath>$(MSBuildThisFileDirectory)..\content\$(vendruSyncPluginFolder)\**\*.*</vendruSyncPackageContentFilesPath>
+	</PropertyGroup>
+
+	<Target Name="CopyVendruSyncPackageAssets" BeforeTargets="Build">
+		<ItemGroup>
+			<vendruSyncPackageContentFiles Include="$(vendruSyncPackageContentFilesPath)" />
+		</ItemGroup>
+		<Message Text="Copying Vendr.uSync Package files -> $(vendruSyncPluginFolder) - #@(vendruSyncPackageContentFiles->Count()) files"  Importance="high" />
+		<Warning Text="No Vendr.uSync Package files found in $(vendruSyncPluginFolder)" Condition="@(vendruSyncPackageContentFiles->Count()) == 0" />
+
+		<Copy
+            SourceFiles="@(vendruSyncPackageContentFiles)"
+            DestinationFiles="@(vendruSyncPackageContentFiles->'$(MSBuildProjectDirectory)\$(vendruSyncPluginFolder)\%(RecursiveDir)%(Filename)%(Extension)')"
+            SkipUnchangedFiles="true" />
+
+	</Target>
+
+	<Target Name="ClearVendruSyncPackageAssets" BeforeTargets="Clean">
+		<ItemGroup>
+			<vendruSyncPackageDir Include="$(MSBuildProjectDirectory)\$(vendruSyncPluginFolder)\" />
+		</ItemGroup>
+		<Message Text="Clear old vendr.uSync Package data"  Importance="high" />
+		<RemoveDir Directories="@(vendruSyncPackageDir)"  />
+	</Target>
+
+</Project>
diff --git a/src/Vendr.uSync/Configuration/VendrSycnSettingsAccessor.cs b/src/Vendr.uSync/Configuration/VendrSycnSettingsAccessor.cs
@@ -0,0 +1,29 @@
+#if NET
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using System;
+#endif
+
+namespace Vendr.uSync.Configuration
+{
+    public class VendrSyncSettingsAccessor
+    {
+#if NETFRAMEWORK
+        public VendrSyncSettings Settings { get; }
+
+        public VendrSyncSettingsAccessor(VendrSyncSettings settings)
+        {
+            Settings = settings;
+        }
+#else
+        private readonly IServiceProvider _serviceProvider;
+
+        public VendrSyncSettingsAccessor(IServiceProvider serviceProvider)
+        {
+            _serviceProvider = serviceProvider;
+        }
+
+        public VendrSyncSettings Settings => _serviceProvider.GetRequiredService<IOptions<VendrSyncSettings>>().Value;
+#endif
+    }
+}
diff --git a/src/Vendr.uSync/Configuration/VendrSyncSettings.cs b/src/Vendr.uSync/Configuration/VendrSyncSettings.cs
@@ -0,0 +1,36 @@
+using System;
+
+#if NETFRAMEWORK
+using System.Configuration;
+using System.Linq;
+#endif
+
+
+namespace Vendr.uSync.Configuration
+{
+    public class VendrSyncSettings
+    {
+        public VendrSyncPaymentMethodSettings PaymentMethods { get; set; }
+
+        public VendrSyncSettings()
+        {
+            PaymentMethods = new VendrSyncPaymentMethodSettings();
+        }
+    }
+
+    public class VendrSyncPaymentMethodSettings
+    {
+        public string[] IgnoreSettings { get; set; }
+
+        public VendrSyncPaymentMethodSettings()
+        {
+#if NETFRAMEWORK
+            IgnoreSettings = (ConfigurationManager.AppSettings["Vendr.uSync:PaymentMethods:IgnoreSettings"] ?? "")
+                .Split(new[] { "," }, System.StringSplitOptions.RemoveEmptyEntries)
+                .ToArray();
+#else
+            IgnoreSettings = Array.Empty<string>();
+#endif
+        }
+    }
+}
diff --git a/src/Vendr.uSync/Handlers/VendrSyncHandlerBase.cs b/src/Vendr.uSync/Handlers/VendrSyncHandlerBase.cs
@@ -94,7 +94,7 @@ public virtual IEnumerable<uSyncAction> ProcessPostImport(string folder, IEnumer
                 {
                     if (result.Success)
                     {
-                        var attempt = ImportSecondPass(result, config, null);
+                        var attempt = ImportSecondPass(result, config, new uSyncImportOptions());
                         // postActions.Add();
                     }
                 }

diff --git a/src/Vendr.uSync/Serializers/CountrySerializer.cs b/src/Vendr.uSync/Serializers/CountrySerializer.cs
@@ -6,6 +6,7 @@
 using Vendr.Common;
 
 using Vendr.uSync.Extensions;
+using Vendr.uSync.Configuration;
 
 #if NETFRAMEWORK
 using Umbraco.Core.Logging;
@@ -27,12 +28,12 @@ public class CountrySerializer : VendrSerializerBase<CountryReadOnly>,
         ISyncSerializer<CountryReadOnly>
     {
         public CountrySerializer(
-            IVendrApi vendrApi,
+            IVendrApi vendrApi, VendrSyncSettingsAccessor settingsAccessor,
             IUnitOfWorkProvider uowProvider,
 #if NETFRAMEWORK
-            ILogger logger) : base(vendrApi, uowProvider, logger)
+            ILogger logger) : base(vendrApi, settingsAccessor, uowProvider, logger)
 #else
-            ILogger<CountrySerializer> logger) : base(vendrApi, uowProvider, logger)
+            ILogger<CountrySerializer> logger) : base(vendrApi, settingsAccessor, uowProvider, logger)
 #endif        
         { }
 

diff --git a/src/Vendr.uSync/Serializers/CurrencySerializer.cs b/src/Vendr.uSync/Serializers/CurrencySerializer.cs
@@ -7,6 +7,7 @@
 using Vendr.Common;
 
 using Vendr.uSync.Extensions;
+using Vendr.uSync.Configuration;
 
 #if NETFRAMEWORK
 using Umbraco.Core;
@@ -30,12 +31,12 @@ public class CurrencySerializer : VendrSerializerBase<CurrencyReadOnly>,
         ISyncSerializer<CurrencyReadOnly>
     {
         public CurrencySerializer(
-            IVendrApi vendrApi,
+            IVendrApi vendrApi, VendrSyncSettingsAccessor settingsAccessor,
             IUnitOfWorkProvider uowProvider,
 #if NETFRAMEWORK
-            ILogger logger) : base(vendrApi, uowProvider, logger)
+            ILogger logger) : base(vendrApi, settingsAccessor, uowProvider, logger)
 #else
-            ILogger<CurrencySerializer> logger) : base(vendrApi, uowProvider, logger)
+            ILogger<CurrencySerializer> logger) : base(vendrApi, settingsAccessor, uowProvider, logger)
 #endif
         {
             _vendrApi = vendrApi;

diff --git a/src/Vendr.uSync/Serializers/EmailTemplateSerializer.cs b/src/Vendr.uSync/Serializers/EmailTemplateSerializer.cs
@@ -6,6 +6,7 @@
 using Vendr.Common;
 
 using Vendr.uSync.Extensions;
+using Vendr.uSync.Configuration;
 
 #if NETFRAMEWORK
 using Umbraco.Core.Logging;
@@ -26,12 +27,12 @@ namespace Vendr.uSync.Serializers
 
     public class EmailTemplateSerializer : VendrSerializerBase<EmailTemplateReadOnly>, ISyncSerializer<EmailTemplateReadOnly>
     {
-        public EmailTemplateSerializer(IVendrApi vendrApi, 
+        public EmailTemplateSerializer(IVendrApi vendrApi, VendrSyncSettingsAccessor settingsAccessor,
             IUnitOfWorkProvider uowProvider,
 #if NETFRAMEWORK
-            ILogger logger) : base(vendrApi, uowProvider, logger)
+            ILogger logger) : base(vendrApi, settingsAccessor, uowProvider, logger)
 #else
-            ILogger<EmailTemplateSerializer> logger) : base(vendrApi, uowProvider, logger)
+            ILogger<EmailTemplateSerializer> logger) : base(vendrApi, settingsAccessor, uowProvider, logger)
 #endif
         { }
 

diff --git a/src/Vendr.uSync/Serializers/ExportTemplateSerializer.cs b/src/Vendr.uSync/Serializers/ExportTemplateSerializer.cs
@@ -6,6 +6,7 @@
 using Vendr.Common;
 
 using Vendr.uSync.Extensions;
+using Vendr.uSync.Configuration;
 
 #if NETFRAMEWORK
 using Umbraco.Core.Logging;
@@ -25,12 +26,12 @@ namespace Vendr.uSync.Serializers
     [SyncSerializer("6D4C64D0-B840-47F7-AF92-61A1C86D892E", "Export Template Serializer", VendrConstants.Serialization.ExportTemplate)]
     public class ExportTemplateSerializer : VendrSerializerBase<ExportTemplateReadOnly>, ISyncSerializer<ExportTemplateReadOnly>
     {
-        public ExportTemplateSerializer(IVendrApi vendrApi, 
+        public ExportTemplateSerializer(IVendrApi vendrApi, VendrSyncSettingsAccessor settingsAccessor,
             IUnitOfWorkProvider uowProvider,
 #if NETFRAMEWORK
-            ILogger logger) : base(vendrApi, uowProvider, logger)
+            ILogger logger) : base(vendrApi, settingsAccessor, uowProvider, logger)
 #else
-            ILogger<ExportTemplateSerializer> logger) : base(vendrApi, uowProvider, logger)
+            ILogger<ExportTemplateSerializer> logger) : base(vendrApi, settingsAccessor, uowProvider, logger)
 #endif
         { }
 

diff --git a/src/Vendr.uSync/Serializers/MethodSerializerBase.cs b/src/Vendr.uSync/Serializers/MethodSerializerBase.cs
@@ -9,6 +9,7 @@
 
 using Vendr.uSync.Extensions;
 using Vendr.uSync.SyncModels;
+using Vendr.uSync.Configuration;
 
 #if NETFRAMEWORK
 using Umbraco.Core.Logging;
@@ -27,12 +28,12 @@ namespace Vendr.uSync.Serializers
     public abstract class MethodSerializerBase<TObject> : VendrSerializerBase<TObject>
         where TObject : EntityBase
     {
-        protected MethodSerializerBase(IVendrApi vendrApi, 
+        protected MethodSerializerBase(IVendrApi vendrApi, VendrSyncSettingsAccessor settingsAccessor,
             IUnitOfWorkProvider uowProvider,
 #if NETFRAMEWORK
-            ILogger logger) : base(vendrApi, uowProvider, logger)
+            ILogger logger) : base(vendrApi, settingsAccessor, uowProvider, logger)
 #else
-            ILogger<MethodSerializerBase<TObject>> logger) : base(vendrApi, uowProvider, logger)
+            ILogger<MethodSerializerBase<TObject>> logger) : base(vendrApi, settingsAccessor, uowProvider, logger)
 #endif
         { }
 

diff --git a/src/Vendr.uSync/Serializers/OrderStatusSerializer.cs b/src/Vendr.uSync/Serializers/OrderStatusSerializer.cs
@@ -6,6 +6,7 @@
 using Vendr.Common;
 
 using Vendr.uSync.Extensions;
+using Vendr.uSync.Configuration;
 
 #if NETFRAMEWORK
 using Umbraco.Core.Logging;
@@ -28,12 +29,12 @@ public class OrderStatusSerializer : VendrSerializerBase<OrderStatusReadOnly>, I
         , ISyncNodeSerializer<OrderStatusReadOnly>
 #endif
     {
-        public OrderStatusSerializer(IVendrApi vendrApi, 
+        public OrderStatusSerializer(IVendrApi vendrApi, VendrSyncSettingsAccessor settingsAccessor,
             IUnitOfWorkProvider uowProvider,
 #if NETFRAMEWORK
-            ILogger logger) : base(vendrApi, uowProvider, logger)
+            ILogger logger) : base(vendrApi, settingsAccessor, uowProvider, logger)
 #else
-            ILogger<OrderStatusSerializer> logger) : base(vendrApi, uowProvider, logger)
+            ILogger<OrderStatusSerializer> logger) : base(vendrApi, settingsAccessor, uowProvider, logger)
 #endif
         { }
 

diff --git a/src/Vendr.uSync/Serializers/PaymentMethodSeralizer.cs b/src/Vendr.uSync/Serializers/PaymentMethodSeralizer.cs
@@ -8,6 +8,9 @@
 using Vendr.Common;
 
 using Vendr.uSync.Extensions;
+using Vendr.uSync.Configuration;
+
+using StringExtensions = Vendr.Extensions.StringExtensions;
 
 #if NETFRAMEWORK
 using Umbraco.Core.Logging;
@@ -27,12 +30,12 @@ namespace Vendr.uSync.Serializers
     [SyncSerializer("707A16D7-AAA8-4399-8CF4-BEC82B8F6C8E", "PaymentMethod Serializer", VendrConstants.Serialization.PaymentMethod)]
     public class PaymentMethodSeralizer : MethodSerializerBase<PaymentMethodReadOnly>, ISyncSerializer<PaymentMethodReadOnly>
     {
-        public PaymentMethodSeralizer(IVendrApi vendrApi, 
+        public PaymentMethodSeralizer(IVendrApi vendrApi, VendrSyncSettingsAccessor settingsAccessor,
             IUnitOfWorkProvider uowProvider,
 #if NETFRAMEWORK
-            ILogger logger) : base(vendrApi, uowProvider, logger)
+            ILogger logger) : base(vendrApi, settingsAccessor, uowProvider, logger)
 #else
-            ILogger<PaymentMethodSeralizer> logger) : base(vendrApi, uowProvider, logger)
+            ILogger<PaymentMethodSeralizer> logger) : base(vendrApi, settingsAccessor, uowProvider, logger)
 #endif
         { }
 
@@ -69,7 +72,7 @@ private XElement SerializeProviderSettings(IReadOnlyDictionary<string, string> v
 
             if (values != null && values.Any())
             {
-                foreach (var setting in values)
+                foreach (var setting in values.Where(x => !StringExtensions.InvariantContains(_settingsAccessor.Settings.PaymentMethods.IgnoreSettings, x.Key)))
                 {
                     root.Add(new XElement("Setting",
                         new XElement("Key", setting.Key),
@@ -154,7 +157,7 @@ private void DeserializeProviderSettings(XElement node, PaymentMethod item)
                 }
             }
 
-            item.SetSettings(settings, SetBehavior.Replace);
+            item.SetSettings(settings, SetBehavior.Merge);
         }
 
         private void DeserializeCountryRegions(XElement node, PaymentMethod item)

diff --git a/src/Vendr.uSync/Serializers/PrintTemplateSerializer.cs b/src/Vendr.uSync/Serializers/PrintTemplateSerializer.cs
@@ -6,6 +6,7 @@
 using Vendr.Common;
 
 using Vendr.uSync.Extensions;
+using Vendr.uSync.Configuration;
 
 #if NETFRAMEWORK
 using Umbraco.Core.Logging;
@@ -25,12 +26,12 @@ namespace Vendr.uSync.Serializers
     [SyncSerializer("D0D7176C-2EDD-453E-9795-D71F1D29B44A", "Print Template Serializer", VendrConstants.Serialization.PrintTemplate)]
     public class PrintTemplateSerializer : VendrSerializerBase<PrintTemplateReadOnly>, ISyncSerializer<PrintTemplateReadOnly>
     {
-        public PrintTemplateSerializer(IVendrApi vendrApi, 
+        public PrintTemplateSerializer(IVendrApi vendrApi, VendrSyncSettingsAccessor settingsAccessor,
             IUnitOfWorkProvider uowProvider,
 #if NETFRAMEWORK
-            ILogger logger) : base(vendrApi, uowProvider, logger)
+            ILogger logger) : base(vendrApi, settingsAccessor, uowProvider, logger)
 #else
-            ILogger<PrintTemplateSerializer> logger) : base(vendrApi, uowProvider, logger)
+            ILogger<PrintTemplateSerializer> logger) : base(vendrApi, settingsAccessor, uowProvider, logger)
 #endif
         { }
 

diff --git a/src/Vendr.uSync/Serializers/RegionSerializer.cs b/src/Vendr.uSync/Serializers/RegionSerializer.cs
@@ -6,6 +6,7 @@
 using Vendr.Common;
 
 using Vendr.uSync.Extensions;
+using Vendr.uSync.Configuration;
 
 #if NETFRAMEWORK
 using Umbraco.Core.Logging;
@@ -25,12 +26,12 @@ namespace Vendr.uSync.Serializers
     [SyncSerializer("62503EA1-6B7E-4567-92E2-9B67E2408434", "Region Serializer", VendrConstants.Serialization.Region)]
     public class RegionSerializer : VendrSerializerBase<RegionReadOnly>, ISyncSerializer<RegionReadOnly>
     {
-        public RegionSerializer(IVendrApi vendrApi, 
+        public RegionSerializer(IVendrApi vendrApi, VendrSyncSettingsAccessor settingsAccessor,
             IUnitOfWorkProvider uowProvider,
 #if NETFRAMEWORK
-            ILogger logger) : base(vendrApi, uowProvider, logger)
+            ILogger logger) : base(vendrApi, settingsAccessor, uowProvider, logger)
 #else
-            ILogger<RegionSerializer> logger) : base(vendrApi, uowProvider, logger)
+            ILogger<RegionSerializer> logger) : base(vendrApi, settingsAccessor, uowProvider, logger)
 #endif
         { }
 

diff --git a/src/Vendr.uSync/Serializers/ShippingMethodSerializer.cs b/src/Vendr.uSync/Serializers/ShippingMethodSerializer.cs
@@ -7,6 +7,7 @@
 using Vendr.Common;
 
 using Vendr.uSync.Extensions;
+using Vendr.uSync.Configuration;
 
 #if NETFRAMEWORK
 using Umbraco.Core.Logging;
@@ -27,12 +28,12 @@ namespace Vendr.uSync.Serializers
     [SyncSerializer("1C91B874-6028-4E50-AE1A-4481E9A267BD", "Shipping Method Serializer", VendrConstants.Serialization.ShippingMethod)]
     public class ShippingMethodSerializer : MethodSerializerBase<ShippingMethodReadOnly>, ISyncSerializer<ShippingMethodReadOnly>
     {
-        public ShippingMethodSerializer(IVendrApi vendrApi, 
+        public ShippingMethodSerializer(IVendrApi vendrApi, VendrSyncSettingsAccessor settingsAccessor,
             IUnitOfWorkProvider uowProvider,
 #if NETFRAMEWORK
-            ILogger logger) : base(vendrApi, uowProvider, logger)
+            ILogger logger) : base(vendrApi, settingsAccessor, uowProvider, logger)
 #else
-            ILogger<ShippingMethodSerializer> logger) : base(vendrApi, uowProvider, logger)
+            ILogger<ShippingMethodSerializer> logger) : base(vendrApi, settingsAccessor, uowProvider, logger)
 #endif
         { }
 

diff --git a/src/Vendr.uSync/Serializers/StoreSerializer.cs b/src/Vendr.uSync/Serializers/StoreSerializer.cs
@@ -5,6 +5,7 @@
 using Vendr.Core.Api;
 using Vendr.Core.Models;
 using Vendr.Common;
+using Vendr.uSync.Configuration;
 
 #if NETFRAMEWORK
 using Umbraco.Core;
@@ -32,12 +33,13 @@ public class StoreSerializer : VendrSerializerBase<StoreReadOnly>, ISyncSerializ
 
         public StoreSerializer(
             IUserService userService,
-            IVendrApi vendrApi,
+            IVendrApi vendrApi, 
+            VendrSyncSettingsAccessor settingsAccessor,
             IUnitOfWorkProvider uowProvider,
 #if NETFRAMEWORK
-            ILogger logger) : base(vendrApi, uowProvider, logger)
+            ILogger logger) : base(vendrApi, settingsAccessor, uowProvider, logger)
 #else
-            ILogger<StoreSerializer> logger) : base(vendrApi, uowProvider, logger)
+            ILogger<StoreSerializer> logger) : base(vendrApi, settingsAccessor, uowProvider, logger)
 #endif
         {
             _userService = userService;