From 81422f3960e8c22d3451d22d90cd64010795b821 Mon Sep 17 00:00:00 2001 From: Ike Kottlowski Date: Thu, 29 Jan 2026 16:06:06 -0500 Subject: [PATCH] fix: remove vestigial null check and nullable enable --- .../Commands/DeleteEmergencyAccessCommand.cs | 4 ++-- .../Repositories/DatabaseContextExtensions.cs | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/Core/Auth/UserFeatures/EmergencyAccess/Commands/DeleteEmergencyAccessCommand.cs b/src/Core/Auth/UserFeatures/EmergencyAccess/Commands/DeleteEmergencyAccessCommand.cs index cd0bf4b7be..40779b266a 100644 --- a/src/Core/Auth/UserFeatures/EmergencyAccess/Commands/DeleteEmergencyAccessCommand.cs +++ b/src/Core/Auth/UserFeatures/EmergencyAccess/Commands/DeleteEmergencyAccessCommand.cs @@ -34,7 +34,7 @@ public class DeleteEmergencyAccessCommand( var emergencyAccessDetails = await _emergencyAccessRepository.GetManyDetailsByGrantorIdAsync(grantorId); // if there is nothing return an empty array and do not send an email - if (emergencyAccessDetails == null || emergencyAccessDetails.Count == 0) + if (emergencyAccessDetails.Count == 0) { return emergencyAccessDetails; } @@ -42,7 +42,7 @@ public class DeleteEmergencyAccessCommand( var (grantorEmails, granteeEmails) = await DeleteEmergencyAccessAsync(emergencyAccessDetails); // Send notification email to grantor - await SendEmergencyAccessRemoveGranteesEmailAsync(grantorEmails, granteeEmails); ; + await SendEmergencyAccessRemoveGranteesEmailAsync(grantorEmails, granteeEmails); return emergencyAccessDetails; } diff --git a/src/Infrastructure.EntityFramework/Repositories/DatabaseContextExtensions.cs b/src/Infrastructure.EntityFramework/Repositories/DatabaseContextExtensions.cs index 40f2a79887..8c15cc17fa 100644 --- a/src/Infrastructure.EntityFramework/Repositories/DatabaseContextExtensions.cs +++ b/src/Infrastructure.EntityFramework/Repositories/DatabaseContextExtensions.cs @@ -1,14 +1,10 @@ -#nullable enable - -using System.Diagnostics; +using System.Diagnostics; using Bit.Core.AdminConsole.Enums.Provider; using Bit.Core.Auth.Enums; using Bit.Core.Enums; using Bit.Infrastructure.EntityFramework.Repositories.Queries; using Microsoft.EntityFrameworkCore; -#nullable enable - namespace Bit.Infrastructure.EntityFramework.Repositories; public static class DatabaseContextExtensions