nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-15 15:30:49 -05:00
Code

[PM-22099] add collection type (#5942)

Browse Source 
* add CollectionType enum

* add CollectionType to CollectionResponseModels

* cleanup

* clean up

* change types

* add collection type to public API model

* remove redundant statements
This commit is contained in:
Brandon Treston 2025-06-11 11:01:04 -04:00 committed by GitHub
parent a618f97234
commit be72a77c72
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Api/Models/Public/Response/CollectionResponseModel.cs
View File

@ -1,6 +1,7 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using Bit.Api.AdminConsole.Public.Models.Response; using Bit.Api.AdminConsole.Public.Models.Response;
using Bit.Core.Entities; using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.Models.Data; using Bit.Core.Models.Data;
namespace Bit.Api.Models.Public.Response; namespace Bit.Api.Models.Public.Response;
@ -20,6 +21,7 @@ public class CollectionResponseModel : CollectionBaseModel, IResponseModel
Id = collection.Id; Id = collection.Id;
ExternalId = collection.ExternalId; ExternalId = collection.ExternalId;
Groups = groups?.Select(c => new AssociationWithPermissionsResponseModel(c)); Groups = groups?.Select(c => new AssociationWithPermissionsResponseModel(c));
Type = collection.Type;
} }
/// <summary> /// <summary>
@ -38,4 +40,8 @@ public class CollectionResponseModel : CollectionBaseModel, IResponseModel
/// The associated groups that this collection is assigned to. /// The associated groups that this collection is assigned to.
/// </summary> /// </summary>
public IEnumerable<AssociationWithPermissionsResponseModel> Groups { get; set; } public IEnumerable<AssociationWithPermissionsResponseModel> Groups { get; set; }
/// <summary>
/// The type of this collection
/// </summary>
public CollectionType Type { get; set; }
} }

3
src/Api/Models/Response/CollectionResponseModel.cs
View File

@ -1,4 +1,5 @@
using Bit.Core.Entities; using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.Models.Api; using Bit.Core.Models.Api;
using Bit.Core.Models.Data; using Bit.Core.Models.Data;
@ -18,12 +19,14 @@ public class CollectionResponseModel : ResponseModel
OrganizationId = collection.OrganizationId; OrganizationId = collection.OrganizationId;
Name = collection.Name; Name = collection.Name;
ExternalId = collection.ExternalId; ExternalId = collection.ExternalId;
Type = collection.Type;
} }
public Guid Id { get; set; } public Guid Id { get; set; }
public Guid OrganizationId { get; set; } public Guid OrganizationId { get; set; }
public string Name { get; set; } public string Name { get; set; }
public string ExternalId { get; set; } public string ExternalId { get; set; }
public CollectionType Type { get; set; }
} }
/// <summary> /// <summary>