Skip to content

Commit ec00b50

Browse files
acoumbacoumb
authored
Merge pull request #262 from umbraco/v16/dynamics
V16/dynamics
2 parents f302451 + 48ea105 commit ec00b50

33 files changed

+2415
-2336
lines changed

‎src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Configuration/BackOfficeSecurityRequirementsOperationFilter.cs

Lines changed: 9 additions & 0 deletions
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.Dynamics.Api.Configuration
4+
{
5+
internal class BackOfficeSecurityRequirementsOperationFilter : BackOfficeSecurityRequirementsOperationFilterBase
6+
{
7+
protected override string ApiName => Constants.ManagementApi.ApiName;
8+
}
9+
}

‎src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Configuration/DynamicsOperationIdHandler.cs

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.Dynamics.Api.Configuration
8+
{
9+
internal class DynamicsOperationIdHandler : OperationIdHandler
10+
{
11+
public DynamicsOperationIdHandler(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.Dynamics") is true;
17+
}
18+
}

‎src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/CheckOAuthConfigurationController.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Microsoft.AspNetCore.Http;
1+
using Asp.Versioning;
2+
using Microsoft.AspNetCore.Http;
23
using Microsoft.AspNetCore.Mvc;
34
using Microsoft.Extensions.Options;
45
using Umbraco.Cms.Integrations.Crm.Dynamics.Configuration;
@@ -7,6 +8,7 @@
78

89
namespace Umbraco.Cms.Integrations.Crm.Dynamics.Api.Management.Controllers
910
{
11+
[ApiVersion("1.0")]
1012
public class CheckOAuthConfigurationController : FormsControllerBase
1113
{
1214
public CheckOAuthConfigurationController(

‎src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/DynamicsControllerBase.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
using Microsoft.AspNetCore.Mvc;
1+
using Microsoft.AspNetCore.Authorization;
2+
using Microsoft.AspNetCore.Mvc;
23
using Umbraco.Cms.Api.Common.Attributes;
3-
using Umbraco.Cms.Web.Common.Routing;
4+
using Umbraco.Cms.Web.Common.Authorization;
45

56
namespace Umbraco.Cms.Integrations.Crm.Dynamics.Api.Management.Controllers
67
{
78
[ApiController]
8-
[BackOfficeRoute($"{Constants.ManagementApi.RootPath}/v{{version:apiVersion}}")]
9+
[Authorize(Policy = AuthorizationPolicies.BackOfficeAccess)]
910
[MapToApi(Constants.ManagementApi.ApiName)]
10-
public class DynamicsControllerBase : Controller
11+
public class DynamicsControllerBase : ControllerBase
1112
{
1213
}
1314
}

‎src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/FormsControllerBase.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
using Asp.Versioning;
2-
using Microsoft.AspNetCore.Mvc;
1+
using Microsoft.AspNetCore.Mvc;
32
using Microsoft.Extensions.Options;
43
using Umbraco.Cms.Integrations.Crm.Dynamics.Configuration;
54
using Umbraco.Cms.Integrations.Crm.Dynamics.Services;
5+
using Umbraco.Cms.Web.Common.Routing;
66
using static Umbraco.Cms.Integrations.Crm.Dynamics.DynamicsComposer;
77

88
namespace Umbraco.Cms.Integrations.Crm.Dynamics.Api.Management.Controllers
99
{
10-
[ApiVersion("1.0")]
1110
[ApiExplorerSettings(GroupName = Constants.ManagementApi.GroupName)]
12-
[Route($"{Constants.ManagementApi.RootPath}/v{{version:apiVersion}}/forms")]
11+
[BackOfficeRoute($"{Constants.ManagementApi.RootPath}/v{{version:apiVersion}}/forms")]
1312
public class FormsControllerBase : DynamicsControllerBase
1413
{
1514
protected readonly DynamicsSettings DynamicsSettings;

‎src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/GetAccessTokenController.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Microsoft.AspNetCore.Http;
1+
using Asp.Versioning;
2+
using Microsoft.AspNetCore.Http;
23
using Microsoft.AspNetCore.Mvc;
34
using Microsoft.Extensions.Options;
45
using Umbraco.Cms.Integrations.Crm.Dynamics.Configuration;
@@ -7,6 +8,7 @@
78

89
namespace Umbraco.Cms.Integrations.Crm.Dynamics.Api.Management.Controllers
910
{
11+
[ApiVersion("1.0")]
1012
public class GetAccessTokenController : FormsControllerBase
1113
{
1214
public GetAccessTokenController(

‎src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/GetAuthorizationUrlController.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
using Microsoft.AspNetCore.Http;
1+
using Asp.Versioning;
2+
using Microsoft.AspNetCore.Http;
23
using Microsoft.AspNetCore.Mvc;
34
using Microsoft.Extensions.Options;
45
using Umbraco.Cms.Integrations.Crm.Dynamics.Configuration;
56
using Umbraco.Cms.Integrations.Crm.Dynamics.Services;
67

78
namespace Umbraco.Cms.Integrations.Crm.Dynamics.Api.Management.Controllers
89
{
10+
[ApiVersion("1.0")]
911
public class GetAuthorizationUrlController : FormsControllerBase
1012
{
1113
public GetAuthorizationUrlController(

‎src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/GetEmbedCodeController.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
using Microsoft.AspNetCore.Http;
1+
using Asp.Versioning;
2+
using Microsoft.AspNetCore.Http;
23
using Microsoft.AspNetCore.Mvc;
34
using Microsoft.Extensions.Options;
45
using Umbraco.Cms.Integrations.Crm.Dynamics.Configuration;
56
using Umbraco.Cms.Integrations.Crm.Dynamics.Services;
67

78
namespace Umbraco.Cms.Integrations.Crm.Dynamics.Api.Management.Controllers
89
{
10+
[ApiVersion("1.0")]
911
public class GetEmbedCodeController : FormsControllerBase
1012
{
1113
public GetEmbedCodeController(

‎src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/GetFormsController.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Microsoft.AspNetCore.Http;
1+
using Asp.Versioning;
2+
using Microsoft.AspNetCore.Http;
23
using Microsoft.AspNetCore.Mvc;
34
using Microsoft.Extensions.Options;
45
using Umbraco.Cms.Integrations.Crm.Dynamics.Configuration;
@@ -8,6 +9,7 @@
89

910
namespace Umbraco.Cms.Integrations.Crm.Dynamics.Api.Management.Controllers
1011
{
12+
[ApiVersion("1.0")]
1113
public class GetFormsController : FormsControllerBase
1214
{
1315
public GetFormsController(

‎src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/GetSystemUserFullNameController.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
using Microsoft.AspNetCore.Http;
1+
using Asp.Versioning;
2+
using Microsoft.AspNetCore.Http;
23
using Microsoft.AspNetCore.Mvc;
34
using Microsoft.Extensions.Options;
45
using Umbraco.Cms.Integrations.Crm.Dynamics.Configuration;
56
using Umbraco.Cms.Integrations.Crm.Dynamics.Services;
67

78
namespace Umbraco.Cms.Integrations.Crm.Dynamics.Api.Management.Controllers
89
{
10+
[ApiVersion("1.0")]
911
public class GetSystemUserFullNameController : FormsControllerBase
1012
{
1113
public GetSystemUserFullNameController(

0 commit comments

Comments
 (0)