nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-24 22:32:22 -05:00
Code

[PM-336] Nullable Platform & Unowned Services (#5646)

Browse Source 
* Nullable Platform & Unowned Services

* Fix build errors

* Format
This commit is contained in:
Justin Baur 2025-04-15 12:56:58 -04:00 committed by GitHub
parent 84a984a9e6
commit 2242a70e50
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
22 changed files with 141 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/Platform/Installations/Commands/UpdateInstallationActivityDateCommand/IUpdateInstallationCommand.cs
View File

@ -1,4 +1,6 @@
namespace Bit.Core.Platform.Installations;
#nullable enable
namespace Bit.Core.Platform.Installations;
/// <summary>
/// Command interface responsible for updating data on an `Installation`

4
src/Core/Platform/Installations/Commands/UpdateInstallationActivityDateCommand/UpdateInstallationCommand.cs
View File

@ -1,4 +1,6 @@
namespace Bit.Core.Platform.Installations;
#nullable enable
namespace Bit.Core.Platform.Installations;
/// <summary>
/// Commands responsible for updating an installation from

6
src/Core/Platform/Installations/Queries/GetInstallationQuery/GetInstallationQuery.cs
View File

@ -1,4 +1,6 @@
namespace Bit.Core.Platform.Installations;
#nullable enable
namespace Bit.Core.Platform.Installations;
/// <summary>
/// Queries responsible for fetching an installation from
@ -19,7 +21,7 @@ public class GetInstallationQuery : IGetInstallationQuery
}
/// <inheritdoc cref="IGetInstallationQuery.GetByIdAsync"/>
public async Task<Installation> GetByIdAsync(Guid installationId)
public async Task<Installation?> GetByIdAsync(Guid installationId)
{
if (installationId == default(Guid))
{

6
src/Core/Platform/Installations/Queries/GetInstallationQuery/IGetInstallationQuery.cs
View File

@ -1,4 +1,6 @@
namespace Bit.Core.Platform.Installations;
#nullable enable
namespace Bit.Core.Platform.Installations;
/// <summary>
/// Query interface responsible for fetching an installation from
@ -16,5 +18,5 @@ public interface IGetInstallationQuery
/// <param name="installationId">The GUID id of the installation.</param>
/// <returns>A task containing an `Installation`.</returns>
/// <seealso cref="T:Bit.Core.Platform.Installations.Repositories.IInstallationRepository"/>
Task<Installation> GetByIdAsync(Guid installationId);
Task<Installation?> GetByIdAsync(Guid installationId);
}

4
src/Core/Platform/PlatformServiceCollectionExtensions.cs
View File

@ -1,4 +1,6 @@
using Bit.Core.Platform.Installations;
#nullable enable
using Bit.Core.Platform.Installations;
using Microsoft.Extensions.DependencyInjection;
namespace Bit.Core.Platform;

4
src/Core/Platform/Push/Services/IPushRegistrationService.cs
View File

@ -1,4 +1,6 @@
using Bit.Core.Enums;
#nullable enable
using Bit.Core.Enums;
using Bit.Core.NotificationHub;
namespace Bit.Core.Platform.Push;

4
src/Core/Platform/Push/Services/NoopPushRegistrationService.cs
View File

@ -1,4 +1,6 @@
using Bit.Core.Enums;
#nullable enable
using Bit.Core.Enums;
using Bit.Core.NotificationHub;
namespace Bit.Core.Platform.Push.Internal;

4
src/Core/Platform/Push/Services/RelayPushRegistrationService.cs
View File

@ -1,4 +1,6 @@
using Bit.Core.Enums;
#nullable enable
using Bit.Core.Enums;
using Bit.Core.IdentityServer;
using Bit.Core.Models.Api;
using Bit.Core.NotificationHub;

2
src/Core/Repositories/ICollectionRepository.cs
View File

@ -48,7 +48,7 @@ public interface ICollectionRepository : IRepository<Collection, Guid>
Task<CollectionAdminDetails?> GetByIdWithPermissionsAsync(Guid collectionId, Guid? userId, bool includeAccessRelationships);
Task CreateAsync(Collection obj, IEnumerable<CollectionAccessSelection>? groups, IEnumerable<CollectionAccessSelection>? users);
Task ReplaceAsync(Collection obj, IEnumerable<CollectionAccessSelection> groups, IEnumerable<CollectionAccessSelection> users);
Task ReplaceAsync(Collection obj, IEnumerable<CollectionAccessSelection>? groups, IEnumerable<CollectionAccessSelection>? users);
Task DeleteUserAsync(Guid collectionId, Guid organizationUserId);
Task UpdateUsersAsync(Guid id, IEnumerable<CollectionAccessSelection> users);
Task<ICollection<CollectionAccessSelection>> GetManyUsersByIdAsync(Guid id);

14
src/Core/Services/ILicensingService.cs
View File

@ -1,4 +1,6 @@
using System.Security.Claims;
#nullable enable
using System.Security.Claims;
using Bit.Core.AdminConsole.Entities;
using Bit.Core.Entities;
using Bit.Core.Models.Business;
@ -12,14 +14,14 @@ public interface ILicensingService
Task<bool> ValidateUserPremiumAsync(User user);
bool VerifyLicense(ILicense license);
byte[] SignLicense(ILicense license);
Task<OrganizationLicense> ReadOrganizationLicenseAsync(Organization organization);
Task<OrganizationLicense> ReadOrganizationLicenseAsync(Guid organizationId);
ClaimsPrincipal GetClaimsPrincipalFromLicense(ILicense license);
Task<OrganizationLicense?> ReadOrganizationLicenseAsync(Organization organization);
Task<OrganizationLicense?> ReadOrganizationLicenseAsync(Guid organizationId);
ClaimsPrincipal? GetClaimsPrincipalFromLicense(ILicense license);
Task<string> CreateOrganizationTokenAsync(
Task<string?> CreateOrganizationTokenAsync(
Organization organization,
Guid installationId,
SubscriptionInfo subscriptionInfo);
Task<string> CreateUserTokenAsync(User user, SubscriptionInfo subscriptionInfo);
Task<string?> CreateUserTokenAsync(User user, SubscriptionInfo subscriptionInfo);
}

10
src/Core/Services/IMailService.cs
View File

@ -1,4 +1,6 @@
using Bit.Core.AdminConsole.Entities;
#nullable enable
using Bit.Core.AdminConsole.Entities;
using Bit.Core.AdminConsole.Entities.Provider;
using Bit.Core.Auth.Entities;
using Bit.Core.Billing.Enums;
@ -55,7 +57,7 @@ public interface IMailService
bool mentionInvoices);
Task SendPaymentFailedAsync(string email, decimal amount, bool mentionInvoices);
Task SendAddedCreditAsync(string email, decimal amount);
Task SendLicenseExpiredAsync(IEnumerable<string> emails, string organizationName = null);
Task SendLicenseExpiredAsync(IEnumerable<string> emails, string? organizationName = null);
Task SendNewDeviceLoggedInEmail(string email, string deviceType, DateTime timestamp, string ip);
Task SendRecoverTwoFactorEmail(string email, DateTime timestamp, string ip);
Task SendOrganizationUserRemovedForPolicySingleOrgEmailAsync(string organizationName, string email);
@ -96,9 +98,11 @@ public interface IMailService
Task SendInitiateDeletProviderEmailAsync(string email, Provider provider, string token);
Task SendInitiateDeleteOrganzationEmailAsync(string email, Organization organization, string token);
Task SendRequestSMAccessToAdminEmailAsync(IEnumerable<string> adminEmails, string organizationName, string userRequestingAccess, string emailContent);
#nullable disable
Task SendFamiliesForEnterpriseRemoveSponsorshipsEmailAsync(string email, string offerAcceptanceDate, string organizationId,
string organizationName);
#nullable enable
Task SendClaimedDomainUserEmailAsync(ClaimedUserDomainClaimedEmails emailList);
Task SendDeviceApprovalRequestedNotificationEmailAsync(IEnumerable<string> adminEmails, Guid organizationId, string email, string userName);
Task SendDeviceApprovalRequestedNotificationEmailAsync(IEnumerable<string> adminEmails, Guid organizationId, string email, string? userName);
Task SendBulkSecurityTaskNotificationsAsync(Organization org, IEnumerable<UserSecurityTasksCount> securityTaskNotifications, IEnumerable<string> adminOwnerEmails);
}

