From 9dab9160a5d672c3bdb2b48b2bba67da02c8759a Mon Sep 17 00:00:00 2001
From: jrmccannon <jmccannon@bitwarden.com>
Date: Fri, 7 Mar 2025 12:23:38 -0600
Subject: [PATCH] Removed unused request model

---
 .../src/Scim/Models/ScimUserRequestModel.cs   |  2 +-
 .../IInviteOrganizationUsersCommand.cs        |  2 +-
 .../InviteOrganizationUsersCommand.cs         |  2 +-
 .../Models/InviteOrganizationUsersRequest.cs  |  4 +--
 .../InviteScimOrganizationUserRequest.cs      | 28 -------------------
 .../Models/OrganizationUserInvite.cs          |  4 +--
 .../OrganizationUserSingleEmailInvite.cs      | 22 ++++++++++++++-
 7 files changed, 28 insertions(+), 36 deletions(-)
 delete mode 100644 src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Models/InviteScimOrganizationUserRequest.cs

diff --git a/bitwarden_license/src/Scim/Models/ScimUserRequestModel.cs b/bitwarden_license/src/Scim/Models/ScimUserRequestModel.cs
index 80d6c1b044..b82b4c299f 100644
--- a/bitwarden_license/src/Scim/Models/ScimUserRequestModel.cs
+++ b/bitwarden_license/src/Scim/Models/ScimUserRequestModel.cs
@@ -27,7 +27,7 @@ public class ScimUserRequestModel : BaseScimUserModel
         };
     }
 
