nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-01 16:12:49 -05:00
Code Activity

Merge branch 'master' into feature/flexible-collections

Browse Source
This commit is contained in:
Thomas Rittson
2023-09-26 10:40:26 +10:00
committed by GitHub
parent f2acf1c366 9db1007df6
commit 2c7d02dcbb
64 changed files with 7428 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/build.yml vendored
View File

@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- name: Install cloc - name: Install cloc
run: | run: |
@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- name: Set up dotnet - name: Set up dotnet
uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0 uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
@ -49,7 +49,7 @@ jobs:
NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
steps: steps:
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- name: Set up dotnet - name: Set up dotnet
uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0 uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
@ -135,7 +135,7 @@ jobs:
node: true node: true
steps: steps:
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- name: Set up dotnet - name: Set up dotnet
uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0 uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
@ -246,7 +246,7 @@ jobs:
dotnet: true dotnet: true
steps: steps:
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- name: Check Branch to Publish - name: Check Branch to Publish
env: env:
@ -337,7 +337,7 @@ jobs:
needs: build-docker needs: build-docker
steps: steps:
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- name: Set up dotnet - name: Set up dotnet
uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0 uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
@ -476,7 +476,7 @@ jobs:
- win-x64 - win-x64
steps: steps:
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- name: Set up dotnet - name: Set up dotnet
uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0 uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0

2
.github/workflows/cleanup-after-pr.yml vendored
View File

@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
########## ACR ########## ########## ACR ##########
- name: Login to Azure - QA Subscription - name: Login to Azure - QA Subscription

2
.github/workflows/database.yml vendored
View File

@ -25,7 +25,7 @@ jobs:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- name: Set up dotnet - name: Set up dotnet
uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0 uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0

2
.github/workflows/infrastructure-tests.yml vendored
View File

@ -38,7 +38,7 @@ jobs:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- name: Set up dotnet - name: Set up dotnet
uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0 uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0

2
.github/workflows/protect-files.yml vendored
View File

@ -30,7 +30,7 @@ jobs:
label: "DB-migrations-changed" label: "DB-migrations-changed"
steps: steps:
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
with: with:
fetch-depth: 2 fetch-depth: 2

4
.github/workflows/release.yml vendored
View File

@ -37,7 +37,7 @@ jobs:
fi fi
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- name: Check Release Version - name: Check Release Version
id: version id: version
@ -211,7 +211,7 @@ jobs:
echo "Github Release Option: $RELEASE_OPTION" echo "Github Release Option: $RELEASE_OPTION"
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- name: Setup project name - name: Setup project name
id: setup id: setup

2
.github/workflows/version-bump.yml vendored
View File

@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- name: Checkout Branch - name: Checkout Branch
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- name: Login to Azure - CI Subscription - name: Login to Azure - CI Subscription
uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7 uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7

4
NuGet.Config
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<!-- No configured package sources besides the default. -->
</configuration>

9
bitwarden_license/src/Commercial.Core/packages.lock.json
View File

@ -141,10 +141,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2433,7 +2434,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",

11
bitwarden_license/src/Commercial.Infrastructure.EntityFramework/packages.lock.json
View File

@ -159,10 +159,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2593,7 +2594,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -2627,7 +2628,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",

19
bitwarden_license/src/Scim/packages.lock.json
View File

@ -158,10 +158,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2597,7 +2598,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -2630,7 +2631,7 @@
"infrastructure.dapper": { "infrastructure.dapper": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )" "Dapper": "[2.0.123, )"
} }
}, },
@ -2638,7 +2639,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@ -2650,9 +2651,9 @@
"sharedweb": { "sharedweb": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.Dapper": "[2023.8.3, )", "Infrastructure.Dapper": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
} }
} }

19
bitwarden_license/src/Sso/packages.lock.json
View File

@ -183,10 +183,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2757,7 +2758,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -2790,7 +2791,7 @@
"infrastructure.dapper": { "infrastructure.dapper": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )" "Dapper": "[2.0.123, )"
} }
}, },
@ -2798,7 +2799,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@ -2810,9 +2811,9 @@
"sharedweb": { "sharedweb": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.Dapper": "[2023.8.3, )", "Infrastructure.Dapper": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
} }
} }

17
bitwarden_license/test/Commercial.Core.Test/packages.lock.json
View File

@ -201,10 +201,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2666,7 +2667,7 @@
"commercial.core": { "commercial.core": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )" "Core": "[2023.9.0, )"
} }
}, },
"common": { "common": {
@ -2674,7 +2675,7 @@
"dependencies": { "dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )", "NSubstitute": "[4.3.0, )",
@ -2693,7 +2694,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -2728,8 +2729,8 @@
"dependencies": { "dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )",
"Common": "[2023.8.3, )", "Common": "[2023.9.0, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )", "NSubstitute": "[4.3.0, )",

33
bitwarden_license/test/Scim.IntegrationTest/packages.lock.json
View File

@ -239,10 +239,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2988,7 +2989,7 @@
"dependencies": { "dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )", "NSubstitute": "[4.3.0, )",
@ -3007,7 +3008,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -3040,15 +3041,15 @@
"identity": { "identity": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"SharedWeb": "[2023.8.3, )", "SharedWeb": "[2023.9.0, )",
"Swashbuckle.AspNetCore.SwaggerGen": "[6.5.0, )" "Swashbuckle.AspNetCore.SwaggerGen": "[6.5.0, )"
} }
}, },
"infrastructure.dapper": { "infrastructure.dapper": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )" "Dapper": "[2.0.123, )"
} }
}, },
@ -3056,7 +3057,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@ -3068,8 +3069,8 @@
"integrationtestcommon": { "integrationtestcommon": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Common": "[2023.8.3, )", "Common": "[2023.9.0, )",
"Identity": "[2023.8.3, )", "Identity": "[2023.9.0, )",
"Microsoft.AspNetCore.Mvc.Testing": "[6.0.5, )", "Microsoft.AspNetCore.Mvc.Testing": "[6.0.5, )",
"Microsoft.EntityFrameworkCore.InMemory": "[7.0.5, )", "Microsoft.EntityFrameworkCore.InMemory": "[7.0.5, )",
"Microsoft.Extensions.Configuration": "[6.0.1, )" "Microsoft.Extensions.Configuration": "[6.0.1, )"
@ -3078,16 +3079,16 @@
"scim": { "scim": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"SharedWeb": "[2023.8.3, )" "SharedWeb": "[2023.9.0, )"
} }
}, },
"sharedweb": { "sharedweb": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.Dapper": "[2023.8.3, )", "Infrastructure.Dapper": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
} }
} }

25
bitwarden_license/test/Scim.Test/packages.lock.json
View File

@ -227,10 +227,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2833,7 +2834,7 @@
"dependencies": { "dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )", "NSubstitute": "[4.3.0, )",
@ -2852,7 +2853,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -2885,7 +2886,7 @@
"infrastructure.dapper": { "infrastructure.dapper": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )" "Dapper": "[2.0.123, )"
} }
}, },
@ -2893,7 +2894,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@ -2905,16 +2906,16 @@
"scim": { "scim": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"SharedWeb": "[2023.8.3, )" "SharedWeb": "[2023.9.0, )"
} }
}, },
"sharedweb": { "sharedweb": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.Dapper": "[2023.8.3, )", "Infrastructure.Dapper": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
} }
} }

9
perf/MicroBenchmarks/packages.lock.json
View File

