Skip to content

FCT2_20202 - Fix Authentication on Materials UI #2076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kramduny-cps merged 5 commits into from
Jun 30, 2026
Merged

FCT2_20202 - Fix Authentication on Materials UI #2076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
69afe89
FCT2_20202 - Fix Authentication on Materials UI
kramduny-cps Jun 29, 2026
c86f735
Fix HK Unit tests
kramduny-cps Jun 29, 2026
56be86e
handle null cookies from unit tests
kramduny-cps Jun 29, 2026
d072160
Make BuildCmsAuthValues static method
kramduny-cps Jun 29, 2026
f6efc9f
Revert "Make BuildCmsAuthValues static method"
kramduny-cps Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Cps.Fct.Hk.Ui.Services.Tests/BulkSetUnusedServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public async Task BulkSetUnusedAsync_AllMaterialsReclassified_ReturnsSuccess()
};

// var cmsAuthValues = new CmsAuthValues();
var cmsAuthValues = new CmsAuthValues("cookies", "token", Guid.NewGuid());
var cmsAuthValues = new CmsAuthValues("cookies", Guid.NewGuid());

this.mockApiClient.Setup(client => client.ReclassifyCommunicationAsync(It.IsAny<ReclassifyCommunicationRequest>(), It.IsAny<CmsAuthValues>()))
.ReturnsAsync((ReclassifyCommunicationRequest req, CmsAuthValues _) =>
Expand Down Expand Up @@ -91,7 +91,7 @@ public async Task BulkSetUnusedAsync_PartialSuccess_ReturnsPartialSuccess()
new BulkSetUnusedRequest { materialId = 2, subject = "Material 2" },
};

var cmsAuthValues = new CmsAuthValues("cookies", "token", Guid.NewGuid());
var cmsAuthValues = new CmsAuthValues("cookies", Guid.NewGuid());

#pragma warning disable CS8620 // Argument cannot be used for parameter due to differences in the nullability of reference types.
this.mockApiClient.Setup(client => client.ReclassifyCommunicationAsync(It.IsAny<ReclassifyCommunicationRequest>(), cmsAuthValues))
Expand Down Expand Up @@ -147,7 +147,7 @@ public async Task BulkSetUnusedAsync_AllMaterialsFail_ReturnsFailed()
new BulkSetUnusedRequest { materialId = 2, subject = "Material 2" },
};

var cmsAuthValues = new CmsAuthValues("cookies", "token", Guid.NewGuid());
var cmsAuthValues = new CmsAuthValues("cookies", Guid.NewGuid());

this.mockApiClient.Setup(client => client.ReclassifyCommunicationAsync(It.IsAny<ReclassifyCommunicationRequest>(), It.IsAny<CmsAuthValues>()))
.ThrowsAsync(new Exception("Reclassification failed"));
Expand Down Expand Up @@ -184,7 +184,7 @@ public async Task BulkSetUnusedAsync_ApiThrowsException_ThrowsException()
new BulkSetUnusedRequest { materialId = 1, subject = "Material 1" },
};

var cmsAuthValues = new CmsAuthValues("cookies", "token", Guid.NewGuid());
var cmsAuthValues = new CmsAuthValues("cookies", Guid.NewGuid());

this.mockApiClient.Setup(client => client.ReclassifyCommunicationAsync(It.IsAny<ReclassifyCommunicationRequest>(), cmsAuthValues))
.ThrowsAsync(exception);
Expand Down Expand Up @@ -223,7 +223,7 @@ public async Task BulkSetUnusedAsync_LogsErrorWhenMaterialFails()
new BulkSetUnusedRequest { materialId = 1, subject = "Material 1" },
};

var cmsAuthValues = new CmsAuthValues("cookies", "token", Guid.NewGuid());
var cmsAuthValues = new CmsAuthValues("cookies", Guid.NewGuid());

this.mockApiClient.Setup(client => client.ReclassifyCommunicationAsync(It.IsAny<ReclassifyCommunicationRequest>(), It.IsAny<CmsAuthValues>()))
.ThrowsAsync(new Exception("Reclassification failed"));
Expand Down
6 changes: 3 additions & 3 deletions Cps.Fct.Hk.Ui.Services.Tests/CaseActionPlanServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public async Task AddCaseActionPlanAsync_ReturnsNoContentResult_WhenApiCallIsSuc
// Arrange
string urn = "1234567890";
int caseId = 123;
var cmsAuthValues = new CmsAuthValues("validCmsToken", "validCmsCookies");
var cmsAuthValues = new CmsAuthValues("validCmsToken");

AddCaseActionPlanRequest mockAddCaseActionPlanRequest = CreateMockAddCaseActionPlanRequest();

Expand Down Expand Up @@ -101,7 +101,7 @@ public async Task AddCaseActionPlanAsync_ThrowsException_WhenApiCallFails()
// Arrange
string urn = "1234567890";
int caseId = 123;
var cmsAuthValues = new CmsAuthValues("validCmsToken", "validCmsCookies");
var cmsAuthValues = new CmsAuthValues("validCmsToken");

AddCaseActionPlanRequest mockAddCaseActionPlanRequest = CreateMockAddCaseActionPlanRequest();

Expand Down Expand Up @@ -146,7 +146,7 @@ public async Task AddCaseActionPlanAsync_LogsError_WhenCaseLocked()
// Arrange
string urn = "1234567890";
int caseId = 123;
var cmsAuthValues = new CmsAuthValues("validCmsToken", "validCmsCookies");
var cmsAuthValues = new CmsAuthValues("validCmsToken");

