From 417ac64ad2d16ef53af2861776f72bbd80450f62 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 28 Aug 2017 07:50:57 -0400 Subject: [PATCH] allow to disable user registration from env --- src/Core/GlobalSettings.cs | 1 + src/Core/Services/Implementations/UserService.cs | 5 +++++ util/Setup/Program.cs | 5 +++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Core/GlobalSettings.cs b/src/Core/GlobalSettings.cs index 4ea58c4c8a..f6d1b39d54 100644 --- a/src/Core/GlobalSettings.cs +++ b/src/Core/GlobalSettings.cs @@ -11,6 +11,7 @@ namespace Bit.Core public virtual string LogDirectory { get; set; } public virtual string LicenseDirectory { get; set; } public virtual string PushRelayBaseUri { get; set; } + public virtual bool DisableUserRegistration { get; set; } public virtual InstallationSettings Installation { get; set; } = new InstallationSettings(); public virtual BaseServiceUriSettings BaseServiceUri { get; set; } = new BaseServiceUriSettings(); public virtual SqlServerSettings SqlServer { get; set; } = new SqlServerSettings(); diff --git a/src/Core/Services/Implementations/UserService.cs b/src/Core/Services/Implementations/UserService.cs index 3ad473f0d4..f4b707bb45 100644 --- a/src/Core/Services/Implementations/UserService.cs +++ b/src/Core/Services/Implementations/UserService.cs @@ -206,6 +206,11 @@ namespace Bit.Core.Services public async Task RegisterUserAsync(User user, string masterPassword) { + if(_globalSettings.DisableUserRegistration) + { + throw new BadRequestException("Registration has been disabled by the system administrator."); + } + var result = await base.CreateAsync(user, masterPassword); if(result == IdentityResult.Success) { diff --git a/util/Setup/Program.cs b/util/Setup/Program.cs index 40d875047c..d4bda04868 100644 --- a/util/Setup/Program.cs +++ b/util/Setup/Program.cs @@ -390,12 +390,13 @@ globalSettings__installation__id={_installationId} globalSettings__installation__key={_installationKey} globalSettings__yubico__clientId=REPLACE globalSettings__yubico__key=REPLACE -globalSettings__mail__replyToEmail=hello@bitwarden.com +globalSettings__mail__replyToEmail=no-reply@{_domain} globalSettings__mail__smtp__host=REPLACE globalSettings__mail__smtp__username=REPLACE globalSettings__mail__smtp__password=REPLACE globalSettings__mail__smtp__ssl=true -globalSettings__mail__smtp__port=587"); +globalSettings__mail__smtp__port=587 +globalSettings__disableUserRegistration=false"); if(!_push) {