Merge pull request #30 from dlmelendez/rel/v6.x

Rel/v6.x
dlmelendez · Nov 23, 2023 · 637fd97 · 637fd97
2 parents 4656599 + b1f5c20
commit 637fd97
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 16 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -69,6 +69,13 @@ dotnet_style_operator_placement_when_wrapping = beginning_of_line
 tab_width = 4
 end_of_line = crlf
 dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
+dotnet_style_allow_multiple_blank_lines_experimental = true:silent
+dotnet_style_allow_statement_immediately_after_block_experimental = true:silent
+dotnet_style_prefer_collection_expression = true:suggestion
+dotnet_style_namespace_match_folder = true:suggestion
+dotnet_style_prefer_simplified_interpolation = true:suggestion
+dotnet_style_prefer_compound_assignment = true:suggestion
+dotnet_code_quality_unused_parameters = all:suggestion
 ###############################
 # C# Coding Conventions       #
 ###############################
@@ -135,12 +142,35 @@ csharp_preserve_single_line_blocks = true
 
 # IDE0007: Use implicit type
 dotnet_diagnostic.IDE0007.severity = none
+dotnet_diagnostic.IDE0090.severity = none
 csharp_using_directive_placement = outside_namespace:silent
 csharp_prefer_simple_using_statement = true:suggestion
 csharp_style_namespace_declarations = block_scoped:silent
 csharp_style_prefer_method_group_conversion = true:silent
 csharp_style_expression_bodied_lambdas = true:silent
 csharp_style_expression_bodied_local_functions = false:silent
+csharp_style_prefer_top_level_statements = true:silent
+csharp_style_prefer_primary_constructors = true:suggestion
+csharp_style_allow_embedded_statements_on_same_line_experimental = true:silent
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true:silent
+csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true:silent
+csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true:silent
+csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true:silent
+csharp_style_prefer_null_check_over_type_check = true:suggestion
+csharp_style_prefer_local_over_anonymous_function = true:suggestion
+csharp_style_prefer_index_operator = true:suggestion
+csharp_style_implicit_object_creation_when_type_is_apparent = true:suggestion
+csharp_style_prefer_tuple_swap = true:suggestion
+csharp_style_prefer_utf8_string_literals = true:suggestion
+csharp_style_unused_value_assignment_preference = discard_variable:suggestion
+csharp_style_unused_value_expression_statement_preference = discard_variable:silent
+csharp_style_prefer_switch_expression = true:suggestion
+csharp_prefer_static_local_function = true:suggestion
+csharp_style_prefer_readonly_struct = true:suggestion
+csharp_style_prefer_readonly_struct_member = true:suggestion
+csharp_style_prefer_pattern_matching = true:silent
+csharp_style_prefer_not_pattern = true:suggestion
+csharp_style_prefer_extended_property_pattern = true:suggestion
 
 [*.vb]
 # Modifier preferences

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -20,6 +20,10 @@ steps:
   displayName: 'Use .Net Core sdk 6.x'
   inputs:
     version: 6.x
+- task: UseDotNet@2
+  displayName: 'Use .Net Core sdk 7.x'
+  inputs:
+    version: 7.x
 - task: DotNetCoreCLI@2
   displayName: 'dotnet build'
   inputs:

diff --git a/src/Elcamino.IdentityServer.AzureStorage/ElCamino.IdentityServer.AzureStorage.csproj b/src/Elcamino.IdentityServer.AzureStorage/ElCamino.IdentityServer.AzureStorage.csproj
@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-    <LangVersion>10.0</LangVersion>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <AssemblyName>ElCamino.IdentityServer.AzureStorage</AssemblyName>
     <RootNamespace>ElCamino.IdentityServer.AzureStorage</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <Copyright>Copyright ©  2022 David Melendez, Apache 2.0 License</Copyright>
