diff --git a/src/Core/Models/Api/Response/ProfileOrganizationResponseModel.cs b/src/Core/Models/Api/Response/ProfileOrganizationResponseModel.cs index 78ef57f00..c6cefcb42 100644 --- a/src/Core/Models/Api/Response/ProfileOrganizationResponseModel.cs +++ b/src/Core/Models/Api/Response/ProfileOrganizationResponseModel.cs @@ -10,6 +10,7 @@ namespace Bit.Core.Models.Api { Id = organization.OrganizationId.ToString(); Name = organization.Name; + UsePolicies = organization.UsePolicies; UseGroups = organization.UseGroups; UseDirectory = organization.UseDirectory; UseEvents = organization.UseEvents; @@ -29,6 +30,7 @@ namespace Bit.Core.Models.Api public string Id { get; set; } public string Name { get; set; } + public bool UsePolicies { get; set; } public bool UseGroups { get; set; } public bool UseDirectory { get; set; } public bool UseEvents { get; set; } diff --git a/src/Core/Models/Data/OrganizationUserOrganizationDetails.cs b/src/Core/Models/Data/OrganizationUserOrganizationDetails.cs index 6c39bfd6a..c67daa560 100644 --- a/src/Core/Models/Data/OrganizationUserOrganizationDetails.cs +++ b/src/Core/Models/Data/OrganizationUserOrganizationDetails.cs @@ -7,6 +7,7 @@ namespace Bit.Core.Models.Data public Guid OrganizationId { get; set; } public Guid? UserId { get; set; } public string Name { get; set; } + public bool UsePolicies { get; set; } public bool UseGroups { get; set; } public bool UseDirectory { get; set; } public bool UseEvents { get; set; } diff --git a/src/Sql/dbo/Views/OrganizationUserOrganizationDetailsView.sql b/src/Sql/dbo/Views/OrganizationUserOrganizationDetailsView.sql index 4b24cd434..9afddf910 100644 --- a/src/Sql/dbo/Views/OrganizationUserOrganizationDetailsView.sql +++ b/src/Sql/dbo/Views/OrganizationUserOrganizationDetailsView.sql @@ -5,6 +5,7 @@ SELECT OU.[OrganizationId], O.[Name], O.[Enabled], + O.[UsePolicies], O.[UseGroups], O.[UseDirectory], O.[UseEvents], diff --git a/util/Migrator/DbScripts/2020-01-15_00_PolicySetup.sql b/util/Migrator/DbScripts/2020-01-15_00_PolicySetup.sql index f6c209032..93d5975d4 100644 --- a/util/Migrator/DbScripts/2020-01-15_00_PolicySetup.sql +++ b/util/Migrator/DbScripts/2020-01-15_00_PolicySetup.sql @@ -293,6 +293,40 @@ FROM [dbo].[Organization] 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 BEGIN DROP PROCEDURE [dbo].[Organization_Create]