Skip to content

Commit bfd13ab

Browse files
committed
Merge branch 'v14/feature/42961-V14-Integrations-(HubSpot/Forms)' into v14/feature/43244-V14-Integrations-(ActiveCampaign/Forms)
2 parents c11736d + 8b2c60e commit bfd13ab

38 files changed

+7904
-8
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ src/Umbraco.Forms.Integrations.Testsite.V14/umbraco
1616
src/Umbraco.Forms.Integrations.Testsite.V14/Views
1717
src/Umbraco.Forms.Integrations.Testsite.V14/wwwroot
1818
src/Umbraco.Forms.Integrations.Automation.Zapier/wwwroot
19+
src/Umbraco.Forms.Integrations.Crm.Hubspot/wwwroot
1920
src/Umbraco.Forms.Integrations.Crm.ActiveCampaign/wwwroot
2021

2122
# User-specific files (MonoDevelop/Xamarin Studio)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using Umbraco.Forms.Integrations.Crm.Hubspot.Models.Dtos;
99
using Umbraco.Forms.Integrations.Crm.Hubspot.Services;
1010

11-
namespace Umbraco.Forms.Integrations.Crm.Hubspot.Api.Management.Controllers.Forms
11+
namespace Umbraco.Forms.Integrations.Crm.Hubspot.Api.Management.Controllers.Contacts
1212
{
1313
public class AuthorizeController : ContactControllerBase
1414
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using Umbraco.Cms.Web.Common.Routing;
99
using Umbraco.Forms.Integrations.Crm.Hubspot.Services;
1010

11-
namespace Umbraco.Forms.Integrations.Crm.Hubspot.Api.Management.Controllers.Forms
11+
namespace Umbraco.Forms.Integrations.Crm.Hubspot.Api.Management.Controllers.Contacts
1212
{
1313
[ApiVersion("1.0")]
1414
[BackOfficeRoute($"{Constants.ManagementApi.RootPath}/v{{version:apiVersion}}/contacts")]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using Umbraco.Forms.Integrations.Crm.Hubspot.Models.Dtos;
99
using Umbraco.Forms.Integrations.Crm.Hubspot.Services;
1010

11-
namespace Umbraco.Forms.Integrations.Crm.Hubspot.Api.Management.Controllers.Forms
11+
namespace Umbraco.Forms.Integrations.Crm.Hubspot.Api.Management.Controllers.Contacts
1212
{
1313
public class DeauthorizeController : ContactControllerBase
1414
{
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
using Umbraco.Forms.Integrations.Crm.Hubspot.Models.Responses;
1010
using Umbraco.Forms.Integrations.Crm.Hubspot.Services;
1111

12-
namespace Umbraco.Forms.Integrations.Crm.Hubspot.Api.Management.Controllers.Forms
12+
namespace Umbraco.Forms.Integrations.Crm.Hubspot.Api.Management.Controllers.Contacts
1313
{
1414
public class GetAllPropertiesController : ContactControllerBase
1515
{
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.Threading.Tasks;
88
using Umbraco.Forms.Integrations.Crm.Hubspot.Services;
99

10-
namespace Umbraco.Forms.Integrations.Crm.Hubspot.Api.Management.Controllers.Forms
10+
namespace Umbraco.Forms.Integrations.Crm.Hubspot.Api.Management.Controllers.Contacts
1111
{
1212
public class GetAuthenticationUrlController : ContactControllerBase
1313
{
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.Threading.Tasks;
88
using Umbraco.Forms.Integrations.Crm.Hubspot.Services;
99

10-
namespace Umbraco.Forms.Integrations.Crm.Hubspot.Api.Management.Controllers.Forms
10+
namespace Umbraco.Forms.Integrations.Crm.Hubspot.Api.Management.Controllers.Contacts
1111
{
1212
public class IsAuthorizationConfiguredController : ContactControllerBase
1313
{
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Logs
2+
logs
3+
*.log
4+
npm-debug.log*
5+
yarn-debug.log*
6+
yarn-error.log*
7+
pnpm-debug.log*
8+
lerna-debug.log*
9+
10+
node_modules
11+
dist
12+
dist-ssr
13+
*.local
14+
15+
# Editor directories and files
16+
.vscode/*
17+
!.vscode/extensions.json
18+
.idea
19+
.DS_Store
20+
*.suo
21+
*.ntvs*
22+
*.njsproj
23+
*.sln
24+
*.sw?
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const outputPath = 'Debug' !== 'Release' ? '../wwwroot' : '../obj/Debug/net8.0/clientassets'
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import type { ApiRequestOptions } from './ApiRequestOptions';
2+
import type { ApiResult } from './ApiResult';
3+
4+
export class ApiError extends Error {
5+
public readonly url: string;
6+
public readonly status: number;
7+
public readonly statusText: string;
8+
public readonly body: unknown;
9+
public readonly request: ApiRequestOptions;
10+
11+
constructor(request: ApiRequestOptions, response: ApiResult, message: string) {
12+
super(message);
13+
14+
this.name = 'ApiError';
15+
this.url = response.url;
16+
this.status = response.status;
17+
this.statusText = response.statusText;
18+
this.body = response.body;
19+
this.request = request;
20+
}
21+
}

0 commit comments

Comments
 (0)