Merge pull request #118 from umbraco/v16/hubspot

Hubspot CRM upgraded to V16

Author: acoumb

azure-pipeline - Crm.Hubspot.yml

@@ -1,49 +1,48 @@
 trigger:
-- main
-- main-v10
+  branches:
+    include:
+    - main-v16
+    - v16/dev
+  paths:
+    include:
+    - src/Umbraco.Forms.Integrations.Crm.Hubspot/**
+    - azure-pipeline - Crm.Hubspot.yml
 
 pool:
   vmImage: 'windows-latest'
 
 variables:
   projectName: 'Umbraco.Forms.Integrations.Crm.Hubspot'
-  solution: '**/*.sln'
   project: 'src/$(projectName)/$(projectName).csproj'
-  testProject: 'src/$(projectName).Tests/$(projectName).Tests.csproj'
   buildPlatform: 'Any CPU'
   buildConfiguration: 'Release'
 
 steps:
 - task: NuGetToolInstaller@1
   displayName: 'Install NuGet'
 
-- task: NuGetCommand@2
+- task: DotNetCoreCLI@2
   displayName: 'NuGet Restore'
   inputs:
-    restoreSolution: '$(solution)'
+    command: 'restore'
+    feedsToUse: 'select'
+    projects: '$(project)'
+    includeNuGetOrg: true
 
-- task: VSBuild@1
-  displayName: 'Build Project'
+- task: UseDotNet@2
+  displayName: 'Use SDK version 9.0.203'
   inputs:
-    solution: '$(project)'
-    msbuildArgs: '/p:DeployOnBuild=true /p:WebPublishMethod=Package /p:PackageAsSingleFile=true /p:SkipInvalidConfigurations=true /p:PackageLocation="$(build.artifactStagingDirectory)"'
-    platform: '$(buildPlatform)'
-    configuration: '$(buildConfiguration)'
+    packageType: 'sdk'
+    version: '9.0.203'
 
 - task: VSBuild@1
-  displayName: 'Build Tests'
+  displayName: 'Build Project'
   inputs:
-    solution: '$(testProject)'
+    solution: '$(project)'
     msbuildArgs: '/p:DeployOnBuild=true /p:WebPublishMethod=Package /p:PackageAsSingleFile=true /p:SkipInvalidConfigurations=true /p:PackageLocation="$(build.artifactStagingDirectory)"'
     platform: '$(buildPlatform)'
     configuration: '$(buildConfiguration)'
 
-- task: DotNetCoreCLI@2
-  displayName: dotnet test
-  inputs:
-    command: test
-    projects: '**/*.Tests.csproj'
-
 - task: DotNetCoreCLI@2
   displayName: 'Create NuGet Package'
   inputs:
@@ -52,19 +51,9 @@ steps:
     packagesToPack: '$(project)'
     versioningScheme: 'off'
 
-- task: CmdLine@2
-  displayName: 'Create Umbraco Package'
-  inputs:
-    script: |
-      dotnet tool install --global Umbraco.Tools.Packages
-      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:
     PathtoPublish: '$(Build.ArtifactStagingDirectory)'
     ArtifactName: 'drop'
-    publishLocation: 'Container'
+    publishLocation: 'Container'

src/Umbraco.Forms.Integrations.Crm.Hubspot/Api/Configuration/BackOfficeSecurityRequirementsOperationFilter.cs

@@ -0,0 +1,8 @@
+using Umbraco.Cms.Api.Management.OpenApi;
+
+namespace Umbraco.Forms.Integrations.Crm.Hubspot.Api.Configuration;
+
+public class BackOfficeSecurityRequirementsOperationFilter : BackOfficeSecurityRequirementsOperationFilterBase
+{
+    protected override string ApiName => Constants.ManagementApi.ApiName;
+}

src/Umbraco.Forms.Integrations.Crm.Hubspot/Api/Configuration/HubspotFormsOperationIdHandler.cs

@@ -0,0 +1,17 @@
+using Asp.Versioning;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.Extensions.Options;
+using Umbraco.Cms.Api.Common.OpenApi;
+
+namespace Umbraco.Forms.Integrations.Crm.Hubspot.Api.Configuration;
+
+internal class HubspotFormsOperationIdHandler : OperationIdHandler
+{
+    public HubspotFormsOperationIdHandler(IOptions<ApiVersioningOptions> apiVersioningOptions) : base(apiVersioningOptions)
+    {
+    }
+
+    protected override bool CanHandle(ApiDescription apiDescription, ControllerActionDescriptor controllerActionDescriptor)
+        => controllerActionDescriptor.ControllerTypeInfo.Namespace?.StartsWith("Umbraco.Forms.Integrations.Crm.Hubspot") is true;
+}

