Fiks Arkiv integration

.editorconfig

@@ -165,6 +165,9 @@ dotnet_diagnostic.CA1720.severity = suggestion
 # CA1816: Call GC.SuppressFinalize correctly
 dotnet_diagnostic.CA1816.severity = warning
 
+# CA1826: Use property instead of Linq Enumerable method
+dotnet_code_quality.CA1826.exclude_ordefault_methods = true
+
 [Program.cs]
 dotnet_diagnostic.CA1050.severity = none
 dotnet_diagnostic.S1118.severity = none

AppLibDotnet.sln

@@ -24,6 +24,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Altinn.App.Internal.Analyze
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Altinn.App.Analyzers", "src\Altinn.App.Analyzers\Altinn.App.Analyzers.csproj", "{9F956488-F123-48A2-B21A-2C2918E8B416}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Altinn.App.Clients.Fiks", "src\Altinn.App.Clients.Fiks\Altinn.App.Clients.Fiks.csproj", "{024AF273-AECF-4275-B123-05F8CE8C7AAC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Altinn.App.Clients.Fiks.Tests", "test\Altinn.App.Clients.Fiks.Tests\Altinn.App.Clients.Fiks.Tests.csproj", "{927BF3D3-24B9-40B0-B66C-4DA24A869622}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -58,6 +62,14 @@ Global
 		{9F956488-F123-48A2-B21A-2C2918E8B416}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9F956488-F123-48A2-B21A-2C2918E8B416}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9F956488-F123-48A2-B21A-2C2918E8B416}.Release|Any CPU.Build.0 = Release|Any CPU
