Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[PM-12607] Move key rotation & validators to km ownership #4941

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
+63 −68
Open

[PM-12607] Move key rotation & validators to km ownership #4941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1ef37fb
Move key rotation & validators to km ownership
quexten Oct 25, 2024
10124e2
Fix build errors
quexten Oct 25, 2024
d925bac
Fix build errors
quexten Oct 25, 2024
52581fa
Fix import ordering
quexten Oct 25, 2024
dc44898
Merge branch 'main' into km/pm-12607/key-rotation-ownership
quexten Oct 28, 2024
1ed890f
Update validator namespace
quexten Oct 29, 2024
aa112cf
Move key rotation data to km ownership
quexten Oct 29, 2024
c9df50e
Fix linting
quexten Oct 29, 2024
cbac040
Merge branch 'main' into km/pm-12607/key-rotation-ownership
quexten Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/Api/Auth/Controllers/AccountsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Bit.Api.Auth.Models.Request;
using Bit.Api.Auth.Models.Request.Accounts;
using Bit.Api.Auth.Models.Request.WebAuthn;
using Bit.Api.Auth.Validators;
using Bit.Api.KeyManagement.Validators;
using Bit.Api.Models.Request;
using Bit.Api.Models.Request.Accounts;
using Bit.Api.Models.Response;
Expand All @@ -18,14 +18,15 @@
using Bit.Core.Auth.Models.Api.Request.Accounts;
using Bit.Core.Auth.Models.Data;
using Bit.Core.Auth.UserFeatures.TdeOffboardingPassword.Interfaces;
using Bit.Core.Auth.UserFeatures.UserKey;
using Bit.Core.Auth.UserFeatures.UserMasterPassword.Interfaces;
using Bit.Core.Billing.Models;
using Bit.Core.Billing.Services;
using Bit.Core.Context;
using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.Exceptions;
using Bit.Core.KeyManagement.Models.Data;
using Bit.Core.KeyManagement.UserFeatures.UserKey;
using Bit.Core.Models.Api.Response;
using Bit.Core.Models.Business;
using Bit.Core.Repositories;
Expand Down
5 changes: 2 additions & 3 deletions ...ult/Validators/CipherRotationValidator.cs → ...ent/Validators/CipherRotationValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
using Bit.Api.Auth.Validators;
using Bit.Api.Vault.Models.Request;
using Bit.Api.Vault.Models.Request;
using Bit.Core.Entities;
using Bit.Core.Exceptions;
using Bit.Core.Vault.Entities;
using Bit.Core.Vault.Repositories;

namespace Bit.Api.Vault.Validators;
namespace Bit.Api.KeyManagement.Validators;

