Merge pull request #121 from umbraco/feature/hubspot-remove-v8

Hubspot - remove V8 support and update unit tests

Author: acoumb

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

@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net60</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="UmbracoCms" Version="8.4.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageReference Include="Umbraco.Cms.Web.Website" Version="10.0.0" />
   </ItemGroup>
 
   <ItemGroup>

src/Umbraco.Cms.Integrations.Crm.Hubspot.Tests/Umbraco.Cms.Integrations.Crm.Hubspot.Tests.csproj

@@ -1,4 +1,4 @@
-@inherits Umbraco.Web.Mvc.UmbracoViewPage<Umbraco.Cms.Integrations.Crm.Hubspot.Models.ViewModels.HubspotFormViewModel>
+@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Integrations.Crm.Hubspot.Models.ViewModels.HubspotFormViewModel>
 
 <script charset="utf-8" type="text/javascript" src="@Model.ScriptPath"></script>
 <script>

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

@@ -4,21 +4,6 @@ namespace Umbraco.Cms.Integrations.Crm.Hubspot.Configuration
 {
     public class HubspotOAuthSettings
     {
-        public HubspotOAuthSettings() { }
-
-        public HubspotOAuthSettings(NameValueCollection appSettings)
-        {
-            ClientId = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmHubspotClientIdKey];
-
-            ClientSecret = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmHubspotClientSecretKey];
-
-            RedirectUri = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmHubspotRedirectUriKey];
-
-            Scopes = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmHubspotScopesKey];
-
-            TokenEndpoint = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmHubspotTokenEndpointKey];
-        }
-
         public string ClientId { get; set; }
 
         public string ClientSecret { get; set; }

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

@@ -1,24 +1,8 @@
-using System.Collections.Specialized;
-
+
 namespace Umbraco.Cms.Integrations.Crm.Hubspot.Configuration
 {
     public class HubspotSettings
     {
-        public HubspotSettings()
-        {
-            
-        }
-
-        public HubspotSettings(NameValueCollection appSettings)
-        {
-            ApiKey = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmHubspotApiKey];
-            Region = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmHubspotRegion];
-            UseUmbracoAuthorization = 
-                bool.TryParse(appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmHubspotUseUmbracoAuthorizationKey], out var key)
-                    ? key
-                    : true;
-        }
-
         public string ApiKey { get; set; }
 
         public string Region { get; set; }

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

@@ -17,23 +17,6 @@ public static class Configuration
             public const string Settings = "Umbraco:Cms:Integrations:Crm:Hubspot:Settings";
 
             public const string OAuthSettings = "Umbraco:Cms:Integrations:Crm:Hubspot:OAuthSettings";
-
-            public const string UmbracoCmsIntegrationsCrmHubspotApiKey = "Umbraco.Cms.Integrations.Crm.Hubspot.ApiKey";
-
-            public const string UmbracoCmsIntegrationsCrmHubspotRegion = "Umbraco.Cms.Integrations.Crm.Hubspot.Region";
-
-            public const string UmbracoCmsIntegrationsCrmHubspotUseUmbracoAuthorizationKey =
-                "Umbraco.Cms.Integrations.Crm.Hubspot.UseUmbracoAuthorization";
-
-            public const string UmbracoCmsIntegrationsCrmHubspotClientIdKey = "Umbraco.Cms.Integrations.Crm.Hubspot.ClientId";
-
-            public const string UmbracoCmsIntegrationsCrmHubspotClientSecretKey = "Umbraco.Cms.Integrations.Crm.Hubspot.ClientSecret";
-
-            public const string UmbracoCmsIntegrationsCrmHubspotRedirectUriKey = "Umbraco.Cms.Integrations.Crm.Hubspot.RedirectUri";
-
-            public const string UmbracoCmsIntegrationsCrmHubspotScopesKey = "Umbraco.Cms.Integrations.Crm.Hubspot.Scopes";
-
-            public const string UmbracoCmsIntegrationsCrmHubspotTokenEndpointKey = "Umbraco.Cms.Integrations.Crm.Hubspot.TokenEndpoint";
         }
 
         public static class ErrorMessages

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

@@ -6,23 +6,12 @@
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
 
-#if NETCOREAPP
 using Microsoft.Extensions.Options;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
+
 using Umbraco.Cms.Web.BackOffice.Controllers;
 using Umbraco.Cms.Web.Common.Attributes;
-#else
-using System.Web.Http;
-using System.Configuration;
-
-using Umbraco.Core.Logging;
-using Umbraco.Web.Mvc;
-using Umbraco.Web.WebApi;
-#endif
-
-using Newtonsoft.Json;
-
 using Umbraco.Cms.Integrations.Crm.Hubspot.Resources;
 using Umbraco.Cms.Integrations.Crm.Hubspot.Configuration;
 using Umbraco.Cms.Integrations.Crm.Hubspot.Models;
@@ -53,13 +42,8 @@ public class FormsController : UmbracoAuthorizedApiController
 
         private const string HubspotFormsApiEndpoint = "https://api.hubapi.com/forms/v2/forms";
 
-#if NETCOREAPP
         private readonly ILogger<FormsController> _logger;
-#else
-        private readonly ILogger _logger;
-#endif
 
