bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2026-01-29 07:43:22 +00:00
Code Issues Releases Wiki Activity

chore: fixing nullable compatibility.

Browse Source
This commit is contained in:
Ike Kottlowski
2026-01-22 23:07:49 -05:00
parent 97451d385e
commit 9391b94f39
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Core/Auth/Models/Data/EmergencyAccessDetails.cs
View File

@@ -8,6 +8,9 @@ public class EmergencyAccessDetails : EmergencyAccess
public string? GranteeEmail { get; set; }
public string? GranteeAvatarColor { get; set; }
public string? GrantorName { get; set; }
/// <summary>
/// Grantor email is assumed not null because in order to create an emergency access the grantor must be an existing user.
/// </summary>
public required string GrantorEmail { get; set; }
public string? GrantorAvatarColor { get; set; }
}

10
src/Core/Platform/Mail/HandlebarsMailService.cs
View File

@@ -1,6 +1,4 @@
#nullable enable
using System.Diagnostics;
using System.Diagnostics;
using System.Net;
using System.Reflection;
using System.Text.Json;
@@ -13,6 +11,7 @@ using Bit.Core.Auth.Models.Mail;
using Bit.Core.Billing.Enums;
using Bit.Core.Billing.Models.Mail;
using Bit.Core.Entities;
using Bit.Core.Exceptions;
using Bit.Core.Models.Data.Organizations;
using Bit.Core.Models.Mail;
using Bit.Core.Models.Mail.Auth;
@@ -1040,6 +1039,11 @@ public class HandlebarsMailService : IMailService
public async Task SendEmergencyAccessInviteEmailAsync(EmergencyAccess emergencyAccess, string name, string token)
{
if(string.IsNullOrEmpty(emergencyAccess.Email))
{
throw new BadRequestException("Emergency Access not valid.");
}
var message = CreateDefaultMessage($"Emergency Access Contact Invite", emergencyAccess.Email);
var model = new EmergencyAccessInvitedViewModel
{

2
test/Api.Test/KeyManagement/Validators/EmergencyAccessRotationValidatorTests.cs
View File

@@ -30,7 +30,7 @@ public class EmergencyAccessRotationValidatorTests
KeyEncrypted = e.KeyEncrypted,
Type = e.Type
}).ToList();
userEmergencyAccess.Add(new EmergencyAccessDetails { Id = Guid.NewGuid(), KeyEncrypted = "TestKey" });
userEmergencyAccess.Add(new EmergencyAccessDetails { Id = Guid.NewGuid(), GrantorEmail="grantor@example.com", KeyEncrypted = "TestKey" });
sutProvider.GetDependency<IEmergencyAccessRepository>().GetManyDetailsByGrantorIdAsync(user.Id)
.Returns(userEmergencyAccess);

2
test/Core.Test/Auth/UserFeatures/EmergencyAccess/EmergencyAccessMailTests.cs
View File

@@ -148,6 +148,6 @@ public class EmergencyAccessMailTests
Assert.NotNull(mail);
Assert.NotNull(mail.View);
Assert.Equal(_emergencyAccessMailSubject, mail.Subject);
Assert.Equal(_emergencyAccessHelpUrl, mail.View.EmergencyAccessHelpPageUrl);
Assert.Equal(_emergencyAccessHelpUrl, EmergencyAccessRemoveGranteesMailView.EmergencyAccessHelpPageUrl);
}
}