nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 15:42:48 -05:00
Code Activity

[PM-2943] Enable Nullable Repositories in Unowned Files (#4549)

Browse Source 
* Enable Nullable In Unowned Repos

* Update More Tests

* Move to One If

* Fix Collections

* Format

* Add Migrations

* Move Pragma Annotation

* Add Better Assert Message
This commit is contained in:
Justin Baur
2024-07-24 09:48:09 -04:00
committed by GitHub
parent b5f09c599b
commit 1e0182008b
67 changed files with 8432 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Infrastructure.Dapper/Repositories/UserRepository.cs
View File

@ -9,6 +9,8 @@ using Dapper;
using Microsoft.AspNetCore.DataProtection;
using Microsoft.Data.SqlClient;
#nullable enable
namespace Bit.Infrastructure.Dapper.Repositories;
public class UserRepository : Repository<User, Guid>, IUserRepository
@ -18,23 +20,19 @@ public class UserRepository : Repository<User, Guid>, IUserRepository
public UserRepository(
GlobalSettings globalSettings,
IDataProtectionProvider dataProtectionProvider)
: this(globalSettings.SqlServer.ConnectionString, globalSettings.SqlServer.ReadOnlyConnectionString)
: base(globalSettings.SqlServer.ConnectionString, globalSettings.SqlServer.ReadOnlyConnectionString)
{
_dataProtector = dataProtectionProvider.CreateProtector(Constants.DatabaseFieldProtectorPurpose);
}
public UserRepository(string connectionString, string readOnlyConnectionString)
: base(connectionString, readOnlyConnectionString)
{ }
public override async Task<User> GetByIdAsync(Guid id)
public override async Task<User?> GetByIdAsync(Guid id)
{
var user = await base.GetByIdAsync(id);
UnprotectData(user);
return user;
}
public async Task<User> GetByEmailAsync(string email)
public async Task<User?> GetByEmailAsync(string email)
{
using (var connection = new SqlConnection(ConnectionString))
{
@ -69,7 +67,7 @@ public class UserRepository : Repository<User, Guid>, IUserRepository
}
}
public async Task<User> GetBySsoUserAsync(string externalId, Guid? organizationId)
public async Task<User?> GetBySsoUserAsync(string externalId, Guid? organizationId)
{
using (var connection = new SqlConnection(ConnectionString))
{
@ -83,7 +81,7 @@ public class UserRepository : Repository<User, Guid>, IUserRepository
}
}
public async Task<UserKdfInformation> GetKdfInformationByEmailAsync(string email)
public async Task<UserKdfInformation?> GetKdfInformationByEmailAsync(string email)
{
using (var connection = new SqlConnection(ConnectionString))
{
@ -125,7 +123,7 @@ public class UserRepository : Repository<User, Guid>, IUserRepository
}
}
public async Task<string> GetPublicKeyAsync(Guid id)
public async Task<string?> GetPublicKeyAsync(Guid id)
{
using (var connection = new SqlConnection(ConnectionString))
{
@ -273,13 +271,13 @@ public class UserRepository : Repository<User, Guid>, IUserRepository
if (!user.MasterPassword?.StartsWith(Constants.DatabaseFieldProtectedPrefix) ?? false)
{
user.MasterPassword = string.Concat(Constants.DatabaseFieldProtectedPrefix,
_dataProtector.Protect(user.MasterPassword));
_dataProtector.Protect(user.MasterPassword!));
}
if (!user.Key?.StartsWith(Constants.DatabaseFieldProtectedPrefix) ?? false)
{
user.Key = string.Concat(Constants.DatabaseFieldProtectedPrefix,
_dataProtector.Protect(user.Key));
_dataProtector.Protect(user.Key!));
}
// Save
@ -290,7 +288,7 @@ public class UserRepository : Repository<User, Guid>, IUserRepository
user.Key = originalKey;
}
private void UnprotectData(User user)
private void UnprotectData(User? user)
{
if (user == null)
{