Instantiation notification (#1703)

* add temp log

* add temp log

* remove sendingtime from email - not supported

* use email for SI

* add sms settings for si

* refactor: allow anonymous

* feat: log any errors from problemdetails

* chore: format

* chore: unused using

* test: update snapshots

* snapshot

* feat: add maskinporten for notification callback to storage

* test: callback

* snapshots

* chore: fix log text

* refactor: update path

* deps: add code from pr 1599

* refactor: add custom sms support  for si

* refactor: forward ct

* intergration snapshots

* refactor: using

Author: HauklandJ

src/Altinn.App.Api/Controllers/InstancesController.cs

@@ -166,14 +166,25 @@ CancellationToken cancellationToken
 
         try
         {
-            Instance instance = await _instanceClient.GetInstance(app, org, instanceOwnerPartyId, instanceGuid);
+            Instance instance = await _instanceClient.GetInstance(
+                app,
+                org,
+                instanceOwnerPartyId,
+                instanceGuid,
+                ct: cancellationToken
+            );
             SelfLinkHelper.SetInstanceAppSelfLinks(instance, Request);
 
             string? userOrgClaim = User.GetOrg();
 
             if (userOrgClaim == null || !org.Equals(userOrgClaim, StringComparison.OrdinalIgnoreCase))
             {
-                await _instanceClient.UpdateReadStatus(instanceOwnerPartyId, instanceGuid, "read");
+                await _instanceClient.UpdateReadStatus(
+                    instanceOwnerPartyId,
+                    instanceGuid,
+                    "read",
+                    ct: cancellationToken
+                );
             }
 
             var instanceOwnerParty = await _registerClient.GetPartyUnchecked(instanceOwnerPartyId, cancellationToken);

src/Altinn.App.Api/Controllers/NotificationCallbackController.cs

@@ -1,7 +1,9 @@
 using System.Text.Json.Serialization;
+using Altinn.App.Core.Features;
 using Altinn.App.Core.Features.Notifications.Cancellation;
 using Altinn.App.Core.Internal.Instances;
 using Altinn.Platform.Storage.Interface.Models;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Altinn.App.Api.Controllers;
@@ -10,8 +12,9 @@ namespace Altinn.App.Api.Controllers;
 /// Endpoint(s) for the Altinn Notification microservice callback
 /// </summary>
 [ApiController]
+[AllowAnonymous]
 [ApiExplorerSettings(IgnoreApi = true)]
-[Route("{org}/{app}/notifications")]
+[Route("{org}/{app}/api/v1/notification-webhook-listener")]
 public class NotificationCallbackController(
     ILogger<NotificationCallbackController> logger,
     ICancelInstantiationNotification instantiationNotification,
@@ -30,12 +33,33 @@ public async Task<ActionResult<NotificationCallbackResponse>> NotificationCallba
         [FromRoute] Guid instanceGuid
     )
     {
-        Instance instance = await instanceClient.GetInstance(app, org, instanceOwnerPartyId, instanceGuid);
         logger.LogInformation(
-            $"Received callback for org:{org}, app:{app}, instanceOwnerPartyId:{instanceOwnerPartyId}, instanceGuid:{instanceGuid}."
+            "Received callback for org:{Org}, app:{App}, instanceOwnerPartyId:{InstanceOwnerPartyId}, instanceGuid:{InstanceGuid}.",
+            org,
+            app,
+            instanceOwnerPartyId,
+            instanceGuid
         );
 
-        bool shouldSend = instantiationNotification.ShouldSend(instance);
+        Instance? instance = null;
+        try
+        {
+            instance = await instanceClient.GetInstance(
+                app,
+                org,
+                instanceOwnerPartyId,
+                instanceGuid,
+                StorageAuthenticationMethod.ServiceOwner()
+            );
+        }
+        catch
+        {
+            logger.LogWarning(
+                "Unable to get instance on notification callback - cannot cancel scheduled notification. Does the app support Maskinporten?"
+            );
+        }
+
+        bool shouldSend = instance is null || instantiationNotification.ShouldSend(instance);
 
         NotificationCallbackResponse response = new() { SendNotification = shouldSend };
         return response;

src/Altinn.App.Core/Constants/AltinnTaskTypes.cs

@@ -0,0 +1,52 @@
+namespace Altinn.App.Core.Constants;
+
+/// <summary>
+/// Constants for Altinn task types.
+/// </summary>
+internal static class AltinnTaskTypes
+{
+    /// <summary>
+    /// The payment task type.
+    /// </summary>
+    public const string Payment = "payment";
+
+    /// <summary>
+    /// The signing task type.
+    /// </summary>
+    public const string Signing = "signing";
+
+    /// <summary>
+    /// The data task type for collecting data from the user in a form.
+    /// </summary>
+    public const string Data = "data";
+
+    /// <summary>
+    /// The feedback task type for waiting for a service owner integration to push update the instance.
+    /// </summary>
+    public const string Feedback = "feedback";
+
+    /// <summary>
+    /// Service task type for generating a pdf document.
+    /// </summary>
+    public const string Pdf = "pdf";
+
+    /// <summary>
+    /// The eFormidling task type when waiting for confirmation that the instance has been sent to eFormidling.
+    /// </summary>
+    public const string EFormidling = "eFormidling";
+
+    /// <summary>
+    /// The FiksArkiv task type.
+    /// </summary>
+    public const string FiksArkiv = "fiksArkiv";
+
+    /// <summary>
+    /// The confirmation task type. (Simple version of Sign without creating a signature document)
+    /// </summary>
+    public const string Confirmation = "confirmation";
+
+    /// <summary>
+    /// Service task type for generating pdf documents from a subform.
+    /// </summary>
+    public const string SubformPdf = "subformPdf";
+}

src/Altinn.App.Core/Features/Notifications/NotificationService.cs

@@ -96,7 +96,6 @@ internal static NotificationOrderRequest CreateNotificationOrderRequest(
         CustomEmail? customEmail = instantiationNotification.CustomEmail;
         EmailSendingOptions emailSettings = new()
         {
-            SendingTimePolicy = sendingTimePolicy,
             Subject = customEmail is not null
                 ? NotificationTexts.ReplaceTokens(
                     text: customEmail.Subject.GetTextForLanguage(language),
@@ -167,7 +166,9 @@ internal static NotificationOrderRequest CreateNotificationOrderRequest(
         Uri? conditionEndpoint = null;
         if (instantiationNotification.RequestedSendTime is not null)
         {
-            conditionEndpoint = new Uri(callBackBaseUrl?.TrimEnd('/') + "/notifications/" + instance.Id);
+            conditionEndpoint = new Uri(
+                callBackBaseUrl?.TrimEnd('/') + "/api/v1/notification-webhook-listener/" + instance.Id
+            );
         }
 
         if (string.IsNullOrWhiteSpace(instanceOwner.OrganisationNumber) is false)
@@ -241,7 +242,8 @@ internal static NotificationOrderRequest CreateNotificationOrderRequest(
                 RecipientExternalIdentity = new RecipientExternalIdentity
                 {
                     ExternalIdentity = instanceOwner.ExternalIdentifier,
-                    ChannelSchema = NotificationChannel.EmailPreferred, // Self identified users may have set a mobile number in profile
+                    ChannelSchema = NotificationChannel.EmailPreferred,
+                    SmsSettings = smsSettings,
                     EmailSettings = emailSettings,
                     ResourceId = resourceId.AsUrn,
                 },
@@ -351,6 +353,9 @@ InstantiationNotificationReminder reminder
                     EmailSettings = reminder.CustomEmail is not null
                         ? BuildEmailSettings(language, reminder.CustomEmail, ext.EmailSettings)
                         : ext.EmailSettings,
+                    SmsSettings = reminder.CustomSms is not null
+                        ? BuildSmsSettings(language, reminder.CustomSms, ext.SmsSettings)
+                        : ext.SmsSettings,
                 },
             };
         }