mirror of
https://github.com/bitwarden/server.git
synced 2025-04-07 05:58:13 -05:00
group external id
This commit is contained in:
parent
5a6e189e67
commit
5d595d4cf9
@ -13,6 +13,7 @@ namespace Bit.Core.Models.Api
|
|||||||
public string Name { get; set; }
|
public string Name { get; set; }
|
||||||
[Required]
|
[Required]
|
||||||
public bool? AccessAll { get; set; }
|
public bool? AccessAll { get; set; }
|
||||||
|
public string ExternalId { get; set; }
|
||||||
public IEnumerable<SelectionReadOnlyRequestModel> Collections { get; set; }
|
public IEnumerable<SelectionReadOnlyRequestModel> Collections { get; set; }
|
||||||
|
|
||||||
public Group ToGroup(Guid orgId)
|
public Group ToGroup(Guid orgId)
|
||||||
@ -27,6 +28,7 @@ namespace Bit.Core.Models.Api
|
|||||||
{
|
{
|
||||||
existingGroup.Name = Name;
|
existingGroup.Name = Name;
|
||||||
existingGroup.AccessAll = AccessAll.Value;
|
existingGroup.AccessAll = AccessAll.Value;
|
||||||
|
existingGroup.ExternalId = ExternalId;
|
||||||
return existingGroup;
|
return existingGroup;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -20,12 +20,14 @@ namespace Bit.Core.Models.Api
|
|||||||
OrganizationId = group.OrganizationId.ToString();
|
OrganizationId = group.OrganizationId.ToString();
|
||||||
Name = group.Name;
|
Name = group.Name;
|
||||||
AccessAll = group.AccessAll;
|
AccessAll = group.AccessAll;
|
||||||
|
ExternalId = group.ExternalId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public string Id { get; set; }
|
public string Id { get; set; }
|
||||||
public string OrganizationId { get; set; }
|
public string OrganizationId { get; set; }
|
||||||
public string Name { get; set; }
|
public string Name { get; set; }
|
||||||
public bool AccessAll { get; set; }
|
public bool AccessAll { get; set; }
|
||||||
|
public string ExternalId { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class GroupDetailsResponseModel : GroupResponseModel
|
public class GroupDetailsResponseModel : GroupResponseModel
|
||||||
|
@ -9,6 +9,7 @@ namespace Bit.Core.Models.Table
|
|||||||
public Guid OrganizationId { get; set; }
|
public Guid OrganizationId { get; set; }
|
||||||
public string Name { get; set; }
|
public string Name { get; set; }
|
||||||
public bool AccessAll { get; set; }
|
public bool AccessAll { get; set; }
|
||||||
|
public string ExternalId { get; set; }
|
||||||
public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
|
public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
|
||||||
public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
|
public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
|
||||||
|
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
@OrganizationId UNIQUEIDENTIFIER,
|
@OrganizationId UNIQUEIDENTIFIER,
|
||||||
@Name VARCHAR(MAX),
|
@Name VARCHAR(MAX),
|
||||||
@AccessAll BIT,
|
@AccessAll BIT,
|
||||||
|
@ExternalId NVARCHAR(50),
|
||||||
@CreationDate DATETIME2(7),
|
@CreationDate DATETIME2(7),
|
||||||
@RevisionDate DATETIME2(7)
|
@RevisionDate DATETIME2(7)
|
||||||
AS
|
AS
|
||||||
@ -15,6 +16,7 @@ BEGIN
|
|||||||
[OrganizationId],
|
[OrganizationId],
|
||||||
[Name],
|
[Name],
|
||||||
[AccessAll],
|
[AccessAll],
|
||||||
|
[ExternalId],
|
||||||
[CreationDate],
|
[CreationDate],
|
||||||
[RevisionDate]
|
[RevisionDate]
|
||||||
)
|
)
|
||||||
@ -24,6 +26,7 @@ BEGIN
|
|||||||
@OrganizationId,
|
@OrganizationId,
|
||||||
@Name,
|
@Name,
|
||||||
@AccessAll,
|
@AccessAll,
|
||||||
|
@ExternalId,
|
||||||
@CreationDate,
|
@CreationDate,
|
||||||
@RevisionDate
|
@RevisionDate
|
||||||
)
|
)
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
@OrganizationId UNIQUEIDENTIFIER,
|
@OrganizationId UNIQUEIDENTIFIER,
|
||||||
@Name VARCHAR(MAX),
|
@Name VARCHAR(MAX),
|
||||||
@AccessAll BIT,
|
@AccessAll BIT,
|
||||||
|
@ExternalId NVARCHAR(50),
|
||||||
@CreationDate DATETIME2(7),
|
@CreationDate DATETIME2(7),
|
||||||
@RevisionDate DATETIME2(7),
|
@RevisionDate DATETIME2(7),
|
||||||
@Collections AS [dbo].[SelectionReadOnlyArray] READONLY
|
@Collections AS [dbo].[SelectionReadOnlyArray] READONLY
|
||||||
@ -10,7 +11,7 @@ AS
|
|||||||
BEGIN
|
BEGIN
|
||||||
SET NOCOUNT ON
|
SET NOCOUNT ON
|
||||||
|
|
||||||
EXEC [dbo].[Group_Create] @Id, @OrganizationId, @Name, @AccessAll, @CreationDate, @RevisionDate
|
EXEC [dbo].[Group_Create] @Id, @OrganizationId, @Name, @AccessAll, @ExternalId, @CreationDate, @RevisionDate
|
||||||
|
|
||||||
;WITH [AvailableCollectionsCTE] AS(
|
;WITH [AvailableCollectionsCTE] AS(
|
||||||
SELECT
|
SELECT
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
@OrganizationId UNIQUEIDENTIFIER,
|
@OrganizationId UNIQUEIDENTIFIER,
|
||||||
@Name VARCHAR(MAX),
|
@Name VARCHAR(MAX),
|
||||||
@AccessAll BIT,
|
@AccessAll BIT,
|
||||||
|
@ExternalId NVARCHAR(50),
|
||||||
@CreationDate DATETIME2(7),
|
@CreationDate DATETIME2(7),
|
||||||
@RevisionDate DATETIME2(7)
|
@RevisionDate DATETIME2(7)
|
||||||
AS
|
AS
|
||||||
@ -15,6 +16,7 @@ BEGIN
|
|||||||
[OrganizationId] = @OrganizationId,
|
[OrganizationId] = @OrganizationId,
|
||||||
[Name] = @Name,
|
[Name] = @Name,
|
||||||
[AccessAll] = @AccessAll,
|
[AccessAll] = @AccessAll,
|
||||||
|
[ExternalId] = @ExternalId,
|
||||||
[CreationDate] = @CreationDate,
|
[CreationDate] = @CreationDate,
|
||||||
[RevisionDate] = @RevisionDate
|
[RevisionDate] = @RevisionDate
|
||||||
WHERE
|
WHERE
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
@OrganizationId UNIQUEIDENTIFIER,
|
@OrganizationId UNIQUEIDENTIFIER,
|
||||||
@Name VARCHAR(MAX),
|
@Name VARCHAR(MAX),
|
||||||
@AccessAll BIT,
|
@AccessAll BIT,
|
||||||
|
@ExternalId NVARCHAR(50),
|
||||||
@CreationDate DATETIME2(7),
|
@CreationDate DATETIME2(7),
|
||||||
@RevisionDate DATETIME2(7),
|
@RevisionDate DATETIME2(7),
|
||||||
@Collections AS [dbo].[SelectionReadOnlyArray] READONLY
|
@Collections AS [dbo].[SelectionReadOnlyArray] READONLY
|
||||||
@ -10,7 +11,7 @@ AS
|
|||||||
BEGIN
|
BEGIN
|
||||||
SET NOCOUNT ON
|
SET NOCOUNT ON
|
||||||
|
|
||||||
EXEC [dbo].[Group_Update] @Id, @OrganizationId, @Name, @AccessAll, @CreationDate, @RevisionDate
|
EXEC [dbo].[Group_Update] @Id, @OrganizationId, @Name, @AccessAll, @ExternalId, @CreationDate, @RevisionDate
|
||||||
|
|
||||||
;WITH [AvailableCollectionsCTE] AS(
|
;WITH [AvailableCollectionsCTE] AS(
|
||||||
SELECT
|
SELECT
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
[OrganizationId] UNIQUEIDENTIFIER NOT NULL,
|
[OrganizationId] UNIQUEIDENTIFIER NOT NULL,
|
||||||
[Name] NVARCHAR (50) NOT NULL,
|
[Name] NVARCHAR (50) NOT NULL,
|
||||||
[AccessAll] BIT NOT NULL,
|
[AccessAll] BIT NOT NULL,
|
||||||
|
[ExternalId] NVARCHAR (50) NULL,
|
||||||
[CreationDate] DATETIME NOT NULL,
|
[CreationDate] DATETIME NOT NULL,
|
||||||
[RevisionDate] DATETIME NOT NULL,
|
[RevisionDate] DATETIME NOT NULL,
|
||||||
CONSTRAINT [PK_Group] PRIMARY KEY CLUSTERED ([Id] ASC),
|
CONSTRAINT [PK_Group] PRIMARY KEY CLUSTERED ([Id] ASC),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user