mirror of
https://github.com/bitwarden/server.git
synced 2025-02-18 02:11:22 +01:00
[AC-2104] Add flexible collections properties to provider organizations sync response (#3717)
This commit is contained in:
parent
31e09e415d
commit
7bf17a20f4
@ -43,5 +43,8 @@ public class ProfileProviderOrganizationResponseModel : ProfileOrganizationRespo
|
|||||||
ProviderId = organization.ProviderId;
|
ProviderId = organization.ProviderId;
|
||||||
ProviderName = organization.ProviderName;
|
ProviderName = organization.ProviderName;
|
||||||
PlanProductType = StaticStore.GetPlan(organization.PlanType).Product;
|
PlanProductType = StaticStore.GetPlan(organization.PlanType).Product;
|
||||||
|
LimitCollectionCreationDeletion = organization.LimitCollectionCreationDeletion;
|
||||||
|
AllowAdminAccessToAllCollectionItems = organization.AllowAdminAccessToAllCollectionItems;
|
||||||
|
FlexibleCollections = organization.FlexibleCollections;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -35,4 +35,7 @@ public class ProviderUserOrganizationDetails
|
|||||||
public Guid? ProviderUserId { get; set; }
|
public Guid? ProviderUserId { get; set; }
|
||||||
public string ProviderName { get; set; }
|
public string ProviderName { get; set; }
|
||||||
public Core.Enums.PlanType PlanType { get; set; }
|
public Core.Enums.PlanType PlanType { get; set; }
|
||||||
|
public bool LimitCollectionCreationDeletion { get; set; }
|
||||||
|
public bool AllowAdminAccessToAllCollectionItems { get; set; }
|
||||||
|
public bool FlexibleCollections { get; set; }
|
||||||
}
|
}
|
||||||
|
@ -43,7 +43,10 @@ public class ProviderUserOrganizationDetailsViewQuery : IQuery<ProviderUserOrgan
|
|||||||
PrivateKey = x.o.PrivateKey,
|
PrivateKey = x.o.PrivateKey,
|
||||||
ProviderId = x.p.Id,
|
ProviderId = x.p.Id,
|
||||||
ProviderName = x.p.Name,
|
ProviderName = x.p.Name,
|
||||||
PlanType = x.o.PlanType
|
PlanType = x.o.PlanType,
|
||||||
|
LimitCollectionCreationDeletion = x.o.LimitCollectionCreationDeletion,
|
||||||
|
AllowAdminAccessToAllCollectionItems = x.o.AllowAdminAccessToAllCollectionItems,
|
||||||
|
FlexibleCollections = x.o.FlexibleCollections
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -31,7 +31,10 @@ SELECT
|
|||||||
PO.[ProviderId],
|
PO.[ProviderId],
|
||||||
PU.[Id] ProviderUserId,
|
PU.[Id] ProviderUserId,
|
||||||
P.[Name] ProviderName,
|
P.[Name] ProviderName,
|
||||||
O.[PlanType]
|
O.[PlanType],
|
||||||
|
O.[LimitCollectionCreationDeletion],
|
||||||
|
O.[AllowAdminAccessToAllCollectionItems],
|
||||||
|
O.[FlexibleCollections]
|
||||||
FROM
|
FROM
|
||||||
[dbo].[ProviderUser] PU
|
[dbo].[ProviderUser] PU
|
||||||
INNER JOIN
|
INNER JOIN
|
||||||
|
@ -0,0 +1,54 @@
|
|||||||
|
-- Add columns LimitCollectionCreationDeletion, AllowAdminAccessToAllCollectionItems, FlexibleCollections to view
|
||||||
|
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.[SelfHost],
|
||||||
|
O.[UsersGetPremium],
|
||||||
|
O.[UseCustomPermissions],
|
||||||
|
O.[Seats],
|
||||||
|
O.[MaxCollections],
|
||||||
|
O.[MaxStorageGb],
|
||||||
|
O.[Identifier],
|
||||||
|
PO.[Key],
|
||||||
|
O.[PublicKey],
|
||||||
|
O.[PrivateKey],
|
||||||
|
PU.[Status],
|
||||||
|
PU.[Type],
|
||||||
|
PO.[ProviderId],
|
||||||
|
PU.[Id] ProviderUserId,
|
||||||
|
P.[Name] ProviderName,
|
||||||
|
O.[PlanType],
|
||||||
|
O.[LimitCollectionCreationDeletion],
|
||||||
|
O.[AllowAdminAccessToAllCollectionItems],
|
||||||
|
O.[FlexibleCollections]
|
||||||
|
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]
|
||||||
|
GO
|
||||||
|
|
||||||
|
--Manually refresh ProviderOrganizationOrganizationDetailsView
|
||||||
|
IF OBJECT_ID('[dbo].[ProviderUserProviderOrganizationDetails_ReadByUserIdStatus]') IS NOT NULL
|
||||||
|
BEGIN
|
||||||
|
EXECUTE sp_refreshsqlmodule N'[dbo].[ProviderUserProviderOrganizationDetails_ReadByUserIdStatus]';
|
||||||
|
END
|
||||||
|
GO
|
Loading…
Reference in New Issue
Block a user