NotS1mp/Musify
0
0
Fork 0
Code Issues 23 Pull Requests Actions Packages Projects Releases Wiki Activity

Remove keycloak and add missing functions

Browse Source
This commit is contained in:
Admin
2026-05-09 19:36:49 +02:00
parent 275ba57c0c
commit 5761f6da69
22 changed files with 89 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Infrastructure/Configuration/InfrastructureStorageConfiguration.cs
+1 -3
View File
@@ -6,16 +6,14 @@ namespace Musify.Infrastructure.Configuration
{
public const string SectionName = "InfrastructureStorage";
[Required]
[Url]
[Required]
public required string Address { get; set; }
[Required]
[MinLength(3)]
public required string AccessKey { get; set; }
[Required]
[MinLength(8)]
public required string SecretAccessKey { get; set; }
[Required]
Infrastructure/Configuration/KeycloakConfiguration.cs
-21
View File
@@ -1,21 +0,0 @@
using System.ComponentModel.DataAnnotations;
namespace Musify.Infrastructure.Configuration
{
public class KeycloakConfiguration
{
public const string SectionName = "Keycloak";
[Required]
public required string Address { get; set; }
[Required]
public required string Realm { get; set; }
[Required]
public required string Username { get; set; }
[Required]
public required string Password { get; set; }
}
}
Infrastructure/Configuration/OpenTelemetryConfiguration.cs
+1 -1
View File
@@ -6,8 +6,8 @@ namespace Musify.Infrastructure.Configuration
{
public const string SectionName = "OpenTelemetry";
[Required]
[Url]
[Required]
public required string OtlpEndpoint { get; set; }
}
}
Infrastructure/Infrastructure.csproj
-1
View File
@@ -15,7 +15,6 @@
<ItemGroup>
<PackageReference Include="AWSSDK.S3" Version="4.0.19" />
<PackageReference Include="Keycloak.Net.Core" Version="1.0.38" />
<PackageReference Include="MassTransit" Version="9.0.1" />
<PackageReference Include="MassTransit.RabbitMQ" Version="9.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.5" />
Infrastructure/Services/KeycloakUserService.cs
-67
View File
@@ -1,67 +0,0 @@
using Keycloak.Net;
using Keycloak.Net.Models.Users;
using Microsoft.Extensions.Logging;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.Users.Responses;
using Musify.Infrastructure.Configuration;
namespace Musify.Infrastructure.Services
{
public class KeycloakUserService(KeycloakClient keycloakClient, ILogger<KeycloakUserService> logger,
KeycloakConfiguration keycloakConfiguration) : IKeycloakUserService
{
public async Task<KeycloakUserResponse> GetUserByIdAsync(string keycloakId, CancellationToken cancellationToken)
{
User keycloakUser;
try
{
keycloakUser = await keycloakClient.GetUserAsync(keycloakConfiguration.Realm, keycloakId, cancellationToken);
}
catch (OperationCanceledException)
{
logger.LogWarning("Operation to retrieve Keycloak user {KeycloakId} was cancelled", keycloakId);
throw;
}
catch (Exception exception)
{
logger.LogWarning(exception, "Failed to retrieve Keycloak user {KeycloakId}", keycloakId);
throw;
}
return ToResponse(keycloakUser);
}
public async Task<IReadOnlyCollection<KeycloakUserResponse>> GetUsersAsync(CancellationToken cancellationToken, string search = "", int first = 0, int max = 20, string username = "")
{
var users = await keycloakClient.GetUsersAsync(
realm: keycloakConfiguration.Realm,
first: first,
max: max,
search: search,
username: username,
cancellationToken: cancellationToken);
return users
.Select(ToResponse)
.ToArray();
}
public Task<int> GetUsersCountAsync(CancellationToken cancellationToken, string search = "", string username = "")
{
return keycloakClient.GetUsersCountAsync(
keycloakConfiguration.Realm,
search: search,
username: username,
cancellationToken: cancellationToken);
}
KeycloakUserResponse ToResponse(User keycloakUser)
{
return new KeycloakUserResponse(
Guid.Parse(keycloakUser.Id ?? throw new InvalidOperationException("Keycloak user Id is required.")),
keycloakUser.UserName ?? throw new InvalidOperationException("Keycloak user Name is required."),
keycloakUser.FirstName ?? throw new InvalidOperationException("Keycloak user FirstName is required."),
keycloakUser.LastName ?? throw new InvalidOperationException("Keycloak user SecondName is required."));
}
}
}
Infrastructure/Services/ServicesDependencyInjection.cs
-23
View File
@@ -1,5 +1,4 @@
using Amazon.S3;
using Keycloak.Net;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
@@ -42,28 +41,6 @@ namespace Musify.Infrastructure.Services
return serviceDescriptors;
}
public static IServiceCollection AddKeycloakService(this IServiceCollection serviceDescriptors, IConfiguration configuration)
{
serviceDescriptors.AddOptionsWithValidateOnStart<KeycloakConfiguration>()
.Bind(configuration.GetRequiredSection(KeycloakConfiguration.SectionName))
.ValidateDataAnnotations();
serviceDescriptors.AddSingleton(serviceProvider =>
serviceProvider.GetRequiredService<IOptions<KeycloakConfiguration>>().Value);
serviceDescriptors.AddScoped(serviceProvider =>
{
var keycloakConfiguration = serviceProvider.GetRequiredService<KeycloakConfiguration>();
return new KeycloakClient(
keycloakConfiguration.Address,
keycloakConfiguration.Username,
keycloakConfiguration.Password);
} );
serviceDescriptors.AddScoped<IKeycloakUserService, KeycloakUserService>();
return serviceDescriptors;
}
public static IServiceCollection AddAudioTranscoder(this IServiceCollection serviceDescriptors, IConfiguration configuration)
{
serviceDescriptors