Feat/service task

src/Altinn.App.Core/EFormidling/Extensions/ServiceCollectionExtensions.cs

@@ -40,6 +40,7 @@ public static void AddEFormidlingServices<TM, TR>(this IServiceCollection servic
     {
         services.AddTransient(typeof(IEFormidlingReceivers), typeof(TR));
         services.AddHttpClient<IEFormidlingClient, Common.EFormidlingClient.EFormidlingClient>();
+        services.AddTransient<IEFormidlingLegacyConfigurationProvider, EFormidlingLegacyConfigurationProvider>();
         services.AddTransient<IEFormidlingService, DefaultEFormidlingService>();
         services.Configure<Common.EFormidlingClient.Configuration.EFormidlingClientSettings>(
             configuration.GetSection("EFormidlingClientSettings")
@@ -63,6 +64,7 @@ public static void AddEFormidlingServices2<TM, TR>(this IServiceCollection servi
     {
         services.AddTransient(typeof(IEFormidlingReceivers), typeof(TR));
         services.AddHttpClient<IEFormidlingClient, Common.EFormidlingClient.EFormidlingClient>();
+        services.AddTransient<IEFormidlingLegacyConfigurationProvider, EFormidlingLegacyConfigurationProvider>();
         services.AddTransient<IEFormidlingService, DefaultEFormidlingService>();
         services.Configure<Common.EFormidlingClient.Configuration.EFormidlingClientSettings>(
             configuration.GetSection("EFormidlingClientSettings")

src/Altinn.App.Core/EFormidling/Implementation/DefaultEFormidlingReceivers.cs

@@ -1,5 +1,6 @@
 using Altinn.App.Core.EFormidling.Interface;
 using Altinn.App.Core.Internal.App;
+using Altinn.App.Core.Models;
 using Altinn.Common.EFormidlingClient.Models.SBD;
 using Altinn.Platform.Storage.Interface.Models;
 
@@ -24,17 +25,44 @@ public DefaultEFormidlingReceivers(IAppMetadata appMetadata)
     /// <inheritdoc />
     public async Task<List<Receiver>> GetEFormidlingReceivers(Instance instance)
     {
-        await Task.CompletedTask;
+        ArgumentNullException.ThrowIfNull(instance);
 
-        Identifier identifier = new Identifier
+        ApplicationMetadata appMetadata = await _appMetadata.GetApplicationMetadata();
+
+        if (string.IsNullOrWhiteSpace(appMetadata.EFormidling?.Receiver))
+        {
+            return new List<Receiver>();
+        }
+
+        string receiver = appMetadata.EFormidling.Receiver.Trim();
+
+        return CreateReceiverList(receiver);
+    }
+
+    /// <inheritdoc />
+    public Task<List<Receiver>> GetEFormidlingReceivers(Instance instance, string? receiverFromConfig)
+    {
+        ArgumentNullException.ThrowIfNull(instance);
+
+        if (string.IsNullOrWhiteSpace(receiverFromConfig))
+        {
+            return Task.FromResult(new List<Receiver>());
+        }
+
+        string receiver = receiverFromConfig.Trim();
+
+        return Task.FromResult(CreateReceiverList(receiver));
+    }
+
+    private static List<Receiver> CreateReceiverList(string receiver)
+    {
+        var identifier = new Identifier
         {
             // 0192 prefix for all Norwegian organisations.
-            Value = $"0192:{(await _appMetadata.GetApplicationMetadata()).EFormidling.Receiver.Trim()}",
+            Value = $"0192:{receiver}",
             Authority = "iso6523-actorid-upis",
         };
 
-        Receiver receiver = new Receiver { Identifier = identifier };
-
-        return new List<Receiver> { receiver };
+        return [new Receiver { Identifier = identifier }];
     }
 }

src/Altinn.App.Core/EFormidling/Implementation/DefaultEFormidlingService.cs

@@ -8,6 +8,7 @@
 using Altinn.App.Core.Internal.Auth;
 using Altinn.App.Core.Internal.Data;
 using Altinn.App.Core.Internal.Events;
+using Altinn.App.Core.Internal.Process.Elements.AltinnExtensionProperties;
 using Altinn.App.Core.Models;
 using Altinn.Common.AccessTokenClient.Services;
 using Altinn.Common.EFormidlingClient;
@@ -34,6 +35,7 @@ public class DefaultEFormidlingService : IEFormidlingService
     private readonly IDataClient _dataClient;
     private readonly IEventsClient _eventClient;
     private readonly AppImplementationFactory _appImplementationFactory;
+    private readonly IEFormidlingLegacyConfigurationProvider _configurationProvider;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="DefaultEFormidlingService"/> class.
@@ -45,6 +47,7 @@ public DefaultEFormidlingService(
         IDataClient dataClient,
         IEventsClient eventClient,
         IServiceProvider sp,
+        IEFormidlingLegacyConfigurationProvider configurationProvider,
         IOptions<AppSettings>? appSettings = null,
         IOptions<PlatformSettings>? platformSettings = null,
         IEFormidlingClient? eFormidlingClient = null,
@@ -61,10 +64,22 @@ public DefaultEFormidlingService(
         _dataClient = dataClient;
         _eventClient = eventClient;
         _appImplementationFactory = sp.GetRequiredService<AppImplementationFactory>();
+        _configurationProvider = configurationProvider;
     }
 
     /// <inheritdoc />
     public async Task SendEFormidlingShipment(Instance instance)
+    {
+        await SendEFormidlingShipmentInternal(instance, await _configurationProvider.GetLegacyConfiguration());
+    }
+
+    /// <inheritdoc />
+    public async Task SendEFormidlingShipment(Instance instance, ValidAltinnEFormidlingConfiguration configuration)
+    {
+        await SendEFormidlingShipmentInternal(instance, configuration);
+    }
+
+    private async Task SendEFormidlingShipmentInternal(Instance instance, ValidAltinnEFormidlingConfiguration config)
     {
         var metadata = _appImplementationFactory.Get<IEFormidlingMetadata>();
         if (
@@ -83,32 +98,32 @@ public async Task SendEFormidlingShipment(Instance instance)
 
         ApplicationMetadata applicationMetadata = await _appMetadata.GetApplicationMetadata();
 
-        string accessToken = _tokenGenerator.GenerateAccessToken(
+        string userToken = _userTokenProvider.GetUserToken();
+        string platformAccessToken = _tokenGenerator.GenerateAccessToken(
             applicationMetadata.Org,
             applicationMetadata.AppIdentifier.App
         );
-        string authzToken = _userTokenProvider.GetUserToken();
 
         var requestHeaders = new Dictionary<string, string>
         {
-            { "Authorization", $"{AuthorizationSchemes.Bearer} {authzToken}" },
-            { General.EFormidlingAccessTokenHeaderName, accessToken },
+            { "Authorization", $"{AuthorizationSchemes.Bearer} {userToken}" },
+            { General.EFormidlingAccessTokenHeaderName, platformAccessToken },
             { General.SubscriptionKeyHeaderName, _platformSettings.SubscriptionKey },
         };
 
         string instanceGuid = instance.Id.Split("/")[1];
 
-        StandardBusinessDocument sbd = await ConstructStandardBusinessDocument(instanceGuid, instance);
+        StandardBusinessDocument sbd = await ConstructStandardBusinessDocument(instanceGuid, instance, config);
         await _eFormidlingClient.CreateMessage(sbd, requestHeaders);
 
         (string metadataFilename, Stream stream) = await metadata.GenerateEFormidlingMetadata(instance);
 
-        using (stream)
+        await using (stream)
         {
             await _eFormidlingClient.UploadAttachment(stream, instanceGuid, metadataFilename, requestHeaders);
         }
 
-        await SendInstanceData(instance, requestHeaders, metadataFilename);
+        await SendInstanceData(instance, requestHeaders, metadataFilename, config);
 
         try
         {
@@ -124,7 +139,8 @@ public async Task SendEFormidlingShipment(Instance instance)
 
     private async Task<StandardBusinessDocument> ConstructStandardBusinessDocument(
         string instanceGuid,
-        Instance instance
+        Instance instance,
+        ValidAltinnEFormidlingConfiguration config
     )
     {
         if (_appSettings is null)
@@ -145,12 +161,11 @@ Instance instance
         };
 
         var eFormidlingReceivers = _appImplementationFactory.GetRequired<IEFormidlingReceivers>();
-        List<Receiver> receivers = await eFormidlingReceivers.GetEFormidlingReceivers(instance);
-        ApplicationMetadata appMetadata = await _appMetadata.GetApplicationMetadata();
+        List<Receiver> receivers = await eFormidlingReceivers.GetEFormidlingReceivers(instance, config.Receiver);
 
         Scope scope = new Scope
         {
-            Identifier = appMetadata.EFormidling.Process,
+            Identifier = config.Process,
             InstanceIdentifier = Guid.NewGuid().ToString(),
             Type = "ConversationId",
             ScopeInformation = new List<ScopeInformation>
@@ -164,10 +179,10 @@ Instance instance
         DocumentIdentification documentIdentification = new DocumentIdentification
         {
             InstanceIdentifier = instanceGuid,
-            Standard = appMetadata.EFormidling.Standard,
-            TypeVersion = appMetadata.EFormidling.TypeVersion,
+            Standard = config.Standard,
+            TypeVersion = config.TypeVersion,
             CreationDateAndTime = completedTime,
-            Type = appMetadata.EFormidling.Type,
+            Type = config.Type,
         };
 
         StandardBusinessDocumentHeader sbdHeader = new StandardBusinessDocumentHeader
@@ -182,12 +197,12 @@ Instance instance
         StandardBusinessDocument sbd = new StandardBusinessDocument
         {
             StandardBusinessDocumentHeader = sbdHeader,
-            Arkivmelding = new Arkivmelding { Sikkerhetsnivaa = appMetadata.EFormidling.SecurityLevel },
+            Arkivmelding = new Arkivmelding { Sikkerhetsnivaa = config.SecurityLevel },
         };
 
-        if (!string.IsNullOrEmpty(appMetadata.EFormidling.DPFShipmentType))
+        if (!string.IsNullOrEmpty(config.DpfShipmentType))
         {
-            sbd.Arkivmelding.DPF = new() { ForsendelsesType = appMetadata.EFormidling.DPFShipmentType };
+            sbd.Arkivmelding.DPF = new() { ForsendelsesType = config.DpfShipmentType };
         }
 
         return sbd;
@@ -196,7 +211,8 @@ Instance instance
     private async Task SendInstanceData(
         Instance instance,
         Dictionary<string, string> requestHeaders,
-        string eformidlingMetadataFilename
+        string eformidlingMetadataFilename,
+        ValidAltinnEFormidlingConfiguration config
     )
     {
         ApplicationMetadata applicationMetadata = await _appMetadata.GetApplicationMetadata();
@@ -211,7 +227,7 @@ string eformidlingMetadataFilename
 
         foreach (DataElement dataElement in instance.Data.OrderBy(x => x.Created))
         {
-            if (!applicationMetadata.EFormidling.DataTypes.Contains(dataElement.DataType))
+            if (!config.DataTypes.Contains(dataElement.DataType))
             {
                 continue;
             }

src/Altinn.App.Core/EFormidling/Implementation/EFormidlingLegacyConfigurationProvider.cs

@@ -0,0 +1,54 @@
+using Altinn.App.Core.Internal.App;
+using Altinn.App.Core.Internal.Process.Elements.AltinnExtensionProperties;
+using Altinn.App.Core.Internal.Process.ProcessTasks.ServiceTasks.Legacy;
+using Altinn.App.Core.Models;
+using Altinn.Platform.Storage.Interface.Models;
+
+namespace Altinn.App.Core.EFormidling.Implementation;
+
+/// <summary>
+/// A small wrapper around loading legacy eFormidling configuration from ApplicationMetadata, to be able to use the same configuration as the new eFormidling service task.
+/// </summary>
+/// <remarks>Should be deleted when <see cref="EformidlingServiceTaskLegacy" /> is removed.</remarks>
+public interface IEFormidlingLegacyConfigurationProvider
+{
+    /// <summary>
+    /// Gets validated eFormidling configuration from ApplicationMetadata (legacy).
+    /// </summary>
+    /// <returns>Validated eFormidling configuration.</returns>
+    Task<ValidAltinnEFormidlingConfiguration> GetLegacyConfiguration();
+}
+
+/// <inheritdoc />
+internal sealed class EFormidlingLegacyConfigurationProvider : IEFormidlingLegacyConfigurationProvider
+{
+    private readonly IAppMetadata _appMetadata;
+
+    public EFormidlingLegacyConfigurationProvider(IAppMetadata appMetadata)
+    {
+        _appMetadata = appMetadata;
+    }
+
+    public async Task<ValidAltinnEFormidlingConfiguration> GetLegacyConfiguration()
+    {
+        ApplicationMetadata applicationMetadata = await _appMetadata.GetApplicationMetadata();
+        EFormidlingContract? eFormidling = applicationMetadata.EFormidling;
+
+        if (eFormidling is null)
+        {
+            throw new ApplicationConfigException($"No legacy eFormidling configuration found in application metadata.");
+        }
+
+        return new ValidAltinnEFormidlingConfiguration(
+            true, // Enabled prop is not used in legacy mode, as whether eFormidling is enabled or not is determined in the legacy service task.
+            eFormidling.Receiver,
+            eFormidling.Process,
+            eFormidling.Standard,
+            eFormidling.TypeVersion,
+            eFormidling.Type,
+            eFormidling.SecurityLevel,
+            eFormidling.DPFShipmentType,
+            eFormidling.DataTypes?.ToList() ?? []
+        );
+    }
+}

src/Altinn.App.Core/EFormidling/Interface/IEFormidlingReceivers.cs

@@ -11,12 +11,30 @@ namespace Altinn.App.Core.EFormidling.Interface;
 public interface IEFormidlingReceivers
 {
     /// <summary>
-    /// Gets a list of eFormidling shipment receivers
+    /// Gets a list of eFormidling shipment receivers.
     /// </summary>
     /// <remarks>
+    /// <para>
     /// Note that the identifier value property on the receiver objects should be prefixed with `0192:` for Norwegian organisations.
+    /// </para>
     /// </remarks>
     /// <param name="instance">Instance data</param>
     /// <returns>List of eFormidling receivers</returns>
+    /// <exception cref="ArgumentNullException">Thrown when <paramref name="instance"/> is null</exception>
     public Task<List<Receiver>> GetEFormidlingReceivers(Instance instance);
+
+    /// <summary>
+    /// Gets a list of eFormidling shipment receivers.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// Note that the identifier value property on the receiver objects should be prefixed with `0192:` for Norwegian organisations.
+    /// </para>
+    /// </remarks>
+    /// <param name="instance">Instance data</param>
+    /// <param name="receiverFromConfig">Receiver organization number from static configuration (BPMN or ApplicationMetadata, depending on if service task is used or not).</param>
+    /// <returns>List of eFormidling receivers</returns>
+    /// <exception cref="ArgumentNullException">Thrown when <paramref name="instance"/> is null</exception>
+    public Task<List<Receiver>> GetEFormidlingReceivers(Instance instance, string? receiverFromConfig) =>
+        GetEFormidlingReceivers(instance);
 }

src/Altinn.App.Core/EFormidling/Interface/IEFormidlingService.cs

@@ -1,3 +1,4 @@
+using Altinn.App.Core.Internal.Process.Elements.AltinnExtensionProperties;
 using Altinn.Platform.Storage.Interface.Models;
 
 namespace Altinn.App.Core.EFormidling.Interface;
@@ -13,4 +14,16 @@ public interface IEFormidlingService
     /// <param name="instance">Instance data</param>
     /// <returns></returns>
     public Task SendEFormidlingShipment(Instance instance);
+
+    /// <summary>
+    /// Send the eFormidling shipment with explicit configuration context.
+    /// </summary>
+    /// <param name="instance">Instance data</param>
+    /// <param name="configuration">A valid config for eFormidling.</param>
+    /// <returns></returns>
+    public Task SendEFormidlingShipment(Instance instance, ValidAltinnEFormidlingConfiguration configuration)
+    {
+        // Default implementation for backward compatibility - calls legacy method. Only meant to avoid forcing implementers to implement the new method.
+        return SendEFormidlingShipment(instance);
+    }
 }

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

@@ -47,7 +47,8 @@
 using Altinn.App.Core.Internal.Process.EventHandlers;
 using Altinn.App.Core.Internal.Process.EventHandlers.ProcessTask;
 using Altinn.App.Core.Internal.Process.ProcessTasks;
-using Altinn.App.Core.Internal.Process.ServiceTasks;
+using Altinn.App.Core.Internal.Process.ProcessTasks.ServiceTasks;
+using Altinn.App.Core.Internal.Process.ProcessTasks.ServiceTasks.Legacy;
 using Altinn.App.Core.Internal.Registers;
 using Altinn.App.Core.Internal.Secrets;
 using Altinn.App.Core.Internal.Sign;
@@ -371,8 +372,11 @@ private static void AddProcessServices(IServiceCollection services)
         services.AddTransient<IProcessTask, NullTypeProcessTask>();
 
         // Service tasks
+        services.AddTransient<IPdfServiceTaskLegacy, PdfServiceTaskLegacy>();
+        services.AddTransient<IEFormidlingServiceTaskLegacy, EformidlingServiceTaskLegacy>();
+
         services.AddTransient<IServiceTask, PdfServiceTask>();
-        services.AddTransient<IServiceTask, EformidlingServiceTask>();
+        services.AddTransient<IServiceTask, EFormidlingServiceTask>();
     }
 
     private static void AddActionServices(IServiceCollection services)

src/Altinn.App.Core/Features/Telemetry/Telemetry.Processes.cs

@@ -62,6 +62,14 @@ internal void ProcessEnded(ProcessStateChange processChange)
         return activity;
     }
 
+    internal Activity? StartProcessExecuteServiceTaskActivity(Instance instance, string serviceTaskType)
+    {
+        var activity = ActivitySource.StartActivity($"{Prefix}.ExecuteServiceTask");
+        activity?.SetInstanceId(instance);
+        activity?.SetTag(InternalLabels.ProcessServiceTaskType, serviceTaskType);
+        return activity;
+    }
+
     internal Activity? StartProcessEndActivity(Instance instance)
     {
         var activity = ActivitySource.StartActivity($"{Prefix}.End");

src/Altinn.App.Core/Features/Telemetry/Telemetry.cs

@@ -236,6 +236,7 @@ internal static class InternalLabels
 
         internal const string ProcessErrorType = "process.error.type";
         internal const string ProcessAction = "process.action";
+        internal const string ProcessServiceTaskType = "process.service.task.type";
 
         internal const string ProblemType = "problem.type";
         internal const string ProblemTitle = "problem.title";