This commit is contained in:
2026-03-20 09:41:43 +01:00
parent a036454220
commit 3c21e0ea1a
8 changed files with 10 additions and 10 deletions
@@ -3,7 +3,7 @@ using Musify.Application.Users.Contracts;
namespace Musify.Application.Contracts.Infrastructure namespace Musify.Application.Contracts.Infrastructure
{ {
public interface IKeycloakUserClient public interface IKeycloakUserService
{ {
Task<Result<KeycloakUserResponse>> GetUserByIdAsync(string keycloakId, CancellationToken cancellationToken); Task<Result<KeycloakUserResponse>> GetUserByIdAsync(string keycloakId, CancellationToken cancellationToken);
@@ -8,7 +8,7 @@ using Musify.Domain.Entities;
namespace Musify.Application.Users.Commands.CreateUser namespace Musify.Application.Users.Commands.CreateUser
{ {
public class CreateUserCommandHandler(IDatabase database, IKeycloakUserClient keycloakUserClient, ILogger<CreateUserCommandHandler> logger) public class CreateUserCommandHandler(IDatabase database, IKeycloakUserService keycloakUserClient, ILogger<CreateUserCommandHandler> logger)
: IRequestHandler<CreateUserCommand, Task<Result<UserResponse> >> : IRequestHandler<CreateUserCommand, Task<Result<UserResponse> >>
{ {
public async Task<Result<UserResponse>> Handle(CreateUserCommand request, CancellationToken cancellationToken) public async Task<Result<UserResponse>> Handle(CreateUserCommand request, CancellationToken cancellationToken)
@@ -6,7 +6,7 @@ using Musify.Application.Users.Contracts;
namespace Musify.Application.Users.Queries.GetUserById namespace Musify.Application.Users.Queries.GetUserById
{ {
public class GetUserByIdQueryHandler(IDatabase database, IKeycloakUserClient keycloakUserClient) public class GetUserByIdQueryHandler(IDatabase database, IKeycloakUserService keycloakUserClient)
: IRequestHandler<GetUserByIdQuery, Task<Result<UserResponse>>> : IRequestHandler<GetUserByIdQuery, Task<Result<UserResponse>>>
{ {
public async Task<Result<UserResponse>> Handle(GetUserByIdQuery request, CancellationToken cancellationToken) public async Task<Result<UserResponse>> Handle(GetUserByIdQuery request, CancellationToken cancellationToken)
@@ -6,7 +6,7 @@ using Musify.Application.Users.Contracts;
namespace Musify.Application.Users.Queries.GetUserByKeycloakId namespace Musify.Application.Users.Queries.GetUserByKeycloakId
{ {
public class GetUserByKeycloakQueryHandler(IDatabase database, IKeycloakUserClient keycloakUserClient) public class GetUserByKeycloakQueryHandler(IDatabase database, IKeycloakUserService keycloakUserClient)
: IRequestHandler<GetUserByKeycloakQuery, Task<Result<UserResponse>>> : IRequestHandler<GetUserByKeycloakQuery, Task<Result<UserResponse>>>
{ {
public async Task<Result<UserResponse>> Handle(GetUserByKeycloakQuery request, CancellationToken cancellationToken) public async Task<Result<UserResponse>> Handle(GetUserByKeycloakQuery request, CancellationToken cancellationToken)
@@ -8,7 +8,7 @@ using X.PagedList.Extensions;
namespace Musify.Application.Users.Queries.GetUsers namespace Musify.Application.Users.Queries.GetUsers
{ {
public class GetUsersQueryHandler(IDatabase database, IKeycloakUserClient keycloakUserClient) public class GetUsersQueryHandler(IDatabase database, IKeycloakUserService keycloakUserClient)
: IRequestHandler<GetUsersQuery, Task<Result<PaginatedUserResponse> >> : IRequestHandler<GetUsersQuery, Task<Result<PaginatedUserResponse> >>
{ {
public async Task<Result<PaginatedUserResponse>> Handle(GetUsersQuery request, CancellationToken cancellationToken) public async Task<Result<PaginatedUserResponse>> Handle(GetUsersQuery request, CancellationToken cancellationToken)
@@ -8,7 +8,7 @@ namespace Musify.Infrastructure.Identity
{ {
public static class KeycloakDependencyInjection public static class KeycloakDependencyInjection
{ {
public static IServiceCollection AddKeycloakAuthentication(this IServiceCollection serviceDescriptors, IConfiguration configuration) public static IServiceCollection AddKeycloakService(this IServiceCollection serviceDescriptors, IConfiguration configuration)
{ {
serviceDescriptors.AddOptionsWithValidateOnStart<KeycloakConfiguration>() serviceDescriptors.AddOptionsWithValidateOnStart<KeycloakConfiguration>()
.Bind(configuration.GetRequiredSection(KeycloakConfiguration.SectionName)) .Bind(configuration.GetRequiredSection(KeycloakConfiguration.SectionName))
@@ -23,7 +23,7 @@ namespace Musify.Infrastructure.Identity
keycloakConfiguration.Username, keycloakConfiguration.Username,
keycloakConfiguration.Password); keycloakConfiguration.Password);
} ); } );
serviceDescriptors.AddScoped<IKeycloakUserClient, KeycloakIdentityService>(); serviceDescriptors.AddScoped<IKeycloakUserService, KeycloakUserService>();
return serviceDescriptors; return serviceDescriptors;
} }
} }
@@ -8,10 +8,10 @@ using Musify.Infrastructure.Configuration;
namespace Musify.Infrastructure.Identity namespace Musify.Infrastructure.Identity
{ {
public class KeycloakIdentityService( public class KeycloakUserService(
KeycloakClient keycloakClient, KeycloakClient keycloakClient,
KeycloakConfiguration keycloakConfiguration, KeycloakConfiguration keycloakConfiguration,
ILogger<KeycloakIdentityService> logger) : IKeycloakUserClient ILogger<KeycloakUserService> logger) : IKeycloakUserService
{ {
public async Task<Result<KeycloakUserResponse>> GetUserByIdAsync(string keycloakId, CancellationToken cancellationToken) public async Task<Result<KeycloakUserResponse>> GetUserByIdAsync(string keycloakId, CancellationToken cancellationToken)
{ {
@@ -17,7 +17,7 @@ namespace Musify.Infrastructure
serviceDescriptors serviceDescriptors
.AddInfrastructureConfigurations(configuration) .AddInfrastructureConfigurations(configuration)
.AddDatabase(configuration) .AddDatabase(configuration)
.AddKeycloakAuthentication(configuration) .AddKeycloakClient(configuration)
.AddStorageHandler() .AddStorageHandler()
.AddPictureHandler() .AddPictureHandler()
.AddMassTransitClient(configuration) .AddMassTransitClient(configuration)