diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 165efd0c7f..ad1bac7abb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout repo
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+ uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- name: Install cloc
run: |
@@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout repo
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+ uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- name: Set up dotnet
uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
@@ -49,7 +49,7 @@ jobs:
NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
steps:
- name: Checkout repo
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+ uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- name: Set up dotnet
uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
@@ -135,7 +135,7 @@ jobs:
node: true
steps:
- name: Checkout repo
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+ uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- name: Set up dotnet
uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
@@ -246,7 +246,7 @@ jobs:
dotnet: true
steps:
- name: Checkout repo
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+ uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- name: Check Branch to Publish
env:
@@ -337,7 +337,7 @@ jobs:
needs: build-docker
steps:
- name: Checkout repo
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+ uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- name: Set up dotnet
uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
@@ -476,7 +476,7 @@ jobs:
- win-x64
steps:
- name: Checkout repo
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+ uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- name: Set up dotnet
uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
diff --git a/.github/workflows/cleanup-after-pr.yml b/.github/workflows/cleanup-after-pr.yml
index d24144c0b7..ac8a1b624e 100644
--- a/.github/workflows/cleanup-after-pr.yml
+++ b/.github/workflows/cleanup-after-pr.yml
@@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout repo
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+ uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
########## ACR ##########
- name: Login to Azure - QA Subscription
diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml
index 523957ae58..3b5b1ac498 100644
--- a/.github/workflows/database.yml
+++ b/.github/workflows/database.yml
@@ -25,7 +25,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout repo
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+ uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- name: Set up dotnet
uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
diff --git a/.github/workflows/infrastructure-tests.yml b/.github/workflows/infrastructure-tests.yml
index 7669be7b75..e6f649f9f5 100644
--- a/.github/workflows/infrastructure-tests.yml
+++ b/.github/workflows/infrastructure-tests.yml
@@ -38,7 +38,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout repo
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+ uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- name: Set up dotnet
uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
diff --git a/.github/workflows/protect-files.yml b/.github/workflows/protect-files.yml
index 2c79c8a983..df595e900c 100644
--- a/.github/workflows/protect-files.yml
+++ b/.github/workflows/protect-files.yml
@@ -30,7 +30,7 @@ jobs:
label: "DB-migrations-changed"
steps:
- name: Checkout repo
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+ uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
with:
fetch-depth: 2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3caa364895..82d43585fc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -37,7 +37,7 @@ jobs:
fi
- name: Checkout repo
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+ uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- name: Check Release Version
id: version
@@ -211,7 +211,7 @@ jobs:
echo "Github Release Option: $RELEASE_OPTION"
- name: Checkout repo
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+ uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- name: Setup project name
id: setup
diff --git a/.github/workflows/version-bump.yml b/.github/workflows/version-bump.yml
index 1616404d53..130babaf0c 100644
--- a/.github/workflows/version-bump.yml
+++ b/.github/workflows/version-bump.yml
@@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout Branch
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+ uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- name: Login to Azure - CI Subscription
uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7
diff --git a/NuGet.Config b/NuGet.Config
deleted file mode 100644
index ecaab16a1e..0000000000
--- a/NuGet.Config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/bitwarden_license/src/Commercial.Core/packages.lock.json b/bitwarden_license/src/Commercial.Core/packages.lock.json
index 3a26cd9d5e..49e4ef1244 100644
--- a/bitwarden_license/src/Commercial.Core/packages.lock.json
+++ b/bitwarden_license/src/Commercial.Core/packages.lock.json
@@ -141,10 +141,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2433,7 +2434,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
diff --git a/bitwarden_license/src/Commercial.Infrastructure.EntityFramework/packages.lock.json b/bitwarden_license/src/Commercial.Infrastructure.EntityFramework/packages.lock.json
index 374ae585cb..ca7a2c8632 100644
--- a/bitwarden_license/src/Commercial.Infrastructure.EntityFramework/packages.lock.json
+++ b/bitwarden_license/src/Commercial.Infrastructure.EntityFramework/packages.lock.json
@@ -159,10 +159,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2593,7 +2594,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
@@ -2627,7 +2628,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
diff --git a/bitwarden_license/src/Scim/packages.lock.json b/bitwarden_license/src/Scim/packages.lock.json
index 0da51a0391..16a42f355d 100644
--- a/bitwarden_license/src/Scim/packages.lock.json
+++ b/bitwarden_license/src/Scim/packages.lock.json
@@ -158,10 +158,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2597,7 +2598,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
@@ -2630,7 +2631,7 @@
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )"
}
},
@@ -2638,7 +2639,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@@ -2650,9 +2651,9 @@
"sharedweb": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "Infrastructure.Dapper": "[2023.8.3, )",
- "Infrastructure.EntityFramework": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "Infrastructure.Dapper": "[2023.9.0, )",
+ "Infrastructure.EntityFramework": "[2023.9.0, )"
}
}
}
diff --git a/bitwarden_license/src/Sso/packages.lock.json b/bitwarden_license/src/Sso/packages.lock.json
index 79e2fecc39..ecccbaab16 100644
--- a/bitwarden_license/src/Sso/packages.lock.json
+++ b/bitwarden_license/src/Sso/packages.lock.json
@@ -183,10 +183,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2757,7 +2758,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
@@ -2790,7 +2791,7 @@
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )"
}
},
@@ -2798,7 +2799,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@@ -2810,9 +2811,9 @@
"sharedweb": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "Infrastructure.Dapper": "[2023.8.3, )",
- "Infrastructure.EntityFramework": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "Infrastructure.Dapper": "[2023.9.0, )",
+ "Infrastructure.EntityFramework": "[2023.9.0, )"
}
}
}
diff --git a/bitwarden_license/test/Commercial.Core.Test/packages.lock.json b/bitwarden_license/test/Commercial.Core.Test/packages.lock.json
index 4b48f35c5a..25d8df6081 100644
--- a/bitwarden_license/test/Commercial.Core.Test/packages.lock.json
+++ b/bitwarden_license/test/Commercial.Core.Test/packages.lock.json
@@ -201,10 +201,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2666,7 +2667,7 @@
"commercial.core": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )"
+ "Core": "[2023.9.0, )"
}
},
"common": {
@@ -2674,7 +2675,7 @@
"dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )",
@@ -2693,7 +2694,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
@@ -2728,8 +2729,8 @@
"dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )",
- "Common": "[2023.8.3, )",
- "Core": "[2023.8.3, )",
+ "Common": "[2023.9.0, )",
+ "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )",
diff --git a/bitwarden_license/test/Scim.IntegrationTest/packages.lock.json b/bitwarden_license/test/Scim.IntegrationTest/packages.lock.json
index 670b8ff3d3..e1d3b4b09e 100644
--- a/bitwarden_license/test/Scim.IntegrationTest/packages.lock.json
+++ b/bitwarden_license/test/Scim.IntegrationTest/packages.lock.json
@@ -239,10 +239,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2988,7 +2989,7 @@
"dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )",
@@ -3007,7 +3008,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
@@ -3040,15 +3041,15 @@
"identity": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "SharedWeb": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
+ "SharedWeb": "[2023.9.0, )",
"Swashbuckle.AspNetCore.SwaggerGen": "[6.5.0, )"
}
},
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )"
}
},
@@ -3056,7 +3057,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@@ -3068,8 +3069,8 @@
"integrationtestcommon": {
"type": "Project",
"dependencies": {
- "Common": "[2023.8.3, )",
- "Identity": "[2023.8.3, )",
+ "Common": "[2023.9.0, )",
+ "Identity": "[2023.9.0, )",
"Microsoft.AspNetCore.Mvc.Testing": "[6.0.5, )",
"Microsoft.EntityFrameworkCore.InMemory": "[7.0.5, )",
"Microsoft.Extensions.Configuration": "[6.0.1, )"
@@ -3078,16 +3079,16 @@
"scim": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "SharedWeb": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "SharedWeb": "[2023.9.0, )"
}
},
"sharedweb": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "Infrastructure.Dapper": "[2023.8.3, )",
- "Infrastructure.EntityFramework": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "Infrastructure.Dapper": "[2023.9.0, )",
+ "Infrastructure.EntityFramework": "[2023.9.0, )"
}
}
}
diff --git a/bitwarden_license/test/Scim.Test/packages.lock.json b/bitwarden_license/test/Scim.Test/packages.lock.json
index 8e8023b0a6..36253d50a1 100644
--- a/bitwarden_license/test/Scim.Test/packages.lock.json
+++ b/bitwarden_license/test/Scim.Test/packages.lock.json
@@ -227,10 +227,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2833,7 +2834,7 @@
"dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )",
@@ -2852,7 +2853,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
@@ -2885,7 +2886,7 @@
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )"
}
},
@@ -2893,7 +2894,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@@ -2905,16 +2906,16 @@
"scim": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "SharedWeb": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "SharedWeb": "[2023.9.0, )"
}
},
"sharedweb": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "Infrastructure.Dapper": "[2023.8.3, )",
- "Infrastructure.EntityFramework": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "Infrastructure.Dapper": "[2023.9.0, )",
+ "Infrastructure.EntityFramework": "[2023.9.0, )"
}
}
}
diff --git a/perf/MicroBenchmarks/packages.lock.json b/perf/MicroBenchmarks/packages.lock.json
index f2a30e33e9..c8d9a6e53f 100644
--- a/perf/MicroBenchmarks/packages.lock.json
+++ b/perf/MicroBenchmarks/packages.lock.json
@@ -166,10 +166,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2540,7 +2541,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
diff --git a/src/Admin/Controllers/OrganizationsController.cs b/src/Admin/Controllers/OrganizationsController.cs
index 44b83c2f34..ceaee641ea 100644
--- a/src/Admin/Controllers/OrganizationsController.cs
+++ b/src/Admin/Controllers/OrganizationsController.cs
@@ -19,6 +19,7 @@ using Bit.Core.Utilities;
using Bit.Core.Vault.Repositories;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
+using Stripe;
namespace Bit.Admin.Controllers;
@@ -47,6 +48,7 @@ public class OrganizationsController : Controller
private readonly ISecretRepository _secretRepository;
private readonly IProjectRepository _projectRepository;
private readonly IServiceAccountRepository _serviceAccountRepository;
+ private readonly IStripeSyncService _stripeSyncService;
public OrganizationsController(
IOrganizationService organizationService,
@@ -70,7 +72,8 @@ public class OrganizationsController : Controller
ICurrentContext currentContext,
ISecretRepository secretRepository,
IProjectRepository projectRepository,
- IServiceAccountRepository serviceAccountRepository)
+ IServiceAccountRepository serviceAccountRepository,
+ IStripeSyncService stripeSyncService)
{
_organizationService = organizationService;
_organizationRepository = organizationRepository;
@@ -94,6 +97,7 @@ public class OrganizationsController : Controller
_secretRepository = secretRepository;
_projectRepository = projectRepository;
_serviceAccountRepository = serviceAccountRepository;
+ _stripeSyncService = stripeSyncService;
}
[RequirePermission(Permission.Org_List_View)]
@@ -208,6 +212,16 @@ public class OrganizationsController : Controller
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 _applicationCacheService.UpsertOrganizationAbilityAsync(organization);
await _referenceEventService.RaiseEventAsync(new ReferenceEvent(ReferenceEventType.OrganizationEditedByAdmin, organization, _currentContext)
@@ -215,6 +229,7 @@ public class OrganizationsController : Controller
EventRaisedByUser = _userService.GetUserName(User),
SalesAssistedTrialStarted = model.SalesAssistedTrialStarted,
});
+
return RedirectToAction("Edit", new { id });
}
diff --git a/src/Admin/Views/Shared/_OrganizationForm.cshtml b/src/Admin/Views/Shared/_OrganizationForm.cshtml
index 9b76d1c2a8..697d3ef943 100644
--- a/src/Admin/Views/Shared/_OrganizationForm.cshtml
+++ b/src/Admin/Views/Shared/_OrganizationForm.cshtml
@@ -277,7 +277,13 @@
}
else
{
-
+
}
diff --git a/src/Admin/packages.lock.json b/src/Admin/packages.lock.json
index 6c420e2a17..b830fdad38 100644
--- a/src/Admin/packages.lock.json
+++ b/src/Admin/packages.lock.json
@@ -178,10 +178,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2791,15 +2792,15 @@
"commercial.core": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )"
+ "Core": "[2023.9.0, )"
}
},
"commercial.infrastructure.entityframework": {
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
- "Core": "[2023.8.3, )",
- "Infrastructure.EntityFramework": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "Infrastructure.EntityFramework": "[2023.9.0, )"
}
},
"core": {
@@ -2814,7 +2815,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
@@ -2847,7 +2848,7 @@
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )"
}
},
@@ -2855,7 +2856,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@@ -2867,7 +2868,7 @@
"migrator": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Microsoft.Extensions.Logging": "[6.0.0, )",
"dbup-sqlserver": "[5.0.8, )"
}
@@ -2875,30 +2876,30 @@
"mysqlmigrations": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "Infrastructure.EntityFramework": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "Infrastructure.EntityFramework": "[2023.9.0, )"
}
},
"postgresmigrations": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "Infrastructure.EntityFramework": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "Infrastructure.EntityFramework": "[2023.9.0, )"
}
},
"sharedweb": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "Infrastructure.Dapper": "[2023.8.3, )",
- "Infrastructure.EntityFramework": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "Infrastructure.Dapper": "[2023.9.0, )",
+ "Infrastructure.EntityFramework": "[2023.9.0, )"
}
},
"sqlitemigrations": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "Infrastructure.EntityFramework": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "Infrastructure.EntityFramework": "[2023.9.0, )"
}
}
}
diff --git a/src/Api/packages.lock.json b/src/Api/packages.lock.json
index 44b805fd7e..409ac010c2 100644
--- a/src/Api/packages.lock.json
+++ b/src/Api/packages.lock.json
@@ -281,10 +281,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2771,15 +2772,15 @@
"commercial.core": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )"
+ "Core": "[2023.9.0, )"
}
},
"commercial.infrastructure.entityframework": {
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
- "Core": "[2023.8.3, )",
- "Infrastructure.EntityFramework": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "Infrastructure.EntityFramework": "[2023.9.0, )"
}
},
"core": {
@@ -2794,7 +2795,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
@@ -2827,7 +2828,7 @@
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )"
}
},
@@ -2835,7 +2836,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@@ -2847,9 +2848,9 @@
"sharedweb": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "Infrastructure.Dapper": "[2023.8.3, )",
- "Infrastructure.EntityFramework": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "Infrastructure.Dapper": "[2023.9.0, )",
+ "Infrastructure.EntityFramework": "[2023.9.0, )"
}
}
}
diff --git a/src/Billing/packages.lock.json b/src/Billing/packages.lock.json
index 0da51a0391..16a42f355d 100644
--- a/src/Billing/packages.lock.json
+++ b/src/Billing/packages.lock.json
@@ -158,10 +158,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2597,7 +2598,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
@@ -2630,7 +2631,7 @@
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )"
}
},
@@ -2638,7 +2639,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@@ -2650,9 +2651,9 @@
"sharedweb": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "Infrastructure.Dapper": "[2023.8.3, )",
- "Infrastructure.EntityFramework": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "Infrastructure.Dapper": "[2023.9.0, )",
+ "Infrastructure.EntityFramework": "[2023.9.0, )"
}
}
}
diff --git a/src/Core/Constants.cs b/src/Core/Constants.cs
index 132b1db447..3684c85ea0 100644
--- a/src/Core/Constants.cs
+++ b/src/Core/Constants.cs
@@ -36,8 +36,8 @@ public static class FeatureFlagKeys
public const string DisplayEuEnvironment = "display-eu-environment";
public const string DisplayLowKdfIterationWarning = "display-kdf-iteration-warning";
public const string TrustedDeviceEncryption = "trusted-device-encryption";
- public const string SecretsManagerBilling = "sm-ga-billing";
public const string AutofillV2 = "autofill-v2";
+ public const string BrowserFilelessImport = "browser-fileless-import";
public static List GetAllKeys()
{
diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj
index 95b5fe8eeb..dff657d7e8 100644
--- a/src/Core/Core.csproj
+++ b/src/Core/Core.csproj
@@ -51,7 +51,7 @@
-
+
diff --git a/src/Core/Services/Implementations/LaunchDarklyFeatureService.cs b/src/Core/Services/Implementations/LaunchDarklyFeatureService.cs
index 501db21d82..1a43967b34 100644
--- a/src/Core/Services/Implementations/LaunchDarklyFeatureService.cs
+++ b/src/Core/Services/Implementations/LaunchDarklyFeatureService.cs
@@ -1,5 +1,6 @@
using Bit.Core.Context;
using Bit.Core.Settings;
+using LaunchDarkly.Logging;
using LaunchDarkly.Sdk.Server;
using LaunchDarkly.Sdk.Server.Integrations;
@@ -14,6 +15,7 @@ public class LaunchDarklyFeatureService : IFeatureService, IDisposable
IGlobalSettings globalSettings)
{
var ldConfig = Configuration.Builder(globalSettings.LaunchDarkly?.SdkKey);
+ ldConfig.Logging(Components.Logging().Level(LogLevel.Error));
if (string.IsNullOrEmpty(globalSettings.LaunchDarkly?.SdkKey))
{
diff --git a/src/Core/packages.lock.json b/src/Core/packages.lock.json
index 57052b8e95..26d7ee5280 100644
--- a/src/Core/packages.lock.json
+++ b/src/Core/packages.lock.json
@@ -98,11 +98,12 @@
},
"Braintree": {
"type": "Direct",
- "requested": "[5.12.0, )",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "requested": "[5.19.0, )",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
diff --git a/src/Events/packages.lock.json b/src/Events/packages.lock.json
index 0da51a0391..16a42f355d 100644
--- a/src/Events/packages.lock.json
+++ b/src/Events/packages.lock.json
@@ -158,10 +158,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2597,7 +2598,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
@@ -2630,7 +2631,7 @@
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )"
}
},
@@ -2638,7 +2639,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@@ -2650,9 +2651,9 @@
"sharedweb": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "Infrastructure.Dapper": "[2023.8.3, )",
- "Infrastructure.EntityFramework": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "Infrastructure.Dapper": "[2023.9.0, )",
+ "Infrastructure.EntityFramework": "[2023.9.0, )"
}
}
}
diff --git a/src/EventsProcessor/packages.lock.json b/src/EventsProcessor/packages.lock.json
index 0da51a0391..16a42f355d 100644
--- a/src/EventsProcessor/packages.lock.json
+++ b/src/EventsProcessor/packages.lock.json
@@ -158,10 +158,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2597,7 +2598,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
@@ -2630,7 +2631,7 @@
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )"
}
},
@@ -2638,7 +2639,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@@ -2650,9 +2651,9 @@
"sharedweb": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "Infrastructure.Dapper": "[2023.8.3, )",
- "Infrastructure.EntityFramework": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "Infrastructure.Dapper": "[2023.9.0, )",
+ "Infrastructure.EntityFramework": "[2023.9.0, )"
}
}
}
diff --git a/src/Icons/packages.lock.json b/src/Icons/packages.lock.json
index c69c089c3b..0b2c51d0c0 100644
--- a/src/Icons/packages.lock.json
+++ b/src/Icons/packages.lock.json
@@ -167,10 +167,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2606,7 +2607,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
@@ -2639,7 +2640,7 @@
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )"
}
},
@@ -2647,7 +2648,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@@ -2659,9 +2660,9 @@
"sharedweb": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "Infrastructure.Dapper": "[2023.8.3, )",
- "Infrastructure.EntityFramework": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "Infrastructure.Dapper": "[2023.9.0, )",
+ "Infrastructure.EntityFramework": "[2023.9.0, )"
}
}
}
diff --git a/src/Identity/packages.lock.json b/src/Identity/packages.lock.json
index da1ee45854..3577f2faef 100644
--- a/src/Identity/packages.lock.json
+++ b/src/Identity/packages.lock.json
@@ -167,10 +167,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2619,7 +2620,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
@@ -2652,7 +2653,7 @@
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )"
}
},
@@ -2660,7 +2661,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@@ -2672,9 +2673,9 @@
"sharedweb": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "Infrastructure.Dapper": "[2023.8.3, )",
- "Infrastructure.EntityFramework": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "Infrastructure.Dapper": "[2023.9.0, )",
+ "Infrastructure.EntityFramework": "[2023.9.0, )"
}
}
}
diff --git a/src/Infrastructure.Dapper/packages.lock.json b/src/Infrastructure.Dapper/packages.lock.json
index d5d9c39e8d..8700a708a7 100644
--- a/src/Infrastructure.Dapper/packages.lock.json
+++ b/src/Infrastructure.Dapper/packages.lock.json
@@ -147,10 +147,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2439,7 +2440,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
diff --git a/src/Infrastructure.EntityFramework/Repositories/OrganizationRepository.cs b/src/Infrastructure.EntityFramework/Repositories/OrganizationRepository.cs
index 702f9bea53..b7ffb9978a 100644
--- a/src/Infrastructure.EntityFramework/Repositories/OrganizationRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/OrganizationRepository.cs
@@ -144,27 +144,42 @@ public class OrganizationRepository : Repository c.UserId == null && c.OrganizationId == organization.Id));
+ await dbContext.Ciphers.Where(c => c.UserId == null && c.OrganizationId == organization.Id)
+ .ExecuteDeleteAsync();
await deleteCiphersTransaction.CommitAsync();
+
var organizationDeleteTransaction = await dbContext.Database.BeginTransactionAsync();
- dbContext.SsoUsers.RemoveRange(dbContext.SsoUsers.Where(su => su.OrganizationId == organization.Id));
- dbContext.SsoConfigs.RemoveRange(dbContext.SsoConfigs.Where(sc => sc.OrganizationId == organization.Id));
- var collectionUsers = from cu in dbContext.CollectionUsers
- join ou in dbContext.OrganizationUsers on cu.OrganizationUserId equals ou.Id
- where ou.OrganizationId == organization.Id
- select cu;
- dbContext.CollectionUsers.RemoveRange(collectionUsers);
- dbContext.OrganizationUsers.RemoveRange(
- dbContext.OrganizationUsers.Where(ou => ou.OrganizationId == organization.Id));
- dbContext.ProviderOrganizations.RemoveRange(
- dbContext.ProviderOrganizations.Where(po => po.OrganizationId == organization.Id));
+ await dbContext.SsoUsers.Where(su => su.OrganizationId == organization.Id)
+ .ExecuteDeleteAsync();
+ await dbContext.SsoConfigs.Where(sc => sc.OrganizationId == organization.Id)
+ .ExecuteDeleteAsync();
+ await dbContext.CollectionUsers.Where(cu => cu.OrganizationUser.OrganizationId == organization.Id)
+ .ExecuteDeleteAsync();
+ await dbContext.UserProjectAccessPolicy.Where(ap => ap.OrganizationUser.OrganizationId == organization.Id)
+ .ExecuteDeleteAsync();
+ await dbContext.UserServiceAccountAccessPolicy.Where(ap => ap.OrganizationUser.OrganizationId == organization.Id)
+ .ExecuteDeleteAsync();
+ 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
- dbContext.OrganizationApiKeys.RemoveRange(
- dbContext.OrganizationApiKeys.Where(oa => oa.OrganizationId == organization.Id));
- dbContext.OrganizationConnections.RemoveRange(
- dbContext.OrganizationConnections.Where(oc => oc.OrganizationId == organization.Id));
+ await dbContext.OrganizationApiKeys.Where(oa => oa.OrganizationId == organization.Id)
+ .ExecuteDeleteAsync();
+ await dbContext.OrganizationConnections.Where(oc => oc.OrganizationId == organization.Id)
+ .ExecuteDeleteAsync();
var sponsoringOrgs = await dbContext.OrganizationSponsorships
.Where(os => os.SponsoringOrganizationId == organization.Id)
.ToListAsync();
diff --git a/src/Infrastructure.EntityFramework/Repositories/OrganizationUserRepository.cs b/src/Infrastructure.EntityFramework/Repositories/OrganizationUserRepository.cs
index a6e31aa666..5e005a5593 100644
--- a/src/Infrastructure.EntityFramework/Repositories/OrganizationUserRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/OrganizationUserRepository.cs
@@ -94,6 +94,11 @@ public class OrganizationUserRepository : Repository gu.OrganizationUserId == organizationUserId);
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
.Where(os => os.SponsoringOrganizationUserId == organizationUserId)
.ToListAsync();
@@ -328,7 +333,7 @@ public class OrganizationUserRepository : Repository u.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)
{
groups = (await (from gu in dbContext.GroupUsers
diff --git a/src/Infrastructure.EntityFramework/Repositories/UserRepository.cs b/src/Infrastructure.EntityFramework/Repositories/UserRepository.cs
index ba422c789b..b29153e47c 100644
--- a/src/Infrastructure.EntityFramework/Repositories/UserRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/UserRepository.cs
@@ -167,6 +167,10 @@ public class UserRepository : Repository, IUserR
where ou.UserId == user.Id
select gu;
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.ProviderUsers.RemoveRange(dbContext.ProviderUsers.Where(pu => pu.UserId == user.Id));
dbContext.SsoUsers.RemoveRange(dbContext.SsoUsers.Where(su => su.UserId == user.Id));
diff --git a/src/Infrastructure.EntityFramework/SecretsManager/Configurations/AccessPolicyEntityTypeConfiguration.cs b/src/Infrastructure.EntityFramework/SecretsManager/Configurations/AccessPolicyEntityTypeConfiguration.cs
index dd7f01f5d5..9e8732a854 100644
--- a/src/Infrastructure.EntityFramework/SecretsManager/Configurations/AccessPolicyEntityTypeConfiguration.cs
+++ b/src/Infrastructure.EntityFramework/SecretsManager/Configurations/AccessPolicyEntityTypeConfiguration.cs
@@ -39,6 +39,12 @@ public class UserProjectAccessPolicyEntityTypeConfiguration : IEntityTypeConfigu
builder
.Property(e => e.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
.Property(e => e.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
.Property(e => e.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
.Property(e => e.GrantedProjectId)
.HasColumnName(nameof(ServiceAccountProjectAccessPolicy.GrantedProjectId));
+
+ builder
+ .HasOne(e => e.GrantedProject)
+ .WithMany(e => e.ServiceAccountAccessPolicies)
+ .HasForeignKey(nameof(ServiceAccountProjectAccessPolicy.GrantedProjectId))
+ .OnDelete(DeleteBehavior.Cascade);
}
}
diff --git a/src/Infrastructure.EntityFramework/packages.lock.json b/src/Infrastructure.EntityFramework/packages.lock.json
index 0e133d9ebb..90a67e5d86 100644
--- a/src/Infrastructure.EntityFramework/packages.lock.json
+++ b/src/Infrastructure.EntityFramework/packages.lock.json
@@ -221,10 +221,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2599,7 +2600,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
diff --git a/src/Notifications/packages.lock.json b/src/Notifications/packages.lock.json
index c6fd56a84b..3da9edc48e 100644
--- a/src/Notifications/packages.lock.json
+++ b/src/Notifications/packages.lock.json
@@ -179,10 +179,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2647,7 +2648,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
@@ -2680,7 +2681,7 @@
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )"
}
},
@@ -2688,7 +2689,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@@ -2700,9 +2701,9 @@
"sharedweb": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "Infrastructure.Dapper": "[2023.8.3, )",
- "Infrastructure.EntityFramework": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "Infrastructure.Dapper": "[2023.9.0, )",
+ "Infrastructure.EntityFramework": "[2023.9.0, )"
}
}
}
diff --git a/src/SharedWeb/packages.lock.json b/src/SharedWeb/packages.lock.json
index 6b0c71b022..08d941f5b0 100644
--- a/src/SharedWeb/packages.lock.json
+++ b/src/SharedWeb/packages.lock.json
@@ -158,10 +158,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2597,7 +2598,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
@@ -2630,7 +2631,7 @@
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )"
}
},
@@ -2638,7 +2639,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
diff --git a/test/Api.IntegrationTest/packages.lock.json b/test/Api.IntegrationTest/packages.lock.json
index 7d5f3373e9..4dacbaa007 100644
--- a/test/Api.IntegrationTest/packages.lock.json
+++ b/test/Api.IntegrationTest/packages.lock.json
@@ -321,10 +321,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -3145,25 +3146,25 @@
"AspNetCore.HealthChecks.SqlServer": "[6.0.2, )",
"AspNetCore.HealthChecks.Uris": "[6.0.3, )",
"Azure.Messaging.EventGrid": "[4.10.0, )",
- "Commercial.Core": "[2023.8.3, )",
- "Commercial.Infrastructure.EntityFramework": "[2023.8.3, )",
- "Core": "[2023.8.3, )",
- "SharedWeb": "[2023.8.3, )",
+ "Commercial.Core": "[2023.9.0, )",
+ "Commercial.Infrastructure.EntityFramework": "[2023.9.0, )",
+ "Core": "[2023.9.0, )",
+ "SharedWeb": "[2023.9.0, )",
"Swashbuckle.AspNetCore": "[6.5.0, )"
}
},
"commercial.core": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )"
+ "Core": "[2023.9.0, )"
}
},
"commercial.infrastructure.entityframework": {
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
- "Core": "[2023.8.3, )",
- "Infrastructure.EntityFramework": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "Infrastructure.EntityFramework": "[2023.9.0, )"
}
},
"common": {
@@ -3171,7 +3172,7 @@
"dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )",
@@ -3190,7 +3191,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
@@ -3223,15 +3224,15 @@
"identity": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "SharedWeb": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
+ "SharedWeb": "[2023.9.0, )",
"Swashbuckle.AspNetCore.SwaggerGen": "[6.5.0, )"
}
},
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )"
}
},
@@ -3239,7 +3240,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@@ -3251,8 +3252,8 @@
"integrationtestcommon": {
"type": "Project",
"dependencies": {
- "Common": "[2023.8.3, )",
- "Identity": "[2023.8.3, )",
+ "Common": "[2023.9.0, )",
+ "Identity": "[2023.9.0, )",
"Microsoft.AspNetCore.Mvc.Testing": "[6.0.5, )",
"Microsoft.EntityFrameworkCore.InMemory": "[7.0.5, )",
"Microsoft.Extensions.Configuration": "[6.0.1, )"
@@ -3261,9 +3262,9 @@
"sharedweb": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "Infrastructure.Dapper": "[2023.8.3, )",
- "Infrastructure.EntityFramework": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "Infrastructure.Dapper": "[2023.9.0, )",
+ "Infrastructure.EntityFramework": "[2023.9.0, )"
}
}
}
diff --git a/test/Api.Test/packages.lock.json b/test/Api.Test/packages.lock.json
index e8d23dc9ba..f778ea613b 100644
--- a/test/Api.Test/packages.lock.json
+++ b/test/Api.Test/packages.lock.json
@@ -331,10 +331,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -3014,25 +3015,25 @@
"AspNetCore.HealthChecks.SqlServer": "[6.0.2, )",
"AspNetCore.HealthChecks.Uris": "[6.0.3, )",
"Azure.Messaging.EventGrid": "[4.10.0, )",
- "Commercial.Core": "[2023.8.3, )",
- "Commercial.Infrastructure.EntityFramework": "[2023.8.3, )",
- "Core": "[2023.8.3, )",
- "SharedWeb": "[2023.8.3, )",
+ "Commercial.Core": "[2023.9.0, )",
+ "Commercial.Infrastructure.EntityFramework": "[2023.9.0, )",
+ "Core": "[2023.9.0, )",
+ "SharedWeb": "[2023.9.0, )",
"Swashbuckle.AspNetCore": "[6.5.0, )"
}
},
"commercial.core": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )"
+ "Core": "[2023.9.0, )"
}
},
"commercial.infrastructure.entityframework": {
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
- "Core": "[2023.8.3, )",
- "Infrastructure.EntityFramework": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "Infrastructure.EntityFramework": "[2023.9.0, )"
}
},
"common": {
@@ -3040,7 +3041,7 @@
"dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )",
@@ -3059,7 +3060,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
@@ -3094,8 +3095,8 @@
"dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )",
- "Common": "[2023.8.3, )",
- "Core": "[2023.8.3, )",
+ "Common": "[2023.9.0, )",
+ "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )",
@@ -3105,7 +3106,7 @@
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )"
}
},
@@ -3113,7 +3114,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@@ -3125,9 +3126,9 @@
"sharedweb": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "Infrastructure.Dapper": "[2023.8.3, )",
- "Infrastructure.EntityFramework": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "Infrastructure.Dapper": "[2023.9.0, )",
+ "Infrastructure.EntityFramework": "[2023.9.0, )"
}
}
}
diff --git a/test/Billing.Test/packages.lock.json b/test/Billing.Test/packages.lock.json
index c1c83fc1d7..8284839385 100644
--- a/test/Billing.Test/packages.lock.json
+++ b/test/Billing.Test/packages.lock.json
@@ -228,10 +228,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2832,8 +2833,8 @@
"billing": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "SharedWeb": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "SharedWeb": "[2023.9.0, )"
}
},
"common": {
@@ -2841,7 +2842,7 @@
"dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )",
@@ -2860,7 +2861,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
@@ -2893,7 +2894,7 @@
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )"
}
},
@@ -2901,7 +2902,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@@ -2913,9 +2914,9 @@
"sharedweb": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "Infrastructure.Dapper": "[2023.8.3, )",
- "Infrastructure.EntityFramework": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "Infrastructure.Dapper": "[2023.9.0, )",
+ "Infrastructure.EntityFramework": "[2023.9.0, )"
}
}
}
diff --git a/test/Common/packages.lock.json b/test/Common/packages.lock.json
index ee03c4cdaa..498b2f4613 100644
--- a/test/Common/packages.lock.json
+++ b/test/Common/packages.lock.json
@@ -216,10 +216,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2673,7 +2674,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
diff --git a/test/Core.Test/packages.lock.json b/test/Core.Test/packages.lock.json
index f4111c44d5..c814703a91 100644
--- a/test/Core.Test/packages.lock.json
+++ b/test/Core.Test/packages.lock.json
@@ -222,10 +222,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2672,7 +2673,7 @@
"dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )",
@@ -2691,7 +2692,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
diff --git a/test/Icons.Test/packages.lock.json b/test/Icons.Test/packages.lock.json
index 69cfc6d888..58a29e615a 100644
--- a/test/Icons.Test/packages.lock.json
+++ b/test/Icons.Test/packages.lock.json
@@ -235,10 +235,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2841,7 +2842,7 @@
"dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )",
@@ -2860,7 +2861,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
@@ -2894,14 +2895,14 @@
"type": "Project",
"dependencies": {
"AngleSharp": "[1.0.4, )",
- "Core": "[2023.8.3, )",
- "SharedWeb": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "SharedWeb": "[2023.9.0, )"
}
},
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )"
}
},
@@ -2909,7 +2910,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@@ -2921,9 +2922,9 @@
"sharedweb": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "Infrastructure.Dapper": "[2023.8.3, )",
- "Infrastructure.EntityFramework": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "Infrastructure.Dapper": "[2023.9.0, )",
+ "Infrastructure.EntityFramework": "[2023.9.0, )"
}
}
}
diff --git a/test/Identity.IntegrationTest/packages.lock.json b/test/Identity.IntegrationTest/packages.lock.json
index 9400fd738a..49e914b2d0 100644
--- a/test/Identity.IntegrationTest/packages.lock.json
+++ b/test/Identity.IntegrationTest/packages.lock.json
@@ -239,10 +239,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2988,7 +2989,7 @@
"dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )",
@@ -3007,7 +3008,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
@@ -3040,15 +3041,15 @@
"identity": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "SharedWeb": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
+ "SharedWeb": "[2023.9.0, )",
"Swashbuckle.AspNetCore.SwaggerGen": "[6.5.0, )"
}
},
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )"
}
},
@@ -3056,7 +3057,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@@ -3068,8 +3069,8 @@
"integrationtestcommon": {
"type": "Project",
"dependencies": {
- "Common": "[2023.8.3, )",
- "Identity": "[2023.8.3, )",
+ "Common": "[2023.9.0, )",
+ "Identity": "[2023.9.0, )",
"Microsoft.AspNetCore.Mvc.Testing": "[6.0.5, )",
"Microsoft.EntityFrameworkCore.InMemory": "[7.0.5, )",
"Microsoft.Extensions.Configuration": "[6.0.1, )"
@@ -3078,9 +3079,9 @@
"sharedweb": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "Infrastructure.Dapper": "[2023.8.3, )",
- "Infrastructure.EntityFramework": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "Infrastructure.Dapper": "[2023.9.0, )",
+ "Infrastructure.EntityFramework": "[2023.9.0, )"
}
}
}
diff --git a/test/Identity.Test/packages.lock.json b/test/Identity.Test/packages.lock.json
index 243e711724..4d501fa090 100644
--- a/test/Identity.Test/packages.lock.json
+++ b/test/Identity.Test/packages.lock.json
@@ -228,10 +228,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2855,7 +2856,7 @@
"dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )",
@@ -2874,7 +2875,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
@@ -2907,15 +2908,15 @@
"identity": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "SharedWeb": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
+ "SharedWeb": "[2023.9.0, )",
"Swashbuckle.AspNetCore.SwaggerGen": "[6.5.0, )"
}
},
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )"
}
},
@@ -2923,7 +2924,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@@ -2935,9 +2936,9 @@
"sharedweb": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "Infrastructure.Dapper": "[2023.8.3, )",
- "Infrastructure.EntityFramework": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "Infrastructure.Dapper": "[2023.9.0, )",
+ "Infrastructure.EntityFramework": "[2023.9.0, )"
}
}
}
diff --git a/test/Infrastructure.EFIntegration.Test/packages.lock.json b/test/Infrastructure.EFIntegration.Test/packages.lock.json
index f8c67ce44e..ef30b1cb1a 100644
--- a/test/Infrastructure.EFIntegration.Test/packages.lock.json
+++ b/test/Infrastructure.EFIntegration.Test/packages.lock.json
@@ -229,10 +229,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2835,7 +2836,7 @@
"dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )",
@@ -2854,7 +2855,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
@@ -2889,8 +2890,8 @@
"dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )",
- "Common": "[2023.8.3, )",
- "Core": "[2023.8.3, )",
+ "Common": "[2023.9.0, )",
+ "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )",
@@ -2900,7 +2901,7 @@
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )"
}
},
@@ -2908,7 +2909,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
diff --git a/test/Infrastructure.IntegrationTest/packages.lock.json b/test/Infrastructure.IntegrationTest/packages.lock.json
index 9d11e6873d..9c69a541c8 100644
--- a/test/Infrastructure.IntegrationTest/packages.lock.json
+++ b/test/Infrastructure.IntegrationTest/packages.lock.json
@@ -228,10 +228,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2712,7 +2713,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
@@ -2745,7 +2746,7 @@
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )"
}
},
@@ -2753,7 +2754,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
diff --git a/test/IntegrationTestCommon/packages.lock.json b/test/IntegrationTestCommon/packages.lock.json
index 91e6b1f0a0..6e1296d5c6 100644
--- a/test/IntegrationTestCommon/packages.lock.json
+++ b/test/IntegrationTestCommon/packages.lock.json
@@ -215,10 +215,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2974,7 +2975,7 @@
"dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )",
@@ -2993,7 +2994,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
@@ -3026,15 +3027,15 @@
"identity": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "SharedWeb": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
+ "SharedWeb": "[2023.9.0, )",
"Swashbuckle.AspNetCore.SwaggerGen": "[6.5.0, )"
}
},
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Dapper": "[2.0.123, )"
}
},
@@ -3042,7 +3043,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@@ -3054,9 +3055,9 @@
"sharedweb": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
- "Infrastructure.Dapper": "[2023.8.3, )",
- "Infrastructure.EntityFramework": "[2023.8.3, )"
+ "Core": "[2023.9.0, )",
+ "Infrastructure.Dapper": "[2023.9.0, )",
+ "Infrastructure.EntityFramework": "[2023.9.0, )"
}
}
}
diff --git a/util/Migrator/packages.lock.json b/util/Migrator/packages.lock.json
index 407014b697..b6286102d7 100644
--- a/util/Migrator/packages.lock.json
+++ b/util/Migrator/packages.lock.json
@@ -165,10 +165,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2637,7 +2638,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
diff --git a/util/MsSqlMigratorUtility/packages.lock.json b/util/MsSqlMigratorUtility/packages.lock.json
index ef06a62640..e39912d7d5 100644
--- a/util/MsSqlMigratorUtility/packages.lock.json
+++ b/util/MsSqlMigratorUtility/packages.lock.json
@@ -168,10 +168,11 @@
},
"Braintree": {
"type": "Transitive",
- "resolved": "5.12.0",
- "contentHash": "bV2tsVIvBQeKwULT4qPZUWhxSr8mFwyAAcvLDvDpCU0cMYPHzGSahha+ghUdgGMb317BqL34/Od59n2s3MkhOQ==",
+ "resolved": "5.19.0",
+ "contentHash": "B60wIX54g78nMsy5cJkvSfqs1VasYDXWFZQW0cUQ4QeW8Y5jPyBSaoxHwKC806lXUDaKC8kr5Y7Q6EdsBkPANQ==",
"dependencies": {
- "Newtonsoft.Json": "9.0.1",
+ "Microsoft.CSharp": "4.7.0",
+ "Newtonsoft.Json": "13.0.1",
"System.Xml.XPath.XmlDocument": "4.3.0"
}
},
@@ -2666,7 +2667,7 @@
"Azure.Storage.Blobs": "[12.14.1, )",
"Azure.Storage.Queues": "[12.12.0, )",
"BitPay.Light": "[1.0.1907, )",
- "Braintree": "[5.12.0, )",
+ "Braintree": "[5.19.0, )",
"DnsClient": "[1.7.0, )",
"Fido2.AspNet": "[3.0.1, )",
"Handlebars.Net": "[2.1.2, )",
@@ -2699,7 +2700,7 @@
"migrator": {
"type": "Project",
"dependencies": {
- "Core": "[2023.8.3, )",
+ "Core": "[2023.9.0, )",
"Microsoft.Extensions.Logging": "[6.0.0, )",
"dbup-sqlserver": "[5.0.8, )"
}
diff --git a/util/MySqlMigrations/Migrations/20230824202452_ACCESSPOLICY_ADD_DELETE_CASCADE.Designer.cs b/util/MySqlMigrations/Migrations/20230824202452_ACCESSPOLICY_ADD_DELETE_CASCADE.Designer.cs
new file mode 100644
index 0000000000..8fc9edb7c4
--- /dev/null
+++ b/util/MySqlMigrations/Migrations/20230824202452_ACCESSPOLICY_ADD_DELETE_CASCADE.Designer.cs
@@ -0,0 +1,2236 @@
+//
+using System;
+using Bit.Infrastructure.EntityFramework.Repositories;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Bit.MySqlMigrations.Migrations
+{
+ [DbContext(typeof(DatabaseContext))]
+ [Migration("20230824202452_ACCESSPOLICY_ADD_DELETE_CASCADE")]
+ partial class ACCESSPOLICY_ADD_DELETE_CASCADE
+ {
+ ///
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("ProductVersion", "7.0.5")
+ .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+ modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.AuthRequest", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("AccessCode")
+ .HasMaxLength(25)
+ .HasColumnType("varchar(25)");
+
+ b.Property("Approved")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("AuthenticationDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("Key")
+ .HasColumnType("longtext");
+
+ b.Property("MasterPasswordHash")
+ .HasColumnType("longtext");
+
+ b.Property("OrganizationId")
+ .HasColumnType("char(36)");
+
+ b.Property("PublicKey")
+ .HasColumnType("longtext");
+
+ b.Property("RequestDeviceIdentifier")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)");
+
+ b.Property("RequestDeviceType")
+ .HasColumnType("tinyint unsigned");
+
+ b.Property("RequestIpAddress")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)");
+
+ b.Property("ResponseDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("ResponseDeviceId")
+ .HasColumnType("char(36)");
+
+ b.Property("Type")
+ .HasColumnType("tinyint unsigned");
+
+ b.Property("UserId")
+ .HasColumnType("char(36)");
+
+ b.HasKey("Id");
+
+ b.HasIndex("OrganizationId");
+
+ b.HasIndex("ResponseDeviceId");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("AuthRequest", (string)null);
+ });
+
+ modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.EmergencyAccess", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("Email")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)");
+
+ b.Property("GranteeId")
+ .HasColumnType("char(36)");
+
+ b.Property("GrantorId")
+ .HasColumnType("char(36)");
+
+ b.Property("KeyEncrypted")
+ .HasColumnType("longtext");
+
+ b.Property("LastNotificationDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("RecoveryInitiatedDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("RevisionDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("Status")
+ .HasColumnType("tinyint unsigned");
+
+ b.Property("Type")
+ .HasColumnType("tinyint unsigned");
+
+ b.Property("WaitTimeDays")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.HasIndex("GranteeId");
+
+ b.HasIndex("GrantorId");
+
+ b.ToTable("EmergencyAccess", (string)null);
+ });
+
+ modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.Grant", b =>
+ {
+ b.Property("Key")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)");
+
+ b.Property("ClientId")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)");
+
+ b.Property("ConsumedDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("Data")
+ .HasColumnType("longtext");
+
+ b.Property("Description")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)");
+
+ b.Property("ExpirationDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("SessionId")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)");
+
+ b.Property("SubjectId")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)");
+
+ b.Property("Type")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)");
+
+ b.HasKey("Key");
+
+ b.ToTable("Grant", (string)null);
+ });
+
+ modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.SsoConfig", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("Data")
+ .HasColumnType("longtext");
+
+ b.Property("Enabled")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("OrganizationId")
+ .HasColumnType("char(36)");
+
+ b.Property("RevisionDate")
+ .HasColumnType("datetime(6)");
+
+ b.HasKey("Id");
+
+ b.HasIndex("OrganizationId");
+
+ b.ToTable("SsoConfig", (string)null);
+ });
+
+ modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Auth.Models.SsoUser", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("ExternalId")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)");
+
+ b.Property("OrganizationId")
+ .HasColumnType("char(36)");
+
+ b.Property("UserId")
+ .HasColumnType("char(36)");
+
+ b.HasKey("Id");
+
+ b.HasIndex("OrganizationId");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("SsoUser", (string)null);
+ });
+
+ modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.Collection", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("ExternalId")
+ .HasMaxLength(300)
+ .HasColumnType("varchar(300)");
+
+ b.Property("Name")
+ .HasColumnType("longtext");
+
+ b.Property("OrganizationId")
+ .HasColumnType("char(36)");
+
+ b.Property("RevisionDate")
+ .HasColumnType("datetime(6)");
+
+ b.HasKey("Id");
+
+ b.HasIndex("OrganizationId");
+
+ b.ToTable("Collection", (string)null);
+ });
+
+ modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.CollectionCipher", b =>
+ {
+ b.Property("CollectionId")
+ .HasColumnType("char(36)");
+
+ b.Property("CipherId")
+ .HasColumnType("char(36)");
+
+ b.HasKey("CollectionId", "CipherId");
+
+ b.HasIndex("CipherId");
+
+ b.ToTable("CollectionCipher", (string)null);
+ });
+
+ modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.CollectionGroup", b =>
+ {
+ b.Property("CollectionId")
+ .HasColumnType("char(36)");
+
+ b.Property("GroupId")
+ .HasColumnType("char(36)");
+
+ b.Property("HidePasswords")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("ReadOnly")
+ .HasColumnType("tinyint(1)");
+
+ b.HasKey("CollectionId", "GroupId");
+
+ b.HasIndex("GroupId");
+
+ b.ToTable("CollectionGroups");
+ });
+
+ modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.CollectionUser", b =>
+ {
+ b.Property("CollectionId")
+ .HasColumnType("char(36)");
+
+ b.Property("OrganizationUserId")
+ .HasColumnType("char(36)");
+
+ b.Property("HidePasswords")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("ReadOnly")
+ .HasColumnType("tinyint(1)");
+
+ b.HasKey("CollectionId", "OrganizationUserId");
+
+ b.HasIndex("OrganizationUserId");
+
+ b.ToTable("CollectionUsers");
+ });
+
+ modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.Device", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("EncryptedPrivateKey")
+ .HasColumnType("longtext");
+
+ b.Property("EncryptedPublicKey")
+ .HasColumnType("longtext");
+
+ b.Property("EncryptedUserKey")
+ .HasColumnType("longtext");
+
+ b.Property("Identifier")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)");
+
+ b.Property("Name")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)");
+
+ b.Property("PushToken")
+ .HasMaxLength(255)
+ .HasColumnType("varchar(255)");
+
+ b.Property("RevisionDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("Type")
+ .HasColumnType("tinyint unsigned");
+
+ b.Property("UserId")
+ .HasColumnType("char(36)");
+
+ b.HasKey("Id");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("Device", (string)null);
+ });
+
+ modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.Event", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("ActingUserId")
+ .HasColumnType("char(36)");
+
+ b.Property("CipherId")
+ .HasColumnType("char(36)");
+
+ b.Property("CollectionId")
+ .HasColumnType("char(36)");
+
+ b.Property("Date")
+ .HasColumnType("datetime(6)");
+
+ b.Property("DeviceType")
+ .HasColumnType("tinyint unsigned");
+
+ b.Property("DomainName")
+ .HasColumnType("longtext");
+
+ b.Property("GroupId")
+ .HasColumnType("char(36)");
+
+ b.Property("InstallationId")
+ .HasColumnType("char(36)");
+
+ b.Property("IpAddress")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)");
+
+ b.Property("OrganizationId")
+ .HasColumnType("char(36)");
+
+ b.Property("OrganizationUserId")
+ .HasColumnType("char(36)");
+
+ b.Property("PolicyId")
+ .HasColumnType("char(36)");
+
+ b.Property("ProviderId")
+ .HasColumnType("char(36)");
+
+ b.Property("ProviderOrganizationId")
+ .HasColumnType("char(36)");
+
+ b.Property("ProviderUserId")
+ .HasColumnType("char(36)");
+
+ b.Property("SecretId")
+ .HasColumnType("char(36)");
+
+ b.Property("ServiceAccountId")
+ .HasColumnType("char(36)");
+
+ b.Property("SystemUser")
+ .HasColumnType("tinyint unsigned");
+
+ b.Property("Type")
+ .HasColumnType("int");
+
+ b.Property("UserId")
+ .HasColumnType("char(36)");
+
+ b.HasKey("Id");
+
+ b.ToTable("Event", (string)null);
+ });
+
+ modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.Group", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("AccessAll")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("ExternalId")
+ .HasMaxLength(300)
+ .HasColumnType("varchar(300)");
+
+ b.Property("Name")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)");
+
+ b.Property("OrganizationId")
+ .HasColumnType("char(36)");
+
+ b.Property("RevisionDate")
+ .HasColumnType("datetime(6)");
+
+ b.HasKey("Id");
+
+ b.HasIndex("OrganizationId");
+
+ b.ToTable("Group", (string)null);
+ });
+
+ modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.GroupUser", b =>
+ {
+ b.Property("GroupId")
+ .HasColumnType("char(36)");
+
+ b.Property("OrganizationUserId")
+ .HasColumnType("char(36)");
+
+ b.HasKey("GroupId", "OrganizationUserId");
+
+ b.HasIndex("OrganizationUserId");
+
+ b.ToTable("GroupUser", (string)null);
+ });
+
+ modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.Installation", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("Email")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)");
+
+ b.Property("Enabled")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("Key")
+ .HasMaxLength(150)
+ .HasColumnType("varchar(150)");
+
+ b.HasKey("Id");
+
+ b.ToTable("Installation", (string)null);
+ });
+
+ modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.Organization", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("BillingEmail")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)");
+
+ b.Property("BusinessAddress1")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)");
+
+ b.Property("BusinessAddress2")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)");
+
+ b.Property("BusinessAddress3")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)");
+
+ b.Property("BusinessCountry")
+ .HasMaxLength(2)
+ .HasColumnType("varchar(2)");
+
+ b.Property("BusinessName")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)");
+
+ b.Property("BusinessTaxNumber")
+ .HasMaxLength(30)
+ .HasColumnType("varchar(30)");
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("Enabled")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("ExpirationDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("Gateway")
+ .HasColumnType("tinyint unsigned");
+
+ b.Property("GatewayCustomerId")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)");
+
+ b.Property("GatewaySubscriptionId")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)");
+
+ b.Property("Identifier")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)");
+
+ b.Property("LicenseKey")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)");
+
+ b.Property("MaxAutoscaleSeats")
+ .HasColumnType("int");
+
+ b.Property("MaxAutoscaleSmSeats")
+ .HasColumnType("int");
+
+ b.Property("MaxAutoscaleSmServiceAccounts")
+ .HasColumnType("int");
+
+ b.Property("MaxCollections")
+ .HasColumnType("smallint");
+
+ b.Property("MaxStorageGb")
+ .HasColumnType("smallint");
+
+ b.Property("Name")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)");
+
+ b.Property("OwnersNotifiedOfAutoscaling")
+ .HasColumnType("datetime(6)");
+
+ b.Property("Plan")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)");
+
+ b.Property("PlanType")
+ .HasColumnType("tinyint unsigned");
+
+ b.Property("PrivateKey")
+ .HasColumnType("longtext");
+
+ b.Property("PublicKey")
+ .HasColumnType("longtext");
+
+ b.Property("ReferenceData")
+ .HasColumnType("longtext");
+
+ b.Property("RevisionDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("Seats")
+ .HasColumnType("int");
+
+ b.Property("SecretsManagerBeta")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("SelfHost")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("SmSeats")
+ .HasColumnType("int");
+
+ b.Property("SmServiceAccounts")
+ .HasColumnType("int");
+
+ b.Property("Status")
+ .HasColumnType("tinyint unsigned");
+
+ b.Property("Storage")
+ .HasColumnType("bigint");
+
+ b.Property("TwoFactorProviders")
+ .HasColumnType("longtext");
+
+ b.Property("Use2fa")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("UseApi")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("UseCustomPermissions")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("UseDirectory")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("UseEvents")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("UseGroups")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("UseKeyConnector")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("UsePasswordManager")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("UsePolicies")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("UseResetPassword")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("UseScim")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("UseSecretsManager")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("UseSso")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("UseTotp")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("UsersGetPremium")
+ .HasColumnType("tinyint(1)");
+
+ b.HasKey("Id");
+
+ b.ToTable("Organization", (string)null);
+ });
+
+ modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.OrganizationApiKey", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("ApiKey")
+ .HasMaxLength(30)
+ .HasColumnType("varchar(30)");
+
+ b.Property("OrganizationId")
+ .HasColumnType("char(36)");
+
+ b.Property("RevisionDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("Type")
+ .HasColumnType("tinyint unsigned");
+
+ b.HasKey("Id");
+
+ b.HasIndex("OrganizationId");
+
+ b.ToTable("OrganizationApiKey", (string)null);
+ });
+
+ modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.OrganizationConnection", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("Config")
+ .HasColumnType("longtext");
+
+ b.Property("Enabled")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("OrganizationId")
+ .HasColumnType("char(36)");
+
+ b.Property("Type")
+ .HasColumnType("tinyint unsigned");
+
+ b.HasKey("Id");
+
+ b.HasIndex("OrganizationId");
+
+ b.ToTable("OrganizationConnection", (string)null);
+ });
+
+ modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.OrganizationDomain", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("DomainName")
+ .HasMaxLength(255)
+ .HasColumnType("varchar(255)");
+
+ b.Property("JobRunCount")
+ .HasColumnType("int");
+
+ b.Property("LastCheckedDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("NextRunDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("OrganizationId")
+ .HasColumnType("char(36)");
+
+ b.Property("Txt")
+ .HasColumnType("longtext");
+
+ b.Property("VerifiedDate")
+ .HasColumnType("datetime(6)");
+
+ b.HasKey("Id");
+
+ b.HasIndex("OrganizationId");
+
+ b.ToTable("OrganizationDomain", (string)null);
+ });
+
+ modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.OrganizationSponsorship", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("FriendlyName")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)");
+
+ b.Property("LastSyncDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("OfferedToEmail")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)");
+
+ b.Property("PlanSponsorshipType")
+ .HasColumnType("tinyint unsigned");
+
+ b.Property("SponsoredOrganizationId")
+ .HasColumnType("char(36)");
+
+ b.Property("SponsoringOrganizationId")
+ .HasColumnType("char(36)");
+
+ b.Property("SponsoringOrganizationUserId")
+ .HasColumnType("char(36)");
+
+ b.Property("ToDelete")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("ValidUntil")
+ .HasColumnType("datetime(6)");
+
+ b.HasKey("Id");
+
+ b.HasIndex("SponsoredOrganizationId");
+
+ b.HasIndex("SponsoringOrganizationId");
+
+ b.ToTable("OrganizationSponsorship", (string)null);
+ });
+
+ modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.OrganizationUser", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("AccessAll")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("AccessSecretsManager")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("Email")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)");
+
+ b.Property("ExternalId")
+ .HasMaxLength(300)
+ .HasColumnType("varchar(300)");
+
+ b.Property("Key")
+ .HasColumnType("longtext");
+
+ b.Property("OrganizationId")
+ .HasColumnType("char(36)");
+
+ b.Property("Permissions")
+ .HasColumnType("longtext");
+
+ b.Property("ResetPasswordKey")
+ .HasColumnType("longtext");
+
+ b.Property("RevisionDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("Status")
+ .HasColumnType("smallint");
+
+ b.Property("Type")
+ .HasColumnType("tinyint unsigned");
+
+ b.Property("UserId")
+ .HasColumnType("char(36)");
+
+ b.HasKey("Id");
+
+ b.HasIndex("OrganizationId");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("OrganizationUser", (string)null);
+ });
+
+ modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.Policy", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("Data")
+ .HasColumnType("longtext");
+
+ b.Property("Enabled")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("OrganizationId")
+ .HasColumnType("char(36)");
+
+ b.Property("RevisionDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("Type")
+ .HasColumnType("tinyint unsigned");
+
+ b.HasKey("Id");
+
+ b.HasIndex("OrganizationId");
+
+ b.ToTable("Policy", (string)null);
+ });
+
+ modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.Provider", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("BillingEmail")
+ .HasColumnType("longtext");
+
+ b.Property("BillingPhone")
+ .HasColumnType("longtext");
+
+ b.Property("BusinessAddress1")
+ .HasColumnType("longtext");
+
+ b.Property("BusinessAddress2")
+ .HasColumnType("longtext");
+
+ b.Property("BusinessAddress3")
+ .HasColumnType("longtext");
+
+ b.Property("BusinessCountry")
+ .HasColumnType("longtext");
+
+ b.Property("BusinessName")
+ .HasColumnType("longtext");
+
+ b.Property("BusinessTaxNumber")
+ .HasColumnType("longtext");
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("Enabled")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("Name")
+ .HasColumnType("longtext");
+
+ b.Property("RevisionDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("Status")
+ .HasColumnType("tinyint unsigned");
+
+ b.Property("Type")
+ .HasColumnType("tinyint unsigned");
+
+ b.Property("UseEvents")
+ .HasColumnType("tinyint(1)");
+
+ b.HasKey("Id");
+
+ b.ToTable("Provider", (string)null);
+ });
+
+ modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.ProviderOrganization", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("Key")
+ .HasColumnType("longtext");
+
+ b.Property("OrganizationId")
+ .HasColumnType("char(36)");
+
+ b.Property("ProviderId")
+ .HasColumnType("char(36)");
+
+ b.Property("RevisionDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("Settings")
+ .HasColumnType("longtext");
+
+ b.HasKey("Id");
+
+ b.HasIndex("OrganizationId");
+
+ b.HasIndex("ProviderId");
+
+ b.ToTable("ProviderOrganization", (string)null);
+ });
+
+ modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.ProviderUser", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("Email")
+ .HasColumnType("longtext");
+
+ b.Property("Key")
+ .HasColumnType("longtext");
+
+ b.Property("Permissions")
+ .HasColumnType("longtext");
+
+ b.Property("ProviderId")
+ .HasColumnType("char(36)");
+
+ b.Property("RevisionDate")
+ .HasColumnType("datetime(6)");
+
+ b.Property("Status")
+ .HasColumnType("tinyint unsigned");
+
+ b.Property("Type")
+ .HasColumnType("tinyint unsigned");
+
+ b.Property("UserId")
+ .HasColumnType("char(36)");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ProviderId");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("ProviderUser", (string)null);
+ });
+
+ modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.Send", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("AccessCount")
+ .HasColumnType("int");
+
+ b.Property