@ -166,10 +166,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2540,7 +2541,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",

17
src/Admin/Controllers/OrganizationsController.cs
View File

@ -19,6 +19,7 @@ using Bit.Core.Utilities;
using Bit.Core.Vault.Repositories; using Bit.Core.Vault.Repositories;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Stripe;
namespace Bit.Admin.Controllers; namespace Bit.Admin.Controllers;
@ -47,6 +48,7 @@ public class OrganizationsController : Controller
private readonly ISecretRepository _secretRepository; private readonly ISecretRepository _secretRepository;
private readonly IProjectRepository _projectRepository; private readonly IProjectRepository _projectRepository;
private readonly IServiceAccountRepository _serviceAccountRepository; private readonly IServiceAccountRepository _serviceAccountRepository;
private readonly IStripeSyncService _stripeSyncService;
public OrganizationsController( public OrganizationsController(
IOrganizationService organizationService, IOrganizationService organizationService,
@ -70,7 +72,8 @@ public class OrganizationsController : Controller
ICurrentContext currentContext, ICurrentContext currentContext,
ISecretRepository secretRepository, ISecretRepository secretRepository,
IProjectRepository projectRepository, IProjectRepository projectRepository,
IServiceAccountRepository serviceAccountRepository) IServiceAccountRepository serviceAccountRepository,
IStripeSyncService stripeSyncService)
{ {
_organizationService = organizationService; _organizationService = organizationService;
_organizationRepository = organizationRepository; _organizationRepository = organizationRepository;
@ -94,6 +97,7 @@ public class OrganizationsController : Controller
_secretRepository = secretRepository; _secretRepository = secretRepository;
_projectRepository = projectRepository; _projectRepository = projectRepository;
_serviceAccountRepository = serviceAccountRepository; _serviceAccountRepository = serviceAccountRepository;
_stripeSyncService = stripeSyncService;
} }
[RequirePermission(Permission.Org_List_View)] [RequirePermission(Permission.Org_List_View)]
@ -208,6 +212,16 @@ public class OrganizationsController : Controller
throw new BadRequestException("Plan does not support Secrets Manager"); throw new BadRequestException("Plan does not support Secrets Manager");
} }
try
{
await _stripeSyncService.UpdateCustomerEmailAddress(organization.GatewayCustomerId, organization.BillingEmail);
}
catch (StripeException stripeException)
{
_logger.LogError(stripeException, "Failed to update billing email address in Stripe for Organization with ID '{organizationId}'", organization.Id);
throw;
}
await _organizationRepository.ReplaceAsync(organization); await _organizationRepository.ReplaceAsync(organization);
await _applicationCacheService.UpsertOrganizationAbilityAsync(organization); await _applicationCacheService.UpsertOrganizationAbilityAsync(organization);
await _referenceEventService.RaiseEventAsync(new ReferenceEvent(ReferenceEventType.OrganizationEditedByAdmin, organization, _currentContext) await _referenceEventService.RaiseEventAsync(new ReferenceEvent(ReferenceEventType.OrganizationEditedByAdmin, organization, _currentContext)
@ -215,6 +229,7 @@ public class OrganizationsController : Controller
EventRaisedByUser = _userService.GetUserName(User), EventRaisedByUser = _userService.GetUserName(User),
SalesAssistedTrialStarted = model.SalesAssistedTrialStarted, SalesAssistedTrialStarted = model.SalesAssistedTrialStarted,
}); });
return RedirectToAction("Edit", new { id }); return RedirectToAction("Edit", new { id });
} }

8
src/Admin/Views/Shared/_OrganizationForm.cshtml
View File

@ -277,7 +277,13 @@
} }
else else
{ {
<input type="email" class="form-control" asp-for="BillingEmail" readonly='@(!canEditBilling)'> <input
type="text"
class="form-control"
asp-for="BillingEmail"
readonly='@(!canEditBilling)'
pattern="@(@"[^@\s]+@[^@\s]+\.[^@\s]+")"
title="Email address must be in the format 'address@domain.com'.">
} }
</div> </div>
</div> </div>

39
src/Admin/packages.lock.json
View File

@ -178,10 +178,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2791,15 +2792,15 @@
"commercial.core": { "commercial.core": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )" "Core": "[2023.9.0, )"
} }
}, },
"commercial.infrastructure.entityframework": { "commercial.infrastructure.entityframework": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
}, },
"core": { "core": {
@ -2814,7 +2815,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -2847,7 +2848,7 @@
"infrastructure.dapper": { "infrastructure.dapper": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )" "Dapper": "[2.0.123, )"
} }
}, },
@ -2855,7 +2856,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@ -2867,7 +2868,7 @@
"migrator": { "migrator": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.Extensions.Logging": "[6.0.0, )", "Microsoft.Extensions.Logging": "[6.0.0, )",
"dbup-sqlserver": "[5.0.8, )" "dbup-sqlserver": "[5.0.8, )"
} }
@ -2875,30 +2876,30 @@
"mysqlmigrations": { "mysqlmigrations": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
}, },
"postgresmigrations": { "postgresmigrations": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
}, },
"sharedweb": { "sharedweb": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.Dapper": "[2023.8.3, )", "Infrastructure.Dapper": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
}, },
"sqlitemigrations": { "sqlitemigrations": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
} }
} }

25
src/Api/packages.lock.json
View File

@ -281,10 +281,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2771,15 +2772,15 @@
"commercial.core": { "commercial.core": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )" "Core": "[2023.9.0, )"
} }
}, },
"commercial.infrastructure.entityframework": { "commercial.infrastructure.entityframework": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
}, },
"core": { "core": {
@ -2794,7 +2795,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -2827,7 +2828,7 @@
"infrastructure.dapper": { "infrastructure.dapper": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )" "Dapper": "[2.0.123, )"
} }
}, },
@ -2835,7 +2836,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@ -2847,9 +2848,9 @@
"sharedweb": { "sharedweb": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.Dapper": "[2023.8.3, )", "Infrastructure.Dapper": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
} }
} }

19
src/Billing/packages.lock.json
View File

@ -158,10 +158,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2597,7 +2598,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -2630,7 +2631,7 @@
"infrastructure.dapper": { "infrastructure.dapper": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )" "Dapper": "[2.0.123, )"
} }
}, },
@ -2638,7 +2639,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@ -2650,9 +2651,9 @@
"sharedweb": { "sharedweb": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.Dapper": "[2023.8.3, )", "Infrastructure.Dapper": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
} }
} }

2
src/Core/Constants.cs
View File

