From 366d8523cf2bf33d5f949464def3eb89edd74b46 Mon Sep 17 00:00:00 2001 From: Damian Hickey <57436+damianh@users.noreply.github.com> Date: Sat, 5 Oct 2024 17:31:55 +0200 Subject: [PATCH] Rename projects and folders --- .../workflows/access-token-management-ci.yml | 7 +- .../access-token-management-codeql.yml | 2 +- ...nagement.sln => AccessTokenManagement.sln} | 72 +++++++++++-------- access-token-management/build/Program.cs | 6 +- .../samples/BlazorServer/BlazorServer.csproj | 2 +- .../samples/Web/Web.csproj | 4 +- .../samples/WebJarJwt/WebJarJwt.csproj | 4 +- .../samples/Worker/Worker.csproj | 2 +- .../samples/WorkerDI/WorkerDI.csproj | 2 +- ...ccessTokenManagement.OpenIdConnect.csproj} | 10 ++- .../AuthenticationSessionUserTokenStore.cs | 0 .../AuthorizationServerDPoPHandler.cs | 0 .../BlazorServerPrincipalAccessor.cs | 0 .../CircuitServicesAccessor.cs | 0 ...reOpenIdConnectClientCredentialsOptions.cs | 0 .../ConfigureOpenIdConnectOptions.cs | 0 .../HttpContextPrincipalAccessor.cs | 0 .../IPrincipalAccessor.cs | 0 .../IStoreTokensInAuthenticationProperties.cs | 0 .../IOpenIdConnectConfigurationService.cs | 0 .../Interfaces/IUserTokenEndpointService.cs | 0 .../Interfaces/IUserTokenManagementService.cs | 0 .../IUserTokenRequestSynchronization.cs | 0 .../Interfaces/IUserTokenStore.cs | 0 .../OpenIdConnectClientAccessTokenHandler.cs | 0 .../OpenIdConnectClientConfiguration.cs | 0 .../OpenIdConnectConfigurationService.cs | 0 .../OpenIdConnectTokenManagementDefaults.cs | 0 ...enManagementServiceCollectionExtensions.cs | 0 .../OpenIdConnectUserAccessTokenHandler.cs | 0 .../README.md | 0 .../StoreTokensInAuthenticationProperties.cs | 0 .../StringExtensions.cs | 0 .../TokenManagementHttpContextExtensions.cs | 0 .../UserAccessTokenManagementService.cs | 0 .../UserToken.cs | 0 .../UserTokenEndpointService.cs | 0 .../UserTokenManagementOptions.cs | 0 .../UserTokenRequestParameters.cs | 0 .../UserTokenRequestSynchronization.cs | 0 .../AccessTokenHandler.cs | 0 .../AccessTokenManagement.csproj} | 2 + .../ClientCredentialsClient.cs | 0 .../ClientCredentialsToken.cs | 0 .../ClientCredentialsTokenEndpointService.cs | 0 .../ClientCredentialsTokenHandler.cs | 0 ...ClientCredentialsTokenManagementBuilder.cs | 0 ...lientCredentialsTokenManagementDefaults.cs | 0 ...ClientCredentialsTokenManagementOptions.cs | 0 ...ClientCredentialsTokenManagementService.cs | 0 ...enManagementServiceCollectionExtensions.cs | 0 .../DPoPExtensions.cs | 0 .../DefaultClientAssertionService.cs | 0 .../DefaultDPoPKeyStore.cs | 0 .../DefaultDPoPProofService.cs | 0 .../DistributedClientCredentialsTokenCache.cs | 0 .../DistributedDPoPNonceStore.cs | 0 .../Interfaces/IClientAssertionService.cs | 0 .../IClientCredentialsTokenCache.cs | 0 .../IClientCredentialsTokenEndpointService.cs | 0 ...ClientCredentialsTokenManagementService.cs | 0 .../Interfaces/IDPoPKeyStore.cs | 0 .../Interfaces/IDPoPNonceStore.cs | 0 .../Interfaces/IDPoPProofService.cs | 0 .../ITokenRequestSynchronization.cs | 0 .../README.md | 0 .../TokenRequestParameters.cs | 0 .../TokenRequestSynchronization.cs | 0 .../AccessTokenHandlerTests.cs | 0 .../AccessTokenManagement.Tests.csproj} | 11 ++- .../BackChannelClientTests.cs | 0 .../ClientTokenManagementApiTests.cs | 0 .../ClientTokenManagementTests.cs | 0 .../Framework/ApiHost.cs | 0 .../Framework/AppHost.cs | 0 .../Framework/GenericHost.cs | 0 .../Framework/IdentityServerHost.cs | 0 .../Framework/IntegrationTestBase.cs | 0 .../Framework/TestBrowserClient.cs | 0 .../Framework/TestClientAssertionService.cs | 0 .../Framework/TestDPoPNonceStore.cs | 0 .../Framework/TestDPoPProofService.cs | 0 .../Framework/TestDistributedCache.cs | 0 .../Framework/TestLoggerProvider.cs | 0 .../Framework/TestOptionsMonitor.cs | 0 .../Framework/TestSchemeProvider.cs | 0 ...reTokensInAuthenticationPropertiesTests.cs | 0 .../UserTokenManagementTests.cs | 0 .../UserTokenManagementWithDPoPTests.cs | 0 .../Usings.cs | 0 90 files changed, 69 insertions(+), 55 deletions(-) rename access-token-management/{Duende.AccessTokenManagement.sln => AccessTokenManagement.sln} (57%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect/Duende.AccessTokenManagement.OpenIdConnect.csproj => AccessTokenManagement.OpenIdConnect/AccessTokenManagement.OpenIdConnect.csproj} (75%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/AuthenticationSessionUserTokenStore.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/AuthorizationServerDPoPHandler.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/BlazorServerPrincipalAccessor.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/CircuitServicesAccessor.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/ConfigureOpenIdConnectClientCredentialsOptions.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/ConfigureOpenIdConnectOptions.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/HttpContextPrincipalAccessor.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/IPrincipalAccessor.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/IStoreTokensInAuthenticationProperties.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/Interfaces/IOpenIdConnectConfigurationService.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/Interfaces/IUserTokenEndpointService.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/Interfaces/IUserTokenManagementService.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/Interfaces/IUserTokenRequestSynchronization.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/Interfaces/IUserTokenStore.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/OpenIdConnectClientAccessTokenHandler.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/OpenIdConnectClientConfiguration.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/OpenIdConnectConfigurationService.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/OpenIdConnectTokenManagementDefaults.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/OpenIdConnectTokenManagementServiceCollectionExtensions.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/OpenIdConnectUserAccessTokenHandler.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/README.md (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/StoreTokensInAuthenticationProperties.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/StringExtensions.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/TokenManagementHttpContextExtensions.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/UserAccessTokenManagementService.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/UserToken.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/UserTokenEndpointService.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/UserTokenManagementOptions.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/UserTokenRequestParameters.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement.OpenIdConnect => AccessTokenManagement.OpenIdConnect}/UserTokenRequestSynchronization.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement => AccessTokenManagement}/AccessTokenHandler.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement/Duende.AccessTokenManagement.csproj => AccessTokenManagement/AccessTokenManagement.csproj} (92%) rename access-token-management/src/{Duende.AccessTokenManagement => AccessTokenManagement}/ClientCredentialsClient.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement => AccessTokenManagement}/ClientCredentialsToken.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement => AccessTokenManagement}/ClientCredentialsTokenEndpointService.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement => AccessTokenManagement}/ClientCredentialsTokenHandler.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement => AccessTokenManagement}/ClientCredentialsTokenManagementBuilder.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement => AccessTokenManagement}/ClientCredentialsTokenManagementDefaults.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement => AccessTokenManagement}/ClientCredentialsTokenManagementOptions.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement => AccessTokenManagement}/ClientCredentialsTokenManagementService.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement => AccessTokenManagement}/ClientCredentialsTokenManagementServiceCollectionExtensions.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement => AccessTokenManagement}/DPoPExtensions.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement => AccessTokenManagement}/DefaultClientAssertionService.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement => AccessTokenManagement}/DefaultDPoPKeyStore.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement => AccessTokenManagement}/DefaultDPoPProofService.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement => AccessTokenManagement}/DistributedClientCredentialsTokenCache.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement => AccessTokenManagement}/DistributedDPoPNonceStore.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement => AccessTokenManagement}/Interfaces/IClientAssertionService.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement => AccessTokenManagement}/Interfaces/IClientCredentialsTokenCache.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement => AccessTokenManagement}/Interfaces/IClientCredentialsTokenEndpointService.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement => AccessTokenManagement}/Interfaces/IClientCredentialsTokenManagementService.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement => AccessTokenManagement}/Interfaces/IDPoPKeyStore.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement => AccessTokenManagement}/Interfaces/IDPoPNonceStore.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement => AccessTokenManagement}/Interfaces/IDPoPProofService.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement => AccessTokenManagement}/Interfaces/ITokenRequestSynchronization.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement => AccessTokenManagement}/README.md (100%) rename access-token-management/src/{Duende.AccessTokenManagement => AccessTokenManagement}/TokenRequestParameters.cs (100%) rename access-token-management/src/{Duende.AccessTokenManagement => AccessTokenManagement}/TokenRequestSynchronization.cs (100%) rename access-token-management/test/{Tests => AccessTokenManagement.Tests}/AccessTokenHandlerTests.cs (100%) rename access-token-management/test/{Tests/Tests.csproj => AccessTokenManagement.Tests/AccessTokenManagement.Tests.csproj} (86%) rename access-token-management/test/{Tests => AccessTokenManagement.Tests}/BackChannelClientTests.cs (100%) rename access-token-management/test/{Tests => AccessTokenManagement.Tests}/ClientTokenManagementApiTests.cs (100%) rename access-token-management/test/{Tests => AccessTokenManagement.Tests}/ClientTokenManagementTests.cs (100%) rename access-token-management/test/{Tests => AccessTokenManagement.Tests}/Framework/ApiHost.cs (100%) rename access-token-management/test/{Tests => AccessTokenManagement.Tests}/Framework/AppHost.cs (100%) rename access-token-management/test/{Tests => AccessTokenManagement.Tests}/Framework/GenericHost.cs (100%) rename access-token-management/test/{Tests => AccessTokenManagement.Tests}/Framework/IdentityServerHost.cs (100%) rename access-token-management/test/{Tests => AccessTokenManagement.Tests}/Framework/IntegrationTestBase.cs (100%) rename access-token-management/test/{Tests => AccessTokenManagement.Tests}/Framework/TestBrowserClient.cs (100%) rename access-token-management/test/{Tests => AccessTokenManagement.Tests}/Framework/TestClientAssertionService.cs (100%) rename access-token-management/test/{Tests => AccessTokenManagement.Tests}/Framework/TestDPoPNonceStore.cs (100%) rename access-token-management/test/{Tests => AccessTokenManagement.Tests}/Framework/TestDPoPProofService.cs (100%) rename access-token-management/test/{Tests => AccessTokenManagement.Tests}/Framework/TestDistributedCache.cs (100%) rename access-token-management/test/{Tests => AccessTokenManagement.Tests}/Framework/TestLoggerProvider.cs (100%) rename access-token-management/test/{Tests => AccessTokenManagement.Tests}/Framework/TestOptionsMonitor.cs (100%) rename access-token-management/test/{Tests => AccessTokenManagement.Tests}/Framework/TestSchemeProvider.cs (100%) rename access-token-management/test/{Tests => AccessTokenManagement.Tests}/StoreTokensInAuthenticationPropertiesTests.cs (100%) rename access-token-management/test/{Tests => AccessTokenManagement.Tests}/UserTokenManagementTests.cs (100%) rename access-token-management/test/{Tests => AccessTokenManagement.Tests}/UserTokenManagementWithDPoPTests.cs (100%) rename access-token-management/test/{Tests => AccessTokenManagement.Tests}/Usings.cs (100%) diff --git a/.github/workflows/access-token-management-ci.yml b/.github/workflows/access-token-management-ci.yml index 5a7da134..8790337b 100644 --- a/.github/workflows/access-token-management-ci.yml +++ b/.github/workflows/access-token-management-ci.yml @@ -1,4 +1,4 @@ -name: access-token-management-ci +name: access-token-management\ci permissions: contents: read @@ -41,10 +41,7 @@ jobs: dotnet-version: | 8.0.x - - name: Build and test - run: ./build.ps1 - - - name: Sign packages + - name: Build run: ./build.ps1 sign - name: Push packages to MyGet diff --git a/.github/workflows/access-token-management-codeql.yml b/.github/workflows/access-token-management-codeql.yml index 8ad26e6b..a49e1cf4 100644 --- a/.github/workflows/access-token-management-codeql.yml +++ b/.github/workflows/access-token-management-codeql.yml @@ -1,4 +1,4 @@ -name: acces-token-management-codeql" +name: acces-token-management\codeql on: push: diff --git a/access-token-management/Duende.AccessTokenManagement.sln b/access-token-management/AccessTokenManagement.sln similarity index 57% rename from access-token-management/Duende.AccessTokenManagement.sln rename to access-token-management/AccessTokenManagement.sln index ba5a4054..e024908f 100644 --- a/access-token-management/Duende.AccessTokenManagement.sln +++ b/access-token-management/AccessTokenManagement.sln @@ -1,47 +1,40 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30114.105 +# 17 +VisualStudioVersion = 17.11.35312.102 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duende.AccessTokenManagement", "src\Duende.AccessTokenManagement\Duende.AccessTokenManagement.csproj", "{BC6D6275-1096-40DD-8D5B-D04FD9C261E2}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{FC05DC37-5F54-4171-97F9-4AC2A64E3E14}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duende.AccessTokenManagement.OpenIdConnect", "src\Duende.AccessTokenManagement.OpenIdConnect\Duende.AccessTokenManagement.OpenIdConnect.csproj", "{9C1ED189-33A1-430C-899E-78C2458C25FC}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Worker", "samples\Worker\Worker.csproj", "{84AA3924-23EF-4E6B-91E9-6D9F9118AAFF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Worker", "samples\Worker\Worker.csproj", "{84AA3924-23EF-4E6B-91E9-6D9F9118AAFF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Web", "samples\Web\Web.csproj", "{FB70E5D8-B185-4DA3-9BA9-2CE69D4775FF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web", "samples\Web\Web.csproj", "{FB70E5D8-B185-4DA3-9BA9-2CE69D4775FF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F65AC342-86DC-4548-883A-61DB34626203}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0B14DE7B-43BD-4570-B6AB-37EDA32032FF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "test\Tests\Tests.csproj", "{11D9707F-E9AB-47BC-82E0-699AA0C49211}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorServer", "samples\BlazorServer\BlazorServer.csproj", "{AB15F574-FDF0-4117-9E4F-9D35EEA65125}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebJarJwt", "samples\WebJarJwt\WebJarJwt.csproj", "{C73469D2-5461-4E65-A1CE-6FE83B0FCA85}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkerDI", "samples\WorkerDI\WorkerDI.csproj", "{22D7B959-CC06-4CDC-8A13-E51E2A94EEE5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorServer", "samples\BlazorServer\BlazorServer.csproj", "{AB15F574-FDF0-4117-9E4F-9D35EEA65125}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AccessTokenManagement", "src\AccessTokenManagement\AccessTokenManagement.csproj", "{9D97D77F-4ADF-4769-AA84-4247D9C53FD9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebJarJwt", "samples\WebJarJwt\WebJarJwt.csproj", "{C73469D2-5461-4E65-A1CE-6FE83B0FCA85}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AccessTokenManagement.OpenIdConnect", "src\AccessTokenManagement.OpenIdConnect\AccessTokenManagement.OpenIdConnect.csproj", "{57A698CF-67A1-46CB-B1AB-902FFFEADB89}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkerDI", "samples\WorkerDI\WorkerDI.csproj", "{22D7B959-CC06-4CDC-8A13-E51E2A94EEE5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AccessTokenManagement.Tests", "test\AccessTokenManagement.Tests\AccessTokenManagement.Tests.csproj", "{93554316-F7D2-426F-A3D2-95C120A7A04D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{CF071876-039F-4DF7-92A3-B0209A7CD27F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "build", "build\build.csproj", "{3EE4C5AF-7DC5-42DC-93F7-C9F8BEF2E5C8}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BC6D6275-1096-40DD-8D5B-D04FD9C261E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BC6D6275-1096-40DD-8D5B-D04FD9C261E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BC6D6275-1096-40DD-8D5B-D04FD9C261E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BC6D6275-1096-40DD-8D5B-D04FD9C261E2}.Release|Any CPU.Build.0 = Release|Any CPU - {9C1ED189-33A1-430C-899E-78C2458C25FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C1ED189-33A1-430C-899E-78C2458C25FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C1ED189-33A1-430C-899E-78C2458C25FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C1ED189-33A1-430C-899E-78C2458C25FC}.Release|Any CPU.Build.0 = Release|Any CPU {84AA3924-23EF-4E6B-91E9-6D9F9118AAFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {84AA3924-23EF-4E6B-91E9-6D9F9118AAFF}.Debug|Any CPU.Build.0 = Debug|Any CPU {84AA3924-23EF-4E6B-91E9-6D9F9118AAFF}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -50,10 +43,6 @@ Global {FB70E5D8-B185-4DA3-9BA9-2CE69D4775FF}.Debug|Any CPU.Build.0 = Debug|Any CPU {FB70E5D8-B185-4DA3-9BA9-2CE69D4775FF}.Release|Any CPU.ActiveCfg = Release|Any CPU {FB70E5D8-B185-4DA3-9BA9-2CE69D4775FF}.Release|Any CPU.Build.0 = Release|Any CPU - {11D9707F-E9AB-47BC-82E0-699AA0C49211}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {11D9707F-E9AB-47BC-82E0-699AA0C49211}.Debug|Any CPU.Build.0 = Debug|Any CPU - {11D9707F-E9AB-47BC-82E0-699AA0C49211}.Release|Any CPU.ActiveCfg = Release|Any CPU - {11D9707F-E9AB-47BC-82E0-699AA0C49211}.Release|Any CPU.Build.0 = Release|Any CPU {AB15F574-FDF0-4117-9E4F-9D35EEA65125}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AB15F574-FDF0-4117-9E4F-9D35EEA65125}.Debug|Any CPU.Build.0 = Debug|Any CPU {AB15F574-FDF0-4117-9E4F-9D35EEA65125}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -66,15 +55,38 @@ Global {22D7B959-CC06-4CDC-8A13-E51E2A94EEE5}.Debug|Any CPU.Build.0 = Debug|Any CPU {22D7B959-CC06-4CDC-8A13-E51E2A94EEE5}.Release|Any CPU.ActiveCfg = Release|Any CPU {22D7B959-CC06-4CDC-8A13-E51E2A94EEE5}.Release|Any CPU.Build.0 = Release|Any CPU + {9D97D77F-4ADF-4769-AA84-4247D9C53FD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9D97D77F-4ADF-4769-AA84-4247D9C53FD9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9D97D77F-4ADF-4769-AA84-4247D9C53FD9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9D97D77F-4ADF-4769-AA84-4247D9C53FD9}.Release|Any CPU.Build.0 = Release|Any CPU + {57A698CF-67A1-46CB-B1AB-902FFFEADB89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {57A698CF-67A1-46CB-B1AB-902FFFEADB89}.Debug|Any CPU.Build.0 = Debug|Any CPU + {57A698CF-67A1-46CB-B1AB-902FFFEADB89}.Release|Any CPU.ActiveCfg = Release|Any CPU + {57A698CF-67A1-46CB-B1AB-902FFFEADB89}.Release|Any CPU.Build.0 = Release|Any CPU + {93554316-F7D2-426F-A3D2-95C120A7A04D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {93554316-F7D2-426F-A3D2-95C120A7A04D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {93554316-F7D2-426F-A3D2-95C120A7A04D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {93554316-F7D2-426F-A3D2-95C120A7A04D}.Release|Any CPU.Build.0 = Release|Any CPU + {3EE4C5AF-7DC5-42DC-93F7-C9F8BEF2E5C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3EE4C5AF-7DC5-42DC-93F7-C9F8BEF2E5C8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3EE4C5AF-7DC5-42DC-93F7-C9F8BEF2E5C8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3EE4C5AF-7DC5-42DC-93F7-C9F8BEF2E5C8}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {84AA3924-23EF-4E6B-91E9-6D9F9118AAFF} = {FC05DC37-5F54-4171-97F9-4AC2A64E3E14} {FB70E5D8-B185-4DA3-9BA9-2CE69D4775FF} = {FC05DC37-5F54-4171-97F9-4AC2A64E3E14} - {BC6D6275-1096-40DD-8D5B-D04FD9C261E2} = {F65AC342-86DC-4548-883A-61DB34626203} - {9C1ED189-33A1-430C-899E-78C2458C25FC} = {F65AC342-86DC-4548-883A-61DB34626203} - {11D9707F-E9AB-47BC-82E0-699AA0C49211} = {0B14DE7B-43BD-4570-B6AB-37EDA32032FF} {AB15F574-FDF0-4117-9E4F-9D35EEA65125} = {FC05DC37-5F54-4171-97F9-4AC2A64E3E14} {C73469D2-5461-4E65-A1CE-6FE83B0FCA85} = {FC05DC37-5F54-4171-97F9-4AC2A64E3E14} {22D7B959-CC06-4CDC-8A13-E51E2A94EEE5} = {FC05DC37-5F54-4171-97F9-4AC2A64E3E14} + {9D97D77F-4ADF-4769-AA84-4247D9C53FD9} = {F65AC342-86DC-4548-883A-61DB34626203} + {57A698CF-67A1-46CB-B1AB-902FFFEADB89} = {F65AC342-86DC-4548-883A-61DB34626203} + {93554316-F7D2-426F-A3D2-95C120A7A04D} = {0B14DE7B-43BD-4570-B6AB-37EDA32032FF} + {3EE4C5AF-7DC5-42DC-93F7-C9F8BEF2E5C8} = {CF071876-039F-4DF7-92A3-B0209A7CD27F} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A8AE52DE-E234-417E-8152-95C30CD71A7A} EndGlobalSection EndGlobal diff --git a/access-token-management/build/Program.cs b/access-token-management/build/Program.cs index 1df7f9ae..a8f9c715 100644 --- a/access-token-management/build/Program.cs +++ b/access-token-management/build/Program.cs @@ -44,7 +44,7 @@ internal static async Task Main(string[] args) Target(Targets.Test, DependsOn(Targets.Build), () => { Run("dotnet", - $"test test/Tests -c Release --nologo " + $"test test/AccessTokenManagement -c Release --nologo " + $"--blame-hang " + $"--blame-hang-timeout=120sec " + $"--logger \"console;verbosity=normal\" --logger \"trx;LogFileName=Test.trx\""); @@ -60,8 +60,8 @@ internal static async Task Main(string[] args) Target(Targets.Pack, DependsOn(Targets.Build, Targets.CleanPackOutput), () => { - Run("dotnet", $"pack src/Duende.AccessTokenManagement/Duende.AccessTokenManagement.csproj -c Release -o {Directory.CreateDirectory(packOutput).FullName} --no-build --nologo"); - Run("dotnet", $"pack src/Duende.AccessTokenManagement.OpenIdConnect/Duende.AccessTokenManagement.OpenIdConnect.csproj -c Release -o {Directory.CreateDirectory(packOutput).FullName} --no-build --nologo"); + Run("dotnet", $"pack src/AccessTokenManagement/AccessTokenManagement.csproj -c Release -o {Directory.CreateDirectory(packOutput).FullName} --no-build --nologo"); + Run("dotnet", $"pack src/AccessTokenManagement.OpenIdConnect/AccessTokenManagement.OpenIdConnect.csproj -c Release -o {Directory.CreateDirectory(packOutput).FullName} --no-build --nologo"); }); Target(Targets.SignPackage, DependsOn(Targets.Pack, Targets.RestoreTools), () => diff --git a/access-token-management/samples/BlazorServer/BlazorServer.csproj b/access-token-management/samples/BlazorServer/BlazorServer.csproj index 85527f6f..5330b05f 100644 --- a/access-token-management/samples/BlazorServer/BlazorServer.csproj +++ b/access-token-management/samples/BlazorServer/BlazorServer.csproj @@ -13,7 +13,7 @@ - + diff --git a/access-token-management/samples/Web/Web.csproj b/access-token-management/samples/Web/Web.csproj index 108410af..53ccc3e0 100644 --- a/access-token-management/samples/Web/Web.csproj +++ b/access-token-management/samples/Web/Web.csproj @@ -9,9 +9,9 @@ - + - + \ No newline at end of file diff --git a/access-token-management/samples/WebJarJwt/WebJarJwt.csproj b/access-token-management/samples/WebJarJwt/WebJarJwt.csproj index 6faf19d9..47b64ba2 100644 --- a/access-token-management/samples/WebJarJwt/WebJarJwt.csproj +++ b/access-token-management/samples/WebJarJwt/WebJarJwt.csproj @@ -9,8 +9,8 @@ - + - + \ No newline at end of file diff --git a/access-token-management/samples/Worker/Worker.csproj b/access-token-management/samples/Worker/Worker.csproj index e945d774..1614aeee 100644 --- a/access-token-management/samples/Worker/Worker.csproj +++ b/access-token-management/samples/Worker/Worker.csproj @@ -11,6 +11,6 @@ - + diff --git a/access-token-management/samples/WorkerDI/WorkerDI.csproj b/access-token-management/samples/WorkerDI/WorkerDI.csproj index 7c0ae15f..78da7dc5 100644 --- a/access-token-management/samples/WorkerDI/WorkerDI.csproj +++ b/access-token-management/samples/WorkerDI/WorkerDI.csproj @@ -11,6 +11,6 @@ - + diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/Duende.AccessTokenManagement.OpenIdConnect.csproj b/access-token-management/src/AccessTokenManagement.OpenIdConnect/AccessTokenManagement.OpenIdConnect.csproj similarity index 75% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/Duende.AccessTokenManagement.OpenIdConnect.csproj rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/AccessTokenManagement.OpenIdConnect.csproj index 629aa96f..438ab465 100644 --- a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/Duende.AccessTokenManagement.OpenIdConnect.csproj +++ b/access-token-management/src/AccessTokenManagement.OpenIdConnect/AccessTokenManagement.OpenIdConnect.csproj @@ -6,11 +6,13 @@ true README.md Duende.AccessTokenManagement.OpenIdConnect + $(PackageId) + $(PackageId) Automatic access token management for interactive OpenIdConnect-based ASP.NET Core applications - + @@ -20,8 +22,10 @@ - - + + + + diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/AuthenticationSessionUserTokenStore.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/AuthenticationSessionUserTokenStore.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/AuthenticationSessionUserTokenStore.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/AuthenticationSessionUserTokenStore.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/AuthorizationServerDPoPHandler.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/AuthorizationServerDPoPHandler.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/AuthorizationServerDPoPHandler.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/AuthorizationServerDPoPHandler.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/BlazorServerPrincipalAccessor.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/BlazorServerPrincipalAccessor.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/BlazorServerPrincipalAccessor.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/BlazorServerPrincipalAccessor.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/CircuitServicesAccessor.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/CircuitServicesAccessor.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/CircuitServicesAccessor.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/CircuitServicesAccessor.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/ConfigureOpenIdConnectClientCredentialsOptions.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/ConfigureOpenIdConnectClientCredentialsOptions.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/ConfigureOpenIdConnectClientCredentialsOptions.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/ConfigureOpenIdConnectClientCredentialsOptions.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/ConfigureOpenIdConnectOptions.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/ConfigureOpenIdConnectOptions.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/ConfigureOpenIdConnectOptions.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/ConfigureOpenIdConnectOptions.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/HttpContextPrincipalAccessor.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/HttpContextPrincipalAccessor.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/HttpContextPrincipalAccessor.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/HttpContextPrincipalAccessor.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/IPrincipalAccessor.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/IPrincipalAccessor.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/IPrincipalAccessor.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/IPrincipalAccessor.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/IStoreTokensInAuthenticationProperties.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/IStoreTokensInAuthenticationProperties.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/IStoreTokensInAuthenticationProperties.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/IStoreTokensInAuthenticationProperties.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/Interfaces/IOpenIdConnectConfigurationService.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/Interfaces/IOpenIdConnectConfigurationService.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/Interfaces/IOpenIdConnectConfigurationService.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/Interfaces/IOpenIdConnectConfigurationService.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/Interfaces/IUserTokenEndpointService.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/Interfaces/IUserTokenEndpointService.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/Interfaces/IUserTokenEndpointService.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/Interfaces/IUserTokenEndpointService.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/Interfaces/IUserTokenManagementService.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/Interfaces/IUserTokenManagementService.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/Interfaces/IUserTokenManagementService.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/Interfaces/IUserTokenManagementService.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/Interfaces/IUserTokenRequestSynchronization.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/Interfaces/IUserTokenRequestSynchronization.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/Interfaces/IUserTokenRequestSynchronization.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/Interfaces/IUserTokenRequestSynchronization.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/Interfaces/IUserTokenStore.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/Interfaces/IUserTokenStore.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/Interfaces/IUserTokenStore.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/Interfaces/IUserTokenStore.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/OpenIdConnectClientAccessTokenHandler.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/OpenIdConnectClientAccessTokenHandler.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/OpenIdConnectClientAccessTokenHandler.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/OpenIdConnectClientAccessTokenHandler.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/OpenIdConnectClientConfiguration.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/OpenIdConnectClientConfiguration.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/OpenIdConnectClientConfiguration.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/OpenIdConnectClientConfiguration.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/OpenIdConnectConfigurationService.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/OpenIdConnectConfigurationService.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/OpenIdConnectConfigurationService.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/OpenIdConnectConfigurationService.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/OpenIdConnectTokenManagementDefaults.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/OpenIdConnectTokenManagementDefaults.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/OpenIdConnectTokenManagementDefaults.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/OpenIdConnectTokenManagementDefaults.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/OpenIdConnectTokenManagementServiceCollectionExtensions.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/OpenIdConnectTokenManagementServiceCollectionExtensions.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/OpenIdConnectTokenManagementServiceCollectionExtensions.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/OpenIdConnectTokenManagementServiceCollectionExtensions.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/OpenIdConnectUserAccessTokenHandler.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/OpenIdConnectUserAccessTokenHandler.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/OpenIdConnectUserAccessTokenHandler.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/OpenIdConnectUserAccessTokenHandler.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/README.md b/access-token-management/src/AccessTokenManagement.OpenIdConnect/README.md similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/README.md rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/README.md diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/StoreTokensInAuthenticationProperties.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/StoreTokensInAuthenticationProperties.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/StoreTokensInAuthenticationProperties.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/StoreTokensInAuthenticationProperties.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/StringExtensions.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/StringExtensions.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/StringExtensions.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/StringExtensions.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/TokenManagementHttpContextExtensions.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/TokenManagementHttpContextExtensions.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/TokenManagementHttpContextExtensions.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/TokenManagementHttpContextExtensions.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/UserAccessTokenManagementService.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/UserAccessTokenManagementService.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/UserAccessTokenManagementService.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/UserAccessTokenManagementService.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/UserToken.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/UserToken.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/UserToken.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/UserToken.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/UserTokenEndpointService.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/UserTokenEndpointService.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/UserTokenEndpointService.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/UserTokenEndpointService.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/UserTokenManagementOptions.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/UserTokenManagementOptions.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/UserTokenManagementOptions.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/UserTokenManagementOptions.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/UserTokenRequestParameters.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/UserTokenRequestParameters.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/UserTokenRequestParameters.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/UserTokenRequestParameters.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/UserTokenRequestSynchronization.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/UserTokenRequestSynchronization.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement.OpenIdConnect/UserTokenRequestSynchronization.cs rename to access-token-management/src/AccessTokenManagement.OpenIdConnect/UserTokenRequestSynchronization.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement/AccessTokenHandler.cs b/access-token-management/src/AccessTokenManagement/AccessTokenHandler.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement/AccessTokenHandler.cs rename to access-token-management/src/AccessTokenManagement/AccessTokenHandler.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement/Duende.AccessTokenManagement.csproj b/access-token-management/src/AccessTokenManagement/AccessTokenManagement.csproj similarity index 92% rename from access-token-management/src/Duende.AccessTokenManagement/Duende.AccessTokenManagement.csproj rename to access-token-management/src/AccessTokenManagement/AccessTokenManagement.csproj index 4daa21c7..3f9a4c09 100644 --- a/access-token-management/src/Duende.AccessTokenManagement/Duende.AccessTokenManagement.csproj +++ b/access-token-management/src/AccessTokenManagement/AccessTokenManagement.csproj @@ -6,6 +6,8 @@ true README.md Duende.AccessTokenManagement + $(PackageId) + $(PackageId) Automatic access token management for OAuth client credential flows diff --git a/access-token-management/src/Duende.AccessTokenManagement/ClientCredentialsClient.cs b/access-token-management/src/AccessTokenManagement/ClientCredentialsClient.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement/ClientCredentialsClient.cs rename to access-token-management/src/AccessTokenManagement/ClientCredentialsClient.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement/ClientCredentialsToken.cs b/access-token-management/src/AccessTokenManagement/ClientCredentialsToken.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement/ClientCredentialsToken.cs rename to access-token-management/src/AccessTokenManagement/ClientCredentialsToken.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement/ClientCredentialsTokenEndpointService.cs b/access-token-management/src/AccessTokenManagement/ClientCredentialsTokenEndpointService.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement/ClientCredentialsTokenEndpointService.cs rename to access-token-management/src/AccessTokenManagement/ClientCredentialsTokenEndpointService.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement/ClientCredentialsTokenHandler.cs b/access-token-management/src/AccessTokenManagement/ClientCredentialsTokenHandler.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement/ClientCredentialsTokenHandler.cs rename to access-token-management/src/AccessTokenManagement/ClientCredentialsTokenHandler.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement/ClientCredentialsTokenManagementBuilder.cs b/access-token-management/src/AccessTokenManagement/ClientCredentialsTokenManagementBuilder.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement/ClientCredentialsTokenManagementBuilder.cs rename to access-token-management/src/AccessTokenManagement/ClientCredentialsTokenManagementBuilder.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement/ClientCredentialsTokenManagementDefaults.cs b/access-token-management/src/AccessTokenManagement/ClientCredentialsTokenManagementDefaults.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement/ClientCredentialsTokenManagementDefaults.cs rename to access-token-management/src/AccessTokenManagement/ClientCredentialsTokenManagementDefaults.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement/ClientCredentialsTokenManagementOptions.cs b/access-token-management/src/AccessTokenManagement/ClientCredentialsTokenManagementOptions.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement/ClientCredentialsTokenManagementOptions.cs rename to access-token-management/src/AccessTokenManagement/ClientCredentialsTokenManagementOptions.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement/ClientCredentialsTokenManagementService.cs b/access-token-management/src/AccessTokenManagement/ClientCredentialsTokenManagementService.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement/ClientCredentialsTokenManagementService.cs rename to access-token-management/src/AccessTokenManagement/ClientCredentialsTokenManagementService.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement/ClientCredentialsTokenManagementServiceCollectionExtensions.cs b/access-token-management/src/AccessTokenManagement/ClientCredentialsTokenManagementServiceCollectionExtensions.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement/ClientCredentialsTokenManagementServiceCollectionExtensions.cs rename to access-token-management/src/AccessTokenManagement/ClientCredentialsTokenManagementServiceCollectionExtensions.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement/DPoPExtensions.cs b/access-token-management/src/AccessTokenManagement/DPoPExtensions.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement/DPoPExtensions.cs rename to access-token-management/src/AccessTokenManagement/DPoPExtensions.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement/DefaultClientAssertionService.cs b/access-token-management/src/AccessTokenManagement/DefaultClientAssertionService.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement/DefaultClientAssertionService.cs rename to access-token-management/src/AccessTokenManagement/DefaultClientAssertionService.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement/DefaultDPoPKeyStore.cs b/access-token-management/src/AccessTokenManagement/DefaultDPoPKeyStore.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement/DefaultDPoPKeyStore.cs rename to access-token-management/src/AccessTokenManagement/DefaultDPoPKeyStore.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement/DefaultDPoPProofService.cs b/access-token-management/src/AccessTokenManagement/DefaultDPoPProofService.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement/DefaultDPoPProofService.cs rename to access-token-management/src/AccessTokenManagement/DefaultDPoPProofService.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement/DistributedClientCredentialsTokenCache.cs b/access-token-management/src/AccessTokenManagement/DistributedClientCredentialsTokenCache.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement/DistributedClientCredentialsTokenCache.cs rename to access-token-management/src/AccessTokenManagement/DistributedClientCredentialsTokenCache.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement/DistributedDPoPNonceStore.cs b/access-token-management/src/AccessTokenManagement/DistributedDPoPNonceStore.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement/DistributedDPoPNonceStore.cs rename to access-token-management/src/AccessTokenManagement/DistributedDPoPNonceStore.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement/Interfaces/IClientAssertionService.cs b/access-token-management/src/AccessTokenManagement/Interfaces/IClientAssertionService.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement/Interfaces/IClientAssertionService.cs rename to access-token-management/src/AccessTokenManagement/Interfaces/IClientAssertionService.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement/Interfaces/IClientCredentialsTokenCache.cs b/access-token-management/src/AccessTokenManagement/Interfaces/IClientCredentialsTokenCache.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement/Interfaces/IClientCredentialsTokenCache.cs rename to access-token-management/src/AccessTokenManagement/Interfaces/IClientCredentialsTokenCache.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement/Interfaces/IClientCredentialsTokenEndpointService.cs b/access-token-management/src/AccessTokenManagement/Interfaces/IClientCredentialsTokenEndpointService.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement/Interfaces/IClientCredentialsTokenEndpointService.cs rename to access-token-management/src/AccessTokenManagement/Interfaces/IClientCredentialsTokenEndpointService.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement/Interfaces/IClientCredentialsTokenManagementService.cs b/access-token-management/src/AccessTokenManagement/Interfaces/IClientCredentialsTokenManagementService.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement/Interfaces/IClientCredentialsTokenManagementService.cs rename to access-token-management/src/AccessTokenManagement/Interfaces/IClientCredentialsTokenManagementService.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement/Interfaces/IDPoPKeyStore.cs b/access-token-management/src/AccessTokenManagement/Interfaces/IDPoPKeyStore.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement/Interfaces/IDPoPKeyStore.cs rename to access-token-management/src/AccessTokenManagement/Interfaces/IDPoPKeyStore.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement/Interfaces/IDPoPNonceStore.cs b/access-token-management/src/AccessTokenManagement/Interfaces/IDPoPNonceStore.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement/Interfaces/IDPoPNonceStore.cs rename to access-token-management/src/AccessTokenManagement/Interfaces/IDPoPNonceStore.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement/Interfaces/IDPoPProofService.cs b/access-token-management/src/AccessTokenManagement/Interfaces/IDPoPProofService.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement/Interfaces/IDPoPProofService.cs rename to access-token-management/src/AccessTokenManagement/Interfaces/IDPoPProofService.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement/Interfaces/ITokenRequestSynchronization.cs b/access-token-management/src/AccessTokenManagement/Interfaces/ITokenRequestSynchronization.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement/Interfaces/ITokenRequestSynchronization.cs rename to access-token-management/src/AccessTokenManagement/Interfaces/ITokenRequestSynchronization.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement/README.md b/access-token-management/src/AccessTokenManagement/README.md similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement/README.md rename to access-token-management/src/AccessTokenManagement/README.md diff --git a/access-token-management/src/Duende.AccessTokenManagement/TokenRequestParameters.cs b/access-token-management/src/AccessTokenManagement/TokenRequestParameters.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement/TokenRequestParameters.cs rename to access-token-management/src/AccessTokenManagement/TokenRequestParameters.cs diff --git a/access-token-management/src/Duende.AccessTokenManagement/TokenRequestSynchronization.cs b/access-token-management/src/AccessTokenManagement/TokenRequestSynchronization.cs similarity index 100% rename from access-token-management/src/Duende.AccessTokenManagement/TokenRequestSynchronization.cs rename to access-token-management/src/AccessTokenManagement/TokenRequestSynchronization.cs diff --git a/access-token-management/test/Tests/AccessTokenHandlerTests.cs b/access-token-management/test/AccessTokenManagement.Tests/AccessTokenHandlerTests.cs similarity index 100% rename from access-token-management/test/Tests/AccessTokenHandlerTests.cs rename to access-token-management/test/AccessTokenManagement.Tests/AccessTokenHandlerTests.cs diff --git a/access-token-management/test/Tests/Tests.csproj b/access-token-management/test/AccessTokenManagement.Tests/AccessTokenManagement.Tests.csproj similarity index 86% rename from access-token-management/test/Tests/Tests.csproj rename to access-token-management/test/AccessTokenManagement.Tests/AccessTokenManagement.Tests.csproj index 23a1d2ff..36931b71 100644 --- a/access-token-management/test/Tests/Tests.csproj +++ b/access-token-management/test/AccessTokenManagement.Tests/AccessTokenManagement.Tests.csproj @@ -4,15 +4,15 @@ net8.0 enable enable - + Duende.AccessTokenManagement false - - + + @@ -40,12 +40,11 @@ with AngleSharp. --> - + - - + diff --git a/access-token-management/test/Tests/BackChannelClientTests.cs b/access-token-management/test/AccessTokenManagement.Tests/BackChannelClientTests.cs similarity index 100% rename from access-token-management/test/Tests/BackChannelClientTests.cs rename to access-token-management/test/AccessTokenManagement.Tests/BackChannelClientTests.cs diff --git a/access-token-management/test/Tests/ClientTokenManagementApiTests.cs b/access-token-management/test/AccessTokenManagement.Tests/ClientTokenManagementApiTests.cs similarity index 100% rename from access-token-management/test/Tests/ClientTokenManagementApiTests.cs rename to access-token-management/test/AccessTokenManagement.Tests/ClientTokenManagementApiTests.cs diff --git a/access-token-management/test/Tests/ClientTokenManagementTests.cs b/access-token-management/test/AccessTokenManagement.Tests/ClientTokenManagementTests.cs similarity index 100% rename from access-token-management/test/Tests/ClientTokenManagementTests.cs rename to access-token-management/test/AccessTokenManagement.Tests/ClientTokenManagementTests.cs diff --git a/access-token-management/test/Tests/Framework/ApiHost.cs b/access-token-management/test/AccessTokenManagement.Tests/Framework/ApiHost.cs similarity index 100% rename from access-token-management/test/Tests/Framework/ApiHost.cs rename to access-token-management/test/AccessTokenManagement.Tests/Framework/ApiHost.cs diff --git a/access-token-management/test/Tests/Framework/AppHost.cs b/access-token-management/test/AccessTokenManagement.Tests/Framework/AppHost.cs similarity index 100% rename from access-token-management/test/Tests/Framework/AppHost.cs rename to access-token-management/test/AccessTokenManagement.Tests/Framework/AppHost.cs diff --git a/access-token-management/test/Tests/Framework/GenericHost.cs b/access-token-management/test/AccessTokenManagement.Tests/Framework/GenericHost.cs similarity index 100% rename from access-token-management/test/Tests/Framework/GenericHost.cs rename to access-token-management/test/AccessTokenManagement.Tests/Framework/GenericHost.cs diff --git a/access-token-management/test/Tests/Framework/IdentityServerHost.cs b/access-token-management/test/AccessTokenManagement.Tests/Framework/IdentityServerHost.cs similarity index 100% rename from access-token-management/test/Tests/Framework/IdentityServerHost.cs rename to access-token-management/test/AccessTokenManagement.Tests/Framework/IdentityServerHost.cs diff --git a/access-token-management/test/Tests/Framework/IntegrationTestBase.cs b/access-token-management/test/AccessTokenManagement.Tests/Framework/IntegrationTestBase.cs similarity index 100% rename from access-token-management/test/Tests/Framework/IntegrationTestBase.cs rename to access-token-management/test/AccessTokenManagement.Tests/Framework/IntegrationTestBase.cs diff --git a/access-token-management/test/Tests/Framework/TestBrowserClient.cs b/access-token-management/test/AccessTokenManagement.Tests/Framework/TestBrowserClient.cs similarity index 100% rename from access-token-management/test/Tests/Framework/TestBrowserClient.cs rename to access-token-management/test/AccessTokenManagement.Tests/Framework/TestBrowserClient.cs diff --git a/access-token-management/test/Tests/Framework/TestClientAssertionService.cs b/access-token-management/test/AccessTokenManagement.Tests/Framework/TestClientAssertionService.cs similarity index 100% rename from access-token-management/test/Tests/Framework/TestClientAssertionService.cs rename to access-token-management/test/AccessTokenManagement.Tests/Framework/TestClientAssertionService.cs diff --git a/access-token-management/test/Tests/Framework/TestDPoPNonceStore.cs b/access-token-management/test/AccessTokenManagement.Tests/Framework/TestDPoPNonceStore.cs similarity index 100% rename from access-token-management/test/Tests/Framework/TestDPoPNonceStore.cs rename to access-token-management/test/AccessTokenManagement.Tests/Framework/TestDPoPNonceStore.cs diff --git a/access-token-management/test/Tests/Framework/TestDPoPProofService.cs b/access-token-management/test/AccessTokenManagement.Tests/Framework/TestDPoPProofService.cs similarity index 100% rename from access-token-management/test/Tests/Framework/TestDPoPProofService.cs rename to access-token-management/test/AccessTokenManagement.Tests/Framework/TestDPoPProofService.cs diff --git a/access-token-management/test/Tests/Framework/TestDistributedCache.cs b/access-token-management/test/AccessTokenManagement.Tests/Framework/TestDistributedCache.cs similarity index 100% rename from access-token-management/test/Tests/Framework/TestDistributedCache.cs rename to access-token-management/test/AccessTokenManagement.Tests/Framework/TestDistributedCache.cs diff --git a/access-token-management/test/Tests/Framework/TestLoggerProvider.cs b/access-token-management/test/AccessTokenManagement.Tests/Framework/TestLoggerProvider.cs similarity index 100% rename from access-token-management/test/Tests/Framework/TestLoggerProvider.cs rename to access-token-management/test/AccessTokenManagement.Tests/Framework/TestLoggerProvider.cs diff --git a/access-token-management/test/Tests/Framework/TestOptionsMonitor.cs b/access-token-management/test/AccessTokenManagement.Tests/Framework/TestOptionsMonitor.cs similarity index 100% rename from access-token-management/test/Tests/Framework/TestOptionsMonitor.cs rename to access-token-management/test/AccessTokenManagement.Tests/Framework/TestOptionsMonitor.cs diff --git a/access-token-management/test/Tests/Framework/TestSchemeProvider.cs b/access-token-management/test/AccessTokenManagement.Tests/Framework/TestSchemeProvider.cs similarity index 100% rename from access-token-management/test/Tests/Framework/TestSchemeProvider.cs rename to access-token-management/test/AccessTokenManagement.Tests/Framework/TestSchemeProvider.cs diff --git a/access-token-management/test/Tests/StoreTokensInAuthenticationPropertiesTests.cs b/access-token-management/test/AccessTokenManagement.Tests/StoreTokensInAuthenticationPropertiesTests.cs similarity index 100% rename from access-token-management/test/Tests/StoreTokensInAuthenticationPropertiesTests.cs rename to access-token-management/test/AccessTokenManagement.Tests/StoreTokensInAuthenticationPropertiesTests.cs diff --git a/access-token-management/test/Tests/UserTokenManagementTests.cs b/access-token-management/test/AccessTokenManagement.Tests/UserTokenManagementTests.cs similarity index 100% rename from access-token-management/test/Tests/UserTokenManagementTests.cs rename to access-token-management/test/AccessTokenManagement.Tests/UserTokenManagementTests.cs diff --git a/access-token-management/test/Tests/UserTokenManagementWithDPoPTests.cs b/access-token-management/test/AccessTokenManagement.Tests/UserTokenManagementWithDPoPTests.cs similarity index 100% rename from access-token-management/test/Tests/UserTokenManagementWithDPoPTests.cs rename to access-token-management/test/AccessTokenManagement.Tests/UserTokenManagementWithDPoPTests.cs diff --git a/access-token-management/test/Tests/Usings.cs b/access-token-management/test/AccessTokenManagement.Tests/Usings.cs similarity index 100% rename from access-token-management/test/Tests/Usings.cs rename to access-token-management/test/AccessTokenManagement.Tests/Usings.cs