-    public InviteScimOrganizationUserRequest ToRequest(
+    public OrganizationUserSingleEmailInvite ToRequest(
         ScimProviderType scimProvider,
         bool hasSecretsManager,
         InviteOrganization inviteOrganization,
diff --git a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/IInviteOrganizationUsersCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/IInviteOrganizationUsersCommand.cs
index b9ad362784..81eabc8d30 100644
--- a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/IInviteOrganizationUsersCommand.cs
+++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/IInviteOrganizationUsersCommand.cs
@@ -5,5 +5,5 @@ namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUse
 
 public interface IInviteOrganizationUsersCommand
 {
-    Task<CommandResult<ScimInviteOrganizationUsersResponse>> InviteScimOrganizationUserAsync(InviteScimOrganizationUserRequest request);
+    Task<CommandResult<ScimInviteOrganizationUsersResponse>> InviteScimOrganizationUserAsync(OrganizationUserSingleEmailInvite request);
 }
diff --git a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/InviteOrganizationUsersCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/InviteOrganizationUsersCommand.cs
index c7067879b5..7e1a28fe8b 100644
--- a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/InviteOrganizationUsersCommand.cs
+++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/InviteOrganizationUsersCommand.cs
@@ -36,7 +36,7 @@ public class InviteOrganizationUsersCommand(IEventService eventService,
     public const string IssueNotifyingOwnersOfSeatLimitReached = "Error encountered notifying organization owners of seat limit reached.";
     public const string FailedToInviteUsers = "Failed to invite user(s).";
 
-    public async Task<CommandResult<ScimInviteOrganizationUsersResponse>> InviteScimOrganizationUserAsync(InviteScimOrganizationUserRequest request)
+    public async Task<CommandResult<ScimInviteOrganizationUsersResponse>> InviteScimOrganizationUserAsync(OrganizationUserSingleEmailInvite request)
     {
         var result = await InviteOrganizationUsersAsync(new InviteOrganizationUsersRequest(request));
 
diff --git a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Models/InviteOrganizationUsersRequest.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Models/InviteOrganizationUsersRequest.cs
index 013ff1a0be..05819c25d1 100644
--- a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Models/InviteOrganizationUsersRequest.cs
+++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Models/InviteOrganizationUsersRequest.cs
@@ -20,8 +20,8 @@ public class InviteOrganizationUsersRequest
         PerformedAt = performedAt;
     }
 
-    public InviteOrganizationUsersRequest(InviteScimOrganizationUserRequest request) :
-        this([OrganizationUserInvite.Create(request, request.ExternalId)],
+    public InviteOrganizationUsersRequest(OrganizationUserSingleEmailInvite request) :
+        this([OrganizationUserInvite.Create(request)],
             request.InviteOrganization,
             Guid.Empty,
             request.PerformedAt)
diff --git a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Models/InviteScimOrganizationUserRequest.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Models/InviteScimOrganizationUserRequest.cs
deleted file mode 100644
index 382a464630..0000000000
--- a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Models/InviteScimOrganizationUserRequest.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Bit.Core.AdminConsole.Models.Business;
-using Bit.Core.Enums;
-using Bit.Core.Models.Data;
-
-namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers.Models;
-
-public record InviteScimOrganizationUserRequest : OrganizationUserSingleEmailInvite
-{
-    public InviteOrganization InviteOrganization { get; private init; }
-    public DateTimeOffset PerformedAt { get; private init; }
-    public string ExternalId { get; private init; } = string.Empty;
-
-    public InviteScimOrganizationUserRequest(string email,
-        bool hasSecretsManager,
-        InviteOrganization inviteOrganization,
-        DateTimeOffset performedAt,
-        string externalId) : base(
-        email: email,
-        accessibleCollections: [],
-        type: OrganizationUserType.User,
-        permissions: new Permissions(),
-        accessSecretsManager: hasSecretsManager)
-    {
-        InviteOrganization = inviteOrganization;
-        PerformedAt = performedAt;
-        ExternalId = externalId;
-    }
-}
diff --git a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Models/OrganizationUserInvite.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Models/OrganizationUserInvite.cs
index b828fd5a99..7ce791be59 100644
--- a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Models/OrganizationUserInvite.cs
+++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Models/OrganizationUserInvite.cs
@@ -42,12 +42,12 @@ public class OrganizationUserInvite
         };
     }
 
-    public static OrganizationUserInvite Create(OrganizationUserSingleEmailInvite invite, string externalId) =>
+    public static OrganizationUserInvite Create(OrganizationUserSingleEmailInvite invite) =>
         Create([invite.Email],
             invite.AccessibleCollections,
             invite.Type,
             invite.Permissions,
-            externalId,
+            invite.ExternalId,
             invite.AccessSecretsManager);
 
     private static void ValidateEmailAddresses(string[] emails)
diff --git a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Models/OrganizationUserSingleEmailInvite.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Models/OrganizationUserSingleEmailInvite.cs
index 6ef84beb92..f52f5353ce 100644
--- a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Models/OrganizationUserSingleEmailInvite.cs
+++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Models/OrganizationUserSingleEmailInvite.cs
@@ -1,4 +1,5 @@
-using Bit.Core.Enums;
+using Bit.Core.AdminConsole.Models.Business;
+using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
@@ -14,6 +15,25 @@ public record OrganizationUserSingleEmailInvite
     public Permissions Permissions { get; init; } = new();
     public OrganizationUserType Type { get; init; } = OrganizationUserType.User;
     public bool AccessSecretsManager { get; init; }
+    public InviteOrganization InviteOrganization { get; private init; }
+    public DateTimeOffset PerformedAt { get; private init; }
+    public string ExternalId { get; private init; } = string.Empty;
+
+    public OrganizationUserSingleEmailInvite(string email,
+        bool hasSecretsManager,
+        InviteOrganization inviteOrganization,
+        DateTimeOffset performedAt,
+        string externalId) : this(
+        email: email,
+        accessibleCollections: [],
+        type: OrganizationUserType.User,
+        permissions: new Permissions(),
+        accessSecretsManager: hasSecretsManager)
+    {
+        InviteOrganization = inviteOrganization;
+        PerformedAt = performedAt;
+        ExternalId = externalId;
+    }
 
     public OrganizationUserSingleEmailInvite(string email,
         IEnumerable<CollectionAccessSelection> accessibleCollections,