src/Umbraco.Forms.Integrations.Crm.Hubspot/Api/Management/Controllers/Contacts/AuthorizeController.cs

@@ -1,10 +1,12 @@
-using Microsoft.AspNetCore.Http;
+using Asp.Versioning;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Forms.Integrations.Crm.Hubspot.Models.Dtos;
 using Umbraco.Forms.Integrations.Crm.Hubspot.Services;
 
 namespace Umbraco.Forms.Integrations.Crm.Hubspot.Api.Management.Controllers.Contacts
 {
+    [ApiVersion("1.0")]
     public class AuthorizeController : ContactControllerBase
     {
         public AuthorizeController(IContactService contactService) : base(contactService)

src/Umbraco.Forms.Integrations.Crm.Hubspot/Api/Management/Controllers/Contacts/ContactControllerBase.cs

@@ -5,7 +5,6 @@
 
 namespace Umbraco.Forms.Integrations.Crm.Hubspot.Api.Management.Controllers.Contacts
 {
-    [ApiVersion("1.0")]
     [BackOfficeRoute($"{Constants.ManagementApi.RootPath}/v{{version:apiVersion}}/contacts")]
     [ApiExplorerSettings(GroupName = Constants.ManagementApi.ContactGroupName)]
     public class ContactControllerBase : HubspotControllerBase

src/Umbraco.Forms.Integrations.Crm.Hubspot/Api/Management/Controllers/Contacts/DeauthorizeController.cs

@@ -1,10 +1,12 @@
-using Microsoft.AspNetCore.Http;
+using Asp.Versioning;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Forms.Integrations.Crm.Hubspot.Models.Dtos;
 using Umbraco.Forms.Integrations.Crm.Hubspot.Services;
 
 namespace Umbraco.Forms.Integrations.Crm.Hubspot.Api.Management.Controllers.Contacts
 {
+    [ApiVersion("1.0")]
     public class DeauthorizeController : ContactControllerBase
     {
         public DeauthorizeController(IContactService contactService) : base(contactService)

src/Umbraco.Forms.Integrations.Crm.Hubspot/Api/Management/Controllers/Contacts/GetAllPropertiesController.cs

@@ -1,10 +1,12 @@
-using Microsoft.AspNetCore.Http;
+using Asp.Versioning;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Forms.Integrations.Crm.Hubspot.Models.Responses;
 using Umbraco.Forms.Integrations.Crm.Hubspot.Services;
 
 namespace Umbraco.Forms.Integrations.Crm.Hubspot.Api.Management.Controllers.Contacts
 {
+    [ApiVersion("1.0")]
     public class GetAllPropertiesController : ContactControllerBase
     {
         public GetAllPropertiesController(IContactService contactService) : base(contactService)

src/Umbraco.Forms.Integrations.Crm.Hubspot/Api/Management/Controllers/Contacts/GetAuthenticationUrlController.cs

@@ -1,9 +1,11 @@
-using Microsoft.AspNetCore.Http;
+using Asp.Versioning;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Forms.Integrations.Crm.Hubspot.Services;
 
 namespace Umbraco.Forms.Integrations.Crm.Hubspot.Api.Management.Controllers.Contacts
 {
+    [ApiVersion("1.0")]
     public class GetAuthenticationUrlController : ContactControllerBase
     {
         public GetAuthenticationUrlController(IContactService contactService) : base(contactService)

src/Umbraco.Forms.Integrations.Crm.Hubspot/Api/Management/Controllers/Contacts/IsAuthorizationConfiguredController.cs

@@ -1,9 +1,11 @@
-using Microsoft.AspNetCore.Http;
+using Asp.Versioning;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Forms.Integrations.Crm.Hubspot.Services;
 
 namespace Umbraco.Forms.Integrations.Crm.Hubspot.Api.Management.Controllers.Contacts
 {
+    [ApiVersion("1.0")]
     public class IsAuthorizationConfiguredController : ContactControllerBase
     {
         public IsAuthorizationConfiguredController(IContactService contactService) : base(contactService)

src/Umbraco.Forms.Integrations.Crm.Hubspot/Api/Management/Controllers/Forms/FormControllerBase.cs

@@ -5,7 +5,6 @@
 
 namespace Umbraco.Forms.Integrations.Crm.Hubspot.Api.Management.Controllers.Forms
 {
-    [ApiVersion("1.0")]
     [BackOfficeRoute($"{Constants.ManagementApi.RootPath}/v{{version:apiVersion}}/forms")]
     [ApiExplorerSettings(GroupName = Constants.ManagementApi.FormGroupName)]
     public class FormControllerBase : HubspotControllerBase