Merge pull request #6 from umbraco/feature/hubspot-forms-v9-multi-target

V9 multi-target updates.

Author: acoumb

src/Umbraco.Cms.Integrations.Commerce.Shopify/Umbraco.Cms.Integrations.Commerce.Shopify.csproj

@@ -36,6 +36,10 @@
 			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
 			<CopyToPublishDirectory>Always</CopyToPublishDirectory>
 		</Content>
+		<None Include="build\**\*.*">
+			<Pack>True</Pack>
+			<PackagePath>buildTransitive</PackagePath>
+		</None>
 	</ItemGroup>
 
 	<ItemGroup>

src/Umbraco.Cms.Integrations.Crm.Hubspot.Tests/Controllers/FormsControllerTests.cs

@@ -1,31 +1,18 @@
-using System;
-using System.Collections.Generic;
+using Moq;
+using Moq.Protected;
+using NUnit.Framework;
+using NUnit.Framework.Internal;
+using System;
 using System.IO;
-using System.Linq;
 using System.Net;
 using System.Net.Http;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Web;
-using Microsoft.AspNet.SignalR.Hubs;
-using Moq;
-using Moq.Protected;
-using Newtonsoft.Json;
-using NUnit.Framework;
-using NUnit.Framework.Internal;
 using Umbraco.Cms.Integrations.Crm.Hubspot.Configuration;
 using Umbraco.Cms.Integrations.Crm.Hubspot.Controllers;
 using Umbraco.Cms.Integrations.Crm.Hubspot.Models;
-using Umbraco.Cms.Integrations.Crm.Hubspot.Models.Dtos;
 using Umbraco.Cms.Integrations.Crm.Hubspot.Services;
 using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.Logging;
-using Umbraco.Web;
-using Umbraco.Web.Routing;
-using Umbraco.Web.Security;
 using ILogger = Umbraco.Core.Logging.ILogger;
 
 namespace Umbraco.Cms.Integrations.Crm.Hubspot.Tests.Controllers
@@ -39,23 +26,11 @@ public class FormsControllerTests
             ""correlationId"": ""73f4a25b-7b0a-4537-a490-e5c226619d59""
         }";
 
-        private readonly string ExpiredOAuthToken = @"{
-            ""status"": ""error"",
-            ""message"": ""This oauth-token is expired! expiresAt: 1643194402611, now: 1643972072320"",
-            ""correlationId"": ""1ae46a55-f5b9-4f68-811a-695a12aaa4f5"",
-            ""category"": ""EXPIRED_AUTHENTICATION"",
-            ""errors"": [
-                {
-                    ""message"": ""The OAuth token used to make this call expired 9 day(s) ago.""
-                }
-            ]
-        }";
+        private HubspotSettings MockedAppSettingsApiSetup;
 
-        private Mock<IAppSettings> MockedAppSettingsApiSetup;
+        private HubspotSettings MockedAppSettingsOAuthSetup;
 
-        private Mock<IAppSettings> MockedAppSettingsOAuthSetup;
-
-        private Mock<IAppSettings> MockedAppSettingsNoSetup;
+        private HubspotSettings MockedAppSettingsNoSetup;
 
         private Mock<ILogger> MockedLogger;
 
