mirror of
https://github.com/bitwarden/server
synced 2025-12-29 22:54:00 +00:00
Merge branch 'master' into feature/billing-obfuscation
This commit is contained in:
@@ -74,11 +74,16 @@
|
||||
<Folder Include="SecretsManager\dbo\Stored Procedures\ApiKey\" />
|
||||
<Folder Include="SecretsManager\dbo\Tables\" />
|
||||
<Folder Include="SecretsManager\dbo\Views\" />
|
||||
<Folder Include="Vault\dbo\" />
|
||||
<Folder Include="Vault\dbo\Functions\" />
|
||||
<Folder Include="Vault\dbo\Stored Procedures\" />
|
||||
<Folder Include="Vault\dbo\Stored Procedures\Cipher\" />
|
||||
<Folder Include="Vault\dbo\Stored Procedures\Folder\" />
|
||||
<Folder Include="Vault\dbo\Tables\" />
|
||||
<Folder Include="Vault\dbo\Views\" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Build Include="dbo\Functions\CipherDetails.sql" />
|
||||
<Build Include="dbo\Functions\PolicyApplicableToUser.sql" />
|
||||
<Build Include="dbo\Functions\UserCipherDetails.sql" />
|
||||
<Build Include="dbo\Functions\UserCollectionDetails.sql" />
|
||||
<Build Include="dbo\Stored Procedures\AuthRequest_Create.sql" />
|
||||
<Build Include="dbo\Stored Procedures\AuthRequest_DeleteById.sql" />
|
||||
@@ -87,35 +92,6 @@
|
||||
<Build Include="dbo\Stored Procedures\AuthRequest_ReadByUserId.sql" />
|
||||
<Build Include="dbo\Stored Procedures\AuthRequest_Update.sql" />
|
||||
<Build Include="dbo\Stored Procedures\AzureSQLMaintenance.sql" />
|
||||
<Build Include="dbo\Stored Procedures\CipherDetails_Create.sql" />
|
||||
<Build Include="dbo\Stored Procedures\CipherDetails_CreateWithCollections.sql" />
|
||||
<Build Include="dbo\Stored Procedures\CipherDetails_ReadByIdUserId.sql" />
|
||||
<Build Include="dbo\Stored Procedures\CipherDetails_ReadByUserId.sql" />
|
||||
<Build Include="dbo\Stored Procedures\CipherDetails_ReadWithoutOrganizationsByUserId.sql" />
|
||||
<Build Include="dbo\Stored Procedures\CipherDetails_Update.sql" />
|
||||
<Build Include="dbo\Stored Procedures\CipherOrganizationDetails_ReadById.sql" />
|
||||
<Build Include="dbo\Stored Procedures\CipherOrganizationDetails_ReadByOrganizationId.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Cipher_Create.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Cipher_CreateWithCollections.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Cipher_Delete.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Cipher_DeleteAttachment.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Cipher_DeleteById.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Cipher_DeleteByIdsOrganizationId.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Cipher_DeleteByOrganizationId.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Cipher_DeleteByUserId.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Cipher_DeleteDeleted.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Cipher_Move.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Cipher_ReadById.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Cipher_ReadByOrganizationId.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Cipher_ReadCanEditByIdUserId.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Cipher_Restore.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Cipher_SoftDelete.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Cipher_SoftDeleteByIdsOrganizationId.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Cipher_Update.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Cipher_UpdateAttachment.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Cipher_UpdateCollections.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Cipher_UpdatePartial.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Cipher_UpdateWithCollections.sql" />
|
||||
<Build Include="dbo\Stored Procedures\CollectionCipher_Create.sql" />
|
||||
<Build Include="dbo\Stored Procedures\CollectionCipher_Delete.sql" />
|
||||
<Build Include="dbo\Stored Procedures\CollectionCipher_ReadByOrganizationId.sql" />
|
||||
@@ -177,11 +153,6 @@
|
||||
<Build Include="dbo\Stored Procedures\Event_ReadPageByProviderId.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Event_ReadPageByProviderIdActingUserId.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Event_ReadPageByUserId.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Folder_Create.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Folder_DeleteById.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Folder_ReadById.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Folder_ReadByUserId.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Folder_Update.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Grant_Delete.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Grant_DeleteByKey.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Grant_DeleteExpired.sql" />
|
||||
@@ -262,6 +233,7 @@
|
||||
<Build Include="dbo\Stored Procedures\OrganizationUser_ReadCountByOnlyOwner.sql" />
|
||||
<Build Include="dbo\Stored Procedures\OrganizationUser_ReadCountByOrganizationId.sql" />
|
||||
<Build Include="dbo\Stored Procedures\OrganizationUser_ReadCountByOrganizationIdEmail.sql" />
|
||||
<Build Include="dbo\Stored Procedures\OrganizationUser_ReadOccupiedSeatCountByOrganizationId.sql" />
|
||||
<Build Include="dbo\Stored Procedures\OrganizationUser_ReadWithCollectionsById.sql" />
|
||||
<Build Include="dbo\Stored Procedures\OrganizationUser_SelectKnownEmails.sql" />
|
||||
<Build Include="dbo\Stored Procedures\OrganizationUser_Update.sql" />
|
||||
@@ -274,8 +246,10 @@
|
||||
<Build Include="dbo\Stored Procedures\Organization_ReadByEnabled.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Organization_ReadById.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Organization_ReadByIdentifier.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Organization_ReadByLicenseKey.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Organization_ReadByProviderId.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Organization_ReadByUserId.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Organization_ReadSelfHostedDetailsById.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Organization_Search.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Organization_Update.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Organization_UpdateStorage.sql" />
|
||||
@@ -378,7 +352,6 @@
|
||||
<Build Include="dbo\Stored Procedures\User_UpdateRenewalReminderDate.sql" />
|
||||
<Build Include="dbo\Stored Procedures\User_UpdateStorage.sql" />
|
||||
<Build Include="dbo\Tables\AuthRequest.sql" />
|
||||
<Build Include="dbo\Tables\Cipher.sql" />
|
||||
<Build Include="dbo\Tables\Collection.sql" />
|
||||
<Build Include="dbo\Tables\CollectionCipher.sql" />
|
||||
<Build Include="dbo\Tables\CollectionGroup.sql" />
|
||||
@@ -386,7 +359,6 @@
|
||||
<Build Include="dbo\Tables\Device.sql" />
|
||||
<Build Include="dbo\Tables\EmergencyAccess.sql" />
|
||||
<Build Include="dbo\Tables\Event.sql" />
|
||||
<Build Include="dbo\Tables\Folder.sql" />
|
||||
<Build Include="dbo\Tables\Grant.sql" />
|
||||
<Build Include="dbo\Tables\Group.sql" />
|
||||
<Build Include="dbo\Tables\GroupUser.sql" />
|
||||
@@ -414,12 +386,10 @@
|
||||
<Build Include="dbo\User Defined Types\SelectionReadOnlyArray.sql" />
|
||||
<Build Include="dbo\User Defined Types\TwoGuidIdArray.sql" />
|
||||
<Build Include="dbo\Views\AuthRequestView.sql" />
|
||||
<Build Include="dbo\Views\CipherView.sql" />
|
||||
<Build Include="dbo\Views\CollectionView.sql" />
|
||||
<Build Include="dbo\Views\DeviceView.sql" />
|
||||
<Build Include="dbo\Views\EmergencyAccessDetailsView.sql" />
|
||||
<Build Include="dbo\Views\EventView.sql" />
|
||||
<Build Include="dbo\Views\FolderView.sql" />
|
||||
<Build Include="dbo\Views\GrantView.sql" />
|
||||
<Build Include="dbo\Views\GroupView.sql" />
|
||||
<Build Include="dbo\Views\InstallationView.sql" />
|
||||
@@ -455,9 +425,46 @@
|
||||
<Build Include="SecretsManager\dbo\Tables\ServiceAccount.sql" />
|
||||
<Build Include="SecretsManager\dbo\Views\ApiKeyDetailsView.sql" />
|
||||
<Build Include="SecretsManager\dbo\Views\ApiKeyView.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Organization_ReadByLicenseKey.sql" />
|
||||
<Build Include="dbo\Stored Procedures\Organization_ReadSelfHostedDetailsById.sql" />
|
||||
<Build Include="dbo\Stored Procedures\OrganizationUser_ReadOccupiedSeatCountByOrganizationId.sql" />
|
||||
<Build Include="Vault\dbo\Functions\CipherDetails.sql" />
|
||||
<Build Include="Vault\dbo\Functions\UserCipherDetails.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\CipherDetails_Create.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\CipherDetails_CreateWithCollections.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\CipherDetails_ReadByIdUserId.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\CipherDetails_ReadByUserId.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\CipherDetails_ReadWithoutOrganizationsByUserId.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\CipherDetails_Update.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\CipherOrganizationDetails_ReadById.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\CipherOrganizationDetails_ReadByOrganizationId.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\Cipher_Create.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\Cipher_CreateWithCollections.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\Cipher_Delete.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\Cipher_DeleteAttachment.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\Cipher_DeleteById.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\Cipher_DeleteByIdsOrganizationId.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\Cipher_DeleteByOrganizationId.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\Cipher_DeleteByUserId.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\Cipher_DeleteDeleted.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\Cipher_Move.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\Cipher_ReadById.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\Cipher_ReadByOrganizationId.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\Cipher_ReadCanEditByIdUserId.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\Cipher_Restore.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\Cipher_SoftDelete.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\Cipher_SoftDeleteByIdsOrganizationId.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\Cipher_Update.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\Cipher_UpdateAttachment.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\Cipher_UpdateCollections.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\Cipher_UpdatePartial.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Cipher\Cipher_UpdateWithCollections.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Folder\Folder_Create.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Folder\Folder_DeleteById.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Folder\Folder_ReadById.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Folder\Folder_ReadByUserId.sql" />
|
||||
<Build Include="Vault\dbo\Stored Procedures\Folder\Folder_Update.sql" />
|
||||
<Build Include="Vault\dbo\Tables\Cipher.sql" />
|
||||
<Build Include="Vault\dbo\Tables\Folder.sql" />
|
||||
<Build Include="Vault\dbo\Views\CipherView.sql" />
|
||||
<Build Include="Vault\dbo\Views\FolderView.sql" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="dbo\Stored Procedures\OrganizationDomain_Create.sql" />
|
||||
|
||||
Reference in New Issue
Block a user