Merge branch 'main' into feature/payment-provider-integration

# Conflicts:
#	src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/Services/MappingService.cs

Author: acoumb

README.md

@@ -10,4 +10,4 @@ This repository houses open-source extensions, created for Umbraco Forms, that i
 
 ### Automation
 
-[Zapier](./src/Umbraco.Forms.Integrations.Automation.Zapier) - a custom workflow allowing form entries to be mapped to the fields of a Zap tool trigger from Zapier.
+[Zapier](./src/Umbraco.Forms.Integrations.Automation.Zapier) - a dashboard interface that allows users to vizualize registered subscription hooks for their Umbraco Forms and to call Zapier triggers when a specific forms gets submitted.

azure-pipeline - Automation.Zapier.yml

@@ -1,5 +1,6 @@
 trigger:
 - main
+- main-v10
 
 pool:
   vmImage: 'windows-latest'
@@ -45,6 +46,7 @@ steps:
       cd src/$(projectName)/
       umbpack pack .\package.xml -o $(Build.ArtifactStagingDirectory)
       cd ../../
+  condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')    
 - task: PublishBuildArtifacts@1
   displayName: 'Publish Build Artifacts'
   inputs:

azure-pipeline - Cms.OAuthProxy.yml

@@ -54,6 +54,11 @@ steps:
           "name": "AppSettings:GoogleClientSecret",
           "value": "$(googleAppSecretKey)",
           "slotSetting": false
+        },
+        {
+          "name": "AppSettings:DynamicsClientSecret",
+          "value": "$(dynamicsAppSecretKey)",
+          "slotSetting": false
         }
       ]
 - task: AzureWebApp@1
@@ -88,5 +93,10 @@ steps:
           "name": "AppSettings:GoogleClientSecret",
           "value": "$(googleAppSecretKey)",
           "slotSetting": false
+        },
+        {
+          "name": "AppSettings:DynamicsClientSecret",
+          "value": "$(dynamicsAppSecretKey)",
+          "slotSetting": false
         }
       ]

azure-pipeline - Commerce.EMerchantPay.yml

@@ -1,5 +1,5 @@
 trigger:
-- feature/payment-provider-integration
+- main
 
 pool:
   vmImage: 'windows-latest'

azure-pipeline - Crm.Hubspot.yml

@@ -1,5 +1,6 @@
 trigger:
 - main
+- main-v10
 
 pool:
   vmImage: 'windows-latest'
@@ -59,6 +60,7 @@ steps:
       cd src/$(projectName)/
       umbpack pack .\package.xml -o $(Build.ArtifactStagingDirectory)
       cd ../../
+  condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
 
 - task: PublishBuildArtifacts@1
   displayName: 'Publish Build Artifacts'

src/Umbraco.Cms.Integrations.OAuthProxy/Configuration/AppSettings.cs

@@ -12,6 +12,8 @@ public class AppSettings
 
         public string GoogleClientSecret { get; set; }
 
+        public string DynamicsClientSecret { get; set; }
+
         public string this[string propertyName] => (string)GetType().GetProperty(propertyName)?.GetValue(this, null);
     }
 }

src/Umbraco.Cms.Integrations.OAuthProxy/Configuration/ServiceConfiguration.cs

@@ -10,13 +10,14 @@ public static class ServiceConfiguration
         /// <summary>
         /// Integrated services with their token URIs
         /// </summary>
-        public static Dictionary<string, string> ServiceProviders = new Dictionary<string, string>
+        public static Dictionary<string, string> ServiceProviders = new()
         {
             { "Hubspot", "oauth/v1/token" }, 
             { "HubspotForms", "oauth/v1/token" }, 
             { "Semrush", "oauth2/access_token" }, 
             { "Shopify", "oauth/access_token" },
-            { "Google", "token"}
+            { "Google", "token"},
+            { "Dynamics", "oauth2/v2.0/token" }
         };
 
         public static void AddServiceClients(this IServiceCollection services)
@@ -41,6 +42,10 @@ public static void AddServiceClients(this IServiceCollection services)
             {
                 c.BaseAddress = new Uri("https://oauth2.googleapis.com/");
             });
+            services.AddHttpClient("DynamicsToken", c =>
+            {
+                c.BaseAddress = new Uri("https://login.microsoftonline.com/common/");
+            });
         }
     }
 }

src/Umbraco.Forms.Integrations.Automation.Zapier/Components/NewFormSubmittedComponent.cs