@ -36,8 +36,8 @@ public static class FeatureFlagKeys
public const string DisplayEuEnvironment = "display-eu-environment"; public const string DisplayEuEnvironment = "display-eu-environment";
public const string DisplayLowKdfIterationWarning = "display-kdf-iteration-warning"; public const string DisplayLowKdfIterationWarning = "display-kdf-iteration-warning";
public const string TrustedDeviceEncryption = "trusted-device-encryption"; public const string TrustedDeviceEncryption = "trusted-device-encryption";
public const string SecretsManagerBilling = "sm-ga-billing";
public const string AutofillV2 = "autofill-v2"; public const string AutofillV2 = "autofill-v2";
public const string BrowserFilelessImport = "browser-fileless-import";
public static List<string> GetAllKeys() public static List<string> GetAllKeys()
{ {

2
src/Core/Core.csproj
View File

@ -51,7 +51,7 @@
<PackageReference Include="Serilog.Sinks.AzureCosmosDB" Version="2.0.0" /> <PackageReference Include="Serilog.Sinks.AzureCosmosDB" Version="2.0.0" />
<PackageReference Include="Serilog.Sinks.SyslogMessages" Version="2.0.6" /> <PackageReference Include="Serilog.Sinks.SyslogMessages" Version="2.0.6" />
<PackageReference Include="AspNetCoreRateLimit" Version="4.0.2" /> <PackageReference Include="AspNetCoreRateLimit" Version="4.0.2" />
<PackageReference Include="Braintree" Version="5.12.0" /> <PackageReference Include="Braintree" Version="5.19.0" />
<PackageReference Include="Stripe.net" Version="40.0.0" /> <PackageReference Include="Stripe.net" Version="40.0.0" />
<PackageReference Include="Otp.NET" Version="1.2.2" /> <PackageReference Include="Otp.NET" Version="1.2.2" />
<PackageReference Include="YubicoDotNetClient" Version="1.2.0" /> <PackageReference Include="YubicoDotNetClient" Version="1.2.0" />

2
src/Core/Services/Implementations/LaunchDarklyFeatureService.cs
View File

@ -1,5 +1,6 @@
using Bit.Core.Context; using Bit.Core.Context;
using Bit.Core.Settings; using Bit.Core.Settings;
using LaunchDarkly.Logging;
using LaunchDarkly.Sdk.Server; using LaunchDarkly.Sdk.Server;
using LaunchDarkly.Sdk.Server.Integrations; using LaunchDarkly.Sdk.Server.Integrations;
@ -14,6 +15,7 @@ public class LaunchDarklyFeatureService : IFeatureService, IDisposable
IGlobalSettings globalSettings) IGlobalSettings globalSettings)
{ {
var ldConfig = Configuration.Builder(globalSettings.LaunchDarkly?.SdkKey); var ldConfig = Configuration.Builder(globalSettings.LaunchDarkly?.SdkKey);
ldConfig.Logging(Components.Logging().Level(LogLevel.Error));
if (string.IsNullOrEmpty(globalSettings.LaunchDarkly?.SdkKey)) if (string.IsNullOrEmpty(globalSettings.LaunchDarkly?.SdkKey))
{ {

9
src/Core/packages.lock.json
View File

@ -98,11 +98,12 @@
}, },
"Braintree": { "Braintree": {
"type": "Direct", "type": "Direct",
"requested": "[5.12.0, )", "requested": "[5.19.0, )",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },

19
src/Events/packages.lock.json
View File

@ -158,10 +158,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2597,7 +2598,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -2630,7 +2631,7 @@
"infrastructure.dapper": { "infrastructure.dapper": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )" "Dapper": "[2.0.123, )"
} }
}, },
@ -2638,7 +2639,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@ -2650,9 +2651,9 @@
"sharedweb": { "sharedweb": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.Dapper": "[2023.8.3, )", "Infrastructure.Dapper": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
} }
} }

19
src/EventsProcessor/packages.lock.json
View File

@ -158,10 +158,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2597,7 +2598,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -2630,7 +2631,7 @@
"infrastructure.dapper": { "infrastructure.dapper": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )" "Dapper": "[2.0.123, )"
} }
}, },
@ -2638,7 +2639,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@ -2650,9 +2651,9 @@
"sharedweb": { "sharedweb": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.Dapper": "[2023.8.3, )", "Infrastructure.Dapper": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
} }
} }

19
src/Icons/packages.lock.json
View File

@ -167,10 +167,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2606,7 +2607,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -2639,7 +2640,7 @@
"infrastructure.dapper": { "infrastructure.dapper": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )" "Dapper": "[2.0.123, )"
} }
}, },
@ -2647,7 +2648,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@ -2659,9 +2660,9 @@
"sharedweb": { "sharedweb": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.Dapper": "[2023.8.3, )", "Infrastructure.Dapper": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
} }
} }

19
src/Identity/packages.lock.json
View File

@ -167,10 +167,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2619,7 +2620,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -2652,7 +2653,7 @@
"infrastructure.dapper": { "infrastructure.dapper": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )" "Dapper": "[2.0.123, )"
} }
}, },
@ -2660,7 +2661,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@ -2672,9 +2673,9 @@
"sharedweb": { "sharedweb": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.Dapper": "[2023.8.3, )", "Infrastructure.Dapper": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
} }
} }

9
src/Infrastructure.Dapper/packages.lock.json
View File

@ -147,10 +147,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2439,7 +2440,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",

49
src/Infrastructure.EntityFramework/Repositories/OrganizationRepository.cs
View File

@ -144,27 +144,42 @@ public class OrganizationRepository : Repository<Core.Entities.Organization, Org
var dbContext = GetDatabaseContext(scope); var dbContext = GetDatabaseContext(scope);
await dbContext.UserBumpAccountRevisionDateByOrganizationIdAsync(organization.Id); await dbContext.UserBumpAccountRevisionDateByOrganizationIdAsync(organization.Id);
var deleteCiphersTransaction = await dbContext.Database.BeginTransactionAsync(); var deleteCiphersTransaction = await dbContext.Database.BeginTransactionAsync();
dbContext.Ciphers.RemoveRange( await dbContext.Ciphers.Where(c => c.UserId == null && c.OrganizationId == organization.Id)
dbContext.Ciphers.Where(c => c.UserId == null && c.OrganizationId == organization.Id)); .ExecuteDeleteAsync();
await deleteCiphersTransaction.CommitAsync(); await deleteCiphersTransaction.CommitAsync();
var organizationDeleteTransaction = await dbContext.Database.BeginTransactionAsync(); var organizationDeleteTransaction = await dbContext.Database.BeginTransactionAsync();
dbContext.SsoUsers.RemoveRange(dbContext.SsoUsers.Where(su => su.OrganizationId == organization.Id)); await dbContext.SsoUsers.Where(su => su.OrganizationId == organization.Id)
dbContext.SsoConfigs.RemoveRange(dbContext.SsoConfigs.Where(sc => sc.OrganizationId == organization.Id)); .ExecuteDeleteAsync();
var collectionUsers = from cu in dbContext.CollectionUsers await dbContext.SsoConfigs.Where(sc => sc.OrganizationId == organization.Id)
join ou in dbContext.OrganizationUsers on cu.OrganizationUserId equals ou.Id .ExecuteDeleteAsync();
where ou.OrganizationId == organization.Id await dbContext.CollectionUsers.Where(cu => cu.OrganizationUser.OrganizationId == organization.Id)
select cu; .ExecuteDeleteAsync();
dbContext.CollectionUsers.RemoveRange(collectionUsers); await dbContext.UserProjectAccessPolicy.Where(ap => ap.OrganizationUser.OrganizationId == organization.Id)
dbContext.OrganizationUsers.RemoveRange( .ExecuteDeleteAsync();
dbContext.OrganizationUsers.Where(ou => ou.OrganizationId == organization.Id)); await dbContext.UserServiceAccountAccessPolicy.Where(ap => ap.OrganizationUser.OrganizationId == organization.Id)
dbContext.ProviderOrganizations.RemoveRange( .ExecuteDeleteAsync();
dbContext.ProviderOrganizations.Where(po => po.OrganizationId == organization.Id)); await dbContext.OrganizationUsers.Where(ou => ou.OrganizationId == organization.Id)
.ExecuteDeleteAsync();
await dbContext.ProviderOrganizations.Where(po => po.OrganizationId == organization.Id)
.ExecuteDeleteAsync();
await dbContext.GroupServiceAccountAccessPolicy.Where(ap => ap.GrantedServiceAccount.OrganizationId == organization.Id)
.ExecuteDeleteAsync();
await dbContext.Project.Where(p => p.OrganizationId == organization.Id)
.ExecuteDeleteAsync();
await dbContext.Secret.Where(s => s.OrganizationId == organization.Id)
.ExecuteDeleteAsync();
await dbContext.ApiKeys.Where(ak => ak.ServiceAccount.OrganizationId == organization.Id)
.ExecuteDeleteAsync();
await dbContext.ServiceAccount.Where(sa => sa.OrganizationId == organization.Id)
.ExecuteDeleteAsync();
// The below section are 3 SPROCS in SQL Server but are only called by here // The below section are 3 SPROCS in SQL Server but are only called by here
dbContext.OrganizationApiKeys.RemoveRange( await dbContext.OrganizationApiKeys.Where(oa => oa.OrganizationId == organization.Id)
dbContext.OrganizationApiKeys.Where(oa => oa.OrganizationId == organization.Id)); .ExecuteDeleteAsync();
dbContext.OrganizationConnections.RemoveRange( await dbContext.OrganizationConnections.Where(oc => oc.OrganizationId == organization.Id)
dbContext.OrganizationConnections.Where(oc => oc.OrganizationId == organization.Id)); .ExecuteDeleteAsync();
var sponsoringOrgs = await dbContext.OrganizationSponsorships var sponsoringOrgs = await dbContext.OrganizationSponsorships
.Where(os => os.SponsoringOrganizationId == organization.Id) .Where(os => os.SponsoringOrganizationId == organization.Id)
.ToListAsync(); .ToListAsync();