@@ -81,7 +56,10 @@ public void Init()
         [Test]
         public void CheckApiConfiguration_WithApiConfig_ShouldReturnValidConfigurationResponseObjectWithType()
         {
-            var sut = new FormsController(MockedAppSettingsApiSetup.Object, Mock.Of<ITokenService>(), Mock.Of<ILogger>());
+            var sut = new FormsController(Mock.Of<ITokenService>(), Mock.Of<ILogger>())
+            {
+                Options = MockedAppSettingsApiSetup
+            };
 
             var result = sut.CheckConfiguration();
 
@@ -92,7 +70,10 @@ public void CheckApiConfiguration_WithApiConfig_ShouldReturnValidConfigurationRe
         [Test]
         public void CheckOAuthConfiguration_WithOAuthConfigAndNoApiConfig_ShouldReturnValidConfigurationResponseObjectWithType()
         {
-            var sut = new FormsController(MockedAppSettingsOAuthSetup.Object, Mock.Of<ITokenService>(), Mock.Of<ILogger>());
+            var sut = new FormsController(Mock.Of<ITokenService>(), Mock.Of<ILogger>())
+            {
+                Options = MockedAppSettingsOAuthSetup
+            };
 
             var result = sut.CheckConfiguration();
 
@@ -107,7 +88,10 @@ public void CheckOAuthConfiguration_WithOAuthConfigAndNoApiConfig_ShouldReturnVa
         [Test]
         public async Task GetAll_WithoutApiKey_ShouldReturnInvalidResponseObjectWithLoggedInfo()
         {
-            var sut = new FormsController(Mock.Of<IAppSettings>(), Mock.Of<ITokenService>(), MockedLogger.Object);
+            var sut = new FormsController(Mock.Of<ITokenService>(), MockedLogger.Object)
+            {
+                Options = MockedAppSettingsNoSetup
+            };
 
             var result = await sut.GetAll();
 
@@ -120,7 +104,8 @@ public async Task GetAll_WithoutApiKey_ShouldReturnInvalidResponseObjectWithLogg
         [Test]
         public async Task GetAll_WithUnauthorizedRequest_ShouldReturnExpiredResponseObjectWithLoggedError()
         {
-            var sut = new FormsController(MockedAppSettingsApiSetup.Object, Mock.Of<ITokenService>(), MockedLogger.Object);
+            var sut = new FormsController(Mock.Of<ITokenService>(), MockedLogger.Object);
+            sut.Options = MockedAppSettingsApiSetup;
 
             var httpClient = CreateMockedHttpClient(HttpStatusCode.Unauthorized, InvalidApiKey);
             FormsController.ClientFactory = () => httpClient;
@@ -136,7 +121,8 @@ public async Task GetAll_WithUnauthorizedRequest_ShouldReturnExpiredResponseObje
         [Test]
         public async Task GetAll_WithSuccessfulRequest_ShouldReturnResponseObjectWithFormsCollection()
         {
-            var sut = new FormsController(MockedAppSettingsApiSetup.Object, Mock.Of<ITokenService>(), MockedLogger.Object);
+            var sut = new FormsController(Mock.Of<ITokenService>(), MockedLogger.Object);
+            sut.Options = MockedAppSettingsApiSetup;
 
             var response = File.ReadAllText(TestContext.CurrentContext.TestDirectory + "\\Data\\mockResponseApiSetup.json");
 
@@ -153,7 +139,8 @@ public async Task GetAll_WithSuccessfulRequest_ShouldReturnResponseObjectWithFor
         [Test]
         public async Task GetAll_WithFailedRequest_ShouldReturnDefaultResponseObjectWithLoggedError()
         {
-            var sut = new FormsController(MockedAppSettingsApiSetup.Object, Mock.Of<ITokenService>(), MockedLogger.Object);
+            var sut = new FormsController(Mock.Of<ITokenService>(), MockedLogger.Object);
+            sut.Options = MockedAppSettingsApiSetup;
 
             var response = File.ReadAllText(TestContext.CurrentContext.TestDirectory + "\\Data\\mockResponseApiSetup.json");
 
@@ -178,7 +165,7 @@ public async Task GetAllOAuth_WithoutAccessToken_ShouldReturnInvalidResponseObje
         {
             var mockedTokenService = CreateMockedTokenService(false);
 
-            var sut = new FormsController(Mock.Of<IAppSettings>(), mockedTokenService.Object, MockedLogger.Object);
+            var sut = new FormsController(mockedTokenService.Object, MockedLogger.Object);
 
             var result = await sut.GetAllOAuth();
 
@@ -193,7 +180,7 @@ public async Task GetAllOAuth_WithUnauthorizedRequest_ShouldReturnExpiredRespons
         {
             var mockedTokenService = CreateMockedTokenService(true);
 
-            var sut = new FormsController(MockedAppSettingsApiSetup.Object, mockedTokenService.Object, MockedLogger.Object);
+            var sut = new FormsController(mockedTokenService.Object, MockedLogger.Object);
 
             var httpClient = CreateMockedHttpClient(HttpStatusCode.Unauthorized);
             FormsController.ClientFactory = () => httpClient;
@@ -211,14 +198,14 @@ public async Task GetAllOAuth_WithSuccessfulRequest_ShouldReturnResponseObjectWi
         {
             var mockedTokenService = CreateMockedTokenService(true);
 
-            var sut = new FormsController(MockedAppSettingsApiSetup.Object, mockedTokenService.Object, MockedLogger.Object);
+            var sut = new FormsController(mockedTokenService.Object, MockedLogger.Object);
 
             var response = File.ReadAllText(TestContext.CurrentContext.TestDirectory + "\\Data\\mockResponseOAuthSetup.json");
 
             var httpClient = CreateMockedHttpClient(HttpStatusCode.OK, response);
             FormsController.ClientFactory = () => httpClient;
 
-            var result = await sut.GetAll();
+            var result = await sut.GetAllOAuth();
 
             Assert.That(result.IsValid, Is.True);
             Assert.That(result.IsExpired, Is.False);
@@ -230,14 +217,14 @@ public async Task GetAllOAuth_WithFailedRequest_ShouldReturnDefaultResponseObjec
         {
             var mockedTokenService = CreateMockedTokenService(true);
 
-            var sut = new FormsController(MockedAppSettingsApiSetup.Object, mockedTokenService.Object, MockedLogger.Object);
+            var sut = new FormsController(mockedTokenService.Object, MockedLogger.Object);
 
             var response = File.ReadAllText(TestContext.CurrentContext.TestDirectory + "\\Data\\mockResponseApiSetup.json");
 
             var httpClient = CreateMockedHttpClient(HttpStatusCode.InternalServerError, response);
             FormsController.ClientFactory = () => httpClient;
 
-            var result = await sut.GetAll();
+            var result = await sut.GetAllOAuth();
 
             MockedLogger.Verify(x => x.Error(It.Is<Type>(y => y == typeof(FormsController)), It.IsAny<string>()), Times.Once);
 
@@ -248,18 +235,11 @@ public async Task GetAllOAuth_WithFailedRequest_ShouldReturnDefaultResponseObjec
 
         #endregion
 
-        private static Mock<IAppSettings> CreateMockedAppSettings(bool includeApiKeySettings = false)
+        private static HubspotSettings CreateMockedAppSettings(bool includeApiKeySettings = false)
         {
-            var mockedAppSettings = new Mock<IAppSettings>();
-
-            if (includeApiKeySettings)
-            {
-                mockedAppSettings
-                    .Setup(c => c[AppSettingsConstants.UmbracoCmsIntegrationsCrmHubspotApiKey])
-                    .Returns("test-api-key");
-            }
-
-            return mockedAppSettings;
+            return includeApiKeySettings
+                ? new HubspotSettings {ApiKey = "test-api-key", Region = "eu1"}
+                : new HubspotSettings { Region = "eu1" };
         }
 
         private static Mock<ITokenService> CreateMockedTokenService(bool includeAccessToken)

src/Umbraco.Cms.Integrations.Crm.Hubspot/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/Render/HubspotForm.cshtml

@@ -8,10 +8,24 @@
 }
 
 <script charset="utf-8" type="text/javascript" src="@hbsptScriptPath"></script>
-<script>
+@if (string.IsNullOrEmpty(region))
+{
+    <script>
+        hbspt.forms.create({
+            portalId: "@Model.PortalId",
+            formId: "@Model.Id"
+        });
+    </script>
+
+}
+else
+{
+    <script>
         hbspt.forms.create({
             region: "@region",
             portalId: "@Model.PortalId",
             formId: "@Model.Id"
         });
-</script>
+    </script>
+
+}

src/Umbraco.Cms.Integrations.Crm.Hubspot/Configuration/AppSettingsConstants.cs

@@ -0,0 +1,22 @@
+using System.Collections.Specialized;
+
+namespace Umbraco.Cms.Integrations.Crm.Hubspot.Configuration
+{
+    public class HubspotSettings
+    {
+        public HubspotSettings()
+        {
+            
+        }
+
+        public HubspotSettings(NameValueCollection appSettings)
+        {
+            ApiKey = appSettings[Constants.UmbracoCmsIntegrationsCrmHubspotApiKey];
+            Region = appSettings[Constants.UmbracoCmsIntegrationsCrmHubspotRegion];
+        }
+
+        public string ApiKey { get; set; }
+
+        public string Region { get; set; }
+    }
+}

src/Umbraco.Cms.Integrations.Crm.Hubspot/Configuration/AppSettingsWrapper.cs

@@ -1,11 +1,20 @@
-namespace Umbraco.Cms.Integrations.Crm.Hubspot.Models
+namespace Umbraco.Cms.Integrations.Crm.Hubspot
 {
     using Newtonsoft.Json;
     using Newtonsoft.Json.Converters;
     using System.Globalization;
 
     public static class Constants
     {
+        public const string UmbracoCmsIntegrationsCrmHubspotApiKey = "Umbraco.Cms.Integrations.Crm.Hubspot.ApiKey";
+
+        public const string UmbracoCmsIntegrationsCrmHubspotRegion = "Umbraco.Cms.Integrations.Crm.Hubspot.Region";
+
+        public static class Configuration
+        {
+            public const string Settings = "Umbraco:Cms:Integrations:Crm:Hubspot:Settings";
+        }
+
         internal static readonly JsonSerializerSettings SerializationSettings = new JsonSerializerSettings
         {
             MetadataPropertyHandling = MetadataPropertyHandling.Ignore,