+		{024AF273-AECF-4275-B123-05F8CE8C7AAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{024AF273-AECF-4275-B123-05F8CE8C7AAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{024AF273-AECF-4275-B123-05F8CE8C7AAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{024AF273-AECF-4275-B123-05F8CE8C7AAC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{927BF3D3-24B9-40B0-B66C-4DA24A869622}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{927BF3D3-24B9-40B0-B66C-4DA24A869622}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{927BF3D3-24B9-40B0-B66C-4DA24A869622}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{927BF3D3-24B9-40B0-B66C-4DA24A869622}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -70,6 +82,8 @@ Global
 		{D5838692-2703-4E42-8802-6E1FA7F1B50B} = {6C8EB054-1747-4BAC-A637-754F304BCAFA}
 		{A43CE769-FAB0-49E7-BDD4-3FCA939E1E5A} = {7AD5FADE-607F-4D5F-8511-6647D0C1AA1C}
 		{9F956488-F123-48A2-B21A-2C2918E8B416} = {7AD5FADE-607F-4D5F-8511-6647D0C1AA1C}
+		{024AF273-AECF-4275-B123-05F8CE8C7AAC} = {7AD5FADE-607F-4D5F-8511-6647D0C1AA1C}
+		{927BF3D3-24B9-40B0-B66C-4DA24A869622} = {6C8EB054-1747-4BAC-A637-754F304BCAFA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4584C6E1-D5B4-40B1-A8C4-CF4620EB0896}

AppLibDotnet.sln.DotSettings

@@ -0,0 +1,5 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IO/@EntryIndexedValue">IO</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=arkiv/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=arkivmelding/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=fiks/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

Directory.Packages.props

@@ -75,4 +75,10 @@
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
     <!-- End JWTCookieAuthentication deps -->
   </ItemGroup>
+  <ItemGroup>
+    <PackageVersion Include="KS.Fiks.Arkiv.Models.V1" Version="1.0.7" />
+    <PackageVersion Include="KS.Fiks.IO.Client" Version="6.1.0" />
+    <PackageVersion Include="Polly.Extensions" Version="8.6.4" />
+    <PackageVersion Include="Polly.Testing" Version="8.6.4" />
+  </ItemGroup>
 </Project>

solutions/All.sln

@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
@@ -23,6 +23,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Altinn.App.Api.Tests", "..\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Altinn.App.Integration.Tests", "..\test\Altinn.App.Integration.Tests\Altinn.App.Integration.Tests.csproj", "{0DE9F775-FE1A-4604-B239-4CFE4E105B1D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Altinn.App.Clients.Fiks", "..\src\Altinn.App.Clients.Fiks\Altinn.App.Clients.Fiks.csproj", "{B9EF324F-7223-484B-B9BC-C8F705431AE3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Altinn.App.Clients.Fiks.Tests", "..\test\Altinn.App.Clients.Fiks.Tests\Altinn.App.Clients.Fiks.Tests.csproj", "{4CCE3E2A-E12C-4382-9089-84A0275478AB}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Altinn.App.SourceGenerator.Tests", "..\test\Altinn.App.SourceGenerator.Tests\Altinn.App.SourceGenerator.Tests.csproj", "{976E3CF9-26CC-4825-92F7-5EEBD99A8B6A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C5968C89-1529-42F3-B082-DC1184C18395}"
@@ -93,6 +97,14 @@ Global
 		{836CECBF-5518-4276-BE2C-B0F255BF19F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{836CECBF-5518-4276-BE2C-B0F255BF19F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{836CECBF-5518-4276-BE2C-B0F255BF19F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9EF324F-7223-484B-B9BC-C8F705431AE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9EF324F-7223-484B-B9BC-C8F705431AE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9EF324F-7223-484B-B9BC-C8F705431AE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9EF324F-7223-484B-B9BC-C8F705431AE3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4CCE3E2A-E12C-4382-9089-84A0275478AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4CCE3E2A-E12C-4382-9089-84A0275478AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4CCE3E2A-E12C-4382-9089-84A0275478AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4CCE3E2A-E12C-4382-9089-84A0275478AB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{D6C1901B-BED6-44AC-A061-5981A2DEB937} = {C5968C89-1529-42F3-B082-DC1184C18395}

src/Altinn.App.Api/Extensions/ServiceCollectionExtensions.cs

@@ -151,12 +151,11 @@ IWebHostEnvironment env
     public static IServiceCollection ConfigureMaskinportenClient(
         this IServiceCollection services,
         Action<MaskinportenSettings> configureOptions
-    )
-    {
-        services.AddOptions<MaskinportenSettings>().Configure(configureOptions).ValidateDataAnnotations();
-
-        return services;
-    }
+    ) =>
+        Altinn.App.Core.Features.Maskinporten.Extensions.ServiceCollectionExtensions.ConfigureMaskinportenClient(
+            services,
+            configureOptions
+        );
 
     /// <summary>
     /// <p>Binds a <see cref="MaskinportenClient"/> configuration to the supplied config section path.</p>
@@ -168,12 +167,11 @@ Action<MaskinportenSettings> configureOptions
     public static IServiceCollection ConfigureMaskinportenClient(
         this IServiceCollection services,
         string configSectionPath
-    )
-    {
-        services.AddOptions<MaskinportenSettings>().BindConfiguration(configSectionPath).ValidateDataAnnotations();
-
-        return services;
-    }
+    ) =>
+        Altinn.App.Core.Features.Maskinporten.Extensions.ServiceCollectionExtensions.ConfigureMaskinportenClient(
+            services,
+            configSectionPath
+        );
 
     /// <summary>
     /// Adds Application Insights to the service collection.

src/Altinn.App.Clients.Fiks/Altinn.App.Clients.Fiks.csproj

@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <PackageTags>Altinn;Studio;App;Clients;Fiks</PackageTags>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../Altinn.App.Core/Altinn.App.Core.csproj"/>
+    <ProjectReference Include="../Altinn.App.Api/Altinn.App.Api.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="KS.Fiks.Arkiv.Models.V1" />
+    <PackageReference Include="KS.Fiks.IO.Client" />
+    <PackageReference Include="Polly.Extensions" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../Altinn.App.Internal.Analyzers/Altinn.App.Internal.Analyzers.csproj" PrivateAssets="all" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <InternalsVisibleTo Include="Altinn.App.Clients.Fiks.Tests" />
+    <InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
+  </ItemGroup>
+</Project>

src/Altinn.App.Clients.Fiks/Configuration/FiksSetupBuilder.cs

@@ -0,0 +1,175 @@
+using Altinn.App.Clients.Fiks.Constants;
+using Altinn.App.Clients.Fiks.Extensions;
+using Altinn.App.Clients.Fiks.FiksArkiv;
+using Altinn.App.Clients.Fiks.FiksArkiv.Models;
+using Altinn.App.Clients.Fiks.FiksIO.Models;
+using Altinn.App.Core.Features.Maskinporten.Extensions;
+using Altinn.App.Core.Features.Maskinporten.Models;
+using Microsoft.Extensions.DependencyInjection;
+using Polly;
+using Polly.DependencyInjection;
+
+namespace Altinn.App.Clients.Fiks.Configuration;
+
+internal abstract class FiksSetupBuilder(IServiceCollection services)
+{
+    /// <inheritdoc cref="IFiksSetupBuilder{T}.WithFiksIOConfig(System.Action{Altinn.App.Clients.Fiks.FiksIO.Models.FiksIOSettings})"/>
+    protected FiksSetupBuilder ConfigureFiksIO(Action<FiksIOSettings> configureOptions)
+    {
+        services.ConfigureFiksIOClient(configureOptions);
+        return this;
+    }
+
+    /// <inheritdoc cref="IFiksSetupBuilder{T}.WithFiksIOConfig(string)"/>
+    protected FiksSetupBuilder ConfigureFiksIO(string configSectionPath)
+    {
+        services.ConfigureFiksIOClient(configSectionPath);
+        return this;
+    }
+
+    /// <summary>
+    /// Configures the Fiks Arkiv client with the provided options.
+    /// </summary>
+    /// <param name="configureOptions">Configuration delegate.</param>
+    /// <returns>The builder instance.</returns>
+    protected FiksSetupBuilder ConfigureFiksArkiv(Action<FiksArkivSettings> configureOptions)
+    {
+        services.ConfigureFiksArkiv(configureOptions);
+        return this;
+    }
+
+    /// <summary>
+    /// Configures the Fiks Arkiv client with the options from the specified configuration section.
+    /// </summary>
+    /// <param name="configSectionPath">Configuration section path.</param>
+    /// <returns>The builder instance.</returns>
+    protected FiksSetupBuilder ConfigureFiksArkiv(string configSectionPath)
+    {
+        services.ConfigureFiksArkiv(configSectionPath);
+        return this;
+    }
+
+    /// <inheritdoc cref="IFiksSetupBuilder{T}.WithMaskinportenConfig(System.Action{Altinn.App.Core.Features.Maskinporten.Models.MaskinportenSettings})"/>
+    protected FiksSetupBuilder ConfigureMaskinporten(Action<MaskinportenSettings> configureOptions)
+    {
+        services.ConfigureMaskinportenClient(configureOptions);
+        return this;
+    }
+
+    /// <inheritdoc cref="IFiksSetupBuilder{T}.WithMaskinportenConfig(string)"/>
+    protected FiksSetupBuilder ConfigureMaskinporten(string configSectionPath)
+    {
+        services.ConfigureMaskinportenClient(configSectionPath);
+        return this;
+    }
+
+    /// <summary>
+    /// Registers a custom message response handler for Fiks Arkiv messages.
+    /// </summary>
+    /// <typeparam name="THandler">The implementation of the message response handler.</typeparam>
+    /// <returns>The builder instance.</returns>
+    protected FiksSetupBuilder UseMessageResponseHandler<THandler>()
+        where THandler : IFiksArkivResponseHandler
+    {
+        services.AddTransient(typeof(IFiksArkivResponseHandler), typeof(THandler));
+        return this;
+    }
+
+    /// <summary>
+    /// Registers a custom payload generator for Fiks Arkiv messages.
+    /// </summary>
+    /// <typeparam name="TGenerator">The implementation of the message payload generator.</typeparam>
+    /// <returns>The builder instance.</returns>
+    protected FiksSetupBuilder UseMessagePayloadGenerator<TGenerator>()
+        where TGenerator : IFiksArkivPayloadGenerator
+    {
+        services.AddTransient(typeof(IFiksArkivPayloadGenerator), typeof(TGenerator));
+        return this;
+    }
+
+    /// <inheritdoc cref="IFiksSetupBuilder{T}.WithResiliencePipeline"/>
+    protected FiksSetupBuilder ConfigureResiliencePipeline(
+        Action<ResiliencePipelineBuilder<FiksIOMessageResponse>, AddResiliencePipelineContext<string>> configure
+    )
+    {
+        services.AddResiliencePipeline(FiksIOConstants.UserDefinedResiliencePipelineId, configure);
+        return this;
+    }
+
+    /// <inheritdoc cref="IFiksSetupBuilder{T}.CompleteSetup"/>
+    public IServiceCollection CompleteSetup() => services;
+}
+
+/// <summary>
+/// Fiks IO setup builder.
+/// </summary>
+internal sealed class FiksIOSetupBuilder(IServiceCollection services) : FiksSetupBuilder(services), IFiksIOSetupBuilder
+{
+    /// <inheritdoc />
+    public IFiksIOSetupBuilder WithFiksIOConfig(Action<FiksIOSettings> configureOptions) =>
+        (IFiksIOSetupBuilder)ConfigureFiksIO(configureOptions);
+
+    /// <inheritdoc />
+    public IFiksIOSetupBuilder WithFiksIOConfig(string configSectionPath) =>
+        (IFiksIOSetupBuilder)ConfigureFiksIO(configSectionPath);
+
+    /// <inheritdoc />
+    public IFiksIOSetupBuilder WithMaskinportenConfig(Action<MaskinportenSettings> configureOptions) =>
+        (IFiksIOSetupBuilder)ConfigureMaskinporten(configureOptions);
+
+    /// <inheritdoc />
+    public IFiksIOSetupBuilder WithMaskinportenConfig(string configSectionPath) =>
+        (IFiksIOSetupBuilder)ConfigureMaskinporten(configSectionPath);
+
+    /// <inheritdoc />
+    public IFiksIOSetupBuilder WithResiliencePipeline(
+        Action<ResiliencePipelineBuilder<FiksIOMessageResponse>, AddResiliencePipelineContext<string>> configure
+    ) => (IFiksIOSetupBuilder)ConfigureResiliencePipeline(configure);
+}
+
+/// <summary>
+/// Fiks Arkiv setup builder.
+/// </summary>
+internal sealed class FiksArkivSetupBuilder(IServiceCollection services)
+    : FiksSetupBuilder(services),
+        IFiksArkivSetupBuilder
+{
+    /// <inheritdoc />
+    public IFiksArkivSetupBuilder WithFiksIOConfig(string configSectionPath) =>
+        (IFiksArkivSetupBuilder)ConfigureFiksIO(configSectionPath);
+
+    /// <inheritdoc />
+    public IFiksArkivSetupBuilder WithFiksIOConfig(Action<FiksIOSettings> configureOptions) =>
+        (IFiksArkivSetupBuilder)ConfigureFiksIO(configureOptions);
+
+    /// <inheritdoc />
+    public IFiksArkivSetupBuilder WithMaskinportenConfig(Action<MaskinportenSettings> configureOptions) =>
+        (IFiksArkivSetupBuilder)ConfigureMaskinporten(configureOptions);
+
+    /// <inheritdoc />
+    public IFiksArkivSetupBuilder WithMaskinportenConfig(string configSectionPath) =>
+        (IFiksArkivSetupBuilder)ConfigureMaskinporten(configSectionPath);
+
+    /// <inheritdoc />
+    public IFiksArkivSetupBuilder WithResiliencePipeline(
+        Action<ResiliencePipelineBuilder<FiksIOMessageResponse>, AddResiliencePipelineContext<string>> configure
+    ) => (IFiksArkivSetupBuilder)ConfigureResiliencePipeline(configure);
+
+    /// <inheritdoc />
+    public IFiksArkivSetupBuilder WithFiksArkivConfig(Action<FiksArkivSettings> configureOptions) =>
+        (IFiksArkivSetupBuilder)ConfigureFiksArkiv(configureOptions);
+
+    /// <inheritdoc />
+    public IFiksArkivSetupBuilder WithFiksArkivConfig(string configSectionPath) =>
+        (IFiksArkivSetupBuilder)ConfigureFiksArkiv(configSectionPath);
+
+    /// <inheritdoc />
+    public IFiksArkivSetupBuilder WithResponseHandler<TMessageHandler>()
+        where TMessageHandler : IFiksArkivResponseHandler =>
+        (IFiksArkivSetupBuilder)UseMessageResponseHandler<TMessageHandler>();
+
+    /// <inheritdoc />
+    public IFiksArkivSetupBuilder WithPayloadGenerator<TMessageHandler>()
+        where TMessageHandler : IFiksArkivPayloadGenerator =>
+        (IFiksArkivSetupBuilder)UseMessagePayloadGenerator<TMessageHandler>();
+}