7
src/Infrastructure.EntityFramework/Repositories/OrganizationUserRepository.cs
View File

@ -94,6 +94,11 @@ public class OrganizationUserRepository : Repository<Core.Entities.OrganizationU
.Where(gu => gu.OrganizationUserId == organizationUserId); .Where(gu => gu.OrganizationUserId == organizationUserId);
dbContext.GroupUsers.RemoveRange(groupUsers); dbContext.GroupUsers.RemoveRange(groupUsers);
dbContext.UserProjectAccessPolicy.RemoveRange(
dbContext.UserProjectAccessPolicy.Where(ap => ap.OrganizationUserId == organizationUserId));
dbContext.UserServiceAccountAccessPolicy.RemoveRange(
dbContext.UserServiceAccountAccessPolicy.Where(ap => ap.OrganizationUserId == organizationUserId));
var orgSponsorships = await dbContext.OrganizationSponsorships var orgSponsorships = await dbContext.OrganizationSponsorships
.Where(os => os.SponsoringOrganizationUserId == organizationUserId) .Where(os => os.SponsoringOrganizationUserId == organizationUserId)
.ToListAsync(); .ToListAsync();
@ -328,7 +333,7 @@ public class OrganizationUserRepository : Repository<Core.Entities.OrganizationU
var userIds = users.Select(u => u.Id); var userIds = users.Select(u => u.Id);
var userIdEntities = dbContext.OrganizationUsers.Where(x => userIds.Contains(x.Id)); var userIdEntities = dbContext.OrganizationUsers.Where(x => userIds.Contains(x.Id));
// Query groups/collections separately to avoid cartesian explosion // Query groups/collections separately to avoid cartesian explosion
if (includeGroups) if (includeGroups)
{ {
groups = (await (from gu in dbContext.GroupUsers groups = (await (from gu in dbContext.GroupUsers

4
src/Infrastructure.EntityFramework/Repositories/UserRepository.cs
View File

@ -167,6 +167,10 @@ public class UserRepository : Repository<Core.Entities.User, User, Guid>, IUserR
where ou.UserId == user.Id where ou.UserId == user.Id
select gu; select gu;
dbContext.GroupUsers.RemoveRange(groupUsers); dbContext.GroupUsers.RemoveRange(groupUsers);
dbContext.UserProjectAccessPolicy.RemoveRange(
dbContext.UserProjectAccessPolicy.Where(ap => ap.OrganizationUser.UserId == user.Id));
dbContext.UserServiceAccountAccessPolicy.RemoveRange(
dbContext.UserServiceAccountAccessPolicy.Where(ap => ap.OrganizationUser.UserId == user.Id));
dbContext.OrganizationUsers.RemoveRange(dbContext.OrganizationUsers.Where(ou => ou.UserId == user.Id)); dbContext.OrganizationUsers.RemoveRange(dbContext.OrganizationUsers.Where(ou => ou.UserId == user.Id));
dbContext.ProviderUsers.RemoveRange(dbContext.ProviderUsers.Where(pu => pu.UserId == user.Id)); dbContext.ProviderUsers.RemoveRange(dbContext.ProviderUsers.Where(pu => pu.UserId == user.Id));
dbContext.SsoUsers.RemoveRange(dbContext.SsoUsers.Where(su => su.UserId == user.Id)); dbContext.SsoUsers.RemoveRange(dbContext.SsoUsers.Where(su => su.UserId == user.Id));

30
src/Infrastructure.EntityFramework/SecretsManager/Configurations/AccessPolicyEntityTypeConfiguration.cs
View File

@ -39,6 +39,12 @@ public class UserProjectAccessPolicyEntityTypeConfiguration : IEntityTypeConfigu
builder builder
.Property(e => e.GrantedProjectId) .Property(e => e.GrantedProjectId)
.HasColumnName(nameof(UserProjectAccessPolicy.GrantedProjectId)); .HasColumnName(nameof(UserProjectAccessPolicy.GrantedProjectId));
builder
.HasOne(e => e.GrantedProject)
.WithMany(e => e.UserAccessPolicies)
.HasForeignKey(nameof(UserProjectAccessPolicy.GrantedProjectId))
.OnDelete(DeleteBehavior.Cascade);
} }
} }
@ -67,6 +73,18 @@ public class GroupProjectAccessPolicyEntityTypeConfiguration : IEntityTypeConfig
builder builder
.Property(e => e.GrantedProjectId) .Property(e => e.GrantedProjectId)
.HasColumnName(nameof(GroupProjectAccessPolicy.GrantedProjectId)); .HasColumnName(nameof(GroupProjectAccessPolicy.GrantedProjectId));
builder
.HasOne(e => e.GrantedProject)
.WithMany(e => e.GroupAccessPolicies)
.HasForeignKey(nameof(GroupProjectAccessPolicy.GrantedProjectId))
.OnDelete(DeleteBehavior.Cascade);
builder
.HasOne(e => e.Group)
.WithMany()
.HasForeignKey(nameof(GroupProjectAccessPolicy.GroupId))
.OnDelete(DeleteBehavior.Cascade);
} }
} }
@ -81,6 +99,12 @@ public class GroupServiceAccountAccessPolicyEntityTypeConfiguration : IEntityTyp
builder builder
.Property(e => e.GrantedServiceAccountId) .Property(e => e.GrantedServiceAccountId)
.HasColumnName(nameof(GroupServiceAccountAccessPolicy.GrantedServiceAccountId)); .HasColumnName(nameof(GroupServiceAccountAccessPolicy.GrantedServiceAccountId));
builder
.HasOne(e => e.Group)
.WithMany()
.HasForeignKey(nameof(GroupProjectAccessPolicy.GroupId))
.OnDelete(DeleteBehavior.Cascade);
} }
} }
@ -95,5 +119,11 @@ public class ServiceAccountProjectAccessPolicyEntityTypeConfiguration : IEntityT
builder builder
.Property(e => e.GrantedProjectId) .Property(e => e.GrantedProjectId)
.HasColumnName(nameof(ServiceAccountProjectAccessPolicy.GrantedProjectId)); .HasColumnName(nameof(ServiceAccountProjectAccessPolicy.GrantedProjectId));
builder
.HasOne(e => e.GrantedProject)
.WithMany(e => e.ServiceAccountAccessPolicies)
.HasForeignKey(nameof(ServiceAccountProjectAccessPolicy.GrantedProjectId))
.OnDelete(DeleteBehavior.Cascade);
} }
} }

