From ea1a551a08abebe8fe213f3a9a7c8642bcfd19ef Mon Sep 17 00:00:00 2001 From: IN40068837 Date: Mon, 17 Mar 2025 16:38:12 +0530 Subject: [PATCH 1/2] 401 unauthorized issue resolved --- .../CSCarestreamServiceImpl.java | 12 ++++++++++ .../transaction/CommonDoctorServiceImpl.java | 11 +++++++++ .../common/transaction/CommonServiceImpl.java | 18 +++++++++++++++ .../DownloadDataFromServerImpl.java | 15 ++++++++++++ ...wnloadDataFromServerTransactionalImpl.java | 15 ++++++++++++ .../UploadDataToServerImpl.java | 11 +++++++++ .../registrar/RegistrarServiceImpl.java | 23 +++++++++++++++++++ .../TeleConsultationServiceImpl.java | 11 +++++++++ 8 files changed, 116 insertions(+) diff --git a/src/main/java/com/iemr/mmu/service/cancerScreening/CSCarestreamServiceImpl.java b/src/main/java/com/iemr/mmu/service/cancerScreening/CSCarestreamServiceImpl.java index 6527e445..60a7b197 100644 --- a/src/main/java/com/iemr/mmu/service/cancerScreening/CSCarestreamServiceImpl.java +++ b/src/main/java/com/iemr/mmu/service/cancerScreening/CSCarestreamServiceImpl.java @@ -29,6 +29,7 @@ import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.PropertySource; import org.springframework.http.HttpEntity; @@ -38,8 +39,13 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import com.google.gson.Gson; +import com.iemr.mmu.utils.CookieUtil; + +import jakarta.servlet.http.HttpServletRequest; @Service @PropertySource("classpath:application.properties") @@ -47,17 +53,23 @@ public class CSCarestreamServiceImpl implements CSCarestreamService { private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); @Value("${carestreamOrderCreateURL}") private String carestreamOrderCreateURL; + @Autowired + private CookieUtil cookieUtil; @Override public int createMamographyRequest(ArrayList benDataForCareStream, long benRegID, long benVisitID, String Authorization) { int responseData = 0; RestTemplate restTemplate = new RestTemplate(); + HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) + .getRequest(); + String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader); try { // HttpHeaders headers = new HttpHeaders(); MultiValueMap headers = new LinkedMultiValueMap(); headers.add("Content-Type", "application/json"); headers.add("AUTHORIZATION", Authorization); + headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie); String requestOBJ = getOrderCreationRequestOBJ(benDataForCareStream, benRegID, benVisitID); HttpEntity request = new HttpEntity(requestOBJ, headers); diff --git a/src/main/java/com/iemr/mmu/service/common/transaction/CommonDoctorServiceImpl.java b/src/main/java/com/iemr/mmu/service/common/transaction/CommonDoctorServiceImpl.java index fdf2cabb..f72d8cfe 100644 --- a/src/main/java/com/iemr/mmu/service/common/transaction/CommonDoctorServiceImpl.java +++ b/src/main/java/com/iemr/mmu/service/common/transaction/CommonDoctorServiceImpl.java @@ -40,6 +40,8 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -69,10 +71,13 @@ import com.iemr.mmu.repo.quickConsultation.PrescriptionDetailRepo; import com.iemr.mmu.service.benFlowStatus.CommonBenStatusFlowServiceImpl; import com.iemr.mmu.service.snomedct.SnomedServiceImpl; +import com.iemr.mmu.utils.CookieUtil; import com.iemr.mmu.utils.exception.IEMRException; import com.iemr.mmu.utils.mapper.InputMapper; import com.iemr.mmu.utils.mapper.OutputMapper; +import jakarta.servlet.http.HttpServletRequest; + /*** * * @author NE298657 @@ -106,6 +111,8 @@ public class CommonDoctorServiceImpl { private CommonBenStatusFlowServiceImpl commonBenStatusFlowServiceImpl; private BeneficiaryFlowStatusRepo beneficiaryFlowStatusRepo; + @Autowired + private CookieUtil cookieUtil; @Autowired public void setSnomedServiceImpl(SnomedServiceImpl snomedServiceImpl) { @@ -899,9 +906,13 @@ public int callTmForSpecialistSlotBook(TcSpecialistSlotBookingRequestOBJ tcSpeci String requestOBJ = OutputMapper.gson().toJson(tcSpecialistSlotBookingRequestOBJ); RestTemplate restTemplate = new RestTemplate(); + HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) + .getRequest(); + String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader); MultiValueMap headers = new LinkedMultiValueMap(); headers.add("Content-Type", "application/json"); headers.add("AUTHORIZATION", Authorization); + headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie); HttpEntity request = new HttpEntity(requestOBJ, headers); ResponseEntity response = restTemplate.exchange(tcSpecialistSlotBook, HttpMethod.POST, request, String.class); diff --git a/src/main/java/com/iemr/mmu/service/common/transaction/CommonServiceImpl.java b/src/main/java/com/iemr/mmu/service/common/transaction/CommonServiceImpl.java index a1665e7c..97975578 100644 --- a/src/main/java/com/iemr/mmu/service/common/transaction/CommonServiceImpl.java +++ b/src/main/java/com/iemr/mmu/service/common/transaction/CommonServiceImpl.java @@ -51,6 +51,8 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import com.google.gson.Gson; import com.google.gson.JsonArray; @@ -76,10 +78,13 @@ import com.iemr.mmu.service.ncdscreening.NCDScreeningServiceImpl; import com.iemr.mmu.service.pnc.PNCServiceImpl; import com.iemr.mmu.service.quickConsultation.QuickConsultationServiceImpl; +import com.iemr.mmu.utils.CookieUtil; import com.iemr.mmu.utils.AESEncryption.AESEncryptionDecryption; import com.iemr.mmu.utils.exception.IEMRException; import com.iemr.mmu.utils.mapper.InputMapper; +import jakarta.servlet.http.HttpServletRequest; + @Service @PropertySource("classpath:application.properties") public class CommonServiceImpl implements CommonService { @@ -124,6 +129,8 @@ public class CommonServiceImpl implements CommonService { @Autowired private EmployeeSignatureRepo employeeSignatureRepo; + @Autowired + private CookieUtil cookieUtil; @Autowired public void setNcdScreeningServiceImpl(NCDScreeningServiceImpl ncdScreeningServiceImpl) { @@ -634,6 +641,12 @@ public ArrayList getTmCaseSheet(BeneficiaryFlowStatus TmBenFlowOBJ, Bene tmReqObj.put("beneficiaryRegID", String.valueOf(TmBenFlowOBJ.getBeneficiaryRegID())); logger.info("TM print data request obj - " + new Gson().toJson(tmReqObj)); + HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) + .getRequest(); + String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader); + MultiValueMap headers = new LinkedMultiValueMap(); + + headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie); // get TM case sheet by passing TM details ResponseEntity response = restTemplatePost(tmCentralServer, Authorization, new Gson().toJson(tmReqObj)); @@ -699,6 +712,11 @@ public String getCaseSheetFromCentralServer(String mmuBenFlowReq, String authCen String suspectedDisease = null; int updated = 0; int allDataUpdated = 0; + HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) + .getRequest(); + String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader); + MultiValueMap headers = new LinkedMultiValueMap(); + headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie); ResponseEntity response = restTemplatePost(mmuCentralServer, authCentralServer, mmuBenFlowReq); diff --git a/src/main/java/com/iemr/mmu/service/dataSyncActivity/DownloadDataFromServerImpl.java b/src/main/java/com/iemr/mmu/service/dataSyncActivity/DownloadDataFromServerImpl.java index c5338017..f0a9a343 100644 --- a/src/main/java/com/iemr/mmu/service/dataSyncActivity/DownloadDataFromServerImpl.java +++ b/src/main/java/com/iemr/mmu/service/dataSyncActivity/DownloadDataFromServerImpl.java @@ -43,6 +43,8 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import com.google.gson.Gson; import com.iemr.mmu.data.syncActivity_syncLayer.MasterDownloadDataDigester; @@ -50,8 +52,11 @@ import com.iemr.mmu.data.syncActivity_syncLayer.TempVan; import com.iemr.mmu.repo.syncActivity_syncLayer.SyncDownloadMasterRepo; import com.iemr.mmu.repo.syncActivity_syncLayer.TempVanRepo; +import com.iemr.mmu.utils.CookieUtil; import com.iemr.mmu.utils.mapper.InputMapper; +import jakarta.servlet.http.HttpServletRequest; + @Service @PropertySource("classpath:application.properties") public class DownloadDataFromServerImpl implements DownloadDataFromServer { @@ -65,6 +70,8 @@ public class DownloadDataFromServerImpl implements DownloadDataFromServer { private DataSyncRepository dataSyncRepository; @Autowired private TempVanRepo tempVanRepo; + @Autowired + private CookieUtil cookieUtil; // ben gen URL @Value("${benGenUrlCentral}") @@ -178,11 +185,15 @@ private int downloadDataFromServer(SyncDownloadMaster syncDownloadMaster, String // initializing RestTemplate RestTemplate restTemplate = new RestTemplate(); + HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) + .getRequest(); + String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader); // Multivalue map for headers with content-type and auth key MultiValueMap headers = new LinkedMultiValueMap(); headers.add("Content-Type", "application/json"); headers.add("AUTHORIZATION", ServerAuthorization); + headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie); HttpEntity request = new HttpEntity(syncDownloadMaster, headers); // Call rest-template to call API to download master data for given table @@ -331,11 +342,15 @@ public int callCentralAPIToGenerateBenIDAndimportToLocal(String requestOBJ, Stri int i = 0; // Rest template RestTemplate restTemplate = new RestTemplate(); + HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) + .getRequest(); + String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader); // Multivalue map for headers with content-type and auth key MultiValueMap headers = new LinkedMultiValueMap(); headers.add("Content-Type", "application/json"); headers.add("AUTHORIZATION", ServerAuthorization); + headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie); HttpEntity request = new HttpEntity(requestOBJ, headers); // Call rest-template to call central API to generate UNIQUE ID at central diff --git a/src/main/java/com/iemr/mmu/service/dataSyncActivity/DownloadDataFromServerTransactionalImpl.java b/src/main/java/com/iemr/mmu/service/dataSyncActivity/DownloadDataFromServerTransactionalImpl.java index 23fce657..79444b1a 100644 --- a/src/main/java/com/iemr/mmu/service/dataSyncActivity/DownloadDataFromServerTransactionalImpl.java +++ b/src/main/java/com/iemr/mmu/service/dataSyncActivity/DownloadDataFromServerTransactionalImpl.java @@ -36,6 +36,8 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import com.iemr.mmu.data.syncActivity_syncLayer.Indent; import com.iemr.mmu.data.syncActivity_syncLayer.IndentIssue; @@ -49,8 +51,11 @@ import com.iemr.mmu.repo.syncActivity_syncLayer.IndentRepo; import com.iemr.mmu.repo.syncActivity_syncLayer.ItemStockEntryRepo; import com.iemr.mmu.repo.syncActivity_syncLayer.StockTransferRepo; +import com.iemr.mmu.utils.CookieUtil; import com.iemr.mmu.utils.mapper.InputMapper; +import jakarta.servlet.http.HttpServletRequest; + @Service @PropertySource("classpath:application.properties") public class DownloadDataFromServerTransactionalImpl implements DownloadDataFromServerTransactional { @@ -73,6 +78,8 @@ public class DownloadDataFromServerTransactionalImpl implements DownloadDataFrom private StockTransferRepo stockTransferRepo; @Autowired private ItemStockEntryRepo itemStockEntryRepo; + @Autowired + private CookieUtil cookieUtil; public int downloadTransactionalData(int vanID, String ServerAuthorization) throws Exception { JSONObject obj; @@ -233,6 +240,9 @@ private JSONObject downloadDataFromCentral(String schemaName, String tableName, if (facilityID != null) { RestTemplate restTemplate = new RestTemplate(); + HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) + .getRequest(); + String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader); SyncUploadDataDigester syncUploadDataDigester = new SyncUploadDataDigester(schemaName, tableName, facilityID); @@ -240,6 +250,7 @@ private JSONObject downloadDataFromCentral(String schemaName, String tableName, MultiValueMap headers = new LinkedMultiValueMap(); headers.add("Content-Type", "application/json"); headers.add("AUTHORIZATION", ServerAuthorization); + headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie); HttpEntity request = new HttpEntity(syncUploadDataDigester, headers); // Call rest-template to call API to download master data for given table @@ -263,12 +274,16 @@ private int updateProcessedFlagToCentral(String schemaName, String tableName, Li int result = 0; RestTemplate restTemplate = new RestTemplate(); + HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) + .getRequest(); + String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader); SyncUploadDataDigester syncUploadDataDigester = new SyncUploadDataDigester(schemaName, tableName, ids); // Multivalue map for headers with content-type and auth key MultiValueMap headers = new LinkedMultiValueMap(); headers.add("Content-Type", "application/json"); headers.add("AUTHORIZATION", ServerAuthorization); + headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie); HttpEntity request = new HttpEntity(syncUploadDataDigester, headers); // Call rest-template to call API to download master data for given table diff --git a/src/main/java/com/iemr/mmu/service/dataSyncActivity/UploadDataToServerImpl.java b/src/main/java/com/iemr/mmu/service/dataSyncActivity/UploadDataToServerImpl.java index fa0685a3..2896d6be 100644 --- a/src/main/java/com/iemr/mmu/service/dataSyncActivity/UploadDataToServerImpl.java +++ b/src/main/java/com/iemr/mmu/service/dataSyncActivity/UploadDataToServerImpl.java @@ -40,6 +40,8 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; @@ -49,6 +51,9 @@ import com.iemr.mmu.repo.login.MasterVanRepo; import com.iemr.mmu.repo.syncActivity_syncLayer.DataSyncGroupsRepo; import com.iemr.mmu.repo.syncActivity_syncLayer.SyncUtilityClassRepo; +import com.iemr.mmu.utils.CookieUtil; + +import jakarta.servlet.http.HttpServletRequest; /*** * @@ -79,6 +84,8 @@ public class UploadDataToServerImpl implements UploadDataToServer { @Autowired private SyncUtilityClassRepo syncutilityClassRepo; + @Autowired + private CookieUtil cookieUtil; // batch size for data upload // private static final int BATCH_SIZE = 30; @@ -342,6 +349,9 @@ public String syncDataToServer(int vanID, String schemaName, String tableName, S vanID, schemaName, tableName, vanAutoIncColumnName, serverColumns, user); RestTemplate restTemplate = new RestTemplate(); + HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) + .getRequest(); + String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader); Integer facilityID = masterVanRepo.getFacilityID(vanID); logger.debug("Fetched facilityID for vanID {}: {}", vanID, facilityID); @@ -367,6 +377,7 @@ public String syncDataToServer(int vanID, String schemaName, String tableName, S MultiValueMap headers = new LinkedMultiValueMap(); headers.add("Content-Type", "application/json"); headers.add("AUTHORIZATION", Authorization); + headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie); HttpEntity request = new HttpEntity(requestOBJ, headers); logger.info("Before Data sync upload Url" + dataSyncUploadUrl); ResponseEntity response = restTemplate.exchange(dataSyncUploadUrl, HttpMethod.POST, request, diff --git a/src/main/java/com/iemr/mmu/service/registrar/RegistrarServiceImpl.java b/src/main/java/com/iemr/mmu/service/registrar/RegistrarServiceImpl.java index 7430a0e0..8be1ffee 100644 --- a/src/main/java/com/iemr/mmu/service/registrar/RegistrarServiceImpl.java +++ b/src/main/java/com/iemr/mmu/service/registrar/RegistrarServiceImpl.java @@ -43,6 +43,8 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -66,9 +68,12 @@ import com.iemr.mmu.repo.registrar.RegistrarRepoBeneficiaryDetails; import com.iemr.mmu.repo.registrar.ReistrarRepoBenSearch; import com.iemr.mmu.service.benFlowStatus.CommonBenStatusFlowServiceImpl; +import com.iemr.mmu.utils.CookieUtil; import com.iemr.mmu.utils.mapper.InputMapper; import com.iemr.mmu.utils.response.OutputResponse; +import jakarta.servlet.http.HttpServletRequest; + /*** * * @author NE298657 @@ -104,6 +109,8 @@ public class RegistrarServiceImpl implements RegistrarService { private RegistrarRepoBeneficiaryDetails registrarRepoBeneficiaryDetails; private BeneficiaryImageRepo beneficiaryImageRepo; private CommonBenStatusFlowServiceImpl commonBenStatusFlowServiceImpl; + @Autowired + private CookieUtil cookieUtil; @Autowired public void setCommonBenStatusFlowServiceImpl(CommonBenStatusFlowServiceImpl commonBenStatusFlowServiceImpl) { @@ -691,9 +698,13 @@ public String registerBeneficiary(String comingRequest, String Authorization) th Long beneficiaryID = null; RestTemplate restTemplate = new RestTemplate(); + HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) + .getRequest(); + String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader); MultiValueMap headers = new LinkedMultiValueMap(); headers.add("Content-Type", "application/json"); headers.add("AUTHORIZATION", Authorization); + headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie); HttpEntity request = new HttpEntity(comingRequest, headers); ResponseEntity response = restTemplate.exchange(registrationUrl, HttpMethod.POST, request, String.class); @@ -721,9 +732,13 @@ public String registerBeneficiary(String comingRequest, String Authorization) th public Integer updateBeneficiary(String comingRequest, String Authorization) throws Exception { Integer returnOBJ = null; RestTemplate restTemplate = new RestTemplate(); + HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) + .getRequest(); + String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader); MultiValueMap headers = new LinkedMultiValueMap(); headers.add("Content-Type", "application/json"); headers.add("AUTHORIZATION", Authorization); + headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie); HttpEntity request = new HttpEntity(comingRequest, headers); @@ -744,10 +759,14 @@ public Integer updateBeneficiary(String comingRequest, String Authorization) thr public String beneficiaryQuickSearch(String requestObj, String Authorization) { String returnOBJ = null; RestTemplate restTemplate = new RestTemplate(); + HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) + .getRequest(); + String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader); JSONObject obj = new JSONObject(requestObj); MultiValueMap headers = new LinkedMultiValueMap(); headers.add("Content-Type", "application/json"); headers.add("AUTHORIZATION", Authorization); + headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie); if (obj.has("beneficiaryID") && !obj.isNull("beneficiaryID")) { HttpEntity request = new HttpEntity(requestObj, headers); ResponseEntity response = restTemplate.exchange(registrarQuickSearchByIdUrl, HttpMethod.POST, @@ -772,10 +791,14 @@ public String beneficiaryQuickSearch(String requestObj, String Authorization) { public String beneficiaryAdvanceSearch(String requestObj, String Authorization) { String returnOBJ = null; RestTemplate restTemplate = new RestTemplate(); + HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) + .getRequest(); + String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader); JSONObject obj = new JSONObject(requestObj); MultiValueMap headers = new LinkedMultiValueMap(); headers.add("Content-Type", "application/json"); headers.add("AUTHORIZATION", Authorization); + headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie); HttpEntity request = new HttpEntity(requestObj, headers); ResponseEntity response = restTemplate.exchange(registrarAdvanceSearchUrl, HttpMethod.POST, request, String.class); diff --git a/src/main/java/com/iemr/mmu/service/tele_consultation/TeleConsultationServiceImpl.java b/src/main/java/com/iemr/mmu/service/tele_consultation/TeleConsultationServiceImpl.java index 32f56d85..4ef44131 100644 --- a/src/main/java/com/iemr/mmu/service/tele_consultation/TeleConsultationServiceImpl.java +++ b/src/main/java/com/iemr/mmu/service/tele_consultation/TeleConsultationServiceImpl.java @@ -42,6 +42,8 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -56,9 +58,12 @@ import com.iemr.mmu.repo.tc_consultation.TCRequestModelRepo; import com.iemr.mmu.service.anc.Utility; import com.iemr.mmu.service.common.transaction.CommonDoctorServiceImpl; +import com.iemr.mmu.utils.CookieUtil; import com.iemr.mmu.utils.mapper.InputMapper; import com.iemr.mmu.utils.mapper.OutputMapper; +import jakarta.servlet.http.HttpServletRequest; + @Service @PropertySource("classpath:application.properties") public class TeleConsultationServiceImpl implements TeleConsultationService { @@ -71,6 +76,8 @@ public class TeleConsultationServiceImpl implements TeleConsultationService { private BeneficiaryFlowStatusRepo beneficiaryFlowStatusRepo; @Autowired private CommonDoctorServiceImpl commonDoctorServiceImpl; + @Autowired + private CookieUtil cookieUtil; public int createTCRequest(TCRequestModel tCRequestModel) { TCRequestModel tCRequestModelRS = tCRequestModelRepo.save(tCRequestModel); @@ -185,9 +192,13 @@ public int cancelSlotForTCCancel(int userID, long benRegID, long visitCode, Stri String requestOBJ = OutputMapper.gson().toJson(obj); RestTemplate restTemplate = new RestTemplate(); + HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) + .getRequest(); + String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader); MultiValueMap headers = new LinkedMultiValueMap(); headers.add("Content-Type", "application/json"); headers.add("AUTHORIZATION", Authorization); + headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie); HttpEntity request = new HttpEntity(requestOBJ, headers); ResponseEntity response = restTemplate.exchange(tcSpecialistSlotCancel, HttpMethod.POST, request, String.class); From 22a9e6041abc880924fc72c00edd1187ff4ba348 Mon Sep 17 00:00:00 2001 From: indraniBan <133205641+indraniBan@users.noreply.github.com> Date: Mon, 17 Mar 2025 16:40:29 +0530 Subject: [PATCH 2/2] Update package.yml --- .github/workflows/package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 69ebb11d..ffc82ba6 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -36,7 +36,7 @@ jobs: run: mvn -B package --file pom.xml - name: Upload WAR file as artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: MMU-API path: target/mmuapi-v1.0.war