Merge pull request #330 from meysamhadeli/fix/fix-bug-404-in-jwt-config

fix: fix bug 404 in jwt config
2026-04-10 17:59:38 +08:00 · 2025-04-11 18:26:40 +03:30 · 2025-04-11 18:26:40 +03:30 · c9b1767b41
commit c9b1767b41
parent d705ff12f2 5e2c92fda6
29 changed files with 68 additions and 36 deletions
--- a/1-monolith-architecture-style/src/BookingMonolith/src/Booking/Bookings/Features/CreatingBook/V1/CreateBooking.cs
+++ b/1-monolith-architecture-style/src/BookingMonolith/src/Booking/Bookings/Features/CreatingBook/V1/CreateBooking.cs
@ -11,6 +11,7 @@ using BuildingBlocks.Core.Event;
 using BuildingBlocks.Core.Model;
 using BuildingBlocks.EventStoreDB.Repository;
 using BuildingBlocks.Web;
+using Duende.IdentityServer.EntityFramework.Entities;
 using FluentValidation;
 using Mapster;
 using MapsterMapper;
@ -51,7 +52,7 @@ public class CreateBookingEndpoint : IMinimalEndpoint

                return Results.Ok(response);
            })
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("CreateBooking")
            .WithApiVersionSet(builder.NewApiVersionSet("Booking").Build())
            .Produces<CreateBookingResponseDto>()
--- a/1-monolith-architecture-style/src/BookingMonolith/src/Flight/Aircrafts/Features/CreatingAircraft/V1/CreateAircraft.cs
+++ b/1-monolith-architecture-style/src/BookingMonolith/src/Flight/Aircrafts/Features/CreatingAircraft/V1/CreateAircraft.cs
@ -6,6 +6,7 @@ using BookingMonolith.Flight.Data;
 using BuildingBlocks.Core.CQRS;
 using BuildingBlocks.Core.Event;
 using BuildingBlocks.Web;
+using Duende.IdentityServer.EntityFramework.Entities;
 using FluentValidation;
 using Mapster;
 using MapsterMapper;
@ -49,7 +50,7 @@ public class CreateAircraftEndpoint : IMinimalEndpoint

                return Results.Ok(response);
            })
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("CreateAircraft")
            .WithApiVersionSet(builder.NewApiVersionSet("Flight").Build())
            .Produces<CreateAircraftResponseDto>()
--- a/1-monolith-architecture-style/src/BookingMonolith/src/Flight/Airports/Features/CreatingAirport/V1/CreateAirport.cs
+++ b/1-monolith-architecture-style/src/BookingMonolith/src/Flight/Airports/Features/CreatingAirport/V1/CreateAirport.cs
@ -5,6 +5,7 @@ using BookingMonolith.Flight.Data;
 using BuildingBlocks.Core.CQRS;
 using BuildingBlocks.Core.Event;
 using BuildingBlocks.Web;
+using Duende.IdentityServer.EntityFramework.Entities;
 using FluentValidation;
 using Mapster;
 using MapsterMapper;
@ -47,7 +48,7 @@ public class CreateAirportEndpoint : IMinimalEndpoint

                return Results.Ok(response);
            })
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("CreateAirport")
            .WithApiVersionSet(builder.NewApiVersionSet("Flight").Build())
            .Produces<CreateAirportResponseDto>()
--- a/1-monolith-architecture-style/src/BookingMonolith/src/Flight/Flights/Features/CreatingFlight/V1/CreateFlight.cs
+++ b/1-monolith-architecture-style/src/BookingMonolith/src/Flight/Flights/Features/CreatingFlight/V1/CreateFlight.cs
@ -7,6 +7,7 @@ using BookingMonolith.Flight.Flights.ValueObjects;
 using BuildingBlocks.Core.CQRS;
 using BuildingBlocks.Core.Event;
 using BuildingBlocks.Web;
+using Duende.IdentityServer.EntityFramework.Entities;
 using FluentValidation;
 using Mapster;
 using MapsterMapper;
@ -55,7 +56,7 @@ public class CreateFlightEndpoint : IMinimalEndpoint

                return Results.CreatedAtRoute("GetFlightById", new { id = result.Id }, response);
            })
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("CreateFlight")
            .WithApiVersionSet(builder.NewApiVersionSet("Flight").Build())
            .Produces<CreateFlightResponseDto>(StatusCodes.Status201Created)
