From 75bade5cbc79bed90c386fed250094f63a7f2841 Mon Sep 17 00:00:00 2001 From: SameenaHMCTS Date: Thu, 21 May 2026 21:37:02 +0100 Subject: [PATCH 1/5] Replaced hardcoded email with env var from azure key vault --- Jenkinsfile_CNP | 1 + Jenkinsfile_nightly | 1 + src/e2eTest/data/user-data/permanent.user.data.ts | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP index 070c35b762..5ba4d1260e 100644 --- a/Jenkinsfile_CNP +++ b/Jenkinsfile_CNP @@ -23,6 +23,7 @@ def secrets = [ secret('pcs-prd-admin-password', 'PCS_PRD_ADMIN_PASSWORD'), secret('idam-expired-user-token', 'IDAM_EXPIRED_USER_TOKEN'), secret('s2s-expired-service-token', 'S2S_EXPIRED_TOKEN'), + secret('pcs-solicitor-automation-email','PCS_SOLICITOR_AUTOMATION_EMAIL'), ] ] diff --git a/Jenkinsfile_nightly b/Jenkinsfile_nightly index 6f5fd8fd2f..9e93512f6f 100644 --- a/Jenkinsfile_nightly +++ b/Jenkinsfile_nightly @@ -81,6 +81,7 @@ def pcsE2eVaultSecrets = [ secret('pcs-api-idam-secret', 'PCS_API_IDAM_SECRET'), secret('idam-pcs-user-password', 'IDAM_PCS_USER_PASSWORD'), secret('pcs-solicitor-automation-uid', 'PCS_SOLICITOR_AUTOMATION_UID'), + secret('pcs-solicitor-automation-email','PCS_SOLICITOR_AUTOMATION_EMAIL'), ] withNightlyPipeline(type, product, component) { diff --git a/src/e2eTest/data/user-data/permanent.user.data.ts b/src/e2eTest/data/user-data/permanent.user.data.ts index 20df3e10ba..a0890fd0d1 100644 --- a/src/e2eTest/data/user-data/permanent.user.data.ts +++ b/src/e2eTest/data/user-data/permanent.user.data.ts @@ -1,6 +1,6 @@ export const user = { claimantSolicitor: { - email: 'pcs-solicitor-automation@test.com', + email: process.env.PCS_SOLICITOR_AUTOMATION_EMAIL, password: process.env.IDAM_PCS_USER_PASSWORD, uid: process.env.PCS_SOLICITOR_AUTOMATION_UID }, From d109e743242b3fb09ddf529ed7e052ce766291d1 Mon Sep 17 00:00:00 2001 From: SameenaHMCTS Date: Thu, 21 May 2026 22:01:44 +0100 Subject: [PATCH 2/5] Updated read me --- README.md | 31 ++++++++++--------- src/e2eTest/config/global-setup.config.ts | 2 +- .../pcs/functional/config/TestConstants.java | 2 +- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 1dedde9b13..659d1ab478 100644 --- a/README.md +++ b/README.md @@ -54,18 +54,19 @@ authMode = AuthMode.AAT Then set the following environment variables based on the value below or named secret from the PCS AAT key vault: -| Environment Variable | Value or Secret Name | -| ---------------------------- | ---------------------------------------------------------------------------- | -| LOCATION_REF_URL | http://rd-location-ref-api-aat.service.core-compute-aat.internal | -| DATA_STORE_URL_BASE | https://ccd-data-store-api-pcs-api-pr-{CHANGE_ID}.preview.platform.hmcts.net | -| PCS_API_S2S_SECRET | secret: pcs-api-s2s-secret | -| IDAM_CLIENT_SECRET | secret: pcs-api-idam-secret | -| PCS_IDAM_SYSTEM_USERNAME | secret: idam-system-user-name | -| PCS_IDAM_SYSTEM_PASSWORD | secret: idam-system-user-password | -| PCS_PRD_ADMIN_USERNAME | secret: pcs-prd-admin-username | -| PCS_PRD_ADMIN_PASSWORD | secret: pcs-prd-admin-password | -| IDAM_PCS_USER_PASSWORD | secret: idam-pcs-user-password | -| PCS_SOLICITOR_AUTOMATION_UID | secret: pcs-solicitor-automation-uid | +| Environment Variable | Value or Secret Name | +|--------------------------------|------------------------------------------------------------------------------| +| LOCATION_REF_URL | http://rd-location-ref-api-aat.service.core-compute-aat.internal | +| DATA_STORE_URL_BASE | https://ccd-data-store-api-pcs-api-pr-{CHANGE_ID}.preview.platform.hmcts.net | +| PCS_API_S2S_SECRET | secret: pcs-api-s2s-secret | +| IDAM_CLIENT_SECRET | secret: pcs-api-idam-secret | +| PCS_IDAM_SYSTEM_USERNAME | secret: idam-system-user-name | +| PCS_IDAM_SYSTEM_PASSWORD | secret: idam-system-user-password | +| PCS_PRD_ADMIN_USERNAME | secret: pcs-prd-admin-username | +| PCS_PRD_ADMIN_PASSWORD | secret: pcs-prd-admin-password | +| IDAM_PCS_USER_PASSWORD | secret: idam-pcs-user-password | +| PCS_SOLICITOR_AUTOMATION_UID | secret: pcs-solicitor-automation-uid | +| PCS_SOLICITOR_AUTOMATION_EMAIL | secret: pcs-solicitor-automation-email | Finally, run the service with the `bootWithCCD` task as above. @@ -91,13 +92,13 @@ To access the swagger documentation for the API, go to http://localhost:3206/swa #### Generating the CCD definition XLS We can generate the xlsx spreadsheet by running the script: ``` -./bin/create-xlsx.sh +./bin/create-xlsx.sh ``` -This spreadsheet can be found in: /build/definitions/CCD_Definition_PCS_ENVIRONMENT.xlsx +This spreadsheet can be found in: /build/definitions/CCD_Definition_PCS_ENVIRONMENT.xlsx You can specify which environment to generate the spreadsheet for by passing it in when calling the script. E.g ./bin/create-xlsx.sh preview. -If you encounter the error: +If you encounter the error: ``` [{"code":"UNAUTHORIZED","message":"authentication required,}] ``` diff --git a/src/e2eTest/config/global-setup.config.ts b/src/e2eTest/config/global-setup.config.ts index 94c61a53f4..678435fb0f 100644 --- a/src/e2eTest/config/global-setup.config.ts +++ b/src/e2eTest/config/global-setup.config.ts @@ -44,7 +44,7 @@ async function authenticateAndSaveState(): Promise { ); } if (!user.claimantSolicitor.email || !user.claimantSolicitor.password) { - throw new Error('Login failed: missing credentials. Set IDAM_PCS_USER_PASSWORD.'); + throw new Error('Login failed: missing credentials. Set PCS_SOLICITOR_AUTOMATION_EMAIL and IDAM_PCS_USER_PASSWORD.'); } const authDir = path.dirname(STORAGE_STATE_PATH); diff --git a/src/functionalTest/java/uk/gov/hmcts/reform/pcs/functional/config/TestConstants.java b/src/functionalTest/java/uk/gov/hmcts/reform/pcs/functional/config/TestConstants.java index 01156fa19c..d3403f26c6 100644 --- a/src/functionalTest/java/uk/gov/hmcts/reform/pcs/functional/config/TestConstants.java +++ b/src/functionalTest/java/uk/gov/hmcts/reform/pcs/functional/config/TestConstants.java @@ -10,7 +10,7 @@ public class TestConstants { public static final String SERVICE_AUTHORIZATION = "ServiceAuthorization"; public static final String EXPIRED_S2S_TOKEN = getEnv("S2S_EXPIRED_TOKEN"); public static final String EXPIRED_IDAM_TOKEN = getEnv("IDAM_EXPIRED_USER_TOKEN"); - public static final String PCS_SOLICITOR_USER = "pcs-solicitor-automation@test.com"; + public static final String PCS_SOLICITOR_USER = getEnv("PCS_SOLICITOR_AUTOMATION_EMAIL"); public static final String PCS_SOLICITOR_AUTOMATION_IDAM_UID = getEnv("PCS_SOLICITOR_AUTOMATION_UID"); public static final String GENERIC_PASSWORD = getEnv("IDAM_PCS_USER_PASSWORD"); } From 912777c5f4f74eaa6f8fc569c92ab74c7652fcdb Mon Sep 17 00:00:00 2001 From: SameenaHMCTS Date: Fri, 22 May 2026 12:10:59 +0100 Subject: [PATCH 3/5] Updated slack to diff channel --- .../data/page-data-figma/claimantInformation.page.data.ts | 2 +- src/e2eTest/data/page-data/serviceRequest.page.data.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/e2eTest/data/page-data-figma/claimantInformation.page.data.ts b/src/e2eTest/data/page-data-figma/claimantInformation.page.data.ts index d2880552bb..1bd65c8a2a 100644 --- a/src/e2eTest/data/page-data-figma/claimantInformation.page.data.ts +++ b/src/e2eTest/data/page-data-figma/claimantInformation.page.data.ts @@ -1,7 +1,7 @@ export const claimantInformation = { mainHeader: `Claimant name`, makeAClaimCaption: `Make a claim`, - possessionClaimSolicitorOrgParagraph: `Possession Claims Solicitor Org`, + possessionClaimSolicitorOrgParagraph: `Possession Claim Service Org1`, yourClaimantNameRegisteredParagraph: `Your claimant name registered with My HMCTS is:`, yesRadioOption: `Yes`, noRadioOption: `No`, diff --git a/src/e2eTest/data/page-data/serviceRequest.page.data.ts b/src/e2eTest/data/page-data/serviceRequest.page.data.ts index 7318e8ea91..a48fb6831c 100644 --- a/src/e2eTest/data/page-data/serviceRequest.page.data.ts +++ b/src/e2eTest/data/page-data/serviceRequest.page.data.ts @@ -7,7 +7,7 @@ export const serviceRequest = { payByCardRadioOption: `Pay by credit or debit card`, selectPBALabel: `Select a PBA`, pbaIndex1: 1, - pbaValue: `PBA0093901`, + pbaValue: `PBA0092853`, pbaReferenceLable: `Enter a reference for your PBA account statements`, pbaReferenceInputText: `UniqueCaseIdentifier-Automation`, continueButton: `Continue`, From 26f301496cb1f7e8d1ddb6ec2d6fd6afc21961cb Mon Sep 17 00:00:00 2001 From: SameenaHMCTS Date: Fri, 22 May 2026 12:24:18 +0100 Subject: [PATCH 4/5] Reverted the email retrieval --- .../gov/hmcts/reform/pcs/functional/config/TestConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/functionalTest/java/uk/gov/hmcts/reform/pcs/functional/config/TestConstants.java b/src/functionalTest/java/uk/gov/hmcts/reform/pcs/functional/config/TestConstants.java index d3403f26c6..01156fa19c 100644 --- a/src/functionalTest/java/uk/gov/hmcts/reform/pcs/functional/config/TestConstants.java +++ b/src/functionalTest/java/uk/gov/hmcts/reform/pcs/functional/config/TestConstants.java @@ -10,7 +10,7 @@ public class TestConstants { public static final String SERVICE_AUTHORIZATION = "ServiceAuthorization"; public static final String EXPIRED_S2S_TOKEN = getEnv("S2S_EXPIRED_TOKEN"); public static final String EXPIRED_IDAM_TOKEN = getEnv("IDAM_EXPIRED_USER_TOKEN"); - public static final String PCS_SOLICITOR_USER = getEnv("PCS_SOLICITOR_AUTOMATION_EMAIL"); + public static final String PCS_SOLICITOR_USER = "pcs-solicitor-automation@test.com"; public static final String PCS_SOLICITOR_AUTOMATION_IDAM_UID = getEnv("PCS_SOLICITOR_AUTOMATION_UID"); public static final String GENERIC_PASSWORD = getEnv("IDAM_PCS_USER_PASSWORD"); } From 740508b5762074df087866fea0850f540bab31d5 Mon Sep 17 00:00:00 2001 From: SameenaHMCTS Date: Fri, 22 May 2026 19:34:26 +0100 Subject: [PATCH 5/5] Updated PBA value and org name --- .../data/page-data-figma/claimantInformation.page.data.ts | 2 +- src/e2eTest/data/page-data/serviceRequest.page.data.ts | 2 +- src/e2eTest/tests/CommonComponent/feeAndPay.spec.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/e2eTest/data/page-data-figma/claimantInformation.page.data.ts b/src/e2eTest/data/page-data-figma/claimantInformation.page.data.ts index 1bd65c8a2a..d2880552bb 100644 --- a/src/e2eTest/data/page-data-figma/claimantInformation.page.data.ts +++ b/src/e2eTest/data/page-data-figma/claimantInformation.page.data.ts @@ -1,7 +1,7 @@ export const claimantInformation = { mainHeader: `Claimant name`, makeAClaimCaption: `Make a claim`, - possessionClaimSolicitorOrgParagraph: `Possession Claim Service Org1`, + possessionClaimSolicitorOrgParagraph: `Possession Claims Solicitor Org`, yourClaimantNameRegisteredParagraph: `Your claimant name registered with My HMCTS is:`, yesRadioOption: `Yes`, noRadioOption: `No`, diff --git a/src/e2eTest/data/page-data/serviceRequest.page.data.ts b/src/e2eTest/data/page-data/serviceRequest.page.data.ts index a48fb6831c..beccc44ee4 100644 --- a/src/e2eTest/data/page-data/serviceRequest.page.data.ts +++ b/src/e2eTest/data/page-data/serviceRequest.page.data.ts @@ -7,7 +7,7 @@ export const serviceRequest = { payByCardRadioOption: `Pay by credit or debit card`, selectPBALabel: `Select a PBA`, pbaIndex1: 1, - pbaValue: `PBA0092853`, + pbaValue: `PBA0095030`, pbaReferenceLable: `Enter a reference for your PBA account statements`, pbaReferenceInputText: `UniqueCaseIdentifier-Automation`, continueButton: `Continue`, diff --git a/src/e2eTest/tests/CommonComponent/feeAndPay.spec.ts b/src/e2eTest/tests/CommonComponent/feeAndPay.spec.ts index 9299c77a54..897a4a0a8a 100644 --- a/src/e2eTest/tests/CommonComponent/feeAndPay.spec.ts +++ b/src/e2eTest/tests/CommonComponent/feeAndPay.spec.ts @@ -36,7 +36,7 @@ test.describe('[Common Component Fee And Pay]', async () => { expectedAmount: serviceRequest.amount404, payByOption: serviceRequest.payByAccountRadioOption, pbaLabel: serviceRequest.selectPBALabel, - pbaValue: serviceRequest.pbaValue, + pbaValue: serviceRequest.pbaIndex1, referenceLabel: serviceRequest.pbaReferenceLable, referenceText: serviceRequest.pbaReferenceInputText, confirmButton: serviceRequest.confirmPaymentButton,