-#if NETCOREAPP
         public FormsController(
             IOptions<HubspotSettings> options,
             IOptions<HubspotOAuthSettings> oauthOptions,
@@ -77,32 +61,14 @@ public FormsController(
 
             _authorizationService = authorizationImplementationFactory(Options.UseUmbracoAuthorization);
         }
-#else
-        public FormsController(ITokenService tokenService, ILogger logger, AuthorizationImplementationFactory authorizationImplementationFactory)
-        {
-            Options = new HubspotSettings(ConfigurationManager.AppSettings);
-
-            OAuthOptions = new HubspotOAuthSettings(ConfigurationManager.AppSettings);
-
-            _tokenService = tokenService;
-
-            _logger = logger;
-
-            _authorizationService = authorizationImplementationFactory(Options.UseUmbracoAuthorization);
-        }
-#endif
 
         public async Task<ResponseDto> GetAll()
         {
             var hubspotApiKey = Options.ApiKey;
 
             if (string.IsNullOrEmpty(hubspotApiKey))
             {
-#if NETCOREAPP
                 _logger.LogInformation(message: Constants.ErrorMessages.ApiKeyMissing);
-#else
-                _logger.Info<FormsController>(message: Constants.ErrorMessages.ApiKeyMissing);
-#endif
 
                 return new ResponseDto { IsValid = false, Error = Constants.ErrorMessages.ApiKeyMissing };
             }
@@ -128,30 +94,19 @@ public async Task<ResponseDto> GetAll()
             }
             catch (HttpRequestException ex) when (ex.Message.Contains(HttpStatusCode.Forbidden.ToString()))
             {
-#if NETCOREAPP
                 _logger.LogError(string.Format(LoggingResources.ApiFetchFormsFailed, responseContent));
-#else
-                _logger.Error<FormsController>(string.Format(LoggingResources.ApiFetchFormsFailed, responseContent));
-#endif
+
                 return new ResponseDto { IsValid = false, Error = Constants.ErrorMessages.TokenPermissions };
             }
             catch (HttpRequestException ex) when (ex.Message.Contains(HttpStatusCode.Unauthorized.ToString()))
             {
-#if NETCOREAPP
                 _logger.LogError(string.Format(LoggingResources.ApiFetchFormsFailed, responseContent));
-#else
-                _logger.Error<FormsController>(string.Format(LoggingResources.ApiFetchFormsFailed, responseContent));
-#endif
 
                 return new ResponseDto { IsExpired = true, Error = Constants.ErrorMessages.InvalidApiKey };
             }
             catch
             {
-#if NETCOREAPP
                 _logger.LogError(string.Format(LoggingResources.ApiFetchFormsFailed, responseContent));
-#else
-                _logger.Error<FormsController>(string.Format(LoggingResources.ApiFetchFormsFailed, responseContent));
-#endif
 
                 return new ResponseDto();
             }
@@ -162,11 +117,7 @@ public async Task<ResponseDto> GetAllOAuth()
             _tokenService.TryGetParameters(Constants.AccessTokenDbKey, out string accessToken);
             if (string.IsNullOrEmpty(accessToken))
             {
-#if NETCOREAPP
                 _logger.LogInformation(Constants.ErrorMessages.AccessTokenMissing);
-#else
-                _logger.Info<FormsController>(Constants.ErrorMessages.AccessTokenMissing);
-#endif
 
                 return new ResponseDto 
                 { 
@@ -196,20 +147,13 @@ public async Task<ResponseDto> GetAllOAuth()
             }
             catch(HttpRequestException ex) when (ex.Message.Contains(HttpStatusCode.Unauthorized.ToString()))
             {
-#if NETCOREAPP
                 _logger.LogError(string.Format(LoggingResources.OAuthFetchFormsFailed, responseContent));
-#else
-                _logger.Error<FormsController>(string.Format(LoggingResources.OAuthFetchFormsFailed, responseContent));
-#endif   
+
                 return new ResponseDto { IsExpired = true, Error = Constants.ErrorMessages.InvalidApiKey };
             }
             catch
             {
-#if NETCOREAPP
                 _logger.LogError(string.Format(LoggingResources.OAuthFetchFormsFailed, responseContent));
-#else
-                _logger.Error<FormsController>(string.Format(LoggingResources.OAuthFetchFormsFailed, responseContent));
-#endif
 
                 return new ResponseDto();
             }

src/Umbraco.Cms.Integrations.Crm.Hubspot/Constants.cs

@@ -1,23 +1,13 @@
 using Umbraco.Cms.Integrations.Crm.Hubspot.Models;
-
-#if NETCOREAPP
-using Microsoft.AspNetCore.Mvc;
-
 using Umbraco.Cms.Web.Common.Controllers;
-#else
-using System.Web.Http;
-using System.Net.Http;
-using System.Net.Http.Headers;
 
-using Umbraco.Web.WebApi;
-#endif
+using Microsoft.AspNetCore.Mvc;
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Controllers
 {
     public class HubspotAuthorizationController : UmbracoApiController
     {
         [HttpGet]
-#if NETCOREAPP
         public IActionResult OAuth(string code)
         {
             return new ContentResult
@@ -28,16 +18,5 @@ public IActionResult OAuth(string code)
                 ContentType = "text/html"
             };
         }
-#else
-        public HttpResponseMessage OAuth(string code)
-        {
-            var response = new HttpResponseMessage();
-            response.Content = new StringContent(string.IsNullOrEmpty(code)
-                ? JavascriptResponse.Fail("Authorization process failed.")
-                : JavascriptResponse.Ok(code));
-            response.Content.Headers.ContentType = new MediaTypeHeaderValue("text/html");
-            return response;
-        }
-#endif
     }
 }

src/Umbraco.Cms.Integrations.Crm.Hubspot/Controllers/FormsController.cs

@@ -3,14 +3,8 @@
 using System;
 
 using Umbraco.Cms.Integrations.Crm.Hubspot.Models.ViewModels;
-
-#if NETCOREAPP
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Models.PublishedContent;
-#else
-using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.PropertyEditors;
-#endif
 
 namespace Umbraco.Cms.Integrations.Crm.Hubspot.Editors
 {