Skip to content

Commit 1e13763

Browse files
srishtigrp78srishtigrp78
authored
Merge pull request #5 from PSMRI/logout-check
Logout check
2 parents 894af98 + f332c50 commit 1e13763

18 files changed

+267
-127
lines changed

‎src/main/java/com/iemr/tm/controller/registrar/main/RegistrarController.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import org.springframework.web.bind.annotation.RequestBody;
3535
import org.springframework.web.bind.annotation.RequestHeader;
3636
import org.springframework.web.bind.annotation.RequestMapping;
37-
import org.springframework.web.bind.annotation.RequestMethod;
3837
import org.springframework.web.bind.annotation.RestController;
3938

4039
import com.google.gson.Gson;

‎src/main/java/com/iemr/tm/service/cancerScreening/CSCarestreamServiceImpl.java‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444

4545
import com.google.gson.Gson;
4646
import com.iemr.tm.utils.CookieUtil;
47+
import com.iemr.tm.utils.RestTemplateUtil;
4748

4849
import jakarta.servlet.http.HttpServletRequest;
4950

@@ -63,19 +64,11 @@ public int createMamographyRequest(ArrayList<Object[]> benDataForCareStream, lon
6364
String Authorization) {
6465
int responseData = 0;
6566
RestTemplate restTemplate = new RestTemplate();
66-
HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
67-
.getRequest();
68-
String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader);
6967
try {
70-
// HttpHeaders headers = new HttpHeaders();
71-
MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
72-
headers.add("Content-Type", "application/json");
73-
headers.add("AUTHORIZATION", Authorization);
74-
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
68+
7569
String requestOBJ = getOrderCreationRequestOBJ(benDataForCareStream, benRegID, benVisitID);
7670

77-
HttpEntity<Object> request = new HttpEntity<Object>(requestOBJ, headers);
78-
// System.out.println("hello");
71+
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(requestOBJ, Authorization);
7972
ResponseEntity<String> response = restTemplate.exchange(carestreamOrderCreateURL, HttpMethod.POST, request,
8073
String.class);
8174
if (response != null) {

‎src/main/java/com/iemr/tm/service/common/master/RegistrarServiceMasterDataImpl.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
import com.iemr.tm.repo.nurse.anc.ANCCareRepo;
6363
import com.iemr.tm.repo.registrar.BeneficiaryImageRepo;
6464
import com.iemr.tm.repo.registrar.ReistrarRepoBenSearch;
65+
import com.iemr.tm.utils.RestTemplateUtil;
6566

6667
@Service
6768
@PropertySource("classpath:application.properties")
@@ -217,11 +218,7 @@ public String getBenDetailsForLeftSideByRegIDNew(Long beneficiaryRegID, Long ben
217218
public String getBenImageFromIdentityAPI(String Authorization, String comingRequest) throws Exception {
218219
String returnOBJ = null;
219220
RestTemplate restTemplate = new RestTemplate();
220-
MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
221-
headers.add("Content-Type", "application/json");
222-
headers.add("AUTHORIZATION", Authorization);
223-
224-
HttpEntity<Object> request = new HttpEntity<Object>(comingRequest, headers);
221+
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(comingRequest, Authorization);
225222
ResponseEntity<String> response = restTemplate.exchange(getBenImageFromIdentity, HttpMethod.POST, request,
226223
String.class);
227224
returnOBJ = response.getBody();

‎src/main/java/com/iemr/tm/service/common/transaction/CommonDoctorServiceImpl.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
import com.iemr.tm.service.snomedct.SnomedServiceImpl;
8484
import com.iemr.tm.service.tele_consultation.SMSGatewayServiceImpl;
8585
import com.iemr.tm.utils.CookieUtil;
86+
import com.iemr.tm.utils.RestTemplateUtil;
8687
import com.iemr.tm.utils.exception.IEMRException;
8788
import com.iemr.tm.utils.mapper.InputMapper;
8889
import com.iemr.tm.utils.mapper.OutputMapper;
@@ -989,14 +990,7 @@ public int callTmForSpecialistSlotBook(TcSpecialistSlotBookingRequestOBJ tcSpeci
989990
String requestOBJ = OutputMapper.gson().toJson(tcSpecialistSlotBookingRequestOBJ);
990991

991992
RestTemplate restTemplate = new RestTemplate();
992-
HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
993-
.getRequest();
994-
String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader);
995-
MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
996-
headers.add("Content-Type", "application/json");
997-
headers.add("AUTHORIZATION", Authorization);
998-
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
999-
HttpEntity<Object> request = new HttpEntity<Object>(requestOBJ, headers);
993+
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(requestOBJ, Authorization);
1000994
ResponseEntity<String> response = restTemplate.exchange(tcSpecialistSlotBook, HttpMethod.POST, request,
1001995
String.class);
1002996
// System.out.println(response.getBody());

‎src/main/java/com/iemr/tm/service/common/transaction/CommonServiceImpl.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
import com.iemr.tm.service.quickConsultation.QuickConsultationServiceImpl;
6666
import com.iemr.tm.service.tele_consultation.TeleConsultationServiceImpl;
6767
import com.iemr.tm.utils.CookieUtil;
68+
import com.iemr.tm.utils.RestTemplateUtil;
6869
import com.iemr.tm.utils.exception.IEMRException;
6970
import com.iemr.tm.utils.mapper.InputMapper;
7071

@@ -553,7 +554,6 @@ public String getOpenKMDocURL(String requestOBJ, String Authorization) throws JS
553554
RestTemplate restTemplate = new RestTemplate();
554555
HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
555556
.getRequest();
556-
String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader);
557557
String fileUUID = null;
558558
JSONObject obj = new JSONObject(requestOBJ);
559559
if (obj.has("fileID")) {
@@ -563,11 +563,7 @@ public String getOpenKMDocURL(String requestOBJ, String Authorization) throws JS
563563
Map<String, Object> requestBody = new HashMap<>();
564564
requestBody.put("fileUID", fileUUID);
565565

566-
MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
567-
headers.add("Content-Type", "application/json");
568-
headers.add("AUTHORIZATION", Authorization);
569-
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
570-
HttpEntity<Object> request = new HttpEntity<Object>(requestBody, headers);
566+
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(requestBody, Authorization);
571567
ResponseEntity<String> response = restTemplate.exchange(openkmDocUrl, HttpMethod.POST, request,
572568
String.class);
573569
return response.getBody();

‎src/main/java/com/iemr/tm/service/dataSyncActivity/DownloadDataFromServerImpl.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import com.iemr.tm.data.syncActivity_syncLayer.TempVan;
5050
import com.iemr.tm.repo.syncActivity_syncLayer.SyncDownloadMasterRepo;
5151
import com.iemr.tm.repo.syncActivity_syncLayer.TempVanRepo;
52+
import com.iemr.tm.utils.RestTemplateUtil;
5253
import com.iemr.tm.utils.mapper.InputMapper;
5354

5455
@Service
@@ -138,11 +139,8 @@ private int downloadDataFromServer(SyncDownloadMaster syncDownloadMaster, String
138139
RestTemplate restTemplate = new RestTemplate();
139140

140141
// Multivalue map for headers with content-type and auth key
141-
MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
142-
headers.add("Content-Type", "application/json");
143-
headers.add("AUTHORIZATION", ServerAuthorization);
144-
HttpEntity<Object> request = new HttpEntity<Object>(syncDownloadMaster, headers);
145-
142+
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(syncDownloadMaster, ServerAuthorization);
143+
146144
// Call rest-template to call API to download master data for given table
147145
ResponseEntity<String> response = restTemplate.exchange(dataSyncDownloadUrl, HttpMethod.POST, request,
148146
String.class);

‎src/main/java/com/iemr/tm/service/dataSyncActivity/UploadDataToServerImpl.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import com.iemr.tm.data.syncActivity_syncLayer.DataSyncGroups;
4747
import com.iemr.tm.data.syncActivity_syncLayer.SyncUtilityClass;
4848
import com.iemr.tm.repo.syncActivity_syncLayer.DataSyncGroupsRepo;
49+
import com.iemr.tm.utils.RestTemplateUtil;
4950

5051
/***
5152
* @purpose "This service is user for data sync activity from van side. Means
@@ -212,11 +213,7 @@ public String syncDataToServer(String schemaName, String tableName, String vanAu
212213

213214
String requestOBJ = gson.toJson(dataMap);
214215

215-
MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
216-
headers.add("Content-Type", "application/json");
217-
headers.add("AUTHORIZATION", Authorization);
218-
HttpEntity<Object> request = new HttpEntity<Object>(requestOBJ, headers);
219-
216+
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(requestOBJ, Authorization);
220217
ResponseEntity<String> response = restTemplate.exchange(dataSyncUploadUrl, HttpMethod.POST, request,
221218
String.class);
222219

‎src/main/java/com/iemr/tm/service/registrar/RegistrarServiceImpl.java‎

Lines changed: 18 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@
7373
import com.iemr.tm.repo.registrar.ReistrarRepoBenSearch;
7474
import com.iemr.tm.service.benFlowStatus.CommonBenStatusFlowServiceImpl;
7575
import com.iemr.tm.utils.CookieUtil;
76+
import com.iemr.tm.utils.RestTemplateUtil;
77+
import com.iemr.tm.utils.UserAgentContext;
7678
import com.iemr.tm.utils.mapper.InputMapper;
7779
import com.iemr.tm.utils.response.OutputResponse;
7880

@@ -655,41 +657,36 @@ public String registerBeneficiary(String comingRequest, String Authorization) th
655657
OutputResponse response1 = new OutputResponse();
656658
Long beneficiaryRegID = null;
657659
Long beneficiaryID = null;
658-
660+
Map<String, Object> responseMap = new HashMap<>();
661+
659662
RestTemplate restTemplate = new RestTemplate();
660-
HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
661-
.getRequest();
662-
String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader);
663-
MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
664-
headers.add("Content-Type", MediaType.APPLICATION_JSON + ";charset=utf-8");
665-
// headers.add("Content-Type", MediaType.APPLICATION_JSON);
666-
headers.add("AUTHORIZATION", Authorization);
667-
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
668-
HttpEntity<Object> request = new HttpEntity<Object>(comingRequest, headers);
663+
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(comingRequest, Authorization);
664+
logger.info("Before Calling Common-API registration : "+request.getHeaders());
669665
ResponseEntity<String> response = restTemplate.exchange(registrationUrl, HttpMethod.POST, request,
670666
String.class);
671667
if (response.getStatusCodeValue() == 200 & response.hasBody()) {
672668
String responseStr = response.getBody();
673669
JSONObject responseOBJ = new JSONObject(responseStr);
674670
beneficiaryRegID = responseOBJ.getJSONObject("data").getLong("beneficiaryRegID");
675671
beneficiaryID = responseOBJ.getJSONObject("data").getLong("beneficiaryID");
676-
// System.out.println("hello");
672+
responseMap.put("benGenId", beneficiaryID);
673+
responseMap.put("benRegId", beneficiaryRegID);
677674

678675
BeneficiaryFlowStatus obj = InputMapper.gson().fromJson(comingRequest, BeneficiaryFlowStatus.class);
679676
if (obj != null && obj.getIsMobile() != null && obj.getIsMobile()) {
680-
response1.setResponse("Beneficiary successfully registered. Beneficiary ID is : " + beneficiaryID);
677+
responseMap.put("response", "Beneficiary successfully registered. Beneficiary ID is : "+ beneficiaryID+" , BenRegID is : "+beneficiaryRegID);
678+
response1.setResponse(new Gson().toJson(responseMap));
679+
681680
} else {
682681
int i = commonBenStatusFlowServiceImpl.createBenFlowRecord(comingRequest, beneficiaryRegID,
683682
beneficiaryID);
684683

685684
if (i > 0) {
686-
if (i == 1)
687-
response1.setResponse(
688-
"Beneficiary successfully registered. Beneficiary ID is : " + beneficiaryID);
685+
responseMap.put("response", "Beneficiary successfully registered. Beneficiary ID is : "+ beneficiaryID+" , BenRegID is : "+beneficiaryRegID);
686+
response1.setResponse(new Gson().toJson(responseMap));
687+
689688
} else {
690689
response1.setError(5000, "Error in registration; please contact administrator");
691-
// log error that beneficiaryID generated but flow part is not
692-
// done successfully.
693690
}
694691
}
695692
} else {
@@ -702,15 +699,7 @@ public String registerBeneficiary(String comingRequest, String Authorization) th
702699
public Integer updateBeneficiary(String comingRequest, String Authorization) throws Exception {
703700
Integer returnOBJ = null;
704701
RestTemplate restTemplate = new RestTemplate();
705-
HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
706-
.getRequest();
707-
String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader);
708-
MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
709-
// headers.add("Content-Type", "application/json");
710-
headers.add("Content-Type", MediaType.APPLICATION_JSON + ";charset=utf-8");
711-
headers.add("AUTHORIZATION", Authorization);
712-
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
713-
HttpEntity<Object> request = new HttpEntity<Object>(comingRequest, headers);
702+
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(comingRequest, Authorization);
714703
ResponseEntity<String> response = restTemplate.exchange(beneficiaryEditUrl, HttpMethod.POST, request,
715704
String.class);
716705

@@ -728,26 +717,18 @@ public Integer updateBeneficiary(String comingRequest, String Authorization) thr
728717
public String beneficiaryQuickSearch(String requestObj, String Authorization) throws JSONException {
729718
String returnOBJ = null;
730719
RestTemplate restTemplate = new RestTemplate();
731-
HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
732-
.getRequest();
733-
String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader);
734720
JSONObject obj = new JSONObject(requestObj);
735-
MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
736-
headers.add("Content-Type", "application/json");
737-
headers.add("AUTHORIZATION", Authorization);
738-
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
721+
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(requestObj, Authorization);
722+
739723
if ((obj.has("beneficiaryID") && !obj.isNull("beneficiaryID"))
740724
|| (obj.has("HealthID") && !obj.isNull("HealthID"))
741725
|| (obj.has("HealthIDNumber") && !obj.isNull("HealthIDNumber"))) {
742-
HttpEntity<Object> request = new HttpEntity<Object>(requestObj, headers);
743726
ResponseEntity<String> response = restTemplate.exchange(registrarQuickSearchByIdUrl, HttpMethod.POST,
744727
request, String.class);
745728
if (response.hasBody())
746729
returnOBJ = response.getBody();
747-
748730
} else {
749731
if (obj.has("phoneNo") && !obj.isNull("phoneNo")) {
750-
HttpEntity<Object> request = new HttpEntity<Object>(requestObj, headers);
751732
ResponseEntity<String> response = restTemplate.exchange(registrarQuickSearchByPhoneNoUrl,
752733
HttpMethod.POST, request, String.class);
753734
if (response.hasBody())
@@ -762,15 +743,7 @@ public String beneficiaryQuickSearch(String requestObj, String Authorization) th
762743
public String beneficiaryAdvanceSearch(String requestObj, String Authorization) throws JSONException {
763744
String returnOBJ = null;
764745
RestTemplate restTemplate = new RestTemplate();
765-
HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
766-
.getRequest();
767-
String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader);
768-
JSONObject obj = new JSONObject(requestObj);
769-
MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
770-
headers.add("Content-Type", "application/json");
771-
headers.add("AUTHORIZATION", Authorization);
772-
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
773-
HttpEntity<Object> request = new HttpEntity<Object>(requestObj, headers);
746+
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(requestObj, Authorization);
774747
ResponseEntity<String> response = restTemplate.exchange(registrarAdvanceSearchUrl, HttpMethod.POST, request,
775748
String.class);
776749

‎src/main/java/com/iemr/tm/service/tele_consultation/SMSGatewayServiceImpl.java‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import com.iemr.tm.data.tele_consultation.SmsRequestOBJ;
4848
import com.iemr.tm.repo.tc_consultation.TCRequestModelRepo;
4949
import com.iemr.tm.utils.CookieUtil;
50+
import com.iemr.tm.utils.RestTemplateUtil;
5051

5152
import jakarta.servlet.http.HttpServletRequest;
5253

@@ -195,16 +196,7 @@ public String createSMSRequest(String smsType, Long benRegID, Integer specializa
195196

196197
@Override
197198
public String sendSMS(String request, String Authorization) {
198-
HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
199-
.getRequest();
200-
String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader);
201-
HttpHeaders headers = new HttpHeaders();
202-
headers.setAccept(Arrays.asList(MediaType.APPLICATION_JSON));
203-
headers.set("AUTHORIZATION", Authorization);
204-
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
205-
206-
HttpEntity<Object> requestOBJ = new HttpEntity<Object>(request, headers);
207-
199+
HttpEntity<Object> requestOBJ = RestTemplateUtil.createRequestEntity(request, Authorization);
208200
return restTemplate.exchange(sendSMSUrl, HttpMethod.POST, requestOBJ, String.class).getBody();
209201
}
210202
}

‎src/main/java/com/iemr/tm/service/tele_consultation/TeleConsultationServiceImpl.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
import com.iemr.tm.repo.tc_consultation.TeleconsultationStatsRepo;
6161
import com.iemr.tm.service.common.transaction.CommonServiceImpl;
6262
import com.iemr.tm.utils.CookieUtil;
63+
import com.iemr.tm.utils.RestTemplateUtil;
6364
import com.iemr.tm.utils.mapper.InputMapper;
6465
import com.iemr.tm.utils.mapper.OutputMapper;
6566

@@ -218,14 +219,7 @@ public int cancelSlotForTCCancel(int userID, long benRegID, long visitCode, Stri
218219
String requestOBJ = OutputMapper.gson().toJson(obj);
219220

220221
RestTemplate restTemplate = new RestTemplate();
221-
HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
222-
.getRequest();
223-
String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader);
224-
MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
225-
headers.add("Content-Type", "application/json");
226-
headers.add("AUTHORIZATION", Authorization);
227-
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
228-
HttpEntity<Object> request = new HttpEntity<Object>(requestOBJ, headers);
222+
HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(requestOBJ, Authorization);
229223
ResponseEntity<String> response = restTemplate.exchange(tcSpecialistSlotCancel, HttpMethod.POST, request,
230224
String.class);
231225

0 commit comments

Comments
 (0)