1
0
mirror of https://github.com/bitwarden/server.git synced 2024-11-25 12:45:18 +01:00

add usepolicies to org profile object

This commit is contained in:
Kyle Spearrin 2020-01-15 15:17:32 -05:00
parent 0790f9859e
commit ff8731c82f
4 changed files with 38 additions and 0 deletions

View File

@ -10,6 +10,7 @@ namespace Bit.Core.Models.Api
{ {
Id = organization.OrganizationId.ToString(); Id = organization.OrganizationId.ToString();
Name = organization.Name; Name = organization.Name;
UsePolicies = organization.UsePolicies;
UseGroups = organization.UseGroups; UseGroups = organization.UseGroups;
UseDirectory = organization.UseDirectory; UseDirectory = organization.UseDirectory;
UseEvents = organization.UseEvents; UseEvents = organization.UseEvents;
@ -29,6 +30,7 @@ namespace Bit.Core.Models.Api
public string Id { get; set; } public string Id { get; set; }
public string Name { get; set; } public string Name { get; set; }
public bool UsePolicies { get; set; }
public bool UseGroups { get; set; } public bool UseGroups { get; set; }
public bool UseDirectory { get; set; } public bool UseDirectory { get; set; }
public bool UseEvents { get; set; } public bool UseEvents { get; set; }

View File

@ -7,6 +7,7 @@ namespace Bit.Core.Models.Data
public Guid OrganizationId { get; set; } public Guid OrganizationId { get; set; }
public Guid? UserId { get; set; } public Guid? UserId { get; set; }
public string Name { get; set; } public string Name { get; set; }
public bool UsePolicies { get; set; }
public bool UseGroups { get; set; } public bool UseGroups { get; set; }
public bool UseDirectory { get; set; } public bool UseDirectory { get; set; }
public bool UseEvents { get; set; } public bool UseEvents { get; set; }

View File

@ -5,6 +5,7 @@ SELECT
OU.[OrganizationId], OU.[OrganizationId],
O.[Name], O.[Name],
O.[Enabled], O.[Enabled],
O.[UsePolicies],
O.[UseGroups], O.[UseGroups],
O.[UseDirectory], O.[UseDirectory],
O.[UseEvents], O.[UseEvents],

View File

@ -293,6 +293,40 @@ FROM
[dbo].[Organization] [dbo].[Organization]
GO GO
IF EXISTS(SELECT * FROM sys.views WHERE [Name] = 'OrganizationUserOrganizationDetailsView')
BEGIN
DROP VIEW [dbo].[OrganizationUserOrganizationDetailsView]
END
GO
CREATE VIEW [dbo].[OrganizationUserOrganizationDetailsView]
AS
SELECT
OU.[UserId],
OU.[OrganizationId],
O.[Name],
O.[Enabled],
O.[UsePolicies],
O.[UseGroups],
O.[UseDirectory],
O.[UseEvents],
O.[UseTotp],
O.[Use2fa],
O.[UseApi],
O.[SelfHost],
O.[UsersGetPremium],
O.[Seats],
O.[MaxCollections],
O.[MaxStorageGb],
OU.[Key],
OU.[Status],
OU.[Type]
FROM
[dbo].[OrganizationUser] OU
INNER JOIN
[dbo].[Organization] O ON O.[Id] = OU.[OrganizationId]
GO
IF OBJECT_ID('[dbo].[Organization_Create]') IS NOT NULL IF OBJECT_ID('[dbo].[Organization_Create]') IS NOT NULL
BEGIN BEGIN
DROP PROCEDURE [dbo].[Organization_Create] DROP PROCEDURE [dbo].[Organization_Create]