--- a/1-monolith-architecture-style/src/BookingMonolith/src/Flight/Flights/Features/DeletingFlight/V1/DeleteFlight.cs
+++ b/1-monolith-architecture-style/src/BookingMonolith/src/Flight/Flights/Features/DeletingFlight/V1/DeleteFlight.cs
@ -4,6 +4,7 @@ using BookingMonolith.Flight.Flights.Exceptions;
 using BuildingBlocks.Core.CQRS;
 using BuildingBlocks.Core.Event;
 using BuildingBlocks.Web;
+using Duende.IdentityServer.EntityFramework.Entities;
 using FluentValidation;
 using MediatR;
 using Microsoft.AspNetCore.Builder;
@ -44,7 +45,7 @@ public class DeleteFlightEndpoint : IMinimalEndpoint

                    return Results.NoContent();
                })
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("DeleteFlight")
            .WithApiVersionSet(builder.NewApiVersionSet("Flight").Build())
            .Produces(StatusCodes.Status204NoContent)
--- a/1-monolith-architecture-style/src/BookingMonolith/src/Flight/Flights/Features/GettingAvailableFlights/V1/GetAvailableFlights.cs
+++ b/1-monolith-architecture-style/src/BookingMonolith/src/Flight/Flights/Features/GettingAvailableFlights/V1/GetAvailableFlights.cs
@ -5,6 +5,7 @@ using BookingMonolith.Flight.Flights.Exceptions;
 using BuildingBlocks.Caching;
 using BuildingBlocks.Core.CQRS;
 using BuildingBlocks.Web;
+using Duende.IdentityServer.EntityFramework.Entities;
 using Mapster;
 using MapsterMapper;
 using MediatR;
@ -39,7 +40,7 @@ public class GetAvailableFlightsEndpoint : IMinimalEndpoint

                    return Results.Ok(response);
                })
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("GetAvailableFlights")
            .WithApiVersionSet(builder.NewApiVersionSet("Flight").Build())
            .Produces<GetAvailableFlightsResponseDto>()
--- a/1-monolith-architecture-style/src/BookingMonolith/src/Flight/Flights/Features/GettingFlightById/V1/GetFlightById.cs
+++ b/1-monolith-architecture-style/src/BookingMonolith/src/Flight/Flights/Features/GettingFlightById/V1/GetFlightById.cs
@ -4,6 +4,7 @@ using BookingMonolith.Flight.Flights.Dtos;
 using BookingMonolith.Flight.Flights.Exceptions;
 using BuildingBlocks.Core.CQRS;
 using BuildingBlocks.Web;
+using Duende.IdentityServer.EntityFramework.Entities;
 using FluentValidation;
 using Mapster;
 using MapsterMapper;
@ -35,7 +36,7 @@ public class GetFlightByIdEndpoint : IMinimalEndpoint

                    return Results.Ok(response);
                })
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("GetFlightById")
            .WithApiVersionSet(builder.NewApiVersionSet("Flight").Build())
            .Produces<GetFlightByIdResponseDto>()
--- a/1-monolith-architecture-style/src/BookingMonolith/src/Flight/Flights/Features/UpdatingFlight/V1/UpdateFlight.cs
+++ b/1-monolith-architecture-style/src/BookingMonolith/src/Flight/Flights/Features/UpdatingFlight/V1/UpdateFlight.cs
@ -9,6 +9,7 @@ using BuildingBlocks.Caching;
 using BuildingBlocks.Core.CQRS;
 using BuildingBlocks.Core.Event;
 using BuildingBlocks.Web;
+using Duende.IdentityServer.EntityFramework.Entities;
 using FluentValidation;
 using MapsterMapper;
 using MediatR;
@ -52,7 +53,7 @@ public class UpdateFlightEndpoint : IMinimalEndpoint

                return Results.NoContent();
            })
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("UpdateFlight")
            .WithApiVersionSet(builder.NewApiVersionSet("Flight").Build())
            .Produces(StatusCodes.Status204NoContent)
--- a/1-monolith-architecture-style/src/BookingMonolith/src/Flight/Seats/Features/CreatingSeat/V1/CreateSeat.cs
+++ b/1-monolith-architecture-style/src/BookingMonolith/src/Flight/Seats/Features/CreatingSeat/V1/CreateSeat.cs
@ -7,6 +7,7 @@ using BookingMonolith.Flight.Seats.ValueObjects;
 using BuildingBlocks.Core.CQRS;
 using BuildingBlocks.Core.Event;
 using BuildingBlocks.Web;