9
src/Infrastructure.EntityFramework/packages.lock.json
View File

@ -221,10 +221,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2599,7 +2600,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",

19
src/Notifications/packages.lock.json
View File

@ -179,10 +179,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2647,7 +2648,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -2680,7 +2681,7 @@
"infrastructure.dapper": { "infrastructure.dapper": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )" "Dapper": "[2.0.123, )"
} }
}, },
@ -2688,7 +2689,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@ -2700,9 +2701,9 @@
"sharedweb": { "sharedweb": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.Dapper": "[2023.8.3, )", "Infrastructure.Dapper": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
} }
} }

13
src/SharedWeb/packages.lock.json
View File

@ -158,10 +158,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2597,7 +2598,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -2630,7 +2631,7 @@
"infrastructure.dapper": { "infrastructure.dapper": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )" "Dapper": "[2.0.123, )"
} }
}, },
@ -2638,7 +2639,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",

43
test/Api.IntegrationTest/packages.lock.json
View File

@ -321,10 +321,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -3145,25 +3146,25 @@
"AspNetCore.HealthChecks.SqlServer": "[6.0.2, )", "AspNetCore.HealthChecks.SqlServer": "[6.0.2, )",
"AspNetCore.HealthChecks.Uris": "[6.0.3, )", "AspNetCore.HealthChecks.Uris": "[6.0.3, )",
"Azure.Messaging.EventGrid": "[4.10.0, )", "Azure.Messaging.EventGrid": "[4.10.0, )",
"Commercial.Core": "[2023.8.3, )", "Commercial.Core": "[2023.9.0, )",
"Commercial.Infrastructure.EntityFramework": "[2023.8.3, )", "Commercial.Infrastructure.EntityFramework": "[2023.9.0, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"SharedWeb": "[2023.8.3, )", "SharedWeb": "[2023.9.0, )",
"Swashbuckle.AspNetCore": "[6.5.0, )" "Swashbuckle.AspNetCore": "[6.5.0, )"
} }
}, },
"commercial.core": { "commercial.core": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )" "Core": "[2023.9.0, )"
} }
}, },
"commercial.infrastructure.entityframework": { "commercial.infrastructure.entityframework": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
}, },
"common": { "common": {
@ -3171,7 +3172,7 @@
"dependencies": { "dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )", "NSubstitute": "[4.3.0, )",
@ -3190,7 +3191,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -3223,15 +3224,15 @@
"identity": { "identity": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"SharedWeb": "[2023.8.3, )", "SharedWeb": "[2023.9.0, )",
"Swashbuckle.AspNetCore.SwaggerGen": "[6.5.0, )" "Swashbuckle.AspNetCore.SwaggerGen": "[6.5.0, )"
} }
}, },
"infrastructure.dapper": { "infrastructure.dapper": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )" "Dapper": "[2.0.123, )"
} }
}, },
@ -3239,7 +3240,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@ -3251,8 +3252,8 @@
"integrationtestcommon": { "integrationtestcommon": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Common": "[2023.8.3, )", "Common": "[2023.9.0, )",
"Identity": "[2023.8.3, )", "Identity": "[2023.9.0, )",
"Microsoft.AspNetCore.Mvc.Testing": "[6.0.5, )", "Microsoft.AspNetCore.Mvc.Testing": "[6.0.5, )",
"Microsoft.EntityFrameworkCore.InMemory": "[7.0.5, )", "Microsoft.EntityFrameworkCore.InMemory": "[7.0.5, )",
"Microsoft.Extensions.Configuration": "[6.0.1, )" "Microsoft.Extensions.Configuration": "[6.0.1, )"
@ -3261,9 +3262,9 @@
"sharedweb": { "sharedweb": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.Dapper": "[2023.8.3, )", "Infrastructure.Dapper": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
} }
} }

39
test/Api.Test/packages.lock.json
View File

@ -331,10 +331,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -3014,25 +3015,25 @@
"AspNetCore.HealthChecks.SqlServer": "[6.0.2, )", "AspNetCore.HealthChecks.SqlServer": "[6.0.2, )",
"AspNetCore.HealthChecks.Uris": "[6.0.3, )", "AspNetCore.HealthChecks.Uris": "[6.0.3, )",
"Azure.Messaging.EventGrid": "[4.10.0, )", "Azure.Messaging.EventGrid": "[4.10.0, )",
"Commercial.Core": "[2023.8.3, )", "Commercial.Core": "[2023.9.0, )",
"Commercial.Infrastructure.EntityFramework": "[2023.8.3, )", "Commercial.Infrastructure.EntityFramework": "[2023.9.0, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"SharedWeb": "[2023.8.3, )", "SharedWeb": "[2023.9.0, )",
"Swashbuckle.AspNetCore": "[6.5.0, )" "Swashbuckle.AspNetCore": "[6.5.0, )"
} }
}, },
"commercial.core": { "commercial.core": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )" "Core": "[2023.9.0, )"
} }
}, },
"commercial.infrastructure.entityframework": { "commercial.infrastructure.entityframework": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
}, },
"common": { "common": {
@ -3040,7 +3041,7 @@
"dependencies": { "dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )", "NSubstitute": "[4.3.0, )",
@ -3059,7 +3060,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -3094,8 +3095,8 @@
"dependencies": { "dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )",
"Common": "[2023.8.3, )", "Common": "[2023.9.0, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )", "NSubstitute": "[4.3.0, )",
@ -3105,7 +3106,7 @@
"infrastructure.dapper": { "infrastructure.dapper": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )" "Dapper": "[2.0.123, )"
} }
}, },
@ -3113,7 +3114,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@ -3125,9 +3126,9 @@
"sharedweb": { "sharedweb": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.Dapper": "[2023.8.3, )", "Infrastructure.Dapper": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
} }
} }

25
test/Billing.Test/packages.lock.json
View File

@ -228,10 +228,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2832,8 +2833,8 @@
"billing": { "billing": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"SharedWeb": "[2023.8.3, )" "SharedWeb": "[2023.9.0, )"
} }
}, },
"common": { "common": {
@ -2841,7 +2842,7 @@
"dependencies": { "dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )", "NSubstitute": "[4.3.0, )",
@ -2860,7 +2861,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -2893,7 +2894,7 @@
"infrastructure.dapper": { "infrastructure.dapper": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )" "Dapper": "[2.0.123, )"
} }
}, },
@ -2901,7 +2902,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@ -2913,9 +2914,9 @@
"sharedweb": { "sharedweb": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.Dapper": "[2023.8.3, )", "Infrastructure.Dapper": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
} }
} }

9
test/Common/packages.lock.json
View File

@ -216,10 +216,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2673,7 +2674,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",

