fix: move Organizations Authorize attributes to endpoint instead of c…

docker/docker-compose.yml

@@ -29,7 +29,6 @@ services:
   localstack:
     image: localstack/localstack
     container_name: localstack
-    restart: always
     ports:
       - 4566:4566
       - 4510-4559:4510-4559
@@ -68,7 +67,6 @@ services:
   seq:
     image: datalust/seq:latest
     container_name: seq
-    restart: always
     ports:
       - 5341:80
     environment:
@@ -79,7 +77,6 @@ services:
   kafka:
     image: confluentinc/cp-kafka:7.0.1
     container_name: kafka
-    restart: always
     ports:
       - 9092:9092
     depends_on:
@@ -96,15 +93,13 @@ services:
   kafka-admin:
     image: confluentinc/cp-zookeeper:7.0.1
     container_name: kafka-admin
-    restart: always
     environment:
       ZOOKEEPER_CLIENT_PORT: 2181
       ZOOKEEPER_TICK_TIME: 2000
 
   postgresql:
     build: ./postgresql
     container_name: postgresql
-    restart: always
     environment:
       POSTGRES_USER: sa
       POSTGRES_PASSWORD: E@syP@ssw0rd
@@ -114,7 +109,6 @@ services:
   postgresql-admin:
     image: adminer
     container_name: postgresql-admin
-    restart: always
     ports:
       - 8081:8080
 

src/RoadRegistry.BackOffice.Api/Infrastructure/Authentication/ServiceCollectionExtensions.cs

@@ -6,9 +6,7 @@ namespace RoadRegistry.BackOffice.Api.Infrastructure.Authentication;
 using Configuration;
 using Controllers.Attributes;
 using IdentityModel.AspNetCore.OAuth2Introspection;
-using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;

src/RoadRegistry.BackOffice.Api/Organizations/OrganizationsController-Change.cs

@@ -2,9 +2,12 @@ namespace RoadRegistry.BackOffice.Api.Organizations;
 
 using System.Threading;
 using System.Threading.Tasks;
+using Be.Vlaanderen.Basisregisters.Auth.AcmIdm;
 using FluentValidation;
 using Framework;
+using Infrastructure.Authentication;
 using Messages;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Swashbuckle.AspNetCore.Annotations;
 
@@ -24,6 +27,7 @@ public partial class OrganizationsController
     /// </param>
     /// <returns>IActionResult.</returns>
     [HttpPatch(ChangeRoute, Name = nameof(Change))]
+    [Authorize(AuthenticationSchemes = AuthenticationSchemes.AllSchemes, Policy = PolicyNames.WegenUitzonderingen.Beheerder)]
     [SwaggerOperation(OperationId = nameof(Change), Description = "")]
     public async Task<IActionResult> Change(
         [FromBody] OrganizationChangeParameters parameters,

src/RoadRegistry.BackOffice.Api/Organizations/OrganizationsController-Create.cs

@@ -7,6 +7,9 @@ namespace RoadRegistry.BackOffice.Api.Organizations;
 using Swashbuckle.AspNetCore.Annotations;
 using System.Threading;
 using System.Threading.Tasks;
+using Be.Vlaanderen.Basisregisters.Auth.AcmIdm;
+using Infrastructure.Authentication;
+using Microsoft.AspNetCore.Authorization;
 
 public partial class OrganizationsController
 {
@@ -23,6 +26,7 @@ public partial class OrganizationsController
     /// </param>
     /// <returns>IActionResult.</returns>
     [HttpPost(CreateRoute, Name = nameof(Create))]
+    [Authorize(AuthenticationSchemes = AuthenticationSchemes.AllSchemes, Policy = PolicyNames.WegenUitzonderingen.Beheerder)]
     [SwaggerOperation(OperationId = nameof(Create), Description = "")]
     public async Task<IActionResult> Create(
         [FromBody] OrganizationCreateParameters parameters,

src/RoadRegistry.BackOffice.Api/Organizations/OrganizationsController-Delete.cs

@@ -7,6 +7,9 @@ namespace RoadRegistry.BackOffice.Api.Organizations;
 using Swashbuckle.AspNetCore.Annotations;
 using System.Threading;
 using System.Threading.Tasks;
+using Be.Vlaanderen.Basisregisters.Auth.AcmIdm;
+using Infrastructure.Authentication;
+using Microsoft.AspNetCore.Authorization;
 
 public partial class OrganizationsController
 {
@@ -23,6 +26,7 @@ public partial class OrganizationsController
     /// </param>
     /// <returns>IActionResult.</returns>
     [HttpDelete(DeleteRoute, Name = nameof(Delete))]
+    [Authorize(AuthenticationSchemes = AuthenticationSchemes.AllSchemes, Policy = PolicyNames.WegenUitzonderingen.Beheerder)]
     [SwaggerOperation(OperationId = nameof(Delete), Description = "")]
     public async Task<IActionResult> Delete(
         [FromRoute] string id,

src/RoadRegistry.BackOffice.Api/Organizations/OrganizationsController-Get.cs

@@ -28,7 +28,6 @@ public partial class OrganizationsController
     /// </param>
     /// <returns>IActionResult.</returns>
     [HttpGet(GetRoute, Name = nameof(Get))]
-    [AllowAnonymous]
     [ProducesResponseType(typeof(GetOrganizationsResponse), StatusCodes.Status200OK)]
     [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status500InternalServerError)]
     [SwaggerResponseExample(StatusCodes.Status200OK, typeof(GetOrganizationsResponseResponseExamples))]

src/RoadRegistry.BackOffice.Api/Organizations/OrganizationsController-Rename.cs

@@ -7,6 +7,9 @@ namespace RoadRegistry.BackOffice.Api.Organizations;
 using Swashbuckle.AspNetCore.Annotations;
 using System.Threading;
 using System.Threading.Tasks;
+using Be.Vlaanderen.Basisregisters.Auth.AcmIdm;
+using Infrastructure.Authentication;
+using Microsoft.AspNetCore.Authorization;
 
 public partial class OrganizationsController
 {
@@ -24,6 +27,7 @@ public partial class OrganizationsController
     /// </param>
     /// <returns>IActionResult.</returns>
     [HttpPatch(RenameRoute, Name = nameof(Rename))]
+    [Authorize(AuthenticationSchemes = AuthenticationSchemes.AllSchemes, Policy = PolicyNames.WegenUitzonderingen.Beheerder)]
     [SwaggerOperation(OperationId = nameof(Rename), Description = "")]
     public async Task<IActionResult> Rename(
         [FromBody] OrganizationRenameParameters parameters,

src/RoadRegistry.BackOffice.Api/Organizations/OrganizationsController.cs

@@ -1,21 +1,17 @@
 namespace RoadRegistry.BackOffice.Api.Organizations;
 
 using Asp.Versioning;
-using Be.Vlaanderen.Basisregisters.Auth.AcmIdm;
 using Be.Vlaanderen.Basisregisters.Api;
 using Infrastructure;
-using Infrastructure.Authentication;
 using Infrastructure.Controllers;
 using MediatR;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using SqlStreamStore;
 
 [ApiVersion(Version.Current)]
 [AdvertiseApiVersions(Version.CurrentAdvertised)]
 [ApiRoute("organizations")]
 [ApiExplorerSettings(GroupName = "Organisaties")]
-[Authorize(AuthenticationSchemes = AuthenticationSchemes.AllSchemes, Policy = PolicyNames.WegenUitzonderingen.Beheerder)]
 public partial class OrganizationsController : BackofficeApiController
 {
     public OrganizationsController(