+using Duende.IdentityServer.EntityFramework.Entities;
 using FluentValidation;
 using Mapster;
 using MapsterMapper;
@ -40,7 +41,7 @@ public class CreateSeatEndpoint : IMinimalEndpoint
    public IEndpointRouteBuilder MapEndpoint(IEndpointRouteBuilder builder)
    {
        builder.MapPost($"{EndpointConfig.BaseApiPath}/flight/seat", CreateSeat)
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("CreateSeat")
            .WithApiVersionSet(builder.NewApiVersionSet("Flight").Build())
            .Produces<CreateSeatResponseDto>()
--- a/1-monolith-architecture-style/src/BookingMonolith/src/Flight/Seats/Features/GettingAvailableSeats/V1/GetAvailableSeats.cs
+++ b/1-monolith-architecture-style/src/BookingMonolith/src/Flight/Seats/Features/GettingAvailableSeats/V1/GetAvailableSeats.cs
@ -4,6 +4,7 @@ using BookingMonolith.Flight.Seats.Dtos;
 using BookingMonolith.Flight.Seats.Exceptions;
 using BuildingBlocks.Core.CQRS;
 using BuildingBlocks.Web;
+using Duende.IdentityServer.EntityFramework.Entities;
 using FluentValidation;
 using Mapster;
 using MapsterMapper;
@ -27,7 +28,7 @@ public class GetAvailableSeatsEndpoint : IMinimalEndpoint
    public IEndpointRouteBuilder MapEndpoint(IEndpointRouteBuilder builder)
    {
        builder.MapGet($"{EndpointConfig.BaseApiPath}/flight/get-available-seats/{{id}}", GetAvailableSeats)
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("GetAvailableSeats")
            .WithApiVersionSet(builder.NewApiVersionSet("Flight").Build())
            .Produces<GetAvailableSeatsResponseDto>()
--- a/1-monolith-architecture-style/src/BookingMonolith/src/Flight/Seats/Features/ReservingSeat/V1/ReserveSeat.cs
+++ b/1-monolith-architecture-style/src/BookingMonolith/src/Flight/Seats/Features/ReservingSeat/V1/ReserveSeat.cs
@ -4,6 +4,7 @@ using BookingMonolith.Flight.Seats.Exceptions;
 using BuildingBlocks.Core.CQRS;
 using BuildingBlocks.Core.Event;
 using BuildingBlocks.Web;
+using Duende.IdentityServer.EntityFramework.Entities;
 using FluentValidation;
 using Mapster;
 using MapsterMapper;
@ -31,7 +32,7 @@ public class ReserveSeatEndpoint : IMinimalEndpoint
    public IEndpointRouteBuilder MapEndpoint(IEndpointRouteBuilder builder)
    {
        builder.MapPost($"{EndpointConfig.BaseApiPath}/flight/reserve-seat", ReserveSeat)
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("ReserveSeat")
            .WithApiVersionSet(builder.NewApiVersionSet("Flight").Build())
            .Produces<ReserveSeatResponseDto>()
--- a/1-monolith-architecture-style/src/BookingMonolith/src/Identity/Identities/Features/RegisteringNewUser/V1/RegisterNewUser.cs
+++ b/1-monolith-architecture-style/src/BookingMonolith/src/Identity/Identities/Features/RegisteringNewUser/V1/RegisterNewUser.cs
@ -5,6 +5,7 @@ using BuildingBlocks.Contracts.EventBus.Messages;
 using BuildingBlocks.Core;
 using BuildingBlocks.Core.CQRS;
 using BuildingBlocks.Web;
+using Duende.IdentityServer.EntityFramework.Entities;
 using FluentValidation;
 using Mapster;
 using MapsterMapper;
@ -43,7 +44,7 @@ public class RegisterNewUserEndpoint : IMinimalEndpoint

                return Results.Ok(response);
            })
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("RegisterUser")
            .WithApiVersionSet(builder.NewApiVersionSet("Identity").Build())
            .Produces<RegisterNewUserResponseDto>()
--- a/1-monolith-architecture-style/src/BookingMonolith/src/Passenger/Passengers/Features/CompletingRegisterPassenger/V1/CompleteRegisterPassenger.cs
+++ b/1-monolith-architecture-style/src/BookingMonolith/src/Passenger/Passengers/Features/CompletingRegisterPassenger/V1/CompleteRegisterPassenger.cs
@ -6,6 +6,7 @@ using BookingMonolith.Passenger.Passengers.ValueObjects;
 using BuildingBlocks.Core.CQRS;
 using BuildingBlocks.Core.Event;
 using BuildingBlocks.Web;
+using Duende.IdentityServer.EntityFramework.Entities;
 using FluentValidation;
 using Mapster;
 using MapsterMapper;
@ -50,7 +51,7 @@ public class CompleteRegisterPassengerEndpoint : IMinimalEndpoint

                return Results.Ok(response);
            })
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("CompleteRegisterPassenger")
            .WithApiVersionSet(builder.NewApiVersionSet("Passenger").Build())
            .Produces<CompleteRegisterPassengerResponseDto>()