@@ -17,7 +17,7 @@ public class NewFormSubmittedComposer : ComponentComposer<NewFormSubmittedCompon
 
     public class NewFormSubmittedComponent : IComponent
     {
-        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
+        private readonly UmbUrlHelper _umbUrlHelper;
 
         private readonly IRecordStorage _recordStorage;
 
@@ -27,12 +27,14 @@ public class NewFormSubmittedComponent : IComponent
 
         private readonly ILogger _logger;
 
-        public NewFormSubmittedComponent(IUmbracoContextAccessor umbracoContextAccessor, IRecordStorage recordStorage, 
+        public NewFormSubmittedComponent(
+            UmbUrlHelper umbUrlHelper, 
+            IRecordStorage recordStorage, 
             ZapierService zapierService, 
             ZapierFormSubscriptionHookService zapierFormSubscriptionHookService,
             ILogger logger)
         {
-            _umbracoContextAccessor = umbracoContextAccessor;
+            _umbUrlHelper = umbUrlHelper;
 
             _recordStorage = recordStorage;
 
@@ -56,13 +58,9 @@ private void RecordStorage_RecordInserting(object sender, Core.RecordEventArgs e
         {
             var triggerHelper = new TriggerHelper(_zapierService);
 
-            UmbracoContext umbracoContext = _umbracoContextAccessor.UmbracoContext;
-            var umbracoPageId = e.Record.UmbracoPageId;
-            var pageUrl = umbracoContext.UrlProvider.GetUrl(umbracoPageId, UrlMode.Absolute);
-
             if (_zapierFormSubscriptionHookService.TryGetById(e.Form.Id.ToString(), out var subscriptionHooks))
             {
-                var content = e.Form.ToFormDictionary(e.Record, pageUrl);
+                var content = e.Form.ToFormDictionary(e.Record, _umbUrlHelper.GetPageUrl(e.Record.UmbracoPageId));
 
                 foreach (var subscriptionHook in subscriptionHooks)
                 {

src/Umbraco.Forms.Integrations.Automation.Zapier/Components/NewFormSubmittedNotification.cs

@@ -16,9 +16,7 @@ namespace Umbraco.Forms.Integrations.Automation.Zapier.Components
 {
     public class NewFormSubmittedNotification : INotificationHandler<RecordCreatingNotification>
     {
-        private readonly IUmbracoHelperAccessor _umbracoHelperAccessor;
-
-        private readonly IPublishedUrlProvider _publishedUrlProvider;
+        private readonly UmbUrlHelper _umbUrlHelper;
 
         private readonly IFormService _formService;
 
@@ -29,15 +27,12 @@ public class NewFormSubmittedNotification : INotificationHandler<RecordCreatingN
         private readonly ILogger<NewFormSubmittedNotification> _logger;
 
         public NewFormSubmittedNotification(
-            IUmbracoHelperAccessor umbracoHelperAccessor,
-            IPublishedUrlProvider publishedUrlProvider,
+            UmbUrlHelper umbUrlHelper,
             IFormService formService, 
             ZapierService zapierService, ZapierFormSubscriptionHookService zapierFormSubscriptionHookService,
             ILogger<NewFormSubmittedNotification> logger)
         {
-            _umbracoHelperAccessor = umbracoHelperAccessor;
-
-            _publishedUrlProvider = publishedUrlProvider;
+            _umbUrlHelper = umbUrlHelper;
 
             _formService = formService;
 
@@ -58,17 +53,7 @@ public void Handle(RecordCreatingNotification notification)
 
                 if (_zapierFormSubscriptionHookService.TryGetById(form.Id.ToString(), out var subscriptionHooks))
                 {
-                    string pageUrl = string.Empty;
-                    if (_umbracoHelperAccessor.TryGetUmbracoHelper(out UmbracoHelper umbracoHelper))
-                    {
-                        IPublishedContent publishedContent = umbracoHelper.Content(notificationSavedEntity.UmbracoPageId);
-                        if (publishedContent != null)
-                        {
-                            pageUrl = publishedContent.Url(_publishedUrlProvider, mode: UrlMode.Absolute);
-                        }
-                    }
-
-                    var content = form.ToFormDictionary(notificationSavedEntity, pageUrl);
+                    var content = form.ToFormDictionary(notificationSavedEntity, _umbUrlHelper.GetPageUrl(notificationSavedEntity.UmbracoPageId));
 
                     foreach (var subscriptionHook in subscriptionHooks)
                     {

src/Umbraco.Forms.Integrations.Automation.Zapier/Controllers/FormController.cs

@@ -32,7 +32,7 @@ public FormController(ZapierFormService zapierFormService, IUserValidationServic
 
         public IEnumerable<FormDto> GetForms()
         {
-            if (!IsUserValid()) return Enumerable.Empty<FormDto>();
+            if (!IsAccessValid()) return Enumerable.Empty<FormDto>();
 
             return _zapierFormService.GetAll();
         }