11
test/Core.Test/packages.lock.json
View File

@ -222,10 +222,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2672,7 +2673,7 @@
"dependencies": { "dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )", "NSubstitute": "[4.3.0, )",
@ -2691,7 +2692,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",

25
test/Icons.Test/packages.lock.json
View File

@ -235,10 +235,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2841,7 +2842,7 @@
"dependencies": { "dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )", "NSubstitute": "[4.3.0, )",
@ -2860,7 +2861,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -2894,14 +2895,14 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AngleSharp": "[1.0.4, )", "AngleSharp": "[1.0.4, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"SharedWeb": "[2023.8.3, )" "SharedWeb": "[2023.9.0, )"
} }
}, },
"infrastructure.dapper": { "infrastructure.dapper": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )" "Dapper": "[2.0.123, )"
} }
}, },
@ -2909,7 +2910,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@ -2921,9 +2922,9 @@
"sharedweb": { "sharedweb": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.Dapper": "[2023.8.3, )", "Infrastructure.Dapper": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
} }
} }

29
test/Identity.IntegrationTest/packages.lock.json
View File

@ -239,10 +239,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2988,7 +2989,7 @@
"dependencies": { "dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )", "NSubstitute": "[4.3.0, )",
@ -3007,7 +3008,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -3040,15 +3041,15 @@
"identity": { "identity": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"SharedWeb": "[2023.8.3, )", "SharedWeb": "[2023.9.0, )",
"Swashbuckle.AspNetCore.SwaggerGen": "[6.5.0, )" "Swashbuckle.AspNetCore.SwaggerGen": "[6.5.0, )"
} }
}, },
"infrastructure.dapper": { "infrastructure.dapper": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )" "Dapper": "[2.0.123, )"
} }
}, },
@ -3056,7 +3057,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@ -3068,8 +3069,8 @@
"integrationtestcommon": { "integrationtestcommon": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Common": "[2023.8.3, )", "Common": "[2023.9.0, )",
"Identity": "[2023.8.3, )", "Identity": "[2023.9.0, )",
"Microsoft.AspNetCore.Mvc.Testing": "[6.0.5, )", "Microsoft.AspNetCore.Mvc.Testing": "[6.0.5, )",
"Microsoft.EntityFrameworkCore.InMemory": "[7.0.5, )", "Microsoft.EntityFrameworkCore.InMemory": "[7.0.5, )",
"Microsoft.Extensions.Configuration": "[6.0.1, )" "Microsoft.Extensions.Configuration": "[6.0.1, )"
@ -3078,9 +3079,9 @@
"sharedweb": { "sharedweb": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.Dapper": "[2023.8.3, )", "Infrastructure.Dapper": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
} }
} }

25
test/Identity.Test/packages.lock.json
View File

@ -228,10 +228,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2855,7 +2856,7 @@
"dependencies": { "dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )", "NSubstitute": "[4.3.0, )",
@ -2874,7 +2875,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -2907,15 +2908,15 @@
"identity": { "identity": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"SharedWeb": "[2023.8.3, )", "SharedWeb": "[2023.9.0, )",
"Swashbuckle.AspNetCore.SwaggerGen": "[6.5.0, )" "Swashbuckle.AspNetCore.SwaggerGen": "[6.5.0, )"
} }
}, },
"infrastructure.dapper": { "infrastructure.dapper": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )" "Dapper": "[2.0.123, )"
} }
}, },
@ -2923,7 +2924,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@ -2935,9 +2936,9 @@
"sharedweb": { "sharedweb": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.Dapper": "[2023.8.3, )", "Infrastructure.Dapper": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
} }
} }

19
test/Infrastructure.EFIntegration.Test/packages.lock.json
View File

@ -229,10 +229,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2835,7 +2836,7 @@
"dependencies": { "dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )", "NSubstitute": "[4.3.0, )",
@ -2854,7 +2855,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -2889,8 +2890,8 @@
"dependencies": { "dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )",
"Common": "[2023.8.3, )", "Common": "[2023.9.0, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )", "NSubstitute": "[4.3.0, )",
@ -2900,7 +2901,7 @@
"infrastructure.dapper": { "infrastructure.dapper": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )" "Dapper": "[2.0.123, )"
} }
}, },
@ -2908,7 +2909,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",

13
test/Infrastructure.IntegrationTest/packages.lock.json
View File

@ -228,10 +228,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2712,7 +2713,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -2745,7 +2746,7 @@
"infrastructure.dapper": { "infrastructure.dapper": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )" "Dapper": "[2.0.123, )"
} }
}, },
@ -2753,7 +2754,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",

25
test/IntegrationTestCommon/packages.lock.json
View File

@ -215,10 +215,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2974,7 +2975,7 @@
"dependencies": { "dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )", "NSubstitute": "[4.3.0, )",
@ -2993,7 +2994,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -3026,15 +3027,15 @@
"identity": { "identity": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"SharedWeb": "[2023.8.3, )", "SharedWeb": "[2023.9.0, )",
"Swashbuckle.AspNetCore.SwaggerGen": "[6.5.0, )" "Swashbuckle.AspNetCore.SwaggerGen": "[6.5.0, )"
} }
}, },
"infrastructure.dapper": { "infrastructure.dapper": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )" "Dapper": "[2.0.123, )"
} }
}, },
@ -3042,7 +3043,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@ -3054,9 +3055,9 @@
"sharedweb": { "sharedweb": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.Dapper": "[2023.8.3, )", "Infrastructure.Dapper": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
} }
} }

9
util/Migrator/packages.lock.json
View File

@ -165,10 +165,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2637,7 +2638,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",

11
util/MsSqlMigratorUtility/packages.lock.json
View File

@ -168,10 +168,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2666,7 +2667,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -2699,7 +2700,7 @@
"migrator": { "migrator": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.Extensions.Logging": "[6.0.0, )", "Microsoft.Extensions.Logging": "[6.0.0, )",
"dbup-sqlserver": "[5.0.8, )" "dbup-sqlserver": "[5.0.8, )"
} }

2236
util/MySqlMigrations/Migrations/20230824202452_ACCESSPOLICY_ADD_DELETE_CASCADE.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

63
util/MySqlMigrations/Migrations/20230824202452_ACCESSPOLICY_ADD_DELETE_CASCADE.cs Normal file
View File

@ -0,0 +1,63 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Bit.MySqlMigrations.Migrations;
/// <inheritdoc />
public partial class ACCESSPOLICY_ADD_DELETE_CASCADE : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_AccessPolicy_Group_GroupId",
table: "AccessPolicy");
migrationBuilder.DropForeignKey(
name: "FK_AccessPolicy_Project_GrantedProjectId",
table: "AccessPolicy");
migrationBuilder.AddForeignKey(
name: "FK_AccessPolicy_Group_GroupId",
table: "AccessPolicy",
column: "GroupId",
principalTable: "Group",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
migrationBuilder.AddForeignKey(
name: "FK_AccessPolicy_Project_GrantedProjectId",
table: "AccessPolicy",
column: "GrantedProjectId",
principalTable: "Project",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_AccessPolicy_Group_GroupId",
table: "AccessPolicy");
migrationBuilder.DropForeignKey(
name: "FK_AccessPolicy_Project_GrantedProjectId",
table: "AccessPolicy");
migrationBuilder.AddForeignKey(
name: "FK_AccessPolicy_Group_GroupId",
table: "AccessPolicy",
column: "GroupId",
principalTable: "Group",
principalColumn: "Id");
migrationBuilder.AddForeignKey(
name: "FK_AccessPolicy_Project_GrantedProjectId",
table: "AccessPolicy",
column: "GrantedProjectId",
principalTable: "Project",
principalColumn: "Id");
}
}

