From 53c81918a56a432d020a0e686d58f3bf67bb9426 Mon Sep 17 00:00:00 2001 From: Umar Bolatov Date: Tue, 6 Apr 2021 18:00:07 -0700 Subject: [PATCH] Enable nullable reference checking in UsersController --- .../Controllers/GreenField/UsersController.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/BTCPayServer/Controllers/GreenField/UsersController.cs b/BTCPayServer/Controllers/GreenField/UsersController.cs index e22f1ae6d..0b9f28757 100644 --- a/BTCPayServer/Controllers/GreenField/UsersController.cs +++ b/BTCPayServer/Controllers/GreenField/UsersController.cs @@ -1,5 +1,5 @@ +#nullable enable using System; -using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; @@ -83,13 +83,13 @@ namespace BTCPayServer.Controllers.GreenField [HttpPost("~/api/v1/users")] public async Task CreateUser(CreateApplicationUserRequest request, CancellationToken cancellationToken = default) { - if (request?.Email is null) + if (request.Email is null) ModelState.AddModelError(nameof(request.Email), "Email is missing"); - if (!string.IsNullOrEmpty(request?.Email) && !Validation.EmailValidator.IsEmail(request.Email)) + if (!string.IsNullOrEmpty(request.Email) && !Validation.EmailValidator.IsEmail(request.Email)) { ModelState.AddModelError(nameof(request.Email), "Invalid email"); } - if (request?.Password is null) + if (request.Password is null) ModelState.AddModelError(nameof(request.Password), "Password is missing"); if (!ModelState.IsValid) @@ -168,8 +168,10 @@ namespace BTCPayServer.Controllers.GreenField if (!anyAdmin) { var settings = await _settingsRepository.GetSettingAsync(); - settings.FirstRun = false; - await _settingsRepository.UpdateSetting(settings); + if (settings != null) { + settings.FirstRun = false; + await _settingsRepository.UpdateSetting(settings); + } await _settingsRepository.FirstAdminRegistered(policies, _options.UpdateUrl != null, _options.DisableRegistration); }