--- a/1-monolith-architecture-style/src/BookingMonolith/src/Passenger/Passengers/Features/GettingPassengerById/V1/GetPassengerById.cs
+++ b/1-monolith-architecture-style/src/BookingMonolith/src/Passenger/Passengers/Features/GettingPassengerById/V1/GetPassengerById.cs
@ -4,6 +4,7 @@ using BookingMonolith.Passenger.Passengers.Dtos;
 using BookingMonolith.Passenger.Passengers.Exceptions;
 using BuildingBlocks.Core.CQRS;
 using BuildingBlocks.Web;
+using Duende.IdentityServer.EntityFramework.Entities;
 using FluentValidation;
 using Mapster;
 using MapsterMapper;
@ -35,7 +36,7 @@ public class GetPassengerByIdEndpoint : IMinimalEndpoint

                    return Results.Ok(response);
                })
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("GetPassengerById")
            .WithApiVersionSet(builder.NewApiVersionSet("Passenger").Build())
            .Produces<GetPassengerByIdResponseDto>()
--- a/2-modular-monolith-architecture-style/src/Modules/Booking/src/Booking/Features/CreatingBook/V1/CreateBooking.cs
+++ b/2-modular-monolith-architecture-style/src/Modules/Booking/src/Booking/Features/CreatingBook/V1/CreateBooking.cs
@ -50,7 +50,7 @@ public class CreateBookingEndpoint : IMinimalEndpoint

                return Results.Ok(response);
            })
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("CreateBooking")
            .WithApiVersionSet(builder.NewApiVersionSet("Booking").Build())
            .Produces<CreateBookingResponseDto>()
--- a/2-modular-monolith-architecture-style/src/Modules/Flight/src/Aircrafts/Features/CreatingAircraft/V1/CreateAircraft.cs
+++ b/2-modular-monolith-architecture-style/src/Modules/Flight/src/Aircrafts/Features/CreatingAircraft/V1/CreateAircraft.cs
@ -54,7 +54,7 @@ public class CreateAircraftEndpoint : IMinimalEndpoint

                return Results.Ok(response);
            })
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("CreateAircraft")
            .WithApiVersionSet(builder.NewApiVersionSet("Flight").Build())
            .Produces<CreateAircraftResponseDto>()
--- a/2-modular-monolith-architecture-style/src/Modules/Flight/src/Airports/Features/CreatingAirport/V1/CreateAirport.cs
+++ b/2-modular-monolith-architecture-style/src/Modules/Flight/src/Airports/Features/CreatingAirport/V1/CreateAirport.cs
@ -51,7 +51,7 @@ public class CreateAirportEndpoint : IMinimalEndpoint

                return Results.Ok(response);
            })
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("CreateAirport")
            .WithApiVersionSet(builder.NewApiVersionSet("Flight").Build())
            .Produces<CreateAirportResponseDto>()
--- a/2-modular-monolith-architecture-style/src/Modules/Flight/src/Flights/Features/CreatingFlight/V1/CreateFlight.cs
+++ b/2-modular-monolith-architecture-style/src/Modules/Flight/src/Flights/Features/CreatingFlight/V1/CreateFlight.cs
@ -59,7 +59,7 @@ public class CreateFlightEndpoint : IMinimalEndpoint

                return Results.CreatedAtRoute("GetFlightById", new { id = result.Id }, response);
            })
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("CreateFlight")
            .WithApiVersionSet(builder.NewApiVersionSet("Flight").Build())
            .Produces<CreateFlightResponseDto>(StatusCodes.Status201Created)