15
util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs
View File

@ -2082,11 +2082,13 @@ namespace Bit.MySqlMigrations.Migrations
{ {
b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.Project", "GrantedProject") b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.Project", "GrantedProject")
.WithMany("GroupAccessPolicies") .WithMany("GroupAccessPolicies")
.HasForeignKey("GrantedProjectId"); .HasForeignKey("GrantedProjectId")
.OnDelete(DeleteBehavior.Cascade);
b.HasOne("Bit.Infrastructure.EntityFramework.Models.Group", "Group") b.HasOne("Bit.Infrastructure.EntityFramework.Models.Group", "Group")
.WithMany() .WithMany()
.HasForeignKey("GroupId"); .HasForeignKey("GroupId")
.OnDelete(DeleteBehavior.Cascade);
b.Navigation("GrantedProject"); b.Navigation("GrantedProject");
@ -2101,7 +2103,8 @@ namespace Bit.MySqlMigrations.Migrations
b.HasOne("Bit.Infrastructure.EntityFramework.Models.Group", "Group") b.HasOne("Bit.Infrastructure.EntityFramework.Models.Group", "Group")
.WithMany() .WithMany()
.HasForeignKey("GroupId"); .HasForeignKey("GroupId")
.OnDelete(DeleteBehavior.Cascade);
b.Navigation("GrantedServiceAccount"); b.Navigation("GrantedServiceAccount");
@ -2112,7 +2115,8 @@ namespace Bit.MySqlMigrations.Migrations
{ {
b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.Project", "GrantedProject") b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.Project", "GrantedProject")
.WithMany("ServiceAccountAccessPolicies") .WithMany("ServiceAccountAccessPolicies")
.HasForeignKey("GrantedProjectId"); .HasForeignKey("GrantedProjectId")
.OnDelete(DeleteBehavior.Cascade);
b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.ServiceAccount", "ServiceAccount") b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.ServiceAccount", "ServiceAccount")
.WithMany() .WithMany()
@ -2127,7 +2131,8 @@ namespace Bit.MySqlMigrations.Migrations
{ {
b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.Project", "GrantedProject") b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.Project", "GrantedProject")
.WithMany("UserAccessPolicies") .WithMany("UserAccessPolicies")
.HasForeignKey("GrantedProjectId"); .HasForeignKey("GrantedProjectId")
.OnDelete(DeleteBehavior.Cascade);
b.HasOne("Bit.Infrastructure.EntityFramework.Models.OrganizationUser", "OrganizationUser") b.HasOne("Bit.Infrastructure.EntityFramework.Models.OrganizationUser", "OrganizationUser")
.WithMany() .WithMany()

11
util/MySqlMigrations/packages.lock.json
View File

@ -170,10 +170,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2622,7 +2623,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -2656,7 +2657,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",

2247
util/PostgresMigrations/Migrations/20230824202447_ACCESSPOLICY_ADD_DELETE_CASCADE.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

63
util/PostgresMigrations/Migrations/20230824202447_ACCESSPOLICY_ADD_DELETE_CASCADE.cs Normal file
View File

@ -0,0 +1,63 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Bit.PostgresMigrations.Migrations;
/// <inheritdoc />
public partial class ACCESSPOLICY_ADD_DELETE_CASCADE : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_AccessPolicy_Group_GroupId",
table: "AccessPolicy");
migrationBuilder.DropForeignKey(
name: "FK_AccessPolicy_Project_GrantedProjectId",
table: "AccessPolicy");
migrationBuilder.AddForeignKey(
name: "FK_AccessPolicy_Group_GroupId",
table: "AccessPolicy",
column: "GroupId",
principalTable: "Group",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
migrationBuilder.AddForeignKey(
name: "FK_AccessPolicy_Project_GrantedProjectId",
table: "AccessPolicy",
column: "GrantedProjectId",
principalTable: "Project",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_AccessPolicy_Group_GroupId",
table: "AccessPolicy");
migrationBuilder.DropForeignKey(
name: "FK_AccessPolicy_Project_GrantedProjectId",
table: "AccessPolicy");
migrationBuilder.AddForeignKey(
name: "FK_AccessPolicy_Group_GroupId",
table: "AccessPolicy",
column: "GroupId",
principalTable: "Group",
principalColumn: "Id");
migrationBuilder.AddForeignKey(
name: "FK_AccessPolicy_Project_GrantedProjectId",
table: "AccessPolicy",
column: "GrantedProjectId",
principalTable: "Project",
principalColumn: "Id");
}
}

15
util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs
View File

@ -2093,11 +2093,13 @@ namespace Bit.PostgresMigrations.Migrations
{ {
b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.Project", "GrantedProject") b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.Project", "GrantedProject")
.WithMany("GroupAccessPolicies") .WithMany("GroupAccessPolicies")
.HasForeignKey("GrantedProjectId"); .HasForeignKey("GrantedProjectId")
.OnDelete(DeleteBehavior.Cascade);
b.HasOne("Bit.Infrastructure.EntityFramework.Models.Group", "Group") b.HasOne("Bit.Infrastructure.EntityFramework.Models.Group", "Group")
.WithMany() .WithMany()
.HasForeignKey("GroupId"); .HasForeignKey("GroupId")
.OnDelete(DeleteBehavior.Cascade);
b.Navigation("GrantedProject"); b.Navigation("GrantedProject");
@ -2112,7 +2114,8 @@ namespace Bit.PostgresMigrations.Migrations
b.HasOne("Bit.Infrastructure.EntityFramework.Models.Group", "Group") b.HasOne("Bit.Infrastructure.EntityFramework.Models.Group", "Group")
.WithMany() .WithMany()
.HasForeignKey("GroupId"); .HasForeignKey("GroupId")
.OnDelete(DeleteBehavior.Cascade);
b.Navigation("GrantedServiceAccount"); b.Navigation("GrantedServiceAccount");
@ -2123,7 +2126,8 @@ namespace Bit.PostgresMigrations.Migrations
{ {
b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.Project", "GrantedProject") b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.Project", "GrantedProject")
.WithMany("ServiceAccountAccessPolicies") .WithMany("ServiceAccountAccessPolicies")
.HasForeignKey("GrantedProjectId"); .HasForeignKey("GrantedProjectId")
.OnDelete(DeleteBehavior.Cascade);
b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.ServiceAccount", "ServiceAccount") b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.ServiceAccount", "ServiceAccount")
.WithMany() .WithMany()
@ -2138,7 +2142,8 @@ namespace Bit.PostgresMigrations.Migrations
{ {
b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.Project", "GrantedProject") b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.Project", "GrantedProject")
.WithMany("UserAccessPolicies") .WithMany("UserAccessPolicies")
.HasForeignKey("GrantedProjectId"); .HasForeignKey("GrantedProjectId")
.OnDelete(DeleteBehavior.Cascade);
b.HasOne("Bit.Infrastructure.EntityFramework.Models.OrganizationUser", "OrganizationUser") b.HasOne("Bit.Infrastructure.EntityFramework.Models.OrganizationUser", "OrganizationUser")
.WithMany() .WithMany()

11
util/PostgresMigrations/packages.lock.json
View File

@ -170,10 +170,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2622,7 +2623,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -2656,7 +2657,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",

11
util/Setup/packages.lock.json
View File

@ -169,10 +169,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2643,7 +2644,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -2676,7 +2677,7 @@
"migrator": { "migrator": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.Extensions.Logging": "[6.0.0, )", "Microsoft.Extensions.Logging": "[6.0.0, )",
"dbup-sqlserver": "[5.0.8, )" "dbup-sqlserver": "[5.0.8, )"
} }

33
util/SqlServerEFScaffold/packages.lock.json
View File

@ -273,10 +273,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2800,25 +2801,25 @@
"AspNetCore.HealthChecks.SqlServer": "[6.0.2, )", "AspNetCore.HealthChecks.SqlServer": "[6.0.2, )",
"AspNetCore.HealthChecks.Uris": "[6.0.3, )", "AspNetCore.HealthChecks.Uris": "[6.0.3, )",
"Azure.Messaging.EventGrid": "[4.10.0, )", "Azure.Messaging.EventGrid": "[4.10.0, )",
"Commercial.Core": "[2023.8.3, )", "Commercial.Core": "[2023.9.0, )",
"Commercial.Infrastructure.EntityFramework": "[2023.8.3, )", "Commercial.Infrastructure.EntityFramework": "[2023.9.0, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"SharedWeb": "[2023.8.3, )", "SharedWeb": "[2023.9.0, )",
"Swashbuckle.AspNetCore": "[6.5.0, )" "Swashbuckle.AspNetCore": "[6.5.0, )"
} }
}, },
"commercial.core": { "commercial.core": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )" "Core": "[2023.9.0, )"
} }
}, },
"commercial.infrastructure.entityframework": { "commercial.infrastructure.entityframework": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
}, },
"core": { "core": {
@ -2833,7 +2834,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -2866,7 +2867,7 @@
"infrastructure.dapper": { "infrastructure.dapper": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )" "Dapper": "[2.0.123, )"
} }
}, },
@ -2874,7 +2875,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@ -2886,9 +2887,9 @@
"sharedweb": { "sharedweb": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Infrastructure.Dapper": "[2023.8.3, )", "Infrastructure.Dapper": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.8.3, )" "Infrastructure.EntityFramework": "[2023.9.0, )"
} }
} }
} }

