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

[AC-1288] Move AssociationWithPermissions public api model to AC Team #3584

Merged
merged 3 commits into from
Dec 21, 2023
Merged

[AC-1288] Move AssociationWithPermissions public api model to AC Team #3584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82e0040
Move AssociationWithPermissions public api model to AC Team
eliykat Dec 7, 2023
b9930a7
Merge branch 'main' into ac/ac-1288/server-permissions
eliykat Dec 19, 2023
5ad5691
Merge branch 'main' into ac/ac-1288/server-permissions
eliykat Dec 21, 2023
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
2 changes: 1 addition & 1 deletion ...ic/AssociationWithPermissionsBaseModel.cs → ...ls/AssociationWithPermissionsBaseModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;

namespace Bit.Api.Auth.Models.Public;
namespace Bit.Api.AdminConsole.Public.Models;

public abstract class AssociationWithPermissionsBaseModel
{
Expand Down
2 changes: 1 addition & 1 deletion ...AssociationWithPermissionsRequestModel.cs → ...AssociationWithPermissionsRequestModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
3 changes: 1 addition & 2 deletions src/Api/AdminConsole/Public/Models/Request/GroupCreateUpdateRequestModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
3 changes: 1 addition & 2 deletions src/Api/AdminConsole/Public/Models/Request/MemberUpdateRequestModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...ssociationWithPermissionsResponseModel.cs → ...ssociationWithPermissionsResponseModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
1 change: 0 additions & 1 deletion src/Api/AdminConsole/Public/Models/Response/GroupResponseModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 0 additions & 1 deletion src/Api/AdminConsole/Public/Models/Response/MemberResponseModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Api/Models/Public/Request/CollectionUpdateRequestModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Api/Models/Public/Response/CollectionResponseModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Loading