--- a/2-modular-monolith-architecture-style/src/Modules/Flight/src/Flights/Features/DeletingFlight/V1/DeleteFlight.cs
+++ b/2-modular-monolith-architecture-style/src/Modules/Flight/src/Flights/Features/DeletingFlight/V1/DeleteFlight.cs
@ -45,7 +45,7 @@ public class DeleteFlightEndpoint : IMinimalEndpoint

                    return Results.NoContent();
                })
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("DeleteFlight")
            .WithApiVersionSet(builder.NewApiVersionSet("Flight").Build())
            .Produces(StatusCodes.Status204NoContent)
--- a/2-modular-monolith-architecture-style/src/Modules/Flight/src/Flights/Features/GettingAvailableFlights/V1/GetAvailableFlights.cs
+++ b/2-modular-monolith-architecture-style/src/Modules/Flight/src/Flights/Features/GettingAvailableFlights/V1/GetAvailableFlights.cs
@ -46,7 +46,7 @@ public class GetAvailableFlightsEndpoint : IMinimalEndpoint

                    return Results.Ok(response);
                })
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("GetAvailableFlights")
            .WithApiVersionSet(builder.NewApiVersionSet("Flight").Build())
            .Produces<GetAvailableFlightsResponseDto>()
--- a/2-modular-monolith-architecture-style/src/Modules/Flight/src/Flights/Features/GettingFlightById/V1/GetFlightById.cs
+++ b/2-modular-monolith-architecture-style/src/Modules/Flight/src/Flights/Features/GettingFlightById/V1/GetFlightById.cs
@ -39,7 +39,7 @@ public class GetFlightByIdEndpoint : IMinimalEndpoint

                    return Results.Ok(response);
                })
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("GetFlightById")
            .WithApiVersionSet(builder.NewApiVersionSet("Flight").Build())
            .Produces<GetFlightByIdResponseDto>()
--- a/2-modular-monolith-architecture-style/src/Modules/Flight/src/Flights/Features/UpdatingFlight/V1/UpdateFlight.cs
+++ b/2-modular-monolith-architecture-style/src/Modules/Flight/src/Flights/Features/UpdatingFlight/V1/UpdateFlight.cs
@ -56,7 +56,7 @@ public class UpdateFlightEndpoint : IMinimalEndpoint

                return Results.NoContent();
            })
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("UpdateFlight")
            .WithApiVersionSet(builder.NewApiVersionSet("Flight").Build())
            .Produces(StatusCodes.Status204NoContent)