+    <Copyright>Copyright ©  2023 David Melendez, Apache 2.0 License</Copyright>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/dlmelendez/identityserver4-azurestorage</PackageProjectUrl>
     <RepositoryUrl>https://github.com/dlmelendez/identityserver4-azurestorage.git</RepositoryUrl>
@@ -18,18 +17,18 @@
     <Authors>David Melendez</Authors>
     <Company>David Melendez</Company>
     <Description>Uses Azure Blob and Table Storage services as an alternative to Entity Framework/SQL data access for Duende IdentityServer.</Description>
-    <Version>6.1.2</Version>
+    <Version>6.3.0</Version>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
 
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="11.0.1" />
-    <PackageReference Include="Azure.Data.Tables" Version="12.6.1" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.13.0" />
-    <PackageReference Include="Duende.IdentityServer.Storage" Version="6.1.2" />
-    <PackageReference Include="ElCamino.Azure.Data.Tables" Version="6.2.0" />
+    <PackageReference Include="AutoMapper" Version="12.0.1" />
+    <PackageReference Include="Azure.Data.Tables" Version="12.8.2" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
+    <PackageReference Include="Duende.IdentityServer.Storage" Version="6.3.6" />
+    <PackageReference Include="ElCamino.Azure.Data.Tables" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />

diff --git a/src/Elcamino.IdentityServer.AzureStorage/Entities/ApiResource.cs b/src/Elcamino.IdentityServer.AzureStorage/Entities/ApiResource.cs
@@ -16,6 +16,7 @@ public class ApiResource
         public string Description { get; set; }
         public string AllowedAccessTokenSigningAlgorithms { get; set; }
         public bool ShowInDiscoveryDocument { get; set; } = true;
+        public bool RequireResourceIndicator { get; set; }
         public List<ApiResourceSecret> Secrets { get; set; }
         public List<ApiResourceScope> Scopes { get; set; }
         public List<ApiResourceClaim> UserClaims { get; set; }

diff --git a/src/Elcamino.IdentityServer.AzureStorage/Entities/Client.cs b/src/Elcamino.IdentityServer.AzureStorage/Entities/Client.cs
@@ -28,6 +28,9 @@ public class Client
         public bool AllowPlainTextPkce { get; set; }
         public bool RequireRequestObject { get; set; }
         public bool AllowAccessTokensViaBrowser { get; set; }
+        public bool RequireDPoP { get; set; }
+        public DPoPTokenExpirationValidationMode DPoPValidationMode { get; set; }
+        public TimeSpan DPoPClockSkew { get; set; } = TimeSpan.FromMinutes(5);
         public List<ClientRedirectUri> RedirectUris { get; set; }
         public List<ClientPostLogoutRedirectUri> PostLogoutRedirectUris { get; set; }
         public string FrontChannelLogoutUri { get; set; }
@@ -55,6 +58,7 @@ public class Client
         public string ClientClaimsPrefix { get; set; } = "client_";
         public string PairWiseSubjectSalt { get; set; }
         public List<ClientCorsOrigin> AllowedCorsOrigins { get; set; }
+        public string InitiateLoginUri { get; set; }
         public List<ClientProperty> Properties { get; set; }
         public int? UserSsoLifetime { get; set; }
         public string UserCodeType { get; set; }

diff --git a/...amino.IdentityServer.AzureStorage.Tests/ElCamino.IdentityServer.AzureStorage.Tests.csproj b/...amino.IdentityServer.AzureStorage.Tests/ElCamino.IdentityServer.AzureStorage.Tests.csproj
@@ -1,24 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
-    <Version>6.1.2</Version>
+    <Version>6.3.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Duende.IdentityServer" Version="6.1.2" />
-    <PackageReference Include="Duende.IdentityServer.Storage" Version="6.1.2" />
+    <PackageReference Include="Duende.IdentityServer" Version="6.3.6" />
+    <PackageReference Include="Duende.IdentityServer.Storage" Version="6.3.6" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
   </ItemGroup>
 
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
   </ItemGroup>