AddCaseActionPlanRequest mockAddCaseActionPlanRequest = CreateMockAddCaseActionPlanRequest();

Expand Down
6 changes: 3 additions & 3 deletions Cps.Fct.Hk.Ui.Services.Tests/CaseInfoServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public async Task GetCaseInfoAsync_ReturnsCaseSummary_WhenApiCallIsSuccessful()
{
// Arrange
int caseId = 123;
var cmsAuthValues = new CmsAuthValues("validCmsToken", "validCmsCookies");
var cmsAuthValues = new CmsAuthValues("validCmsToken");

// Setup the expected CaseSummary result
var expectedCaseSummary = new CaseSummaryResponse(caseId, "06SC1234572", "Will", "SMITH", 2, "Hull UT");
Expand Down Expand Up @@ -82,7 +82,7 @@ public async Task GetCaseInfoAsync_ThrowsInvalidOperationException_WhenCaseSumma
{
// Arrange
int caseId = 123;
var cmsAuthValues = new CmsAuthValues("validCmsToken", "validCmsCookies");
var cmsAuthValues = new CmsAuthValues("validCmsToken");

// Setup the API client to return null for the case summary
this.apiClientMock
Expand Down Expand Up @@ -113,7 +113,7 @@ public async Task GetCaseInfoAsync_ThrowsException_WhenApiCallFails()
{
// Arrange
int caseId = 123;
var cmsAuthValues = new CmsAuthValues("validCmsToken", "validCmsCookies");
var cmsAuthValues = new CmsAuthValues("validCmsToken");

// Setup the API client to throw an exception
this.apiClientMock
Expand Down
13 changes: 2 additions & 11 deletions Cps.Fct.Hk.Ui.Services.Tests/CaseMaterialServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public void MapUsedExhibitsToCaseMaterials_ReturnsMappedCaseMaterials()
DateTime receivedDate = new DateTime(2025, 04, 01);

int caseId = 123;
var cmsAuthValues = new CmsAuthValues("validCmsToken", "validCmsCookies");
var cmsAuthValues = new CmsAuthValues("validCmsToken");

var usedExhibitsResponse = new UsedExhibitsResponse
{
Expand Down Expand Up @@ -189,7 +189,7 @@ public void MapUsedExhibitsToCaseMaterials_WithNullDocumentType_ReturnsMappedCas
// Arrange
DateTime receivedDate = new DateTime(2025, 04, 01);
int caseId = 123;
var cmsAuthValues = new CmsAuthValues("validCmsToken", "validCmsCookies");
var cmsAuthValues = new CmsAuthValues("validCmsToken");

var usedExhibitsResponse = new UsedExhibitsResponse
{
Expand Down Expand Up @@ -855,7 +855,6 @@ public async Task Run_ReturnsUnprocessableEntityError_WhenExceptionIsThrownBy_Ge

var cmsAuthValues = new CmsAuthValues(
"cookies",
"token",
Guid.NewGuid());

this.mockCommunicationService
Expand Down Expand Up @@ -889,7 +888,6 @@ public async Task Run_ReturnsUnprocessableEntityError_WhenExceptionIsThrownBy_Ge

var cmsAuthValues = new CmsAuthValues(
"cookies",
"token",
Guid.NewGuid());

this.mockCommunicationService
Expand Down Expand Up @@ -923,7 +921,6 @@ public async Task Run_ReturnsUnprocessableEntityError_WhenExceptionIsThrownBy_Ge

var cmsAuthValues = new CmsAuthValues(
"cookies",
"token",
Guid.NewGuid());

this.mockCommunicationService
Expand Down Expand Up @@ -957,7 +954,6 @@ public async Task Run_ReturnsUnprocessableEntityError_WhenExceptionIsThrownBy_Ge

var cmsAuthValues = new CmsAuthValues(
"cookies",
"token",
Guid.NewGuid());

this.mockCommunicationService
Expand Down Expand Up @@ -1329,7 +1325,6 @@ public async Task Run_ReturnsUnprocessableEntityError_WhenExceptionIsThrownBy_Ge
// Arrange
var cmsAuthValues = new CmsAuthValues(
"cookies",
"token",
Guid.NewGuid());

this.mockCommunicationService
Expand Down Expand Up @@ -1361,7 +1356,6 @@ public async Task Run_ReturnsUnprocessableEntityError_WhenExceptionIsThrownBy_Ge
// Arrange
var cmsAuthValues = new CmsAuthValues(
"cookies",
"token",
Guid.NewGuid());

this.mockCommunicationService
Expand Down Expand Up @@ -1395,7 +1389,6 @@ public async Task Run_ReturnsUnprocessableEntityError_WhenExceptionIsThrownBy_Ge

var cmsAuthValues = new CmsAuthValues(
"cookies",
"token",
Guid.NewGuid());

ExhibitProducersResponse exhibitProducersResponse = BuildTestExhibitProducers();
Expand Down Expand Up @@ -1430,7 +1423,6 @@ public void MapExistingProducerOrWitnessId_ReturnsNull_WhenExhibitProducerIsNotP

var cmsAuthValues = new CmsAuthValues(
"cookies",
"token",
Guid.NewGuid());

ExhibitProducersResponse exhibitProducersResponse = BuildTestExhibitProducers();
Expand Down Expand Up @@ -1464,7 +1456,6 @@ public void MapExistingProducerOrWitnessId_ReturnsId_WhenExhibitProducerIsMatche

var cmsAuthValues = new CmsAuthValues(
"cookies",
"token",
Guid.NewGuid());

var exhibitProducers = new ExhibitProducersResponse()
Expand Down
Loading
Loading