Skip to content

Commit 3435b7b

Browse files
committed
ActiveCampaign updates for Umbraco 16
1 parent 25c647b commit 3435b7b

23 files changed

+2275
-1924
lines changed

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/ActiveCampaignComposer.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
using Microsoft.Extensions.DependencyInjection;
22
using Microsoft.OpenApi.Models;
33
using Swashbuckle.AspNetCore.SwaggerGen;
4+
using Umbraco.Cms.Api.Common.OpenApi;
45
using Umbraco.Cms.Core.Composing;
56
using Umbraco.Cms.Core.DependencyInjection;
7+
using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Api.Configuration;
68
using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Configuration;
79

810
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign
@@ -34,8 +36,9 @@ public void Compose(IUmbracoBuilder builder)
3436
Description = $"Describes the {Constants.ManagementApi.ApiTitle} available for handling Active Campaign product(s) and configuration."
3537
});
3638

37-
options.CustomOperationIds(e => $"{e.ActionDescriptor.RouteValues["action"]}");
38-
});
39+
options.OperationFilter<BackOfficeSecurityRequirementsOperationFilter>();
40+
})
41+
.AddSingleton<IOperationIdHandler, ActiveCampaignOperationIdHandler>();
3942
}
4043

4144
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
using Asp.Versioning;
2+
using Microsoft.AspNetCore.Mvc.ApiExplorer;
3+
using Microsoft.AspNetCore.Mvc.Controllers;
4+
using Microsoft.Extensions.Options;
5+
using Umbraco.Cms.Api.Common.OpenApi;
6+
7+
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Api.Configuration
8+
{
9+
internal class ActiveCampaignOperationIdHandler : OperationIdHandler
10+
{
11+
public ActiveCampaignOperationIdHandler(IOptions<ApiVersioningOptions> apiVersioningOptions) : base(apiVersioningOptions)
12+
{
13+
}
14+
15+
protected override bool CanHandle(ApiDescription apiDescription, ControllerActionDescriptor controllerActionDescriptor)
16+
=> controllerActionDescriptor.ControllerTypeInfo.Namespace?.StartsWith("Umbraco.Cms.Integrations.Crm.ActiveCampaign") is true;
17+
}
18+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
using Umbraco.Cms.Api.Management.OpenApi;
2+
3+
namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Api.Configuration
4+
{
5+
internal class BackOfficeSecurityRequirementsOperationFilter : BackOfficeSecurityRequirementsOperationFilterBase
6+
{
7+
protected override string ApiName => Constants.ManagementApi.ApiName;
8+
}
9+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// This file is auto-generated by @hey-api/openapi-ts
2+
3+
import type { ClientOptions } from './types.gen';
4+
import { type Config, type ClientOptions as DefaultClientOptions, createClient, createConfig } from '@hey-api/client-fetch';
5+
6+
/**
7+
* The `createClientConfig()` function will be called on client initialization
8+
* and the returned object will become the client's initial configuration.
9+
*
10+
* You may want to initialize your client this way instead of calling
11+
* `setConfig()`. This is useful for example if you're using Next.js
12+
* to ensure your client always has the correct values.
13+
*/
14+
export type CreateClientConfig<T extends DefaultClientOptions = ClientOptions> = (override?: Config<DefaultClientOptions & T>) => Config<Required<DefaultClientOptions> & T>;
15+
16+
export const client = createClient(createConfig<ClientOptions>({
17+
baseUrl: 'http://localhost:30450',
18+
throwOnError: true
19+
}));

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Client/generated/core/ApiError.ts

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Client/generated/core/ApiRequestOptions.ts

Lines changed: 0 additions & 13 deletions
This file was deleted.

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Client/generated/core/ApiResult.ts

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Client/generated/core/CancelablePromise.ts

Lines changed: 0 additions & 126 deletions
This file was deleted.

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Client/generated/core/OpenAPI.ts

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)