nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 23:52:50 -05:00
Code Activity

update OrgUserDetailsView to include PlanType and other sponsorship parameters previously removed (#2122)

Browse Source
This commit is contained in:
Jake Fink
2022-07-17 20:28:46 -04:00
committed by GitHub
parent 6628dc3336
commit be146a8f62
3 changed files with 74 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserOrganizationDetailsViewQuery.cs
View File

@ -54,8 +54,11 @@ namespace Bit.Infrastructure.EntityFramework.Repositories.Queries
PrivateKey = x.o.PrivateKey,
ProviderId = x.p.Id,
ProviderName = x.p.Name,
FamilySponsorshipFriendlyName = x.os.FriendlyName,
SsoConfig = x.ss.Data,
FamilySponsorshipFriendlyName = x.os.FriendlyName,
FamilySponsorshipLastSyncDate = x.os.LastSyncDate,
FamilySponsorshipToDelete = x.os.ToDelete,
FamilySponsorshipValidUntil = x.os.ValidUntil
});
}
}

9
src/Sql/dbo/Views/OrganizationUserOrganizationDetailsView.sql
View File

@ -5,6 +5,7 @@ SELECT
OU.[OrganizationId],
O.[Name],
O.[Enabled],
O.[PlanType],
O.[UsePolicies],
O.[UseSso],
O.[UseKeyConnector],
@ -32,7 +33,11 @@ SELECT
OU.[Permissions],
PO.[ProviderId],
P.[Name] ProviderName,
SS.[Data] SsoConfig
SS.[Data] SsoConfig,
OS.[FriendlyName] FamilySponsorshipFriendlyName,
OS.[LastSyncDate] FamilySponsorshipLastSyncDate,
OS.[ToDelete] FamilySponsorshipToDelete,
OS.[ValidUntil] FamilySponsorshipValidUntil
FROM
[dbo].[OrganizationUser] OU
INNER JOIN
@ -45,3 +50,5 @@ LEFT JOIN
[dbo].[Provider] P ON P.[Id] = PO.[ProviderId]
LEFT JOIN
[dbo].[SsoConfig] SS ON SS.[OrganizationId] = OU.[OrganizationId]
LEFT JOIN
[dbo].[OrganizationSponsorship] OS ON OS.[SponsoringOrganizationUserID] = OU.[Id]