6
src/Core/Services/Implementations/AmazonSesMailDeliveryService.cs
View File

@ -1,4 +1,6 @@
using Amazon;
#nullable enable
using Amazon;
using Amazon.SimpleEmail;
using Amazon.SimpleEmail.Model;
using Bit.Core.Models.Mail;
@ -17,7 +19,7 @@ public class AmazonSesMailDeliveryService : IMailDeliveryService, IDisposable
private readonly IAmazonSimpleEmailService _client;
private readonly string _source;
private readonly string _senderTag;
private readonly string _configSetName;
private readonly string? _configSetName;
public AmazonSesMailDeliveryService(
GlobalSettings globalSettings,

4
src/Core/Services/Implementations/AzureQueueService.cs
View File

@ -1,4 +1,6 @@
using System.Text;
#nullable enable
using System.Text;
using System.Text.Json;
using Azure.Storage.Queues;
using Bit.Core.Utilities;

8
src/Core/Services/Implementations/CollectionService.cs
View File

@ -1,4 +1,6 @@
using Bit.Core.Context;
#nullable enable
using Bit.Core.Context;
using Bit.Core.Entities;
using Bit.Core.Exceptions;
using Bit.Core.Models.Data;
@ -34,8 +36,8 @@ public class CollectionService : ICollectionService
_currentContext = currentContext;
}
public async Task SaveAsync(Collection collection, IEnumerable<CollectionAccessSelection> groups = null,
IEnumerable<CollectionAccessSelection> users = null)
public async Task SaveAsync(Collection collection, IEnumerable<CollectionAccessSelection>? groups = null,
IEnumerable<CollectionAccessSelection>? users = null)
{
var org = await _organizationRepository.GetByIdAsync(collection.OrganizationId);
if (org == null)

26
src/Core/Services/Implementations/HandlebarsMailService.cs
View File

@ -1,4 +1,7 @@
using System.Net;
#nullable enable
using System.Diagnostics;
using System.Net;
using System.Reflection;
using System.Text.Json;
using Bit.Core.AdminConsole.Entities;
@ -213,6 +216,7 @@ public class HandlebarsMailService : IMailService
public async Task SendOrganizationAutoscaledEmailAsync(Organization organization, int initialSeatCount, IEnumerable<string> ownerEmails)
{
Debug.Assert(organization.Seats.HasValue, "Organization is expected to have a non-null value for seats at the time of sending this email");
var message = CreateDefaultMessage($"{organization.DisplayName()} Seat Count Has Increased", ownerEmails);
var model = new OrganizationSeatsAutoscaledViewModel
{
@ -286,7 +290,7 @@ public class HandlebarsMailService : IMailService
var messageModels = orgInvitesInfo.OrgUserTokenPairs.Select(orgUserTokenPair =>
{
Debug.Assert(orgUserTokenPair.OrgUser.Email is not null);
var orgUserInviteViewModel = OrganizationUserInvitedViewModel.CreateFromInviteInfo(
orgInvitesInfo, orgUserTokenPair.OrgUser, orgUserTokenPair.Token, _globalSettings);
return CreateMessage(orgUserTokenPair.OrgUser.Email, orgUserInviteViewModel);
@ -358,7 +362,7 @@ public class HandlebarsMailService : IMailService
WebVaultUrl = _globalSettings.BaseServiceUri.VaultWithHash,
SiteName = _globalSettings.SiteName,
ProviderId = provider.Id,
ProviderName = CoreHelpers.SanitizeForEmail(provider.DisplayName(), false),
ProviderName = CoreHelpers.SanitizeForEmail(provider.DisplayName()!, false),
ProviderNameUrlEncoded = WebUtility.UrlEncode(provider.Name),
ProviderBillingEmail = provider.BillingEmail,
ProviderCreationDate = provider.CreationDate.ToLongDateString(),
@ -448,7 +452,7 @@ public class HandlebarsMailService : IMailService
await _mailDeliveryService.SendEmailAsync(message);
}
public async Task SendLicenseExpiredAsync(IEnumerable<string> emails, string organizationName = null)
public async Task SendLicenseExpiredAsync(IEnumerable<string> emails, string? organizationName = null)
{
var message = CreateDefaultMessage("License Expired", emails);
var model = new LicenseExpiredViewModel();
@ -598,12 +602,14 @@ public class HandlebarsMailService : IMailService
}
private async Task AddMessageContentAsync<T>(MailMessage message, string templateName, T model)
where T : notnull
{
message.HtmlContent = await RenderAsync($"{templateName}.html", model);
message.TextContent = await RenderAsync($"{templateName}.text", model);
}
private async Task<string> RenderAsync<T>(string templateName, T model)
private async Task<string?> RenderAsync<T>(string templateName, T model)
where T : notnull
{
await RegisterHelpersAndPartialsAsync();
if (!_templateCache.TryGetValue(templateName, out var template))
@ -618,7 +624,7 @@ public class HandlebarsMailService : IMailService
return template != null ? template(model) : null;
}
private async Task<string> ReadSourceAsync(string templateName)
private async Task<string?> ReadSourceAsync(string templateName)
{
var assembly = typeof(HandlebarsMailService).GetTypeInfo().Assembly;
var fullTemplateName = $"{Namespace}.{templateName}.hbs";
@ -626,7 +632,7 @@ public class HandlebarsMailService : IMailService
{
return null;
}
using (var s = assembly.GetManifestResourceStream(fullTemplateName))
using (var s = assembly.GetManifestResourceStream(fullTemplateName)!)
using (var sr = new StreamReader(s))
{
return await sr.ReadToEndAsync();
@ -757,7 +763,7 @@ public class HandlebarsMailService : IMailService
var emailList = new List<string>();
if (parameters[0] is JsonElement jsonElement && jsonElement.ValueKind == JsonValueKind.Array)
{
emailList = jsonElement.EnumerateArray().Select(e => e.GetString()).ToList();
emailList = jsonElement.EnumerateArray().Select(e => e.GetString()!).ToList();
}
else if (parameters[0] is IEnumerable<string> emails)
{
@ -1276,7 +1282,7 @@ public class HandlebarsMailService : IMailService
await _mailDeliveryService.SendEmailAsync(message);
}
public async Task SendDeviceApprovalRequestedNotificationEmailAsync(IEnumerable<string> adminEmails, Guid organizationId, string email, string userName)
public async Task SendDeviceApprovalRequestedNotificationEmailAsync(IEnumerable<string> adminEmails, Guid organizationId, string email, string? userName)
{
var templateName = _globalSettings.SelfHosted ?
"AdminConsole.SelfHostNotifyAdminDeviceApprovalRequested" :
@ -1313,7 +1319,7 @@ public class HandlebarsMailService : IMailService
await EnqueueMailAsync(messageModels.ToList());
}
private static string GetUserIdentifier(string email, string userName)
private static string GetUserIdentifier(string email, string? userName)
{
return string.IsNullOrEmpty(userName) ? email : CoreHelpers.SanitizeForEmail(userName, false);
}

7
src/Core/Services/Implementations/I18nService.cs
View File

@ -1,4 +1,5 @@
using System.Reflection;
#nullable enable
using Bit.Core.Resources;
using Microsoft.Extensions.Localization;
@ -10,8 +11,8 @@ public class I18nService : II18nService
public I18nService(IStringLocalizerFactory factory)
{
var assemblyName = new AssemblyName(typeof(SharedResources).GetTypeInfo().Assembly.FullName);
_localizer = factory.Create("SharedResources", assemblyName.Name);
var assemblyName = typeof(SharedResources).Assembly.GetName()!;
_localizer = factory.Create("SharedResources", assemblyName.Name!);
}
public LocalizedString GetLocalizedHtmlString(string key)

9
src/Core/Services/Implementations/I18nViewLocalizer.cs
View File

@ -1,4 +1,5 @@
using System.Reflection;
#nullable enable
using Bit.Core.Resources;
using Microsoft.AspNetCore.Mvc.Localization;
using Microsoft.Extensions.Localization;
@ -13,9 +14,9 @@ public class I18nViewLocalizer : IViewLocalizer
public I18nViewLocalizer(IStringLocalizerFactory stringFactory,
IHtmlLocalizerFactory htmlFactory)
{
var assemblyName = new AssemblyName(typeof(SharedResources).GetTypeInfo().Assembly.FullName);
_stringLocalizer = stringFactory.Create("SharedResources", assemblyName.Name);
_htmlLocalizer = htmlFactory.Create("SharedResources", assemblyName.Name);
var assemblyName = typeof(SharedResources).Assembly.GetName()!;
_stringLocalizer = stringFactory.Create("SharedResources", assemblyName.Name!);
_htmlLocalizer = htmlFactory.Create("SharedResources", assemblyName.Name!);
}
public LocalizedHtmlString this[string name] => _htmlLocalizer[name];

9
src/Core/Services/Implementations/MailKitSmtpMailDeliveryService.cs
View File

@ -22,12 +22,17 @@ public class MailKitSmtpMailDeliveryService : IMailDeliveryService
ILogger<MailKitSmtpMailDeliveryService> logger,
IOptions<X509ChainOptions> x509ChainOptions)
{
if (globalSettings.Mail?.Smtp?.Host == null)
if (globalSettings.Mail.Smtp?.Host == null)
{
throw new ArgumentNullException(nameof(globalSettings.Mail.Smtp.Host));
}
_replyEmail = CoreHelpers.PunyEncode(globalSettings.Mail?.ReplyToEmail);
if (globalSettings.Mail.ReplyToEmail == null)
{
throw new InvalidOperationException("A GlobalSettings.Mail.ReplyToEmail is required to be set up.");
}
_replyEmail = CoreHelpers.PunyEncode(globalSettings.Mail.ReplyToEmail);
if (_replyEmail.Contains("@"))
{

22
src/Core/Services/NoopImplementations/NoopLicensingService.cs
View File

@ -1,4 +1,6 @@
using System.Security.Claims;
#nullable enable
using System.Security.Claims;
using Bit.Core.AdminConsole.Entities;
using Bit.Core.Entities;
using Bit.Core.Models.Business;
@ -45,28 +47,28 @@ public class NoopLicensingService : ILicensingService
return new byte[0];
}
public Task<OrganizationLicense> ReadOrganizationLicenseAsync(Organization organization)
public Task<OrganizationLicense?> ReadOrganizationLicenseAsync(Organization organization)
{
return Task.FromResult<OrganizationLicense>(null);
return Task.FromResult<OrganizationLicense?>(null);
}
public Task<OrganizationLicense> ReadOrganizationLicenseAsync(Guid organizationId)
public Task<OrganizationLicense?> ReadOrganizationLicenseAsync(Guid organizationId)
{
return Task.FromResult<OrganizationLicense>(null);
return Task.FromResult<OrganizationLicense?>(null);
}
public ClaimsPrincipal GetClaimsPrincipalFromLicense(ILicense license)
public ClaimsPrincipal? GetClaimsPrincipalFromLicense(ILicense license)
{
return null;
}
public Task<string> CreateOrganizationTokenAsync(Organization organization, Guid installationId, SubscriptionInfo subscriptionInfo)
public Task<string?> CreateOrganizationTokenAsync(Organization organization, Guid installationId, SubscriptionInfo subscriptionInfo)
{
return Task.FromResult<string>(null);
return Task.FromResult<string?>(null);
}
public Task<string> CreateUserTokenAsync(User user, SubscriptionInfo subscriptionInfo)
public Task<string?> CreateUserTokenAsync(User user, SubscriptionInfo subscriptionInfo)
{
return Task.FromResult<string>(null);
return Task.FromResult<string?>(null);
}
}

8
src/Core/Services/NoopImplementations/NoopMailService.cs
View File

@ -1,4 +1,6 @@
using Bit.Core.AdminConsole.Entities;
#nullable enable
using Bit.Core.AdminConsole.Entities;
using Bit.Core.AdminConsole.Entities.Provider;
using Bit.Core.Auth.Entities;
using Bit.Core.Billing.Enums;
@ -137,7 +139,7 @@ public class NoopMailService : IMailService
return Task.FromResult(0);
}
public Task SendLicenseExpiredAsync(IEnumerable<string> emails, string organizationName = null)
public Task SendLicenseExpiredAsync(IEnumerable<string> emails, string? organizationName = null)
{
return Task.FromResult(0);
}
@ -324,7 +326,7 @@ public class NoopMailService : IMailService
}
public Task SendClaimedDomainUserEmailAsync(ClaimedUserDomainClaimedEmails emailList) => Task.CompletedTask;
public Task SendDeviceApprovalRequestedNotificationEmailAsync(IEnumerable<string> adminEmails, Guid organizationId, string email, string userName)
public Task SendDeviceApprovalRequestedNotificationEmailAsync(IEnumerable<string> adminEmails, Guid organizationId, string email, string? userName)
{
return Task.FromResult(0);
}

50
src/Core/Utilities/CoreHelpers.cs
View File

@ -1,4 +1,7 @@
using System.Globalization;
#nullable enable
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.Reflection;
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
@ -116,11 +119,11 @@ public static class CoreHelpers
return Regex.Replace(thumbprint, @"[^\da-fA-F]", string.Empty).ToUpper();
}
public static X509Certificate2 GetCertificate(string thumbprint)
public static X509Certificate2? GetCertificate(string thumbprint)
{
thumbprint = CleanCertificateThumbprint(thumbprint);
X509Certificate2 cert = null;
X509Certificate2? cert = null;
var certStore = new X509Store(StoreName.My, StoreLocation.CurrentUser);
certStore.Open(OpenFlags.ReadOnly);
var certCollection = certStore.Certificates.Find(X509FindType.FindByThumbprint, thumbprint, false);
@ -141,7 +144,7 @@ public static class CoreHelpers
public async static Task<X509Certificate2> GetEmbeddedCertificateAsync(string file, string password)
{
var assembly = typeof(CoreHelpers).GetTypeInfo().Assembly;
using (var s = assembly.GetManifestResourceStream($"Bit.Core.{file}"))
using (var s = assembly.GetManifestResourceStream($"Bit.Core.{file}")!)
using (var ms = new MemoryStream())
{
await s.CopyToAsync(ms);
@ -153,14 +156,14 @@ public static class CoreHelpers
{
var assembly = Assembly.GetCallingAssembly();
var resourceName = assembly.GetManifestResourceNames().Single(n => n.EndsWith(file));
using (var stream = assembly.GetManifestResourceStream(resourceName))
using (var stream = assembly.GetManifestResourceStream(resourceName)!)
using (var reader = new StreamReader(stream))
{
return reader.ReadToEnd();
}
}
public async static Task<X509Certificate2> GetBlobCertificateAsync(string connectionString, string container, string file, string password)
public async static Task<X509Certificate2?> GetBlobCertificateAsync(string connectionString, string container, string file, string password)
{
try
{
@ -233,7 +236,7 @@ public static class CoreHelpers
throw new ArgumentOutOfRangeException(nameof(length), "length cannot be less than zero.");
}
if ((characters?.Length ?? 0) == 0)
if (string.IsNullOrEmpty(characters))
{
throw new ArgumentOutOfRangeException(nameof(characters), "characters invalid.");
}
@ -346,10 +349,10 @@ public static class CoreHelpers
/// </summary>
public static T CloneObject<T>(T obj)
{
return JsonSerializer.Deserialize<T>(JsonSerializer.Serialize(obj));
return JsonSerializer.Deserialize<T>(JsonSerializer.Serialize(obj))!;
}
public static bool SettingHasValue(string setting)
public static bool SettingHasValue([NotNullWhen(true)] string? setting)
{
var normalizedSetting = setting?.ToLowerInvariant();
return !string.IsNullOrWhiteSpace(normalizedSetting) && !normalizedSetting.Equals("secret") &&
@ -448,7 +451,8 @@ public static class CoreHelpers
return output;
}
public static string PunyEncode(string text)
[return: NotNullIfNotNull(nameof(text))]
public static string? PunyEncode(string? text)
{
if (text == "")
{
@ -473,21 +477,21 @@ public static class CoreHelpers
}
}
public static string FormatLicenseSignatureValue(object val)
public static string? FormatLicenseSignatureValue(object val)
{
if (val == null)
{
return string.Empty;
}
if (val.GetType() == typeof(DateTime))
if (val is DateTime dateTimeVal)
{
return ToEpocSeconds((DateTime)val).ToString();
return ToEpocSeconds(dateTimeVal).ToString();
}
if (val.GetType() == typeof(bool))
if (val is bool boolVal)
{
return val.ToString().ToLowerInvariant();
return boolVal.ToString().ToLowerInvariant();
}
if (val is PlanType planType)
@ -625,7 +629,7 @@ public static class CoreHelpers
return subName;
}
public static string GetIpAddress(this Microsoft.AspNetCore.Http.HttpContext httpContext,
public static string? GetIpAddress(this Microsoft.AspNetCore.Http.HttpContext httpContext,
GlobalSettings globalSettings)
{
if (httpContext == null)
@ -652,7 +656,7 @@ public static class CoreHelpers
(!globalSettings.SelfHosted && origin == "https://bitwarden.com");
}
public static X509Certificate2 GetIdentityServerCertificate(GlobalSettings globalSettings)
public static X509Certificate2? GetIdentityServerCertificate(GlobalSettings globalSettings)
{
if (globalSettings.SelfHosted &&
SettingHasValue(globalSettings.IdentityServer.CertificatePassword)
@ -804,14 +808,16 @@ public static class CoreHelpers
/// <param name="jsonData">The JSON data</param>
/// <typeparam name="T">The type to deserialize into</typeparam>
/// <returns></returns>
public static T LoadClassFromJsonData<T>(string jsonData) where T : new()
public static T LoadClassFromJsonData<T>(string? jsonData) where T : new()
{
if (string.IsNullOrWhiteSpace(jsonData))
{
return new T();
}
#nullable disable // TODO: Remove this and fix any callee warnings.
return System.Text.Json.JsonSerializer.Deserialize<T>(jsonData, _jsonSerializerOptions);
#nullable enable
}
public static string ClassToJsonData<T>(T data)
@ -829,7 +835,7 @@ public static class CoreHelpers
return list;
}
public static string DecodeMessageText(this QueueMessage message)
public static string? DecodeMessageText(this QueueMessage message)
{
var text = message?.MessageText;
if (string.IsNullOrWhiteSpace(text))
@ -852,7 +858,7 @@ public static class CoreHelpers
Encoding.UTF8.GetBytes(input1), Encoding.UTF8.GetBytes(input2));
}
public static string ObfuscateEmail(string email)
public static string? ObfuscateEmail(string email)
{
if (email == null)
{
@ -886,7 +892,7 @@ public static class CoreHelpers
}
public static string GetEmailDomain(string email)
public static string? GetEmailDomain(string email)
{
if (!string.IsNullOrWhiteSpace(email))
{
@ -906,7 +912,7 @@ public static class CoreHelpers
return _whiteSpaceRegex.Replace(input, newValue);
}
public static string RedactEmailAddress(string email)
public static string? RedactEmailAddress(string email)
{
if (string.IsNullOrWhiteSpace(email))
{

14
src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs
View File

@ -513,15 +513,21 @@ public class CollectionRepository : Repository<Core.Entities.Collection, Collect
}
}
public async Task ReplaceAsync(Core.Entities.Collection collection, IEnumerable<CollectionAccessSelection> groups,
IEnumerable<CollectionAccessSelection> users)
public async Task ReplaceAsync(Core.Entities.Collection collection, IEnumerable<CollectionAccessSelection>? groups,
IEnumerable<CollectionAccessSelection>? users)
{
await UpsertAsync(collection);
using (var scope = ServiceScopeFactory.CreateScope())
{
var dbContext = GetDatabaseContext(scope);
await ReplaceCollectionGroupsAsync(dbContext, collection, groups);
await ReplaceCollectionUsersAsync(dbContext, collection, users);
if (groups != null)
{
await ReplaceCollectionGroupsAsync(dbContext, collection, groups);
}
if (users != null)
{
await ReplaceCollectionUsersAsync(dbContext, collection, users);
}
await dbContext.UserBumpAccountRevisionDateByCollectionIdAsync(collection.Id, collection.OrganizationId);
await dbContext.SaveChangesAsync();
}