Skip to content

jwttoken and user-agent validation #84

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
ravishanigarapu merged 2 commits into from
May 22, 2025
Merged

jwttoken and user-agent validation #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81e0a2a
0jwttoken and user-agent validation
ravishanigarapu May 22, 2025
e06a30a
null check
ravishanigarapu May 22, 2025
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
12 changes: 2 additions & 10 deletions src/main/java/com/iemr/mmu/service/cancerScreening/CSCarestreamServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@

import com.google.gson.Gson;
import com.iemr.mmu.utils.CookieUtil;
import com.iemr.mmu.utils.RestTemplateUtil;

import jakarta.servlet.http.HttpServletRequest;

Expand All @@ -61,18 +62,9 @@ public int createMamographyRequest(ArrayList<Object[]> benDataForCareStream, lon
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<String, String> headers = new LinkedMultiValueMap<String, String>();
headers.add("Content-Type", "application/json");
headers.add("AUTHORIZATION", Authorization);
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
String requestOBJ = getOrderCreationRequestOBJ(benDataForCareStream, benRegID, benVisitID);

HttpEntity<Object> request = new HttpEntity<Object>(requestOBJ, headers);
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(requestOBJ, Authorization);
// System.out.println("hello");
ResponseEntity<String> response = restTemplate.exchange(carestreamOrderCreateURL, HttpMethod.POST, request,
String.class);
Expand Down
7 changes: 2 additions & 5 deletions src/main/java/com/iemr/mmu/service/common/master/RegistrarServiceMasterDataImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
import com.iemr.mmu.repo.nurse.anc.ANCCareRepo;
import com.iemr.mmu.repo.registrar.BeneficiaryImageRepo;
import com.iemr.mmu.repo.registrar.ReistrarRepoBenSearch;
import com.iemr.mmu.utils.RestTemplateUtil;

@Service
@PropertySource("classpath:application.properties")
Expand Down Expand Up @@ -224,11 +225,7 @@ public String getBenDetailsForLeftSideByRegIDNew(Long beneficiaryRegID, Long ben
public String getBenImageFromIdentityAPI(String Authorization, String comingRequest) throws Exception {
String returnOBJ = null;
RestTemplate restTemplate = new RestTemplate();
MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
headers.add("Content-Type", "application/json");
headers.add("AUTHORIZATION", Authorization);

HttpEntity<Object> request = new HttpEntity<Object>(comingRequest, headers);
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(comingRequest, Authorization);
ResponseEntity<String> response = restTemplate.exchange(getBenImageFromIdentity, HttpMethod.POST, request,
String.class);
// if()
Expand Down
10 changes: 2 additions & 8 deletions src/main/java/com/iemr/mmu/service/common/transaction/CommonDoctorServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
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.RestTemplateUtil;
import com.iemr.mmu.utils.exception.IEMRException;
import com.iemr.mmu.utils.mapper.InputMapper;
import com.iemr.mmu.utils.mapper.OutputMapper;
Expand Down Expand Up @@ -906,14 +907,7 @@ 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<String, String> headers = new LinkedMultiValueMap<String, String>();
headers.add("Content-Type", "application/json");
headers.add("AUTHORIZATION", Authorization);
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
HttpEntity<Object> request = new HttpEntity<Object>(requestOBJ, headers);
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(requestOBJ, Authorization);
ResponseEntity<String> response = restTemplate.exchange(tcSpecialistSlotBook, HttpMethod.POST, request,
String.class);
// System.out.println(response.getBody());
Expand Down
11 changes: 3 additions & 8 deletions src/main/java/com/iemr/mmu/service/common/transaction/CommonServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
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.RestTemplateUtil;
import com.iemr.mmu.utils.AESEncryption.AESEncryptionDecryption;
import com.iemr.mmu.utils.exception.IEMRException;
import com.iemr.mmu.utils.mapper.InputMapper;
Expand Down Expand Up @@ -823,20 +824,14 @@ public String getCaseSheetOfTm(String mmuBenFlowReq, String authCentralServer) t

public ResponseEntity<String> restTemplatePost(String URL, String authorization, String reqObj) {
RestTemplate restTemplate = new RestTemplate();
MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
headers.add("Content-Type", "application/json");
headers.add("AUTHORIZATION", authorization);
HttpEntity<Object> request = new HttpEntity<Object>(reqObj, headers);
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(reqObj, authorization);
ResponseEntity<String> response = restTemplate.exchange(URL, HttpMethod.POST, request, String.class);
return response;
}

public ResponseEntity<String> restTemplateGet(String URL, String authorization) {
RestTemplate restTemplate = new RestTemplate();
MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
headers.add("Content-Type", "application/json");
headers.add("AUTHORIZATION", authorization);
HttpEntity<Object> request = new HttpEntity<Object>("", headers);
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity("", authorization);
ResponseEntity<String> response = restTemplate.exchange(URL, HttpMethod.GET, request, String.class);
return response;
}
Expand Down
31 changes: 4 additions & 27 deletions src/main/java/com/iemr/mmu/service/dataSyncActivity/DownloadDataFromServerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
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.RestTemplateUtil;
import com.iemr.mmu.utils.mapper.InputMapper;

import jakarta.servlet.http.HttpServletRequest;
Expand Down Expand Up @@ -185,17 +186,7 @@ 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<String, String> headers = new LinkedMultiValueMap<String, String>();
headers.add("Content-Type", "application/json");
headers.add("AUTHORIZATION", ServerAuthorization);
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
HttpEntity<Object> request = new HttpEntity<Object>(syncDownloadMaster, headers);

HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(syncDownloadMaster, ServerAuthorization);
// Call rest-template to call API to download master data for given table
ResponseEntity<String> response = restTemplate.exchange(dataSyncDownloadUrl, HttpMethod.POST, request,
String.class);
Expand Down Expand Up @@ -342,17 +333,7 @@ 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<String, String> headers = new LinkedMultiValueMap<String, String>();
headers.add("Content-Type", "application/json");
headers.add("AUTHORIZATION", ServerAuthorization);
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
HttpEntity<Object> request = new HttpEntity<Object>(requestOBJ, headers);

HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(requestOBJ, Authorization);
// Call rest-template to call central API to generate UNIQUE ID at central
ResponseEntity<String> response = restTemplate.exchange(benGenUrlCentral, HttpMethod.POST, request,
String.class);
Expand All @@ -361,11 +342,7 @@ public int callCentralAPIToGenerateBenIDAndimportToLocal(String requestOBJ, Stri
JSONObject obj = new JSONObject(response.getBody());
if (obj != null && obj.has("data") && obj.has("statusCode") && obj.getInt("statusCode") == 200) {
// Consume the response from API and call local identity api to save data
MultiValueMap<String, String> headers1 = new LinkedMultiValueMap<String, String>();
headers1.add("Content-Type", "application/json");
headers1.add("AUTHORIZATION", Authorization);
HttpEntity<Object> request1 = new HttpEntity<Object>(obj.get("data").toString(), headers1);

HttpEntity<Object> request1 = RestTemplateUtil.createRequestEntity(obj.get("data").toString(), Authorization);
i = 1;
// Call rest-template to call central API to generate UNIQUE ID at central
ResponseEntity<String> response1 = restTemplate.exchange(benImportUrlLocal, HttpMethod.POST, request1,
Expand Down
23 changes: 3 additions & 20 deletions ...n/java/com/iemr/mmu/service/dataSyncActivity/DownloadDataFromServerTransactionalImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
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.RestTemplateUtil;
import com.iemr.mmu.utils.mapper.InputMapper;

import jakarta.servlet.http.HttpServletRequest;
Expand Down Expand Up @@ -240,19 +241,10 @@ 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);

// Multivalue map for headers with content-type and auth key
MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
headers.add("Content-Type", "application/json");
headers.add("AUTHORIZATION", ServerAuthorization);
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
HttpEntity<Object> request = new HttpEntity<Object>(syncUploadDataDigester, headers);

HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(syncUploadDataDigester, ServerAuthorization);
// Call rest-template to call API to download master data for given table
ResponseEntity<String> response = restTemplate.exchange(dataSyncTransactionDownloadUrl, HttpMethod.POST,
request, String.class);
Expand All @@ -274,18 +266,9 @@ 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<String, String> headers = new LinkedMultiValueMap<String, String>();
headers.add("Content-Type", "application/json");
headers.add("AUTHORIZATION", ServerAuthorization);
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
HttpEntity<Object> request = new HttpEntity<Object>(syncUploadDataDigester, headers);

HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(syncUploadDataDigester, ServerAuthorization);
// Call rest-template to call API to download master data for given table
ResponseEntity<String> response = restTemplate.exchange(dataSyncProcessedFlagUpdate, HttpMethod.POST, request,
String.class);
Expand Down
11 changes: 3 additions & 8 deletions src/main/java/com/iemr/mmu/service/dataSyncActivity/UploadDataToServerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import com.iemr.mmu.repo.syncActivity_syncLayer.DataSyncGroupsRepo;
import com.iemr.mmu.repo.syncActivity_syncLayer.SyncUtilityClassRepo;
import com.iemr.mmu.utils.CookieUtil;
import com.iemr.mmu.utils.RestTemplateUtil;

import jakarta.servlet.http.HttpServletRequest;

Expand Down Expand Up @@ -349,9 +350,7 @@ 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);
Expand All @@ -374,11 +373,7 @@ public String syncDataToServer(int vanID, String schemaName, String tableName, S
String requestOBJ = gson.toJson(dataMap);
logger.debug("Serialized request object: {}", requestOBJ);

MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
headers.add("Content-Type", "application/json");
headers.add("AUTHORIZATION", Authorization);
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
HttpEntity<Object> request = new HttpEntity<Object>(requestOBJ, headers);
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(requestOBJ, Authorization);
logger.info("Before Data sync upload Url" + dataSyncUploadUrl);
ResponseEntity<String> response = restTemplate.exchange(dataSyncUploadUrl, HttpMethod.POST, request,
String.class);
Expand Down
40 changes: 6 additions & 34 deletions src/main/java/com/iemr/mmu/service/registrar/RegistrarServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
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.RestTemplateUtil;
import com.iemr.mmu.utils.mapper.InputMapper;
import com.iemr.mmu.utils.response.OutputResponse;

Expand Down Expand Up @@ -698,14 +699,8 @@ 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<String, String> headers = new LinkedMultiValueMap<String, String>();
headers.add("Content-Type", "application/json");
headers.add("AUTHORIZATION", Authorization);
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
HttpEntity<Object> request = new HttpEntity<Object>(comingRequest, headers);

HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(comingRequest, Authorization);
ResponseEntity<String> response = restTemplate.exchange(registrationUrl, HttpMethod.POST, request,
String.class);
if (response.getStatusCodeValue() == 200 & response.hasBody()) {
Expand All @@ -732,15 +727,8 @@ 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<String, String> headers = new LinkedMultiValueMap<String, String>();
headers.add("Content-Type", "application/json");
headers.add("AUTHORIZATION", Authorization);
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);

HttpEntity<Object> request = new HttpEntity<Object>(comingRequest, headers);
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(comingRequest, Authorization);

ResponseEntity<String> response = restTemplate.exchange(beneficiaryEditUrl, HttpMethod.POST, request,
String.class);
Expand All @@ -759,24 +747,16 @@ 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<String, String> headers = new LinkedMultiValueMap<String, String>();
headers.add("Content-Type", "application/json");
headers.add("AUTHORIZATION", Authorization);
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(requestObj, Authorization);
if (obj.has("beneficiaryID") && !obj.isNull("beneficiaryID")) {
HttpEntity<Object> request = new HttpEntity<Object>(requestObj, headers);
ResponseEntity<String> response = restTemplate.exchange(registrarQuickSearchByIdUrl, HttpMethod.POST,
request, String.class);
if (response.hasBody())
returnOBJ = response.getBody();

} else {
if (obj.has("phoneNo") && !obj.isNull("phoneNo")) {
HttpEntity<Object> request = new HttpEntity<Object>(requestObj, headers);
ResponseEntity<String> response = restTemplate.exchange(registrarQuickSearchByPhoneNoUrl,
HttpMethod.POST, request, String.class);
if (response.hasBody())
Expand All @@ -791,15 +771,7 @@ 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<String, String> headers = new LinkedMultiValueMap<String, String>();
headers.add("Content-Type", "application/json");
headers.add("AUTHORIZATION", Authorization);
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
HttpEntity<Object> request = new HttpEntity<Object>(requestObj, headers);
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(requestObj, Authorization);
ResponseEntity<String> response = restTemplate.exchange(registrarAdvanceSearchUrl, HttpMethod.POST, request,
String.class);

Expand Down
10 changes: 2 additions & 8 deletions src/main/java/com/iemr/mmu/service/tele_consultation/TeleConsultationServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
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.RestTemplateUtil;
import com.iemr.mmu.utils.mapper.InputMapper;
import com.iemr.mmu.utils.mapper.OutputMapper;

Expand Down Expand Up @@ -196,14 +197,7 @@ 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<String, String> headers = new LinkedMultiValueMap<String, String>();
headers.add("Content-Type", "application/json");
headers.add("AUTHORIZATION", Authorization);
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
HttpEntity<Object> request = new HttpEntity<Object>(requestOBJ, headers);
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(requestOBJ, Authorization);
ResponseEntity<String> response = restTemplate.exchange(tcSpecialistSlotCancel, HttpMethod.POST, request,
String.class);

Expand Down
Loading
Loading