Use TaskId on IInstanceDataAccessor in SingingService. (#1612)

bjorntore · web-flow · commit d46b64414cc9 · 2026-01-06T13:19:56.000+01:00
diff --git a/src/Altinn.App.Api/Controllers/SigningController.cs b/src/Altinn.App.Api/Controllers/SigningController.cs
@@ -107,7 +107,6 @@ public async Task<IActionResult> GetSigneesState(
         List<SigneeContext> signeeContexts = await _signingService.GetSigneeContexts(
             instanceDataAccessor,
             signingConfiguration,
-            taskId,
             ct
         );
 
diff --git a/src/Altinn.App.Core/Features/Signing/Services/ISigningService.cs b/src/Altinn.App.Core/Features/Signing/Services/ISigningService.cs
@@ -33,7 +33,6 @@ Task<List<OrganizationSignee>> GetAuthorizedOrganizationSignees(
     Task<List<SigneeContext>> GetSigneeContexts(
         IInstanceDataAccessor instanceDataAccessor,
         AltinnSignatureConfiguration signatureConfiguration,
-        string? taskIdOverride = null,
         CancellationToken ct = default
     );
 
diff --git a/src/Altinn.App.Core/Features/Signing/Services/SigningService.cs b/src/Altinn.App.Core/Features/Signing/Services/SigningService.cs
@@ -161,7 +161,6 @@ public async Task<List<SigneeContext>> InitializeSignees(
     public async Task<List<SigneeContext>> GetSigneeContexts(
         IInstanceDataAccessor instanceDataAccessor,
         AltinnSignatureConfiguration signatureConfiguration,
-        string? taskIdOverride = null,
         CancellationToken ct = default
     )
     {
@@ -179,7 +178,7 @@ public async Task<List<SigneeContext>> GetSigneeContexts(
         );
 
         signeeContexts = await _signDocumentManager.SynchronizeSigneeContextsWithSignDocuments(
-            taskIdOverride ?? instanceDataAccessor.Instance.Process.CurrentTask.ElementId,
+            instanceDataAccessor.TaskId ?? instanceDataAccessor.Instance.Process.CurrentTask.ElementId,
             signeeContexts,
             signDocuments,
             ct
diff --git a/src/Altinn.App.Core/Features/Validation/Default/SignatureHashValidator.cs b/src/Altinn.App.Core/Features/Validation/Default/SignatureHashValidator.cs
@@ -72,7 +72,6 @@ public async Task<List<ValidationIssue>> Validate(
         List<SigneeContext> signeeContextsResults = await signingService.GetSigneeContexts(
             dataAccessor,
             signingConfiguration,
-            null,
             cancellationToken
         );
 
diff --git a/src/Altinn.App.Core/Features/Validation/Default/SigningTaskValidator.cs b/src/Altinn.App.Core/Features/Validation/Default/SigningTaskValidator.cs
@@ -93,7 +93,6 @@ public async Task<List<ValidationIssue>> Validate(
         List<SigneeContext> signeeContextsResult = await _signingService.GetSigneeContexts(
             dataAccessor,
             signingConfiguration,
-            null,
             CancellationToken.None
         );
 
diff --git a/test/Altinn.App.Api.Tests/Controllers/SigningControllerTests.cs b/test/Altinn.App.Api.Tests/Controllers/SigningControllerTests.cs
@@ -229,7 +229,6 @@ public async Task GetSigneesState_WhenSigneeContextIsOrg_Returns_Expected_Signee
                 s.GetSigneeContexts(
                     It.IsAny<InstanceDataUnitOfWork>(),
                     _altinnTaskExtension.SignatureConfiguration!,
-                    null,
                     It.IsAny<CancellationToken>()
                 )
             )
@@ -333,7 +332,6 @@ public async Task GetSigneesState_WhenSigneeContextIsPerson_Returns_Expected_Sig
                 s.GetSigneeContexts(
                     It.IsAny<InstanceDataUnitOfWork>(),
                     _altinnTaskExtension.SignatureConfiguration!,
-                    null,
                     It.IsAny<CancellationToken>()
                 )
             )
@@ -415,7 +413,6 @@ public async Task GetSigneesState_WhenSigneeContextIsPersonOnBehalfOfOrg_Returns
                 s.GetSigneeContexts(
                     It.IsAny<InstanceDataUnitOfWork>(),
                     _altinnTaskExtension.SignatureConfiguration!,
-                    null,
                     It.IsAny<CancellationToken>()
                 )
             )
@@ -494,7 +491,6 @@ public async Task GetSigneesState_WhenSigneeContextIsSystem_Returns_Expected_Sig
                 s.GetSigneeContexts(
                     It.IsAny<InstanceDataUnitOfWork>(),
                     _altinnTaskExtension.SignatureConfiguration!,
-                    null,
                     It.IsAny<CancellationToken>()
                 )
             )
@@ -949,7 +945,6 @@ public async Task GetSigneesState_WithTaskId_UsesOverriddenTask()
                 s.GetSigneeContexts(
                     It.IsAny<InstanceDataUnitOfWork>(),
                     altinnTaskExtensionTask2.SignatureConfiguration!,
-                    "task2",
                     It.IsAny<CancellationToken>()
                 )
             )
@@ -979,7 +974,6 @@ public async Task GetSigneesState_WithTaskId_UsesOverriddenTask()
                 s.GetSigneeContexts(
                     It.IsAny<InstanceDataUnitOfWork>(),
                     altinnTaskExtensionTask2.SignatureConfiguration!,
-                    "task2",
                     It.IsAny<CancellationToken>()
                 ),
             Times.Once
diff --git a/test/Altinn.App.Core.Tests/Features/Signing/SigningServiceTests.cs b/test/Altinn.App.Core.Tests/Features/Signing/SigningServiceTests.cs
@@ -238,7 +238,6 @@ public async Task GetSigneeContexts_HappyPath()
         List<SigneeContext> result = await _signingService.GetSigneeContexts(
             cachedInstanceMutator.Object,
             signatureConfiguration,
-            null,
             CancellationToken.None
         );
 
@@ -333,6 +332,7 @@ public async Task AbortRuntimeDelegatedSigning_Removes_SigningData_And_Revokes_D
         var cachedInstanceMutator = new Mock<IInstanceDataMutator>();
 
         cachedInstanceMutator.Setup(x => x.Instance).Returns(instance);
+        cachedInstanceMutator.Setup(x => x.TaskId).Returns(instance.Process.CurrentTask.ElementId);
 
         var signeeStateDataElementIdentifier = new DataElementIdentifier(signeeStateDataElement.Id);
         var signeeContexts = new List<SigneeContext>()
@@ -421,6 +421,7 @@ await _signingService.AbortRuntimeDelegatedSigning(
 
         // Assert
         cachedInstanceMutator.Verify(x => x.Instance);
+        cachedInstanceMutator.Verify(x => x.TaskId);
 
         // Verify that the data elements are removed
         cachedInstanceMutator.Verify(x => x.RemoveDataElement(signeeStateDataElement), Times.Once);
@@ -481,6 +482,7 @@ public async Task AbortRuntimeDelegatedSigning_Does_Nothing_If_No_Existing_Data(
             Data = [],
         };
         cachedInstanceMutator.Setup(x => x.Instance).Returns(instance);
+        cachedInstanceMutator.Setup(x => x.TaskId).Returns(instance.Process.CurrentTask.ElementId);
 
         _signDocumentManager
             .Setup(x =>
@@ -511,6 +513,7 @@ await _signingService.AbortRuntimeDelegatedSigning(
         );
 
         cachedInstanceMutator.Verify(x => x.Instance);
+        cachedInstanceMutator.Verify(x => x.TaskId);
         cachedInstanceMutator.VerifyNoOtherCalls();
     }
 
diff --git a/test/Altinn.App.Core.Tests/Features/Validators/Default/SignatureHashValidatorTests.cs b/test/Altinn.App.Core.Tests/Features/Validators/Default/SignatureHashValidatorTests.cs
@@ -397,7 +397,6 @@ string dataElementStringContent
                 x.GetSigneeContexts(
                     It.Is<IInstanceDataAccessor>(d => d == _dataAccessorMock.Object),
                     It.Is<AltinnSignatureConfiguration>(c => c == signingConfiguration),
-                    null,
                     It.IsAny<CancellationToken>()
                 )
             )
diff --git a/test/Altinn.App.Core.Tests/Features/Validators/Default/SigningTaskValidatorTests.cs b/test/Altinn.App.Core.Tests/Features/Validators/Default/SigningTaskValidatorTests.cs
@@ -72,12 +72,7 @@ public async Task Validate_ShouldReturnEmptyList_WhenAllHaveSigned()
         _appMetadataMock.Setup(am => am.GetApplicationMetadata()).ReturnsAsync(appMetadata);
         _signingServiceMock
             .Setup(ss =>
-                ss.GetSigneeContexts(
-                    It.IsAny<IInstanceDataAccessor>(),
-                    signingConfiguration,
-                    null,
-                    CancellationToken.None
-                )
+                ss.GetSigneeContexts(It.IsAny<IInstanceDataAccessor>(), signingConfiguration, CancellationToken.None)
             )
             .ReturnsAsync(signeeContexts);
 
@@ -131,12 +126,7 @@ public async Task Validate_ShouldReturnValidationIssue_WhenNotAllHaveSigned(stri
         _appMetadataMock.Setup(am => am.GetApplicationMetadata()).ReturnsAsync(appMetadata);
         _signingServiceMock
             .Setup(ss =>
-                ss.GetSigneeContexts(
-                    It.IsAny<IInstanceDataAccessor>(),
-                    signingConfiguration,
-                    null,
-                    CancellationToken.None
-                )
+                ss.GetSigneeContexts(It.IsAny<IInstanceDataAccessor>(), signingConfiguration, CancellationToken.None)
             )
             .ReturnsAsync(signeeContexts);
 
@@ -187,12 +177,7 @@ public async Task Validate_ShouldLogError_WhenSigneeContextsFetchFails()
         _appMetadataMock.Setup(am => am.GetApplicationMetadata()).ReturnsAsync(appMetadata);
         _signingServiceMock
             .Setup(ss =>
-                ss.GetSigneeContexts(
-                    It.IsAny<IInstanceDataAccessor>(),
-                    signingConfiguration,
-                    null,
-                    CancellationToken.None
-                )
+                ss.GetSigneeContexts(It.IsAny<IInstanceDataAccessor>(), signingConfiguration, CancellationToken.None)
             )
             .ThrowsAsync(exception);
 

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,6 @@ public async Task GetSigneesState_WhenSigneeContextIsOrg_Returns_Expected_Signee`
`229`	`229`	`s.GetSigneeContexts(`
`230`	`230`	`It.IsAny<InstanceDataUnitOfWork>(),`
`231`	`231`	`_altinnTaskExtension.SignatureConfiguration!,`
`232`		`- null,`
`233`	`232`	`It.IsAny<CancellationToken>()`
`234`	`233`	`)`
`235`	`234`	`)`
`@@ -333,7 +332,6 @@ public async Task GetSigneesState_WhenSigneeContextIsPerson_Returns_Expected_Sig`
`333`	`332`	`s.GetSigneeContexts(`
`334`	`333`	`It.IsAny<InstanceDataUnitOfWork>(),`
`335`	`334`	`_altinnTaskExtension.SignatureConfiguration!,`
`336`		`- null,`
`337`	`335`	`It.IsAny<CancellationToken>()`
`338`	`336`	`)`
`339`	`337`	`)`
`@@ -415,7 +413,6 @@ public async Task GetSigneesState_WhenSigneeContextIsPersonOnBehalfOfOrg_Returns`
`415`	`413`	`s.GetSigneeContexts(`
`416`	`414`	`It.IsAny<InstanceDataUnitOfWork>(),`
`417`	`415`	`_altinnTaskExtension.SignatureConfiguration!,`
`418`		`- null,`
`419`	`416`	`It.IsAny<CancellationToken>()`
`420`	`417`	`)`
`421`	`418`	`)`
`@@ -494,7 +491,6 @@ public async Task GetSigneesState_WhenSigneeContextIsSystem_Returns_Expected_Sig`
`494`	`491`	`s.GetSigneeContexts(`
`495`	`492`	`It.IsAny<InstanceDataUnitOfWork>(),`
`496`	`493`	`_altinnTaskExtension.SignatureConfiguration!,`
`497`		`- null,`
`498`	`494`	`It.IsAny<CancellationToken>()`
`499`	`495`	`)`
`500`	`496`	`)`
`@@ -949,7 +945,6 @@ public async Task GetSigneesState_WithTaskId_UsesOverriddenTask()`
`949`	`945`	`s.GetSigneeContexts(`
`950`	`946`	`It.IsAny<InstanceDataUnitOfWork>(),`
`951`	`947`	`altinnTaskExtensionTask2.SignatureConfiguration!,`
`952`		`- "task2",`
`953`	`948`	`It.IsAny<CancellationToken>()`
`954`	`949`	`)`
`955`	`950`	`)`
`@@ -979,7 +974,6 @@ public async Task GetSigneesState_WithTaskId_UsesOverriddenTask()`
`979`	`974`	`s.GetSigneeContexts(`
`980`	`975`	`It.IsAny<InstanceDataUnitOfWork>(),`
`981`	`976`	`altinnTaskExtensionTask2.SignatureConfiguration!,`
`982`		`- "task2",`
`983`	`977`	`It.IsAny<CancellationToken>()`
`984`	`978`	`),`
`985`	`979`	`Times.Once`
Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,6 @@ string dataElementStringContent`
`397`	`397`	`x.GetSigneeContexts(`
`398`	`398`	`It.Is<IInstanceDataAccessor>(d => d == _dataAccessorMock.Object),`
`399`	`399`	`It.Is<AltinnSignatureConfiguration>(c => c == signingConfiguration),`
`400`		`- null,`
`401`	`400`	`It.IsAny<CancellationToken>()`
`402`	`401`	`)`
`403`	`402`	`)`