mirror of
https://github.com/bitwarden/server
synced 2026-01-12 21:44:13 +00:00
* Adding new item to organization license * fixing whitespace issues * fixing missing comment * fixing merge conflicts * merge fix * db merge fixes * fix * Updating SM to Sm, and adding more view refreshes * fixing merge conflicts * Redoing migration * Update OrganizationLicense.cs * Update OrganizationLicense.cs * fixes * fixes * fixing db issues * fix * rearranging sql after merge conflicts * Merge conflicts with dbscripts are fixed, adding missing usedisableSMadsForUsers where needed * removing incorrect merge fix * fixes * adding feature flag to disable sm ads --------- Co-authored-by: Conner Turnbull <cturnbull@bitwarden.com>
245 lines
6.6 KiB
Transact-SQL
245 lines
6.6 KiB
Transact-SQL
/* Adds the UseDisableSmAdsForUsers column to the OrganizationUserOrganizationDetailsView view. */
|
|
CREATE OR ALTER VIEW [dbo].[OrganizationUserOrganizationDetailsView]
|
|
AS
|
|
SELECT
|
|
OU.[UserId],
|
|
OU.[OrganizationId],
|
|
OU.[Id] OrganizationUserId,
|
|
O.[Name],
|
|
O.[Enabled],
|
|
O.[PlanType],
|
|
O.[UsePolicies],
|
|
O.[UseSso],
|
|
O.[UseKeyConnector],
|
|
O.[UseScim],
|
|
O.[UseGroups],
|
|
O.[UseDirectory],
|
|
O.[UseEvents],
|
|
O.[UseTotp],
|
|
O.[Use2fa],
|
|
O.[UseApi],
|
|
O.[UseResetPassword],
|
|
O.[SelfHost],
|
|
O.[UsersGetPremium],
|
|
O.[UseCustomPermissions],
|
|
O.[UseSecretsManager],
|
|
O.[Seats],
|
|
O.[MaxCollections],
|
|
COALESCE(O.[MaxStorageGbIncreased], O.[MaxStorageGb]) AS [MaxStorageGb],
|
|
O.[Identifier],
|
|
OU.[Key],
|
|
OU.[ResetPasswordKey],
|
|
O.[PublicKey],
|
|
O.[PrivateKey],
|
|
OU.[Status],
|
|
OU.[Type],
|
|
SU.[ExternalId] SsoExternalId,
|
|
OU.[Permissions],
|
|
PO.[ProviderId],
|
|
P.[Name] ProviderName,
|
|
P.[Type] ProviderType,
|
|
SS.[Enabled] SsoEnabled,
|
|
SS.[Data] SsoConfig,
|
|
OS.[FriendlyName] FamilySponsorshipFriendlyName,
|
|
OS.[LastSyncDate] FamilySponsorshipLastSyncDate,
|
|
OS.[ToDelete] FamilySponsorshipToDelete,
|
|
OS.[ValidUntil] FamilySponsorshipValidUntil,
|
|
OU.[AccessSecretsManager],
|
|
O.[UsePasswordManager],
|
|
O.[SmSeats],
|
|
O.[SmServiceAccounts],
|
|
O.[LimitCollectionCreation],
|
|
O.[LimitCollectionDeletion],
|
|
O.[AllowAdminAccessToAllCollectionItems],
|
|
O.[UseRiskInsights],
|
|
O.[LimitItemDeletion],
|
|
O.[UseAdminSponsoredFamilies],
|
|
O.[UseOrganizationDomains],
|
|
OS.[IsAdminInitiated],
|
|
O.[UseAutomaticUserConfirmation],
|
|
O.[UsePhishingBlocker],
|
|
O.[UseDisableSmAdsForUsers]
|
|
FROM
|
|
[dbo].[OrganizationUser] OU
|
|
LEFT JOIN
|
|
[dbo].[Organization] O ON O.[Id] = OU.[OrganizationId]
|
|
LEFT JOIN
|
|
[dbo].[SsoUser] SU ON SU.[UserId] = OU.[UserId] AND SU.[OrganizationId] = OU.[OrganizationId]
|
|
LEFT JOIN
|
|
[dbo].[ProviderOrganization] PO ON PO.[OrganizationId] = O.[Id]
|
|
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]
|
|
GO
|
|
|
|
/* Updates the ProviderUserProviderOrganizationDetailsView view to include the UseDisableSmAdsForUsers column. */
|
|
CREATE OR ALTER VIEW [dbo].[ProviderUserProviderOrganizationDetailsView]
|
|
AS
|
|
SELECT
|
|
PU.[UserId],
|
|
PO.[OrganizationId],
|
|
O.[Name],
|
|
O.[Enabled],
|
|
O.[UsePolicies],
|
|
O.[UseSso],
|
|
O.[UseKeyConnector],
|
|
O.[UseScim],
|
|
O.[UseGroups],
|
|
O.[UseDirectory],
|
|
O.[UseEvents],
|
|
O.[UseTotp],
|
|
O.[Use2fa],
|
|
O.[UseApi],
|
|
O.[UseResetPassword],
|
|
O.[UseSecretsManager],
|
|
O.[UsePasswordManager],
|
|
O.[SelfHost],
|
|
O.[UsersGetPremium],
|
|
O.[UseCustomPermissions],
|
|
O.[Seats],
|
|
O.[MaxCollections],
|
|
COALESCE(O.[MaxStorageGbIncreased], O.[MaxStorageGb]) AS [MaxStorageGb],
|
|
O.[Identifier],
|
|
PO.[Key],
|
|
O.[PublicKey],
|
|
O.[PrivateKey],
|
|
PU.[Status],
|
|
PU.[Type],
|
|
PO.[ProviderId],
|
|
PU.[Id] ProviderUserId,
|
|
P.[Name] ProviderName,
|
|
O.[PlanType],
|
|
O.[LimitCollectionCreation],
|
|
O.[LimitCollectionDeletion],
|
|
O.[AllowAdminAccessToAllCollectionItems],
|
|
O.[UseRiskInsights],
|
|
O.[UseAdminSponsoredFamilies],
|
|
P.[Type] ProviderType,
|
|
O.[LimitItemDeletion],
|
|
O.[UseOrganizationDomains],
|
|
O.[UseAutomaticUserConfirmation],
|
|
SS.[Enabled] SsoEnabled,
|
|
SS.[Data] SsoConfig,
|
|
O.[UsePhishingBlocker],
|
|
O.[UseDisableSmAdsForUsers]
|
|
FROM
|
|
[dbo].[ProviderUser] PU
|
|
INNER JOIN
|
|
[dbo].[ProviderOrganization] PO ON PO.[ProviderId] = PU.[ProviderId]
|
|
INNER JOIN
|
|
[dbo].[Organization] O ON O.[Id] = PO.[OrganizationId]
|
|
INNER JOIN
|
|
[dbo].[Provider] P ON P.[Id] = PU.[ProviderId]
|
|
LEFT JOIN
|
|
[dbo].[SsoConfig] SS ON SS.[OrganizationId] = O.[Id]
|
|
GO
|
|
|
|
/* Updates the OrganizationView view to include the UseDisableSmAdsForUsers column. */
|
|
CREATE OR ALTER VIEW [dbo].[OrganizationView]
|
|
AS
|
|
SELECT
|
|
[Id],
|
|
[Identifier],
|
|
[Name],
|
|
[BusinessName],
|
|
[BusinessAddress1],
|
|
[BusinessAddress2],
|
|
[BusinessAddress3],
|
|
[BusinessCountry],
|
|
[BusinessTaxNumber],
|
|
[BillingEmail],
|
|
[Plan],
|
|
[PlanType],
|
|
[Seats],
|
|
[MaxCollections],
|
|
[UsePolicies],
|
|
[UseSso],
|
|
[UseGroups],
|
|
[UseDirectory],
|
|
[UseEvents],
|
|
[UseTotp],
|
|
[Use2fa],
|
|
[UseApi],
|
|
[UseResetPassword],
|
|
[SelfHost],
|
|
[UsersGetPremium],
|
|
[Storage],
|
|
COALESCE([MaxStorageGbIncreased], [MaxStorageGb]) AS [MaxStorageGb],
|
|
[Gateway],
|
|
[GatewayCustomerId],
|
|
[GatewaySubscriptionId],
|
|
[ReferenceData],
|
|
[Enabled],
|
|
[LicenseKey],
|
|
[PublicKey],
|
|
[PrivateKey],
|
|
[TwoFactorProviders],
|
|
[ExpirationDate],
|
|
[CreationDate],
|
|
[RevisionDate],
|
|
[OwnersNotifiedOfAutoscaling],
|
|
[MaxAutoscaleSeats],
|
|
[UseKeyConnector],
|
|
[UseScim],
|
|
[UseCustomPermissions],
|
|
[UseSecretsManager],
|
|
[Status],
|
|
[UsePasswordManager],
|
|
[SmSeats],
|
|
[SmServiceAccounts],
|
|
[MaxAutoscaleSmSeats],
|
|
[MaxAutoscaleSmServiceAccounts],
|
|
[SecretsManagerBeta],
|
|
[LimitCollectionCreation],
|
|
[LimitCollectionDeletion],
|
|
[LimitItemDeletion],
|
|
[AllowAdminAccessToAllCollectionItems],
|
|
[UseRiskInsights],
|
|
[UseOrganizationDomains],
|
|
[UseAdminSponsoredFamilies],
|
|
[SyncSeats],
|
|
[UseAutomaticUserConfirmation],
|
|
[UsePhishingBlocker],
|
|
[UseDisableSmAdsForUsers]
|
|
FROM
|
|
[dbo].[Organization]
|
|
GO
|
|
|
|
--Manually refresh [dbo].[OrganizationUserOrganizationDetailsView]
|
|
IF OBJECT_ID('[dbo].[OrganizationUserOrganizationDetailsView]') IS NOT NULL
|
|
BEGIN
|
|
EXECUTE sp_refreshsqlmodule N'[dbo].[OrganizationUserOrganizationDetailsView]';
|
|
END
|
|
GO
|
|
|
|
--Manually refresh [dbo].[ProviderUserProviderOrganizationDetailsView]
|
|
IF OBJECT_ID('[dbo].[ProviderUserProviderOrganizationDetailsView]') IS NOT NULL
|
|
BEGIN
|
|
EXECUTE sp_refreshsqlmodule N'[dbo].[ProviderUserProviderOrganizationDetailsView]';
|
|
END
|
|
GO
|
|
|
|
--Manually refresh [dbo].[OrganizationView]
|
|
IF OBJECT_ID('[dbo].[OrganizationView]') IS NOT NULL
|
|
BEGIN
|
|
EXECUTE sp_refreshsqlmodule N'[dbo].[OrganizationView]';
|
|
END
|
|
GO
|
|
|
|
--Manually refresh [dbo].[OrganizationCipherDetailsCollectionsView]
|
|
IF OBJECT_ID('[dbo].[OrganizationCipherDetailsCollectionsView]') IS NOT NULL
|
|
BEGIN
|
|
EXECUTE sp_refreshsqlmodule N'[dbo].[OrganizationCipherDetailsCollectionsView]';
|
|
END
|
|
GO
|
|
|
|
--Manually refresh [dbo].[ProviderOrganizationOrganizationDetailsView]
|
|
IF OBJECT_ID('[dbo].[ProviderOrganizationOrganizationDetailsView]') IS NOT NULL
|
|
BEGIN
|
|
EXECUTE sp_refreshsqlmodule N'[dbo].[ProviderOrganizationOrganizationDetailsView]';
|
|
END
|
|
GO
|