From c26e679ad9a5f909162dba8827833984a31a7666 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 10 Jul 2017 16:38:18 -0400 Subject: [PATCH] null check on push --- .../Implementations/OrganizationService.cs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/Core/Services/Implementations/OrganizationService.cs b/src/Core/Services/Implementations/OrganizationService.cs index 9909f9dea6..c5207249e6 100644 --- a/src/Core/Services/Implementations/OrganizationService.cs +++ b/src/Core/Services/Implementations/OrganizationService.cs @@ -744,8 +744,11 @@ namespace Bit.Core.Services await _organizationUserRepository.DeleteAsync(orgUser); - // push - await _pushRegistrationService.DeleteUserRegistrationOrganizationAsync(orgUser.UserId.Value, organizationId); + if(orgUser.UserId.HasValue) + { + // push + await _pushRegistrationService.DeleteUserRegistrationOrganizationAsync(orgUser.UserId.Value, organizationId); + } } public async Task DeleteUserAsync(Guid organizationId, Guid userId) @@ -764,8 +767,11 @@ namespace Bit.Core.Services await _organizationUserRepository.DeleteAsync(orgUser); - // push - await _pushRegistrationService.DeleteUserRegistrationOrganizationAsync(orgUser.UserId.Value, organizationId); + if(orgUser.UserId.HasValue) + { + // push + await _pushRegistrationService.DeleteUserRegistrationOrganizationAsync(orgUser.UserId.Value, organizationId); + } } public async Task ImportAsync(Guid organizationId,