--- a/2-modular-monolith-architecture-style/src/Modules/Flight/src/Seats/Features/CreatingSeat/V1/CreateSeat.cs
+++ b/2-modular-monolith-architecture-style/src/Modules/Flight/src/Seats/Features/CreatingSeat/V1/CreateSeat.cs
@ -44,7 +44,7 @@ public class CreateSeatEndpoint : IMinimalEndpoint
    public IEndpointRouteBuilder MapEndpoint(IEndpointRouteBuilder builder)
    {
        builder.MapPost($"{EndpointConfig.BaseApiPath}/flight/seat", CreateSeat)
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("CreateSeat")
            .WithApiVersionSet(builder.NewApiVersionSet("Flight").Build())
            .Produces<CreateSeatResponseDto>()
--- a/2-modular-monolith-architecture-style/src/Modules/Flight/src/Seats/Features/GettingAvailableSeats/V1/GetAvailableSeats.cs
+++ b/2-modular-monolith-architecture-style/src/Modules/Flight/src/Seats/Features/GettingAvailableSeats/V1/GetAvailableSeats.cs
@ -34,7 +34,7 @@ public class GetAvailableSeatsEndpoint : IMinimalEndpoint
    public IEndpointRouteBuilder MapEndpoint(IEndpointRouteBuilder builder)
    {
        builder.MapGet($"{EndpointConfig.BaseApiPath}/flight/get-available-seats/{{id}}", GetAvailableSeats)
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("GetAvailableSeats")
            .WithApiVersionSet(builder.NewApiVersionSet("Flight").Build())
            .Produces<GetAvailableSeatsResponseDto>()
--- a/2-modular-monolith-architecture-style/src/Modules/Flight/src/Seats/Features/ReservingSeat/V1/ReserveSeat.cs
+++ b/2-modular-monolith-architecture-style/src/Modules/Flight/src/Seats/Features/ReservingSeat/V1/ReserveSeat.cs
@ -35,7 +35,7 @@ public class ReserveSeatEndpoint : IMinimalEndpoint
    public IEndpointRouteBuilder MapEndpoint(IEndpointRouteBuilder builder)
    {
        builder.MapPost($"{EndpointConfig.BaseApiPath}/flight/reserve-seat", ReserveSeat)
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("ReserveSeat")
            .WithApiVersionSet(builder.NewApiVersionSet("Flight").Build())
            .Produces<ReserveSeatResponseDto>()
--- a/2-modular-monolith-architecture-style/src/Modules/Identity/src/Identity/Features/RegisteringNewUser/V1/RegisterNewUser.cs
+++ b/2-modular-monolith-architecture-style/src/Modules/Identity/src/Identity/Features/RegisteringNewUser/V1/RegisterNewUser.cs
@ -1,3 +1,5 @@
+using Duende.IdentityServer.EntityFramework.Entities;
+
 namespace Identity.Identity.Features.RegisteringNewUser.V1;

 using System;
@ -47,7 +49,7 @@ public class RegisterNewUserEndpoint : IMinimalEndpoint

                return Results.Ok(response);
            })
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("RegisterUser")
            .WithApiVersionSet(builder.NewApiVersionSet("Identity").Build())
            .Produces<RegisterNewUserResponseDto>()
--- a/2-modular-monolith-architecture-style/src/Modules/Passenger/src/Passengers/Features/CompletingRegisterPassenger/V1/CompleteRegisterPassenger.cs
+++ b/2-modular-monolith-architecture-style/src/Modules/Passenger/src/Passengers/Features/CompletingRegisterPassenger/V1/CompleteRegisterPassenger.cs
@ -41,7 +41,7 @@ public class CompleteRegisterPassengerEndpoint : IMinimalEndpoint
    {
        builder.MapPost($"{EndpointConfig.BaseApiPath}/passenger/complete-registration", async (
                CompleteRegisterPassengerRequestDto request, IMapper mapper,
-                IMediator mediator, CancellationToken cancellationToken) =>
+                IMediator mediator, CancellationToken cancellationToken, IHttpContextAccessor httpContextAccessor) =>
            {
                var command = mapper.Map<CompleteRegisterPassenger>(request);

@ -51,7 +51,7 @@ public class CompleteRegisterPassengerEndpoint : IMinimalEndpoint

                return Results.Ok(response);
            })
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("CompleteRegisterPassenger")
            .WithApiVersionSet(builder.NewApiVersionSet("Passenger").Build())
            .Produces<CompleteRegisterPassengerResponseDto>()
--- a/2-modular-monolith-architecture-style/src/Modules/Passenger/src/Passengers/Features/GettingPassengerById/V1/GetPassengerById.cs
+++ b/2-modular-monolith-architecture-style/src/Modules/Passenger/src/Passengers/Features/GettingPassengerById/V1/GetPassengerById.cs
@ -36,7 +36,7 @@ public class GetPassengerByIdEndpoint : IMinimalEndpoint

                    return Results.Ok(response);
                })
-            .RequireAuthorization()
+            .RequireAuthorization(nameof(ApiScope))
            .WithName("GetPassengerById")
            .WithApiVersionSet(builder.NewApiVersionSet("Passenger").Build())
            .Produces<GetPassengerByIdResponseDto>()
--- a/building-blocks/Jwt/JwtExtensions.cs
+++ b/building-blocks/Jwt/JwtExtensions.cs
@ -1,5 +1,6 @@
 using BuildingBlocks.Web;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.DependencyInjection;

 namespace BuildingBlocks.Jwt;
@ -40,13 +41,28 @@ public static class JwtExtensions
        {
            services.AddAuthorization(
                options =>
-                    options.AddPolicy(
-                        nameof(ApiScope),
-                        policy =>
-                        {
-                            policy.RequireAuthenticatedUser();
-                            policy.RequireClaim("scope", jwtOptions.Audience);
-                        }));
+                {
+                    // Set JWT as the default scheme for all [Authorize] attributes
+                    options.DefaultPolicy =
+                        new AuthorizationPolicyBuilder(JwtBearerDefaults.AuthenticationScheme)
+                            .RequireAuthenticatedUser()
+                            .Build();
+
+                    // Add your scope policy (optional)
+                    if (!string.IsNullOrEmpty(jwtOptions.Audience))
+                    {
+                        options.AddPolicy(
+                            nameof(ApiScope),
+                            policy =>
+                            {
+                                policy.AuthenticationSchemes.Add(
+                                    JwtBearerDefaults.AuthenticationScheme);
+
+                                policy.RequireAuthenticatedUser();
+                                policy.RequireClaim("scope", jwtOptions.Audience);
+                            });
+                    }
+                });
        }

        return services;