diff --git a/install.sh b/install.sh index 6b404b09e..f01250d2a 100755 --- a/install.sh +++ b/install.sh @@ -372,11 +372,11 @@ set_support_email() { } set_public_registration() { - printf "${CYAN}> Checking PUBLIC_REGISTRATION...${NC}\n" - if ! grep -q "^PUBLIC_REGISTRATION=" "$ENV_FILE" || [ -z "$(grep "^PUBLIC_REGISTRATION=" "$ENV_FILE" | cut -d '=' -f2)" ]; then - update_env_var "PUBLIC_REGISTRATION" "true" + printf "${CYAN}> Checking PUBLIC_REGISTRATION_ENABLED...${NC}\n" + if ! grep -q "^PUBLIC_REGISTRATION_ENABLED=" "$ENV_FILE" || [ -z "$(grep "^PUBLIC_REGISTRATION_ENABLED=" "$ENV_FILE" | cut -d '=' -f2)" ]; then + update_env_var "PUBLIC_REGISTRATION_ENABLED" "true" else - printf " ${GREEN}> PUBLIC_REGISTRATION already exists.${NC}\n" + printf " ${GREEN}> PUBLIC_REGISTRATION_ENABLED already exists.${NC}\n" fi } diff --git a/src/AliasVault.Api/Config.cs b/src/AliasVault.Api/Config.cs index 9651ff4cd..a724e4d95 100644 --- a/src/AliasVault.Api/Config.cs +++ b/src/AliasVault.Api/Config.cs @@ -15,5 +15,5 @@ public class Config /// /// Gets or sets a value indicating whether public registration is enabled. /// - public bool PublicRegistration { get; set; } + public bool PublicRegistrationEnabled { get; set; } } diff --git a/src/AliasVault.Api/Controllers/AuthController.cs b/src/AliasVault.Api/Controllers/AuthController.cs index 44926e429..df168c1d4 100644 --- a/src/AliasVault.Api/Controllers/AuthController.cs +++ b/src/AliasVault.Api/Controllers/AuthController.cs @@ -333,7 +333,7 @@ public class AuthController(IDbContextFactory dbContextFac public async Task Register([FromBody] RegisterRequest model) { // Check if public registration is disabled in the configuration. - if (!config.PublicRegistration) + if (!config.PublicRegistrationEnabled) { return BadRequest(ServerValidationErrorResponse.Create(["New account registration is currently disabled on this server. Please contact the administrator."], 400)); } diff --git a/src/AliasVault.Api/Program.cs b/src/AliasVault.Api/Program.cs index 0e7a26b83..95b3c69e2 100644 --- a/src/AliasVault.Api/Program.cs +++ b/src/AliasVault.Api/Program.cs @@ -27,8 +27,8 @@ builder.Configuration.AddJsonFile("appsettings.json", optional: false, reloadOnC builder.Configuration.AddJsonFile($"appsettings.{builder.Environment.EnvironmentName}.json", optional: true, reloadOnChange: true); var config = new Config(); -var publicRegistration = Environment.GetEnvironmentVariable("PUBLIC_REGISTRATION") ?? "false"; -config.PublicRegistration = bool.Parse(publicRegistration); +var publicRegistrationEnabled = Environment.GetEnvironmentVariable("PUBLIC_REGISTRATION_ENABLED") ?? "false"; +config.PublicRegistrationEnabled = bool.Parse(publicRegistrationEnabled); builder.Services.AddSingleton(config); diff --git a/src/AliasVault.Api/Properties/launchSettings.json b/src/AliasVault.Api/Properties/launchSettings.json index 7b7ebc0c8..687660e87 100644 --- a/src/AliasVault.Api/Properties/launchSettings.json +++ b/src/AliasVault.Api/Properties/launchSettings.json @@ -8,7 +8,7 @@ "ASPNETCORE_ENVIRONMENT": "Development", "JWT_KEY": "12345678901234567890123456789012", "DATA_PROTECTION_CERT_PASS": "Development", - "PUBLIC_REGISTRATION": "true" + "PUBLIC_REGISTRATION_ENABLED": "true" }, "dotnetRunMessages": true, "applicationUrl": "http://0.0.0.0:5092" @@ -21,7 +21,7 @@ "ASPNETCORE_ENVIRONMENT": "Development", "JWT_KEY": "12345678901234567890123456789012", "DATA_PROTECTION_CERT_PASS": "Development", - "PUBLIC_REGISTRATION": "true" + "PUBLIC_REGISTRATION_ENABLED": "true" }, "dotnetRunMessages": true, "applicationUrl": "https://0.0.0.0:7223"