public class CipherRotationValidator : IRotationValidator<IEnumerable<CipherWithIdRequestModel>, IEnumerable<Cipher>>
{
Expand Down
2 changes: 1 addition & 1 deletion ...ators/EmergencyAccessRotationValidator.cs → ...ators/EmergencyAccessRotationValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using Bit.Core.Repositories;
using Bit.Core.Services;

namespace Bit.Api.Auth.Validators;
namespace Bit.Api.KeyManagement.Validators;

public class EmergencyAccessRotationValidator : IRotationValidator<IEnumerable<EmergencyAccessWithIdRequestModel>,
IEnumerable<EmergencyAccess>>
Expand Down
5 changes: 2 additions & 3 deletions ...ult/Validators/FolderRotationValidator.cs → ...ent/Validators/FolderRotationValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
using Bit.Api.Auth.Validators;
using Bit.Api.Vault.Models.Request;
using Bit.Api.Vault.Models.Request;
using Bit.Core.Entities;
using Bit.Core.Exceptions;
using Bit.Core.Vault.Entities;
using Bit.Core.Vault.Repositories;

namespace Bit.Api.Vault.Validators;
namespace Bit.Api.KeyManagement.Validators;

public class FolderRotationValidator : IRotationValidator<IEnumerable<FolderWithIdRequestModel>, IEnumerable<Folder>>
{
Expand Down
2 changes: 1 addition & 1 deletion ...Api/Auth/Validators/IRotationValidator.cs → ...nagement/Validators/IRotationValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Bit.Core.Entities;
using Bit.Core.Exceptions;

namespace Bit.Api.Auth.Validators;
namespace Bit.Api.KeyManagement.Validators;

/// <summary>
/// A consistent interface for domains to validate re-encrypted data before saved to database. Some examples are:<br/>
Expand Down
3 changes: 1 addition & 2 deletions ...tors/OrganizationUserRotationValidator.cs → ...tors/OrganizationUserRotationValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
using Bit.Api.AdminConsole.Models.Request.Organizations;
using Bit.Api.Auth.Validators;
using Bit.Core.Entities;
using Bit.Core.Exceptions;
using Bit.Core.Repositories;

namespace Bit.Api.AdminConsole.Validators;
namespace Bit.Api.KeyManagement.Validators;

/// <summary>
/// Organization user implementation for <see cref="IRotationValidator{T,R}"/>
Expand Down
5 changes: 2 additions & 3 deletions ...Tools/Validators/SendRotationValidator.cs → ...ement/Validators/SendRotationValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
using Bit.Api.Auth.Validators;
using Bit.Api.Tools.Models.Request;
using Bit.Api.Tools.Models.Request;
using Bit.Core.Entities;
using Bit.Core.Exceptions;
using Bit.Core.Tools.Entities;
using Bit.Core.Tools.Repositories;
using Bit.Core.Tools.Services;

namespace Bit.Api.Tools.Validators;
namespace Bit.Api.KeyManagement.Validators;

/// <summary>
/// Send implementation for <see cref="IRotationValidator{T,R}"/>
Expand Down
2 changes: 1 addition & 1 deletion ...tors/WebAuthnLoginKeyRotationValidator.cs → ...tors/WebAuthnLoginKeyRotationValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Bit.Core.Entities;
using Bit.Core.Exceptions;

namespace Bit.Api.Auth.Validators;
namespace Bit.Api.KeyManagement.Validators;

public class WebAuthnLoginKeyRotationValidator : IRotationValidator<IEnumerable<WebAuthnLoginRotateKeyRequestModel>, IEnumerable<WebAuthnLoginRotateKeyData>>
{
Expand Down
5 changes: 1 addition & 4 deletions src/Api/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,10 @@
using IdentityModel;
using System.Globalization;
using Bit.Api.AdminConsole.Models.Request.Organizations;
using Bit.Api.AdminConsole.Validators;
using Bit.Api.Auth.Models.Request;
using Bit.Api.Auth.Validators;
using Bit.Api.KeyManagement.Validators;
using Bit.Api.Tools.Models.Request;
using Bit.Api.Tools.Validators;
using Bit.Api.Vault.Models.Request;
using Bit.Api.Vault.Validators;
using Bit.Core.Auth.Entities;
using Bit.Core.IdentityServer;
using Bit.SharedWeb.Health;
Expand Down
2 changes: 1 addition & 1 deletion src/Core/AdminConsole/Repositories/IOrganizationUserRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Bit.Core.AdminConsole.Enums;
using Bit.Core.Auth.UserFeatures.UserKey;
using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.KeyManagement.UserFeatures.UserKey;
using Bit.Core.Models.Data;
using Bit.Core.Models.Data.Organizations.OrganizationUsers;

Expand Down
2 changes: 1 addition & 1 deletion src/Core/Auth/Repositories/IEmergencyAccessRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Bit.Core.Auth.Entities;
using Bit.Core.Auth.Models.Data;
using Bit.Core.Auth.UserFeatures.UserKey;
using Bit.Core.KeyManagement.UserFeatures.UserKey;

#nullable enable

Expand Down
2 changes: 1 addition & 1 deletion src/Core/Auth/Repositories/IWebAuthnCredentialRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Bit.Core.Auth.Entities;
using Bit.Core.Auth.Models.Data;
using Bit.Core.Auth.UserFeatures.UserKey;
using Bit.Core.KeyManagement.UserFeatures.UserKey;
using Bit.Core.Repositories;

#nullable enable
Expand Down
4 changes: 2 additions & 2 deletions src/Core/Auth/UserFeatures/UserServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
using Bit.Core.Auth.UserFeatures.TdeOffboardingPassword.Interfaces;
using Bit.Core.Auth.UserFeatures.TwoFactorAuth;
using Bit.Core.Auth.UserFeatures.TwoFactorAuth.Interfaces;
using Bit.Core.Auth.UserFeatures.UserKey;
using Bit.Core.Auth.UserFeatures.UserKey.Implementations;
using Bit.Core.Auth.UserFeatures.UserMasterPassword;
using Bit.Core.Auth.UserFeatures.UserMasterPassword.Interfaces;
using Bit.Core.Auth.UserFeatures.WebAuthnLogin;
using Bit.Core.Auth.UserFeatures.WebAuthnLogin.Implementations;
using Bit.Core.KeyManagement.UserFeatures.UserKey;
using Bit.Core.KeyManagement.UserFeatures.UserKey.Implementations;
using Bit.Core.Services;
using Bit.Core.Settings;
using Microsoft.Extensions.DependencyInjection;
Expand Down
3 changes: 2 additions & 1 deletion ...ore/Auth/Models/Data/RotateUserKeyData.cs → ...nagement/Models/Data/RotateUserKeyData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
using Bit.Core.Auth.Entities;
using Bit.Core.Auth.Models.Data;
using Bit.Core.Entities;
using Bit.Core.Tools.Entities;
using Bit.Core.Vault.Entities;

namespace Bit.Core.Auth.Models.Data;
namespace Bit.Core.KeyManagement.Models.Data;

public class RotateUserKeyData
{
Expand Down
6 changes: 3 additions & 3 deletions ...Features/UserKey/IRotateUserKeyCommand.cs → ...nagement/UserKey/IRotateUserKeyCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Bit.Core.Auth.Models.Data;
using Bit.Core.Entities;
using Bit.Core.Entities;
using Bit.Core.KeyManagement.Models.Data;
using Microsoft.AspNetCore.Identity;
using Microsoft.Data.SqlClient;

namespace Bit.Core.Auth.UserFeatures.UserKey;
namespace Bit.Core.KeyManagement.UserFeatures.UserKey;

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⛏️ Namespace doesn't correspond to file location, due to UserFeatures not existing under KeyManagement

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wrong namespace as already pointed out by @djsmith85

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any automated linting, we could put in places to prevent this in the future?

/// <summary>
/// Responsible for rotation of a user key and updating database with re-encrypted data
Expand Down
6 changes: 3 additions & 3 deletions ...y/Implementations/RotateUserKeyCommand.cs → ...y/Implementations/RotateUserKeyCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
using Bit.Core.Auth.Models.Data;
using Bit.Core.Auth.Repositories;
using Bit.Core.Auth.Repositories;
using Bit.Core.Entities;
using Bit.Core.KeyManagement.Models.Data;
using Bit.Core.Repositories;
using Bit.Core.Services;
using Bit.Core.Tools.Repositories;
using Bit.Core.Vault.Repositories;
using Microsoft.AspNetCore.Identity;

namespace Bit.Core.Auth.UserFeatures.UserKey.Implementations;
namespace Bit.Core.KeyManagement.UserFeatures.UserKey.Implementations;

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wrong namespace to the file location, should be:

Suggested change
namespace Bit.Core.KeyManagement.UserFeatures.UserKey.Implementations;
namespace Bit.Core.KeyManagement.UserKey.Implementations;

Or move the file to "UserFeatures" directory.

/// <inheritdoc />
public class RotateUserKeyCommand : IRotateUserKeyCommand
Expand Down
4 changes: 2 additions & 2 deletions src/Core/Repositories/IUserRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Bit.Core.Auth.UserFeatures.UserKey;
using Bit.Core.Entities;
using Bit.Core.Entities;
using Bit.Core.KeyManagement.UserFeatures.UserKey;
using Bit.Core.Models.Data;

#nullable enable
Expand Down
2 changes: 1 addition & 1 deletion src/Core/Tools/Repositories/ISendRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#nullable enable

using Bit.Core.Auth.UserFeatures.UserKey;
using Bit.Core.KeyManagement.UserFeatures.UserKey;
using Bit.Core.Repositories;
using Bit.Core.Tools.Entities;

Expand Down
4 changes: 2 additions & 2 deletions src/Core/Vault/Repositories/ICipherRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Bit.Core.Auth.UserFeatures.UserKey;
using Bit.Core.Entities;
using Bit.Core.Entities;
using Bit.Core.KeyManagement.UserFeatures.UserKey;
using Bit.Core.Repositories;
using Bit.Core.Vault.Entities;
using Bit.Core.Vault.Models.Data;
Expand Down
2 changes: 1 addition & 1 deletion src/Core/Vault/Repositories/IFolderRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Bit.Core.Auth.UserFeatures.UserKey;
using Bit.Core.KeyManagement.UserFeatures.UserKey;
using Bit.Core.Repositories;
using Bit.Core.Vault.Entities;

Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure.Dapper/AdminConsole/Repositories/OrganizationUserRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
using System.Text.Json;
using Bit.Core.AdminConsole.Entities;
using Bit.Core.AdminConsole.Enums;
using Bit.Core.Auth.UserFeatures.UserKey;
using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.KeyManagement.UserFeatures.UserKey;
using Bit.Core.Models.Data;
using Bit.Core.Models.Data.Organizations.OrganizationUsers;
using Bit.Core.Repositories;
Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure.Dapper/Auth/Repositories/EmergencyAccessRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Data;
using Bit.Core.Auth.Entities;
using Bit.Core.Auth.Models.Data;
using Bit.Core.Auth.UserFeatures.UserKey;
using Bit.Core.KeyManagement.UserFeatures.UserKey;
using Bit.Core.Repositories;
using Bit.Core.Settings;
using Bit.Infrastructure.Dapper.Auth.Helpers;
Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure.Dapper/Auth/Repositories/WebAuthnCredentialRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Bit.Core.Auth.Entities;
using Bit.Core.Auth.Models.Data;
using Bit.Core.Auth.Repositories;
using Bit.Core.Auth.UserFeatures.UserKey;
using Bit.Core.KeyManagement.UserFeatures.UserKey;
using Bit.Core.Settings;
using Bit.Core.Utilities;
using Bit.Infrastructure.Dapper.Repositories;
Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure.Dapper/Repositories/UserRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System.Data;
using System.Text.Json;
using Bit.Core;
using Bit.Core.Auth.UserFeatures.UserKey;
using Bit.Core.Entities;
using Bit.Core.KeyManagement.UserFeatures.UserKey;
using Bit.Core.Models.Data;
using Bit.Core.Repositories;
using Bit.Core.Settings;
Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure.Dapper/Tools/Repositories/SendRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#nullable enable

using System.Data;
using Bit.Core.Auth.UserFeatures.UserKey;
using Bit.Core.KeyManagement.UserFeatures.UserKey;
using Bit.Core.Settings;
using Bit.Core.Tools.Entities;
using Bit.Core.Tools.Repositories;
Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure.Dapper/Vault/Repositories/CipherRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Data;
using System.Text.Json;
using Bit.Core.Auth.UserFeatures.UserKey;
using Bit.Core.Entities;
using Bit.Core.KeyManagement.UserFeatures.UserKey;
using Bit.Core.Settings;
using Bit.Core.Tools.Entities;
using Bit.Core.Vault.Entities;
Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure.Dapper/Vault/Repositories/FolderRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.Data;
using Bit.Core.Auth.UserFeatures.UserKey;
using Bit.Core.KeyManagement.UserFeatures.UserKey;
using Bit.Core.Settings;
using Bit.Core.Vault.Entities;
using Bit.Core.Vault.Repositories;
Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using AutoMapper;
using Bit.Core.AdminConsole.Enums;
using Bit.Core.Auth.UserFeatures.UserKey;
using Bit.Core.Enums;
using Bit.Core.KeyManagement.UserFeatures.UserKey;
using Bit.Core.Models.Data;
using Bit.Core.Models.Data.Organizations.OrganizationUsers;
using Bit.Core.Repositories;
Expand Down Expand Up @@ -248,7 +248,7 @@
}
}

public async Task<(OrganizationUserUserDetails? OrganizationUser, ICollection<CollectionAccessSelection> Collections)> GetDetailsByIdWithCollectionsAsync(Guid id)

Check warning on line 251 in src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs

View workflow job for this annotation

GitHub Actions / Build artifacts (Notifications, ./src) 

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.

Check warning on line 251 in src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs

View workflow job for this annotation

GitHub Actions / Build artifacts (EventsProcessor, ./src) 

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.

Check warning on line 251 in src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs

View workflow job for this annotation

GitHub Actions / Build artifacts (Icons, ./src) 

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.

Check warning on line 251 in src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs

View workflow job for this annotation

GitHub Actions / Build artifacts (Api, ./src) 

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.

Check warning on line 251 in src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs

View workflow job for this annotation

GitHub Actions / Build artifacts (Scim, ./bitwarden_license/src, true) 

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.

Check warning on line 251 in src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs

View workflow job for this annotation

GitHub Actions / Build artifacts (Events, ./src) 

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.

Check warning on line 251 in src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs

View workflow job for this annotation

GitHub Actions / Build artifacts (Billing, ./src) 

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.

Check warning on line 251 in src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs

View workflow job for this annotation

GitHub Actions / Build artifacts (Identity, ./src) 

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.

Check warning on line 251 in src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs

View workflow job for this annotation

GitHub Actions / Build artifacts (Sso, ./bitwarden_license/src, true) 

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.

Check warning on line 251 in src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs

View workflow job for this annotation

GitHub Actions / Build artifacts (Admin, ./src, true) 

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.

Check warning on line 251 in src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs

View workflow job for this annotation

GitHub Actions / Quality scan 

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.

Check warning on line 251 in src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs

View workflow job for this annotation

GitHub Actions / Run tests 

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.

Check warning on line 251 in src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs

View workflow job for this annotation

GitHub Actions / Upload 

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
{
var organizationUserUserDetails = await GetDetailsByIdAsync(id);
using (var scope = ServiceScopeFactory.CreateScope())
Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure.EntityFramework/Auth/Repositories/EmergencyAccessRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using AutoMapper;
using Bit.Core.Auth.Enums;
using Bit.Core.Auth.Models.Data;
using Bit.Core.Auth.UserFeatures.UserKey;
using Bit.Core.KeyManagement.UserFeatures.UserKey;
using Bit.Core.Repositories;
using Bit.Infrastructure.EntityFramework.Auth.Models;
using Bit.Infrastructure.EntityFramework.Auth.Repositories.Queries;
Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure.EntityFramework/Auth/Repositories/WebAuthnCredentialRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using AutoMapper;
using Bit.Core.Auth.Models.Data;
using Bit.Core.Auth.Repositories;
using Bit.Core.Auth.UserFeatures.UserKey;
using Bit.Core.KeyManagement.UserFeatures.UserKey;
using Bit.Infrastructure.EntityFramework.Auth.Models;
using Bit.Infrastructure.EntityFramework.Repositories;
using Microsoft.EntityFrameworkCore;
Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure.EntityFramework/Repositories/UserRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using AutoMapper;
using Bit.Core.Auth.UserFeatures.UserKey;
using Bit.Core.KeyManagement.UserFeatures.UserKey;
using Bit.Core.Repositories;
using Bit.Infrastructure.EntityFramework.Models;
using Microsoft.EntityFrameworkCore;
Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure.EntityFramework/Tools/Repositories/SendRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#nullable enable

using AutoMapper;
using Bit.Core.Auth.UserFeatures.UserKey;
using Bit.Core.KeyManagement.UserFeatures.UserKey;
using Bit.Core.Tools.Repositories;
using Bit.Infrastructure.EntityFramework.Models;
using Bit.Infrastructure.EntityFramework.Repositories;
Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure.EntityFramework/Vault/Repositories/CipherRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Text.Json;
using System.Text.Json.Nodes;
using AutoMapper;
using Bit.Core.Auth.UserFeatures.UserKey;
using Bit.Core.KeyManagement.UserFeatures.UserKey;
using Bit.Core.Utilities;
using Bit.Core.Vault.Enums;
using Bit.Core.Vault.Models.Data;
Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure.EntityFramework/Vault/Repositories/FolderRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using AutoMapper;
using Bit.Core.Auth.UserFeatures.UserKey;
using Bit.Core.KeyManagement.UserFeatures.UserKey;
using Bit.Core.Vault.Repositories;
using Bit.Infrastructure.EntityFramework.Repositories;
using Bit.Infrastructure.EntityFramework.Vault.Models;
Expand Down
4 changes: 2 additions & 2 deletions test/Api.Test/Auth/Controllers/AccountsControllerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Bit.Api.Auth.Models.Request;
using Bit.Api.Auth.Models.Request.Accounts;
using Bit.Api.Auth.Models.Request.WebAuthn;
using Bit.Api.Auth.Validators;
using Bit.Api.KeyManagement.Validators;
using Bit.Api.Tools.Models.Request;
using Bit.Api.Vault.Models.Request;
using Bit.Core;
Expand All @@ -14,12 +14,12 @@
using Bit.Core.Auth.Models.Api.Request.Accounts;
using Bit.Core.Auth.Models.Data;
using Bit.Core.Auth.UserFeatures.TdeOffboardingPassword.Interfaces;
using Bit.Core.Auth.UserFeatures.UserKey;
using Bit.Core.Auth.UserFeatures.UserMasterPassword.Interfaces;
using Bit.Core.Billing.Services;
using Bit.Core.Context;
using Bit.Core.Entities;
using Bit.Core.Exceptions;
using Bit.Core.KeyManagement.UserFeatures.UserKey;
using Bit.Core.Repositories;
using Bit.Core.Services;
using Bit.Core.Settings;
Expand Down
4 changes: 2 additions & 2 deletions ...alidators/CipherRotationValidatorTests.cs → ...alidators/CipherRotationValidatorTests.cs
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

namespace not updated, should be namespace Bit.Api.Test.KeyManagement.Validators;

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Bit.Api.Vault.Models.Request;
using Bit.Api.Vault.Validators;
using Bit.Api.KeyManagement.Validators;
using Bit.Api.Vault.Models.Request;
using Bit.Core.Entities;
using Bit.Core.Exceptions;
using Bit.Core.Vault.Models.Data;
Expand Down
Loading
Loading