feature/openiddict 4 (#20)

* updated to latest nuget packages * fixed integration tests * removed ServerWithCustomKey sample * added Api.csproj to sln * added changlogs * fixed failing integration tests when db migrations not finished * fixed reference paths in build/Program.cs * refactored to use UseInMemoryDatabase for integration tests
thomasduft · Dec 27, 2022 · 61a4d52 · 61a4d52
1 parent 0948ff0
commit 61a4d52
Show file tree

Hide file tree

Showing 76 changed files with 81 additions and 6,528 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -46,29 +46,6 @@
       "sourceFileMap": {
         "/Views": "${workspaceFolder}/Views"
       }
-    },
-    {
-      "name": "ServerWithCustomKey",
-      "type": "coreclr",
-      "request": "launch",
-      "preLaunchTask": "build-server-with-custom-key",
-      "program": "${workspaceFolder}/samples/ServerWithCustomKey/bin/Debug/net7.0/ServerWithCustomKey.dll",
-      "args": [
-        "--urls",
-        "https://localhost:5001"
-      ],
-      "cwd": "${workspaceFolder}/samples/ServerWithCustomKey",
-      "stopAtEntry": false,
-      "serverReadyAction": {
-        "action": "openExternally",
-        "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
-      },
-      "env": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "sourceFileMap": {
-        "/Views": "${workspaceFolder}/Views"
-      }
     }
   ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -26,29 +26,18 @@
       "problemMatcher": "$msCompile"
     },
     {
-      "label": "build-server-with-custom-key",
-      "command": "dotnet",
-      "type": "process",
-      "args": [
-        "build",
-        "${workspaceFolder}/samples/ServerWithCustomKey/ServerWithCustomKey.csproj",
-        "/property:GenerateFullPaths=true",
-        "/consoleloggerparameters:NoSummary"
-      ],
-      "problemMatcher": "$msCompile"
-    },
-    {
-      "label": "test",
+      "label": "build:test-watch",
       "command": "dotnet",
       "type": "process",
       "args": [
+        "watch",
         "test",
-        "/p:ParallelizeTestCollections=false",
+        "--project",
+        "${workspaceFolder}/tests/OpenIddict.UI.Tests.csproj",
         "/p:CollectCoverage=true",
         "/p:CoverletOutputFormat=lcov",
         "/p:CoverletOutput=./../lcov",
         "/p:Include=[tomware.*]tomware.OpenIddict.UI.*",
-        "${workspaceFolder}/tests/OpenIddict.UI.Tests.csproj"
       ],
       "problemMatcher": "$msCompile",
       "group": {

diff --git a/changelogs/07a018fc2407496b894ee0df6858b1d9.cle b/changelogs/07a018fc2407496b894ee0df6858b1d9.cle
@@ -0,0 +1,9 @@
+{
+  "Id": "07a018fc-2407-496b-894e-e0df6858b1d9",
+  "IssueId": "",
+  "Prefix": "Added",
+  "Tag": "",
+  "Message": "added support for OpenIddict v4.0",
+  "CreatedAt": "2022-12-27T09:20:18.1537358+00:00",
+  "CreatedBy": "vscode"
+}
diff --git a/changelogs/429b0b06c4ab42de8a716fee66b1e268.cle b/changelogs/429b0b06c4ab42de8a716fee66b1e268.cle
@@ -0,0 +1,9 @@
+{
+  "Id": "429b0b06-c4ab-42de-8a71-6fee66b1e268",
+  "IssueId": "",
+  "Prefix": "Removed",
+  "Tag": "",
+  "Message": "removed ServerWithCustomKey sample to remove heavy sample code duplication",
+  "CreatedAt": "2022-12-27T09:21:19.2983377+00:00",
+  "CreatedBy": "vscode"
+}
diff --git a/openiddict-ui.sln b/openiddict-ui.sln
@@ -33,10 +33,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server", "samples\Server\Se
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{213222C7-2F94-40BC-ADBF-4B2AE43D8043}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerWithCustomKey", "samples\ServerWithCustomKey\ServerWithCustomKey.csproj", "{049B9CC7-E284-45A8-AD96-071DC21D887F}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "targets", "build\targets.csproj", "{9397C4FC-56DB-4AD9-AB97-BCE4FF780FA0}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Api", "samples\Api\Api.csproj", "{CAAA1627-8110-4484-800C-4C96A7F7BDB6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -155,18 +155,6 @@ Global
 		{1DF2B3A1-A6EA-428B-98FB-6FA02E503E01}.Release|x64.Build.0 = Release|Any CPU
 		{1DF2B3A1-A6EA-428B-98FB-6FA02E503E01}.Release|x86.ActiveCfg = Release|Any CPU
 		{1DF2B3A1-A6EA-428B-98FB-6FA02E503E01}.Release|x86.Build.0 = Release|Any CPU
-		{049B9CC7-E284-45A8-AD96-071DC21D887F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{049B9CC7-E284-45A8-AD96-071DC21D887F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{049B9CC7-E284-45A8-AD96-071DC21D887F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{049B9CC7-E284-45A8-AD96-071DC21D887F}.Debug|x64.Build.0 = Debug|Any CPU
-		{049B9CC7-E284-45A8-AD96-071DC21D887F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{049B9CC7-E284-45A8-AD96-071DC21D887F}.Debug|x86.Build.0 = Debug|Any CPU
-		{049B9CC7-E284-45A8-AD96-071DC21D887F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{049B9CC7-E284-45A8-AD96-071DC21D887F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{049B9CC7-E284-45A8-AD96-071DC21D887F}.Release|x64.ActiveCfg = Release|Any CPU
-		{049B9CC7-E284-45A8-AD96-071DC21D887F}.Release|x64.Build.0 = Release|Any CPU
-		{049B9CC7-E284-45A8-AD96-071DC21D887F}.Release|x86.ActiveCfg = Release|Any CPU
-		{049B9CC7-E284-45A8-AD96-071DC21D887F}.Release|x86.Build.0 = Release|Any CPU
 		{9397C4FC-56DB-4AD9-AB97-BCE4FF780FA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9397C4FC-56DB-4AD9-AB97-BCE4FF780FA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9397C4FC-56DB-4AD9-AB97-BCE4FF780FA0}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -179,6 +167,18 @@ Global
 		{9397C4FC-56DB-4AD9-AB97-BCE4FF780FA0}.Release|x64.Build.0 = Release|Any CPU
 		{9397C4FC-56DB-4AD9-AB97-BCE4FF780FA0}.Release|x86.ActiveCfg = Release|Any CPU
 		{9397C4FC-56DB-4AD9-AB97-BCE4FF780FA0}.Release|x86.Build.0 = Release|Any CPU
+		{CAAA1627-8110-4484-800C-4C96A7F7BDB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CAAA1627-8110-4484-800C-4C96A7F7BDB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CAAA1627-8110-4484-800C-4C96A7F7BDB6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CAAA1627-8110-4484-800C-4C96A7F7BDB6}.Debug|x64.Build.0 = Debug|Any CPU
+		{CAAA1627-8110-4484-800C-4C96A7F7BDB6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CAAA1627-8110-4484-800C-4C96A7F7BDB6}.Debug|x86.Build.0 = Debug|Any CPU
+		{CAAA1627-8110-4484-800C-4C96A7F7BDB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CAAA1627-8110-4484-800C-4C96A7F7BDB6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CAAA1627-8110-4484-800C-4C96A7F7BDB6}.Release|x64.ActiveCfg = Release|Any CPU
+		{CAAA1627-8110-4484-800C-4C96A7F7BDB6}.Release|x64.Build.0 = Release|Any CPU
+		{CAAA1627-8110-4484-800C-4C96A7F7BDB6}.Release|x86.ActiveCfg = Release|Any CPU
+		{CAAA1627-8110-4484-800C-4C96A7F7BDB6}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -196,7 +196,7 @@ Global
 		{30B7D5F1-E9BF-4E62-99DE-63A54929B3AA} = {EE96B966-7F77-4E35-BD2D-F80243693D87}
 		{7FA885DC-025C-4ABD-89EA-9A4EBEFCA425} = {213222C7-2F94-40BC-ADBF-4B2AE43D8043}
 		{1DF2B3A1-A6EA-428B-98FB-6FA02E503E01} = {36BC6CE4-67E7-40B0-B117-08637D7CB87A}
-		{049B9CC7-E284-45A8-AD96-071DC21D887F} = {36BC6CE4-67E7-40B0-B117-08637D7CB87A}
+		{CAAA1627-8110-4484-800C-4C96A7F7BDB6} = {36BC6CE4-67E7-40B0-B117-08637D7CB87A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3F5427BA-2C47-4399-A082-3653383D71C2}

diff --git a/samples/Api/Api.csproj b/samples/Api/Api.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
-    <PackageReference Include="OpenIddict.Validation.AspNetCore" Version="3.1.1" />
-    <PackageReference Include="OpenIddict.Validation.SystemNetHttp" Version="3.1.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+    <PackageReference Include="OpenIddict.Validation.AspNetCore" Version="4.0.0" />
+    <PackageReference Include="OpenIddict.Validation.SystemNetHttp" Version="4.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/Server/Server.csproj b/samples/Server/Server.csproj
@@ -22,9 +22,9 @@
 
     <PackageReference Include="Quartz.Extensions.Hosting" Version="3.5.0" />
 
-    <PackageReference Include="OpenIddict.AspNetCore" Version="3.1.1" />
-    <PackageReference Include="OpenIddict.EntityFrameworkCore" Version="3.1.1" />
-    <PackageReference Include="OpenIddict.Quartz" Version="3.1.1" />
+    <PackageReference Include="OpenIddict.AspNetCore" Version="4.0.0" />
+    <PackageReference Include="OpenIddict.EntityFrameworkCore" Version="4.0.0" />
+    <PackageReference Include="OpenIddict.Quartz" Version="4.0.0" />
 
     <PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />

diff --git a/samples/Server/appsettings.Testing.json b/samples/Server/appsettings.Testing.json
@@ -2,6 +2,7 @@
   "ConnectionStrings": {
     "DefaultConnection": "Filename=testing.sqlite"
   },
+  "DisableAccessTokenEncryption": false,
   "Serilog": {
     "MinimumLevel": {
       "Default": "Warning"

diff --git a/samples/ServerWithCustomKey/ConfigureApplication.cs b/samples/ServerWithCustomKey/ConfigureApplication.cs