From 50e2313b78b5ae6eecdf014ed06172e56027c29e Mon Sep 17 00:00:00 2001 From: Vanitha S <116701245+vanitha1822@users.noreply.github.com> Date: Fri, 5 Sep 2025 11:25:25 +0530 Subject: [PATCH 1/3] fix: fix the session expiry issue (#286) --- .../com/iemr/common/controller/users/IEMRAdminController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java b/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java index 28c7e4b9..12e0e9e4 100644 --- a/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java +++ b/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java @@ -343,9 +343,10 @@ public String logOutUserFromConcurrentSession( deleteSessionObjectByGettingSessionDetails(previousTokenFromRedis); sessionObject.deleteSessionObject(previousTokenFromRedis); response.setResponse("User successfully logged out"); - } else + } else{ logger.error("Unable to fetch session from redis"); throw new IEMRException("Session error. Please try again later"); + } } } else { throw new IEMRException("Invalid request object"); From 6c00a6b35c255d02ca6dce639cbb82dd5afc4706 Mon Sep 17 00:00:00 2001 From: Amoghavarsh <93114621+5Amogh@users.noreply.github.com> Date: Thu, 25 Sep 2025 12:46:51 +0530 Subject: [PATCH 2/3] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0ae3d0b9..a98d44c6 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.iemr.common-API common-api - 3.4.0 + 3.5.1 war Common-API From e5789f4c75befd0c50e7bcfc58d304f56ee86dbd Mon Sep 17 00:00:00 2001 From: 5Amogh Date: Fri, 26 Sep 2025 14:58:27 +0530 Subject: [PATCH 3/3] fix: missing env added --- src/main/environment/common_ci.properties | 3 ++- src/main/environment/common_docker.properties | 3 ++- src/main/environment/common_example.properties | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties index a5e66660..856659f1 100644 --- a/src/main/environment/common_ci.properties +++ b/src/main/environment/common_ci.properties @@ -185,4 +185,5 @@ cors.allowed-origins=@env.CORS_ALLOWED_ORIGINS@ video-call-url=@env.VIDEO_CALL_URL@ jibri.output.path=@env.JIBRI_OUTPUT_PATH@ -video.recording.path=@env.VIDEO_RECORDING_PATH@ \ No newline at end of file +video.recording.path=@env.VIDEO_RECORDING_PATH@ +generateBeneficiaryIDs-api-url=@env.GEN_BENEFICIARY_IDS_API_URL@ diff --git a/src/main/environment/common_docker.properties b/src/main/environment/common_docker.properties index 41881886..030a7cfe 100644 --- a/src/main/environment/common_docker.properties +++ b/src/main/environment/common_docker.properties @@ -187,4 +187,5 @@ cors.allowed-origins=${CORS_ALLOWED_ORIGINS} video-call-url=${VIDEO_CALL_URL} jibri.output.path={JIBRI_OUTPUT_PATH} -video.recording.path={VIDEO_RECORDING_PATH} \ No newline at end of file +video.recording.path={VIDEO_RECORDING_PATH} +generateBeneficiaryIDs-api-url={GEN_BENEFICIARY_IDS_API_URL} diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties index 09a526dd..bea76523 100644 --- a/src/main/environment/common_example.properties +++ b/src/main/environment/common_example.properties @@ -208,3 +208,5 @@ captcha.enable-captcha=true cors.allowed-origins=http://localhost:* +### generate Beneficiary IDs URL +generateBeneficiaryIDs-api-url=/generateBeneficiaryController/generateBeneficiaryIDs