2234
util/SqliteMigrations/Migrations/20230824202443_ACCESSPOLICY_ADD_DELETE_CASCADE.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

63
util/SqliteMigrations/Migrations/20230824202443_ACCESSPOLICY_ADD_DELETE_CASCADE.cs Normal file
View File

@ -0,0 +1,63 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Bit.SqliteMigrations.Migrations;
/// <inheritdoc />
public partial class ACCESSPOLICY_ADD_DELETE_CASCADE : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_AccessPolicy_Group_GroupId",
table: "AccessPolicy");
migrationBuilder.DropForeignKey(
name: "FK_AccessPolicy_Project_GrantedProjectId",
table: "AccessPolicy");
migrationBuilder.AddForeignKey(
name: "FK_AccessPolicy_Group_GroupId",
table: "AccessPolicy",
column: "GroupId",
principalTable: "Group",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
migrationBuilder.AddForeignKey(
name: "FK_AccessPolicy_Project_GrantedProjectId",
table: "AccessPolicy",
column: "GrantedProjectId",
principalTable: "Project",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_AccessPolicy_Group_GroupId",
table: "AccessPolicy");
migrationBuilder.DropForeignKey(
name: "FK_AccessPolicy_Project_GrantedProjectId",
table: "AccessPolicy");
migrationBuilder.AddForeignKey(
name: "FK_AccessPolicy_Group_GroupId",
table: "AccessPolicy",
column: "GroupId",
principalTable: "Group",
principalColumn: "Id");
migrationBuilder.AddForeignKey(
name: "FK_AccessPolicy_Project_GrantedProjectId",
table: "AccessPolicy",
column: "GrantedProjectId",
principalTable: "Project",
principalColumn: "Id");
}
}

15
util/SqliteMigrations/Migrations/DatabaseContextModelSnapshot.cs
View File

@ -2080,11 +2080,13 @@ namespace Bit.SqliteMigrations.Migrations
{ {
b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.Project", "GrantedProject") b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.Project", "GrantedProject")
.WithMany("GroupAccessPolicies") .WithMany("GroupAccessPolicies")
.HasForeignKey("GrantedProjectId"); .HasForeignKey("GrantedProjectId")
.OnDelete(DeleteBehavior.Cascade);
b.HasOne("Bit.Infrastructure.EntityFramework.Models.Group", "Group") b.HasOne("Bit.Infrastructure.EntityFramework.Models.Group", "Group")
.WithMany() .WithMany()
.HasForeignKey("GroupId"); .HasForeignKey("GroupId")
.OnDelete(DeleteBehavior.Cascade);
b.Navigation("GrantedProject"); b.Navigation("GrantedProject");
@ -2099,7 +2101,8 @@ namespace Bit.SqliteMigrations.Migrations
b.HasOne("Bit.Infrastructure.EntityFramework.Models.Group", "Group") b.HasOne("Bit.Infrastructure.EntityFramework.Models.Group", "Group")
.WithMany() .WithMany()
.HasForeignKey("GroupId"); .HasForeignKey("GroupId")
.OnDelete(DeleteBehavior.Cascade);
b.Navigation("GrantedServiceAccount"); b.Navigation("GrantedServiceAccount");
@ -2110,7 +2113,8 @@ namespace Bit.SqliteMigrations.Migrations
{ {
b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.Project", "GrantedProject") b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.Project", "GrantedProject")
.WithMany("ServiceAccountAccessPolicies") .WithMany("ServiceAccountAccessPolicies")
.HasForeignKey("GrantedProjectId"); .HasForeignKey("GrantedProjectId")
.OnDelete(DeleteBehavior.Cascade);
b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.ServiceAccount", "ServiceAccount") b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.ServiceAccount", "ServiceAccount")
.WithMany() .WithMany()
@ -2125,7 +2129,8 @@ namespace Bit.SqliteMigrations.Migrations
{ {
b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.Project", "GrantedProject") b.HasOne("Bit.Infrastructure.EntityFramework.SecretsManager.Models.Project", "GrantedProject")
.WithMany("UserAccessPolicies") .WithMany("UserAccessPolicies")
.HasForeignKey("GrantedProjectId"); .HasForeignKey("GrantedProjectId")
.OnDelete(DeleteBehavior.Cascade);
b.HasOne("Bit.Infrastructure.EntityFramework.Models.OrganizationUser", "OrganizationUser") b.HasOne("Bit.Infrastructure.EntityFramework.Models.OrganizationUser", "OrganizationUser")
.WithMany() .WithMany()

11
util/SqliteMigrations/packages.lock.json
View File

@ -170,10 +170,11 @@
}, },
"Braintree": { "Braintree": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.12.0", "resolved": "5.19.0",
"contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==", "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "9.0.1", "Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0" "System.Xml.XPath.XmlDocument": "4.3.0"
} }
}, },
@ -2622,7 +2623,7 @@
"Azure.Storage.Blobs": "[12.14.1, )", "Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )", "Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )", "BitPay.Light": "[1.0.1907, )",
"Braintree": "[5.12.0, )", "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )", "DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )", "Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )", "Handlebars.Net": "[2.1.2, )",
@ -2656,7 +2657,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.8.3, )", "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",