Skip to content

Commit 0440005

Browse files
authored
V14: Cleanup [ApiController] attribute usage (#15842)
* Applying [ApiController] to ManagementApiControllerBase and the rest derive it from it * Removing [ApiController] from deriving controllers * Removing [ApiVersion("1.0")] from controller base * Cleanup * [ApiController] from deriving DeliveryApiControllerBase controller
1 parent 7710d9d commit 0440005

File tree

104 files changed

+67
-181
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+67
-181
lines changed

src/Umbraco.Cms.Api.Delivery/Controllers/DeliveryApiControllerBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
using Microsoft.AspNetCore.Mvc;
21
using System.Net;
32
using Microsoft.AspNetCore.Authorization;
3+
using Microsoft.AspNetCore.Mvc;
44
using Umbraco.Cms.Api.Common.Attributes;
55
using Umbraco.Cms.Api.Common.Filters;
66
using Umbraco.Cms.Api.Delivery.Configuration;

src/Umbraco.Cms.Api.Delivery/Controllers/Security/MemberController.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@
1515
using Umbraco.Cms.Core.Security;
1616
using Umbraco.Cms.Web.Common.Security;
1717
using Umbraco.Extensions;
18-
using SignInResult = Microsoft.AspNetCore.Mvc.SignInResult;
1918
using IdentitySignInResult = Microsoft.AspNetCore.Identity.SignInResult;
19+
using SignInResult = Microsoft.AspNetCore.Mvc.SignInResult;
2020

2121
namespace Umbraco.Cms.Api.Delivery.Controllers.Security;
2222

2323
[ApiVersion("1.0")]
24-
[ApiController]
2524
[VersionedDeliveryApiRoute(Common.Security.Paths.MemberApi.EndpointTemplate)]
2625
[ApiExplorerSettings(IgnoreApi = true)]
2726
public class MemberController : DeliveryApiControllerBase

src/Umbraco.Cms.Api.Management/Controllers/AuditLog/AuditLogControllerBase.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
namespace Umbraco.Cms.Api.Management.Controllers.AuditLog;
55

6-
[ApiController]
76
[VersionedApiBackOfficeRoute("audit-log")]
87
[ApiExplorerSettings(GroupName = "Audit Log")]
98
public class AuditLogControllerBase : ManagementApiControllerBase

src/Umbraco.Cms.Api.Management/Controllers/Culture/CultureControllerBase.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
namespace Umbraco.Cms.Api.Management.Controllers.Culture;
55

6-
[ApiController]
76
[VersionedApiBackOfficeRoute("culture")]
87
[ApiExplorerSettings(GroupName = "Culture")]
98
public abstract class CultureControllerBase : ManagementApiControllerBase

src/Umbraco.Cms.Api.Management/Controllers/DataType/DataTypeControllerBase.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
namespace Umbraco.Cms.Api.Management.Controllers.DataType;
1111

12-
[ApiController]
1312
[VersionedApiBackOfficeRoute(Constants.UdiEntityType.DataType)]
1413
[ApiExplorerSettings(GroupName = "Data Type")]
1514
[Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentsOrDocumentTypes)]

src/Umbraco.Cms.Api.Management/Controllers/DataType/Filter/DataTypeFilterControllerBase.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
namespace Umbraco.Cms.Api.Management.Controllers.DataType.Filter;
88

9-
[ApiController]
109
[ApiExplorerSettings(GroupName = "Data Type")]
1110
[VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Filter}/{Constants.UdiEntityType.DataType}")]
1211
// This auth policy might become problematic, as when getting DataTypes on Media types, you don't need access to the document tree.

src/Umbraco.Cms.Api.Management/Controllers/DataType/Folder/DataTypeFolderControllerBase.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
namespace Umbraco.Cms.Api.Management.Controllers.DataType.Folder;
1111

12-
[ApiController]
1312
[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.DataType}/folder")]
1413
[ApiExplorerSettings(GroupName = "Data Type")]
1514
[Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]

src/Umbraco.Cms.Api.Management/Controllers/DataType/Item/DatatypeItemControllerBase.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
namespace Umbraco.Cms.Api.Management.Controllers.DataType.Item;
88

9-
[ApiController]
109
[VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Item}/{Constants.UdiEntityType.DataType}")]
1110
[ApiExplorerSettings(GroupName = "Data Type")]
1211
[Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentsOrDocumentTypes)]

src/Umbraco.Cms.Api.Management/Controllers/DataType/Tree/DataTypeTreeControllerBase.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
using Microsoft.AspNetCore.Authorization;
22
using Microsoft.AspNetCore.Mvc;
3+
using Umbraco.Cms.Api.Management.Controllers.Tree;
4+
using Umbraco.Cms.Api.Management.Routing;
5+
using Umbraco.Cms.Api.Management.ViewModels.Tree;
36
using Umbraco.Cms.Core;
47
using Umbraco.Cms.Core.Models;
58
using Umbraco.Cms.Core.Models.Entities;
69
using Umbraco.Cms.Core.Services;
7-
using Umbraco.Cms.Api.Management.Controllers.Tree;
8-
using Umbraco.Cms.Api.Management.Routing;
9-
using Umbraco.Cms.Api.Management.ViewModels.Tree;
1010
using Umbraco.Cms.Web.Common.Authorization;
1111
using Umbraco.Extensions;
1212

1313
namespace Umbraco.Cms.Api.Management.Controllers.DataType.Tree;
1414

15-
[ApiController]
1615
[VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.DataType}")]
1716
[ApiExplorerSettings(GroupName = "Data Type")]
1817
[Authorize(Policy = AuthorizationPolicies.TreeAccessDataTypes)]

src/Umbraco.Cms.Api.Management/Controllers/Dictionary/DictionaryControllerBase.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
namespace Umbraco.Cms.Api.Management.Controllers.Dictionary;
1010

11-
[ApiController]
1211
[VersionedApiBackOfficeRoute("dictionary")]
1312
[ApiExplorerSettings(GroupName = "Dictionary")]
1413
[Authorize(Policy = AuthorizationPolicies.TreeAccessDictionary)]

0 commit comments

Comments
 (0)