From 82e0040b5835c62e47ac205f6f1b435502f43c5a Mon Sep 17 00:00:00 2001 From: Thomas Rittson Date: Thu, 7 Dec 2023 14:43:55 +1000 Subject: [PATCH] Move AssociationWithPermissions public api model to AC Team --- .../Public/Models}/AssociationWithPermissionsBaseModel.cs | 2 +- .../Models}/Request/AssociationWithPermissionsRequestModel.cs | 2 +- .../Public/Models/Request/GroupCreateUpdateRequestModel.cs | 3 +-- .../Public/Models/Request/MemberUpdateRequestModel.cs | 3 +-- .../Response/AssociationWithPermissionsResponseModel.cs | 2 +- .../AdminConsole/Public/Models/Response/GroupResponseModel.cs | 1 - .../AdminConsole/Public/Models/Response/MemberResponseModel.cs | 1 - src/Api/Models/Public/Request/CollectionUpdateRequestModel.cs | 2 +- src/Api/Models/Public/Response/CollectionResponseModel.cs | 2 +- 9 files changed, 7 insertions(+), 11 deletions(-) rename src/Api/{Auth/Models/Public => AdminConsole/Public/Models}/AssociationWithPermissionsBaseModel.cs (91%) rename src/Api/{Auth/Models/Public => AdminConsole/Public/Models}/Request/AssociationWithPermissionsRequestModel.cs (85%) rename src/Api/{Auth/Models/Public => AdminConsole/Public/Models}/Response/AssociationWithPermissionsResponseModel.cs (88%) diff --git a/src/Api/Auth/Models/Public/AssociationWithPermissionsBaseModel.cs b/src/Api/AdminConsole/Public/Models/AssociationWithPermissionsBaseModel.cs similarity index 91% rename from src/Api/Auth/Models/Public/AssociationWithPermissionsBaseModel.cs rename to src/Api/AdminConsole/Public/Models/AssociationWithPermissionsBaseModel.cs index 18f12fb6f95c..9ccc17915df9 100644 --- a/src/Api/Auth/Models/Public/AssociationWithPermissionsBaseModel.cs +++ b/src/Api/AdminConsole/Public/Models/AssociationWithPermissionsBaseModel.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Bit.Api.Auth.Models.Public; +namespace Bit.Api.AdminConsole.Public.Models; public abstract class AssociationWithPermissionsBaseModel { diff --git a/src/Api/Auth/Models/Public/Request/AssociationWithPermissionsRequestModel.cs b/src/Api/AdminConsole/Public/Models/Request/AssociationWithPermissionsRequestModel.cs similarity index 85% rename from src/Api/Auth/Models/Public/Request/AssociationWithPermissionsRequestModel.cs rename to src/Api/AdminConsole/Public/Models/Request/AssociationWithPermissionsRequestModel.cs index cac9894b2984..a367e8d4e6fa 100644 --- a/src/Api/Auth/Models/Public/Request/AssociationWithPermissionsRequestModel.cs +++ b/src/Api/AdminConsole/Public/Models/Request/AssociationWithPermissionsRequestModel.cs @@ -1,6 +1,6 @@ using Bit.Core.Models.Data; -namespace Bit.Api.Auth.Models.Public.Request; +namespace Bit.Api.AdminConsole.Public.Models.Request; public class AssociationWithPermissionsRequestModel : AssociationWithPermissionsBaseModel { diff --git a/src/Api/AdminConsole/Public/Models/Request/GroupCreateUpdateRequestModel.cs b/src/Api/AdminConsole/Public/Models/Request/GroupCreateUpdateRequestModel.cs index 01850003d7cc..c1c7945d1083 100644 --- a/src/Api/AdminConsole/Public/Models/Request/GroupCreateUpdateRequestModel.cs +++ b/src/Api/AdminConsole/Public/Models/Request/GroupCreateUpdateRequestModel.cs @@ -1,5 +1,4 @@ -using Bit.Api.Auth.Models.Public.Request; -using Bit.Core.AdminConsole.Entities; +using Bit.Core.AdminConsole.Entities; namespace Bit.Api.AdminConsole.Public.Models.Request; diff --git a/src/Api/AdminConsole/Public/Models/Request/MemberUpdateRequestModel.cs b/src/Api/AdminConsole/Public/Models/Request/MemberUpdateRequestModel.cs index 18aced43718b..0d584af2f234 100644 --- a/src/Api/AdminConsole/Public/Models/Request/MemberUpdateRequestModel.cs +++ b/src/Api/AdminConsole/Public/Models/Request/MemberUpdateRequestModel.cs @@ -1,5 +1,4 @@ -using Bit.Api.Auth.Models.Public.Request; -using Bit.Core.Entities; +using Bit.Core.Entities; namespace Bit.Api.AdminConsole.Public.Models.Request; diff --git a/src/Api/Auth/Models/Public/Response/AssociationWithPermissionsResponseModel.cs b/src/Api/AdminConsole/Public/Models/Response/AssociationWithPermissionsResponseModel.cs similarity index 88% rename from src/Api/Auth/Models/Public/Response/AssociationWithPermissionsResponseModel.cs rename to src/Api/AdminConsole/Public/Models/Response/AssociationWithPermissionsResponseModel.cs index 757eb7ab18d9..08d9e36d45fd 100644 --- a/src/Api/Auth/Models/Public/Response/AssociationWithPermissionsResponseModel.cs +++ b/src/Api/AdminConsole/Public/Models/Response/AssociationWithPermissionsResponseModel.cs @@ -1,6 +1,6 @@ using Bit.Core.Models.Data; -namespace Bit.Api.Auth.Models.Public.Response; +namespace Bit.Api.AdminConsole.Public.Models.Response; public class AssociationWithPermissionsResponseModel : AssociationWithPermissionsBaseModel { diff --git a/src/Api/AdminConsole/Public/Models/Response/GroupResponseModel.cs b/src/Api/AdminConsole/Public/Models/Response/GroupResponseModel.cs index b1100ef02cca..a2f6899e5e85 100644 --- a/src/Api/AdminConsole/Public/Models/Response/GroupResponseModel.cs +++ b/src/Api/AdminConsole/Public/Models/Response/GroupResponseModel.cs @@ -1,5 +1,4 @@ using System.ComponentModel.DataAnnotations; -using Bit.Api.Auth.Models.Public.Response; using Bit.Api.Models.Public.Response; using Bit.Core.AdminConsole.Entities; using Bit.Core.Models.Data; diff --git a/src/Api/AdminConsole/Public/Models/Response/MemberResponseModel.cs b/src/Api/AdminConsole/Public/Models/Response/MemberResponseModel.cs index 4f2ff1c17840..7035b642957b 100644 --- a/src/Api/AdminConsole/Public/Models/Response/MemberResponseModel.cs +++ b/src/Api/AdminConsole/Public/Models/Response/MemberResponseModel.cs @@ -1,5 +1,4 @@ using System.ComponentModel.DataAnnotations; -using Bit.Api.Auth.Models.Public.Response; using Bit.Api.Models.Public.Response; using Bit.Core.Entities; using Bit.Core.Enums; diff --git a/src/Api/Models/Public/Request/CollectionUpdateRequestModel.cs b/src/Api/Models/Public/Request/CollectionUpdateRequestModel.cs index 8e62c6156818..0adc6afa77a1 100644 --- a/src/Api/Models/Public/Request/CollectionUpdateRequestModel.cs +++ b/src/Api/Models/Public/Request/CollectionUpdateRequestModel.cs @@ -1,4 +1,4 @@ -using Bit.Api.Auth.Models.Public.Request; +using Bit.Api.AdminConsole.Public.Models.Request; using Bit.Core.Entities; namespace Bit.Api.Models.Public.Request; diff --git a/src/Api/Models/Public/Response/CollectionResponseModel.cs b/src/Api/Models/Public/Response/CollectionResponseModel.cs index 4ea747eac05f..58968d4be7fb 100644 --- a/src/Api/Models/Public/Response/CollectionResponseModel.cs +++ b/src/Api/Models/Public/Response/CollectionResponseModel.cs @@ -1,5 +1,5 @@ using System.ComponentModel.DataAnnotations; -using Bit.Api.Auth.Models.Public.Response; +using Bit.Api.AdminConsole.Public.Models.Response; using Bit.Core.Entities; using Bit.Core.Models.Data;