[PM-1188] Server owner auth migration (#2825)

* [PM-1188] add sso project to auth

* [PM-1188] move sso api models to auth

* [PM-1188] fix sso api model namespace & imports

* [PM-1188] move core files to auth

* [PM-1188] fix core sso namespace & models

* [PM-1188] move sso repository files to auth

* [PM-1188] fix sso repo files namespace & imports

* [PM-1188] move sso sql files to auth folder

* [PM-1188] move sso test files to auth folders

* [PM-1188] fix sso tests namespace & imports

* [PM-1188] move auth api files to auth folder

* [PM-1188] fix auth api files namespace & imports

* [PM-1188] move auth core files to auth folder

* [PM-1188] fix auth core files namespace & imports

* [PM-1188] move auth email templates to auth folder

* [PM-1188] move auth email folder back into shared directory

* [PM-1188] fix auth email names

* [PM-1188] move auth core models to auth folder

* [PM-1188] fix auth model namespace & imports

* [PM-1188] add entire Identity project to auth codeowners

* [PM-1188] fix auth orm files namespace & imports

* [PM-1188] move auth orm files to auth folder

* [PM-1188] move auth sql files to auth folder

* [PM-1188] move auth tests to auth folder

* [PM-1188] fix auth test files namespace & imports

* [PM-1188] move emergency access api files to auth folder

* [PM-1188] fix emergencyaccess api files namespace & imports

* [PM-1188] move emergency access core files to auth folder

* [PM-1188] fix emergency access core files namespace & imports

* [PM-1188] move emergency access orm files to auth folder

* [PM-1188] fix emergency access orm files namespace & imports

* [PM-1188] move emergency access sql files to auth folder

* [PM-1188] move emergencyaccess test files to auth folder

* [PM-1188] fix emergency access test files namespace & imports

* [PM-1188] move captcha files to auth folder

* [PM-1188] fix captcha files namespace & imports

* [PM-1188] move auth admin files into auth folder

* [PM-1188] fix admin auth files namespace & imports
- configure mvc to look in auth folders for views

* [PM-1188] remove extra imports and formatting

* [PM-1188] fix ef auth model imports

* [PM-1188] fix DatabaseContextModelSnapshot paths

* [PM-1188] fix grant import in ef

* [PM-1188] update sqlproj

* [PM-1188] move missed sqlproj files

* [PM-1188] move auth ef models out of auth folder

* [PM-1188] fix auth ef models namespace

* [PM-1188] remove auth ef models unused imports

* [PM-1188] fix imports for auth ef models

* [PM-1188] fix more ef model imports

* [PM-1188] fix file encodings

src/Api/Auth/Controllers/AuthRequestsController.cs

@@ -1,7 +1,9 @@
-using Bit.Api.Models.Request;
+using Bit.Api.Auth.Models.Request;
+using Bit.Api.Auth.Models.Response;
 using Bit.Api.Models.Response;
+using Bit.Core.Auth.Entities;
+using Bit.Core.Auth.Exceptions;
 using Bit.Core.Context;
-using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
@@ -10,7 +12,7 @@ using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Api.Controllers;
+namespace Bit.Api.Auth.Controllers;
 
 [Route("auth-requests")]
 [Authorize("Application")]

src/Api/Auth/Controllers/EmergencyAccessController.cs

@@ -1,7 +1,9 @@
-using Bit.Api.Models.Request;
+using Bit.Api.Auth.Models.Request;
+using Bit.Api.Auth.Models.Response;
 using Bit.Api.Models.Request.Organizations;
 using Bit.Api.Models.Response;
 using Bit.Api.Vault.Models.Response;
+using Bit.Core.Auth.Services;
 using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
@@ -10,7 +12,7 @@ using Bit.Core.Settings;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Api.Controllers;
+namespace Bit.Api.Auth.Controllers;
 
 [Route("emergency-access")]
 [Authorize("Application")]

src/Api/Auth/Controllers/TwoFactorController.cs

@@ -1,12 +1,14 @@
-using Bit.Api.Models.Request;
-using Bit.Api.Models.Request.Accounts;
+using Bit.Api.Auth.Models.Request;
+using Bit.Api.Auth.Models.Request.Accounts;
+using Bit.Api.Auth.Models.Response.TwoFactor;
+using Bit.Api.Models.Request;
 using Bit.Api.Models.Response;
-using Bit.Api.Models.Response.TwoFactor;
+using Bit.Core.Auth.Enums;
+using Bit.Core.Auth.LoginFeatures.PasswordlessLogin.Interfaces;
+using Bit.Core.Auth.Utilities;
 using Bit.Core.Context;
 using Bit.Core.Entities;
-using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.LoginFeatures.PasswordlessLogin.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
@@ -16,7 +18,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Api.Controllers;
+namespace Bit.Api.Auth.Controllers;
 
 [Route("two-factor")]
 [Authorize("Web")]

src/Api/Auth/Jobs/EmergencyAccessNotificationJob.cs

@@ -1,8 +1,8 @@
-using Bit.Core.Jobs;
-using Bit.Core.Services;
+using Bit.Core.Auth.Services;
+using Bit.Core.Jobs;
 using Quartz;
 
-namespace Bit.Api.Jobs;
+namespace Bit.Api.Auth.Jobs;
 
 public class EmergencyAccessNotificationJob : BaseJob
 {

src/Api/Auth/Jobs/EmergencyAccessTimeoutJob.cs

@@ -1,8 +1,8 @@
-using Bit.Core.Jobs;
-using Bit.Core.Services;
+using Bit.Core.Auth.Services;
+using Bit.Core.Jobs;
 using Quartz;
 
-namespace Bit.Api.Jobs;
+namespace Bit.Api.Auth.Jobs;
 
 public class EmergencyAccessTimeoutJob : BaseJob
 {

src/Api/Auth/Models/Public/AssociationWithPermissionsBaseModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Api.Models.Public;
+namespace Bit.Api.Auth.Models.Public;
 
 public abstract class AssociationWithPermissionsBaseModel
 {

src/Api/Auth/Models/Public/Request/AssociationWithPermissionsRequestModel.cs

@@ -1,6 +1,6 @@
 using Bit.Core.Models.Data;
 
-namespace Bit.Api.Models.Public.Request;
+namespace Bit.Api.Auth.Models.Public.Request;
 
 public class AssociationWithPermissionsRequestModel : AssociationWithPermissionsBaseModel
 {

src/Api/Auth/Models/Public/Response/AssociationWithPermissionsResponseModel.cs

@@ -1,6 +1,6 @@
 using Bit.Core.Models.Data;
 
-namespace Bit.Api.Models.Public.Response;
+namespace Bit.Api.Auth.Models.Public.Response;
 
 public class AssociationWithPermissionsResponseModel : AssociationWithPermissionsBaseModel
 {

src/Api/Auth/Models/Request/Accounts/DeleteRecoverRequestModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Api.Models.Request.Accounts;
+namespace Bit.Api.Auth.Models.Request.Accounts;
 
 public class DeleteRecoverRequestModel
 {

src/Api/Auth/Models/Request/Accounts/EmailRequestModel.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Utilities;
 
-namespace Bit.Api.Models.Request.Accounts;
+namespace Bit.Api.Auth.Models.Request.Accounts;
 
 public class EmailRequestModel : SecretVerificationRequestModel
 {

src/Api/Auth/Models/Request/Accounts/EmailTokenRequestModel.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Utilities;
 
-namespace Bit.Api.Models.Request.Accounts;
+namespace Bit.Api.Auth.Models.Request.Accounts;
 
 public class EmailTokenRequestModel : SecretVerificationRequestModel
 {

src/Api/Auth/Models/Request/Accounts/KdfRequestModel.cs

@@ -2,7 +2,7 @@
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
 
-namespace Bit.Api.Models.Request.Accounts;
+namespace Bit.Api.Auth.Models.Request.Accounts;
 
 public class KdfRequestModel : PasswordRequestModel, IValidatableObject
 {

src/Api/Auth/Models/Request/Accounts/PasswordHintRequestModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Api.Models.Request.Accounts;
+namespace Bit.Api.Auth.Models.Request.Accounts;
 
 public class PasswordHintRequestModel
 {

src/Api/Auth/Models/Request/Accounts/PasswordRequestModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Api.Models.Request.Accounts;
+namespace Bit.Api.Auth.Models.Request.Accounts;
 
 public class PasswordRequestModel : SecretVerificationRequestModel
 {

src/Api/Auth/Models/Request/Accounts/RegenerateTwoFactorRequestModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Api.Models.Request.Accounts;
+namespace Bit.Api.Auth.Models.Request.Accounts;
 
 public class RegenerateTwoFactorRequestModel
 {

src/Api/Auth/Models/Request/Accounts/SecretVerificationRequestModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Api.Models.Request.Accounts;
+namespace Bit.Api.Auth.Models.Request.Accounts;
 
 public class SecretVerificationRequestModel : IValidatableObject
 {

src/Api/Auth/Models/Request/Accounts/SetKeyConnectorKeyRequestModel.cs

@@ -1,10 +1,10 @@
 using System.ComponentModel.DataAnnotations;
+using Bit.Core.Auth.Models.Api.Request.Accounts;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Models.Api.Request.Accounts;
 using Bit.Core.Utilities;
 
-namespace Bit.Api.Models.Request.Accounts;
+namespace Bit.Api.Auth.Models.Request.Accounts;
 
 public class SetKeyConnectorKeyRequestModel : IValidatableObject
 {

src/Api/Auth/Models/Request/Accounts/SetPasswordRequestModel.cs

@@ -1,10 +1,10 @@
 using System.ComponentModel.DataAnnotations;
+using Bit.Core.Auth.Models.Api.Request.Accounts;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Models.Api.Request.Accounts;
 using Bit.Core.Utilities;
 
-namespace Bit.Api.Models.Request.Accounts;
+namespace Bit.Api.Auth.Models.Request.Accounts;
 
 public class SetPasswordRequestModel : IValidatableObject
 {

src/Api/Auth/Models/Request/Accounts/UpdateKeyRequestModel.cs

@@ -1,7 +1,8 @@
 using System.ComponentModel.DataAnnotations;
+using Bit.Api.Models.Request;
 using Bit.Api.Vault.Models.Request;
 
-namespace Bit.Api.Models.Request.Accounts;
+namespace Bit.Api.Auth.Models.Request.Accounts;
 
 public class UpdateKeyRequestModel
 {

src/Api/Auth/Models/Request/Accounts/UpdateProfileRequestModel.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Entities;
 
-namespace Bit.Api.Models.Request.Accounts;
+namespace Bit.Api.Auth.Models.Request.Accounts;
 
 public class UpdateProfileRequestModel
 {

src/Api/Auth/Models/Request/Accounts/UpdateTempPasswordRequestModel.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using Bit.Api.Models.Request.Organizations;
 
-namespace Bit.Api.Models.Request.Accounts;
+namespace Bit.Api.Auth.Models.Request.Accounts;
 
 public class UpdateTempPasswordRequestModel : OrganizationUserResetPasswordRequestModel
 {

src/Api/Auth/Models/Request/Accounts/VerifyDeleteRecoverRequestModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Api.Models.Request.Accounts;
+namespace Bit.Api.Auth.Models.Request.Accounts;
 
 public class VerifyDeleteRecoverRequestModel
 {

src/Api/Auth/Models/Request/Accounts/VerifyEmailRequestModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Api.Models.Request.Accounts;
+namespace Bit.Api.Auth.Models.Request.Accounts;
 
 public class VerifyEmailRequestModel
 {

src/Api/Auth/Models/Request/Accounts/VerifyOTPRequestModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Api.Models.Request.Accounts;
+namespace Bit.Api.Auth.Models.Request.Accounts;
 
 public class VerifyOTPRequestModel
 {

src/Api/Auth/Models/Request/AuthRequestRequestModel.cs

@@ -1,8 +1,8 @@
 using System.ComponentModel.DataAnnotations;
-using Bit.Core.Enums;
+using Bit.Core.Auth.Enums;
 using Newtonsoft.Json;
 
-namespace Bit.Api.Models.Request;
+namespace Bit.Api.Auth.Models.Request;
 
 public class AuthRequestCreateRequestModel
 {

src/Api/Auth/Models/Request/EmergencyAccessRequstModels.cs

@@ -1,9 +1,9 @@
 using System.ComponentModel.DataAnnotations;
-using Bit.Core.Entities;
-using Bit.Core.Enums;
+using Bit.Core.Auth.Entities;
+using Bit.Core.Auth.Enums;
 using Bit.Core.Utilities;
 
-namespace Bit.Api.Models.Request;
+namespace Bit.Api.Auth.Models.Request;
 
 public class EmergencyAccessInviteRequestModel
 {

src/Api/Auth/Models/Request/OrganizationSsoRequestModel.cs

@@ -2,15 +2,15 @@
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using System.Text.RegularExpressions;
-using Bit.Core.Entities;
-using Bit.Core.Enums;
-using Bit.Core.Models.Data;
+using Bit.Core.Auth.Entities;
+using Bit.Core.Auth.Enums;
+using Bit.Core.Auth.Models.Data;
 using Bit.Core.Services;
 using Bit.Core.Sso;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 
-namespace Bit.Api.Models.Request.Organizations;
+namespace Bit.Api.Auth.Models.Request.Organizations;
 
 public class OrganizationSsoRequestModel
 {

src/Api/Auth/Models/Request/TwoFactorRequestModels.cs

@@ -1,12 +1,12 @@
 using System.ComponentModel.DataAnnotations;
-using Bit.Api.Models.Request.Accounts;
+using Bit.Api.Auth.Models.Request.Accounts;
+using Bit.Core.Auth.Enums;
+using Bit.Core.Auth.Models;
+using Bit.Core.Auth.Utilities;
 using Bit.Core.Entities;
-using Bit.Core.Enums;
-using Bit.Core.Models;
-using Bit.Core.Utilities;
 using Fido2NetLib;
 
-namespace Bit.Api.Models.Request;
+namespace Bit.Api.Auth.Models.Request;
 
 public class UpdateTwoFactorAuthenticatorRequestModel : SecretVerificationRequestModel
 {

src/Api/Auth/Models/Response/AuthRequestResponseModel.cs

@@ -1,9 +1,9 @@
 using System.ComponentModel.DataAnnotations;
 using System.Reflection;
-using Bit.Core.Entities;
+using Bit.Core.Auth.Entities;
 using Bit.Core.Models.Api;
 
-namespace Bit.Api.Models.Response;
+namespace Bit.Api.Auth.Models.Response;
 
 public class AuthRequestResponseModel : ResponseModel
 {

src/Api/Auth/Models/Response/EmergencyAccessResponseModel.cs

@@ -1,12 +1,14 @@
 using Bit.Api.Vault.Models.Response;
+using Bit.Core.Auth.Entities;
+using Bit.Core.Auth.Enums;
+using Bit.Core.Auth.Models.Data;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
-using Bit.Core.Models.Data;
 using Bit.Core.Settings;
 using Bit.Core.Vault.Models.Data;
 
-namespace Bit.Api.Models.Response;
+namespace Bit.Api.Auth.Models.Response;
 
 public class EmergencyAccessResponseModel : ResponseModel
 {

src/Api/Auth/Models/Response/OrganizationSsoResponseModel.cs

@@ -1,9 +1,10 @@
-using Bit.Core.Entities;
+using Bit.Core.Auth.Entities;
+using Bit.Core.Auth.Models.Data;
+using Bit.Core.Entities;
 using Bit.Core.Models.Api;
-using Bit.Core.Models.Data;
 using Bit.Core.Settings;
 
-namespace Bit.Api.Models.Response.Organizations;
+namespace Bit.Api.Auth.Models.Response.Organizations;
 
 public class OrganizationSsoResponseModel : ResponseModel
 {

src/Api/Auth/Models/Response/TwoFactor/TwoFactorAuthenticatorResponseModel.cs

@@ -1,9 +1,9 @@
-using Bit.Core.Entities;
-using Bit.Core.Enums;
+using Bit.Core.Auth.Enums;
+using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 using OtpNet;
 
-namespace Bit.Api.Models.Response.TwoFactor;
+namespace Bit.Api.Auth.Models.Response.TwoFactor;
 
 public class TwoFactorAuthenticatorResponseModel : ResponseModel
 {

src/Api/Auth/Models/Response/TwoFactor/TwoFactorDuoResponseModel.cs

@@ -1,9 +1,9 @@
-using Bit.Core.Entities;
-using Bit.Core.Enums;
-using Bit.Core.Models;
+using Bit.Core.Auth.Enums;
+using Bit.Core.Auth.Models;
+using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 
-namespace Bit.Api.Models.Response.TwoFactor;
+namespace Bit.Api.Auth.Models.Response.TwoFactor;
 
 public class TwoFactorDuoResponseModel : ResponseModel
 {

src/Api/Auth/Models/Response/TwoFactor/TwoFactorEmailResponseModel.cs

@@ -1,8 +1,8 @@
-using Bit.Core.Entities;
-using Bit.Core.Enums;
+using Bit.Core.Auth.Enums;
+using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 
-namespace Bit.Api.Models.Response.TwoFactor;
+namespace Bit.Api.Auth.Models.Response.TwoFactor;
 
 public class TwoFactorEmailResponseModel : ResponseModel
 {

src/Api/Auth/Models/Response/TwoFactor/TwoFactorProviderResponseModel.cs

@@ -1,9 +1,9 @@
-using Bit.Core.Entities;
-using Bit.Core.Enums;
-using Bit.Core.Models;
+using Bit.Core.Auth.Enums;
+using Bit.Core.Auth.Models;
+using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 
-namespace Bit.Api.Models.Response.TwoFactor;
+namespace Bit.Api.Auth.Models.Response.TwoFactor;
 
 public class TwoFactorProviderResponseModel : ResponseModel
 {

src/Api/Auth/Models/Response/TwoFactor/TwoFactorRecoverResponseModel.cs

@@ -1,7 +1,7 @@
 using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 
-namespace Bit.Api.Models.Response.TwoFactor;
+namespace Bit.Api.Auth.Models.Response.TwoFactor;
 
 public class TwoFactorRecoverResponseModel : ResponseModel
 {

src/Api/Auth/Models/Response/TwoFactor/TwoFactorWebAuthnResponseModel.cs

@@ -1,9 +1,9 @@
-using Bit.Core.Entities;
-using Bit.Core.Enums;
-using Bit.Core.Models;
+using Bit.Core.Auth.Enums;
+using Bit.Core.Auth.Models;
+using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 
-namespace Bit.Api.Models.Response.TwoFactor;
+namespace Bit.Api.Auth.Models.Response.TwoFactor;
 
 public class TwoFactorWebAuthnResponseModel : ResponseModel
 {

src/Api/Auth/Models/Response/TwoFactor/TwoFactorYubiKeyResponseModel.cs

@@ -1,8 +1,8 @@
-using Bit.Core.Entities;
-using Bit.Core.Enums;
+using Bit.Core.Auth.Enums;
+using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 
-namespace Bit.Api.Models.Response.TwoFactor;
+namespace Bit.Api.Auth.Models.Response.TwoFactor;
 
 public class TwoFactorYubiKeyResponseModel : ResponseModel
 {

src/Api/Controllers/AccountsController.cs

@@ -1,14 +1,17 @@
-using Bit.Api.Models.Request;
+using Bit.Api.Auth.Models.Request.Accounts;
+using Bit.Api.Models.Request;
 using Bit.Api.Models.Request.Accounts;
 using Bit.Api.Models.Response;
 using Bit.Api.Utilities;
 using Bit.Core;
+using Bit.Core.Auth.Models.Api.Request.Accounts;
+using Bit.Core.Auth.Models.Api.Response.Accounts;
+using Bit.Core.Auth.Services;
+using Bit.Core.Auth.Utilities;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Enums.Provider;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Api.Request.Accounts;
-using Bit.Core.Models.Api.Response.Accounts;
 using Bit.Core.Models.Business;
 using Bit.Core.Models.Data;
 using Bit.Core.Repositories;

src/Api/Controllers/OrganizationsController.cs

@@ -1,10 +1,15 @@
 using System.Text.Json;
+using Bit.Api.Auth.Models.Request.Accounts;
+using Bit.Api.Auth.Models.Request.Organizations;
+using Bit.Api.Auth.Models.Response.Organizations;
 using Bit.Api.Models.Request;
 using Bit.Api.Models.Request.Accounts;
 using Bit.Api.Models.Request.Organizations;
 using Bit.Api.Models.Response;
 using Bit.Api.Models.Response.Organizations;
 using Bit.Api.SecretsManager;
+using Bit.Core.Auth.Repositories;
+using Bit.Core.Auth.Services;
 using Bit.Core.Context;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;

src/Api/Jobs/JobsHostedService.cs

@@ -1,4 +1,5 @@
-using Bit.Core.Jobs;
+using Bit.Api.Auth.Jobs;
+using Bit.Core.Jobs;
 using Bit.Core.Settings;
 using Quartz;
 

src/Api/Models/Public/Request/CollectionUpdateRequestModel.cs

@@ -1,4 +1,5 @@
-using Bit.Core.Entities;
+using Bit.Api.Auth.Models.Public.Request;
+using Bit.Core.Entities;
 
 namespace Bit.Api.Models.Public.Request;
 

src/Api/Models/Public/Request/GroupCreateUpdateRequestModel.cs

@@ -1,4 +1,5 @@
-using Bit.Core.Entities;
+using Bit.Api.Auth.Models.Public.Request;
+using Bit.Core.Entities;
 
 namespace Bit.Api.Models.Public.Request;
 

src/Api/Models/Public/Request/MemberUpdateRequestModel.cs

@@ -1,4 +1,5 @@
-using Bit.Core.Entities;
+using Bit.Api.Auth.Models.Public.Request;
+using Bit.Core.Entities;
 
 namespace Bit.Api.Models.Public.Request;
 

src/Api/Models/Public/Response/CollectionResponseModel.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using Bit.Api.Auth.Models.Public.Response;
 using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 

src/Api/Models/Public/Response/GroupResponseModel.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using Bit.Api.Auth.Models.Public.Response;
 using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 

src/Api/Models/Public/Response/MemberResponseModel.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using Bit.Api.Auth.Models.Public.Response;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;

src/Api/Models/Request/Accounts/OrganizationApiKeyRequestModel.cs

@@ -1,4 +1,5 @@
-using Bit.Core.Enums;
+using Bit.Api.Auth.Models.Request.Accounts;
+using Bit.Core.Enums;
 
 namespace Bit.Api.Models.Request.Accounts;
 

src/Api/Models/Request/Organizations/OrganizationUserRequestModels.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json;
-using Bit.Api.Models.Request.Accounts;
+using Bit.Api.Auth.Models.Request.Accounts;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;

src/Api/Models/Response/ProfileOrganizationResponseModel.cs

@@ -1,4 +1,5 @@
-using Bit.Core.Enums;
+using Bit.Core.Auth.Models.Data;
+using Bit.Core.Enums;
 using Bit.Core.Enums.Provider;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;

src/Api/Startup.cs

@@ -1,7 +1,6 @@
 using Bit.Api.Utilities;
 using Bit.Core;
 using Bit.Core.Context;
-using Bit.Core.Identity;
 using Bit.Core.Settings;
 using AspNetCoreRateLimit;
 using Stripe;
@@ -13,6 +12,7 @@ using Microsoft.IdentityModel.Logging;
 using Microsoft.OpenApi.Models;
 using Bit.SharedWeb.Utilities;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Bit.Core.Auth.Identity;
 
 #if !OSS
 using Bit.Commercial.Core.SecretsManager;

src/Api/Vault/Controllers/CiphersController.cs

@@ -1,5 +1,6 @@
 using System.Text.Json;
 using Azure.Messaging.EventGrid;
+using Bit.Api.Auth.Models.Request.Accounts;
 using Bit.Api.Models.Request.Accounts;
 using Bit.Api.Models.Request.Organizations;
 using Bit.Api.Models.Response;