diff --git a/Iceshrimp.Backend/Controllers/Schemas/AuthRequest.cs b/Iceshrimp.Backend/Controllers/Schemas/AuthRequest.cs index 1d9f308c..68073555 100644 --- a/Iceshrimp.Backend/Controllers/Schemas/AuthRequest.cs +++ b/Iceshrimp.Backend/Controllers/Schemas/AuthRequest.cs @@ -3,12 +3,12 @@ using J = System.Text.Json.Serialization.JsonPropertyNameAttribute; namespace Iceshrimp.Backend.Controllers.Schemas; public class AuthRequest { - [J("username")] public required string Username { get; set; } - [J("password")] public required string Password { get; set; } + [J("username")] public required string Username { get; set; } + [J("password")] public required string Password { get; set; } } public class RegistrationRequest : AuthRequest { - [J("invite")] public string? Invite { get; set; } + [J("invite")] public string? Invite { get; set; } } public class ChangePasswordRequest { diff --git a/Iceshrimp.Backend/Core/Configuration/Config.cs b/Iceshrimp.Backend/Core/Configuration/Config.cs index 58d64390..cf28aec0 100644 --- a/Iceshrimp.Backend/Core/Configuration/Config.cs +++ b/Iceshrimp.Backend/Core/Configuration/Config.cs @@ -52,9 +52,10 @@ public sealed class Config { public sealed class RedisSection { public required string Host { get; init; } = "localhost"; public required int Port { get; init; } = 6379; - public int? Database { get; init; } + public string? Prefix { get; init; } public string? Username { get; init; } public string? Password { get; init; } + public int? Database { get; init; } //TODO: TLS settings } diff --git a/Iceshrimp.Backend/Core/Extensions/ServiceExtensions.cs b/Iceshrimp.Backend/Core/Extensions/ServiceExtensions.cs index f7797d77..d1b7ce97 100644 --- a/Iceshrimp.Backend/Core/Extensions/ServiceExtensions.cs +++ b/Iceshrimp.Backend/Core/Extensions/ServiceExtensions.cs @@ -70,6 +70,7 @@ public static class ServiceExtensions { var config = configuration.GetSection("Redis").Get(); if (config == null) throw new Exception("Failed to initialize redis: Failed to load configuration"); services.AddStackExchangeRedisCache(options => { + options.InstanceName = config.Prefix; options.ConfigurationOptions = new ConfigurationOptions { User = config.Username, Password = config.Password, diff --git a/Iceshrimp.Backend/configuration.ini b/Iceshrimp.Backend/configuration.ini index 48a7d12a..bfa5ad06 100644 --- a/Iceshrimp.Backend/configuration.ini +++ b/Iceshrimp.Backend/configuration.ini @@ -24,9 +24,10 @@ Password = iceshrimp [Redis] Host = localhost Port = 6379 -;;Database = 0 +;;Prefix = ;;Username = ;;Password = +;;Database = 0 [Logging:LogLevel] Default = Information