Skip to content

Commit 2b5ddda

Browse files
indraniBanIN40068837
indraniBan
and
IN40068837
authored
401 unauthorized issue resolved (#70)
* 401 unauthorized issue resolved * Update package.yml --------- Co-authored-by: IN40068837 <IN40068837@L-156289031.wipro.com>
1 parent 4d76aad commit 2b5ddda

9 files changed

Lines changed: 117 additions & 1 deletion

File tree

‎.github/workflows/package.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
run: mvn -B package --file pom.xml
3737

3838
- name: Upload WAR file as artifact
39-
uses: actions/upload-artifact@v3
39+
uses: actions/upload-artifact@v4
4040
with:
4141
name: MMU-API
4242
path: target/mmuapi-v1.0.war

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.json.JSONObject;
3030
import org.slf4j.Logger;
3131
import org.slf4j.LoggerFactory;
32+
import org.springframework.beans.factory.annotation.Autowired;
3233
import org.springframework.beans.factory.annotation.Value;
3334
import org.springframework.context.annotation.PropertySource;
3435
import org.springframework.http.HttpEntity;
@@ -38,26 +39,37 @@
3839
import org.springframework.util.LinkedMultiValueMap;
3940
import org.springframework.util.MultiValueMap;
4041
import org.springframework.web.client.RestTemplate;
42+
import org.springframework.web.context.request.RequestContextHolder;
43+
import org.springframework.web.context.request.ServletRequestAttributes;
4144

4245
import com.google.gson.Gson;
46+
import com.iemr.mmu.utils.CookieUtil;
47+
48+
import jakarta.servlet.http.HttpServletRequest;
4349

4450
@Service
4551
@PropertySource("classpath:application.properties")
4652
public class CSCarestreamServiceImpl implements CSCarestreamService {
4753
private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
4854
@Value("${carestreamOrderCreateURL}")
4955
private String carestreamOrderCreateURL;
56+
@Autowired
57+
private CookieUtil cookieUtil;
5058

5159
@Override
5260
public int createMamographyRequest(ArrayList<Object[]> benDataForCareStream, long benRegID, long benVisitID,
5361
String Authorization) {
5462
int responseData = 0;
5563
RestTemplate restTemplate = new RestTemplate();
64+
HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
65+
.getRequest();
66+
String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader);
5667
try {
5768
// HttpHeaders headers = new HttpHeaders();
5869
MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
5970
headers.add("Content-Type", "application/json");
6071
headers.add("AUTHORIZATION", Authorization);
72+
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
6173
String requestOBJ = getOrderCreationRequestOBJ(benDataForCareStream, benRegID, benVisitID);
6274

6375
HttpEntity<Object> request = new HttpEntity<Object>(requestOBJ, headers);

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
import org.springframework.util.LinkedMultiValueMap;
4141
import org.springframework.util.MultiValueMap;
4242
import org.springframework.web.client.RestTemplate;
43+
import org.springframework.web.context.request.RequestContextHolder;
44+
import org.springframework.web.context.request.ServletRequestAttributes;
4345

4446
import com.google.gson.Gson;
4547
import com.google.gson.JsonElement;
@@ -69,10 +71,13 @@
6971
import com.iemr.mmu.repo.quickConsultation.PrescriptionDetailRepo;
7072
import com.iemr.mmu.service.benFlowStatus.CommonBenStatusFlowServiceImpl;
7173
import com.iemr.mmu.service.snomedct.SnomedServiceImpl;
74+
import com.iemr.mmu.utils.CookieUtil;
7275
import com.iemr.mmu.utils.exception.IEMRException;
7376
import com.iemr.mmu.utils.mapper.InputMapper;
7477
import com.iemr.mmu.utils.mapper.OutputMapper;
7578

79+
import jakarta.servlet.http.HttpServletRequest;
80+
7681
/***
7782
*
7883
* @author NE298657
@@ -106,6 +111,8 @@ public class CommonDoctorServiceImpl {
106111
private CommonBenStatusFlowServiceImpl commonBenStatusFlowServiceImpl;
107112

108113
private BeneficiaryFlowStatusRepo beneficiaryFlowStatusRepo;
114+
@Autowired
115+
private CookieUtil cookieUtil;
109116

110117
@Autowired
111118
public void setSnomedServiceImpl(SnomedServiceImpl snomedServiceImpl) {
@@ -899,9 +906,13 @@ public int callTmForSpecialistSlotBook(TcSpecialistSlotBookingRequestOBJ tcSpeci
899906
String requestOBJ = OutputMapper.gson().toJson(tcSpecialistSlotBookingRequestOBJ);
900907

901908
RestTemplate restTemplate = new RestTemplate();
909+
HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
910+
.getRequest();
911+
String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader);
902912
MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
903913
headers.add("Content-Type", "application/json");
904914
headers.add("AUTHORIZATION", Authorization);
915+
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
905916
HttpEntity<Object> request = new HttpEntity<Object>(requestOBJ, headers);
906917
ResponseEntity<String> response = restTemplate.exchange(tcSpecialistSlotBook, HttpMethod.POST, request,
907918
String.class);

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
import org.springframework.util.LinkedMultiValueMap;
5252
import org.springframework.util.MultiValueMap;
5353
import org.springframework.web.client.RestTemplate;
54+
import org.springframework.web.context.request.RequestContextHolder;
55+
import org.springframework.web.context.request.ServletRequestAttributes;
5456

5557
import com.google.gson.Gson;
5658
import com.google.gson.JsonArray;
@@ -76,10 +78,13 @@
7678
import com.iemr.mmu.service.ncdscreening.NCDScreeningServiceImpl;
7779
import com.iemr.mmu.service.pnc.PNCServiceImpl;
7880
import com.iemr.mmu.service.quickConsultation.QuickConsultationServiceImpl;
81+
import com.iemr.mmu.utils.CookieUtil;
7982
import com.iemr.mmu.utils.AESEncryption.AESEncryptionDecryption;
8083
import com.iemr.mmu.utils.exception.IEMRException;
8184
import com.iemr.mmu.utils.mapper.InputMapper;
8285

86+
import jakarta.servlet.http.HttpServletRequest;
87+
8388
@Service
8489
@PropertySource("classpath:application.properties")
8590
public class CommonServiceImpl implements CommonService {
@@ -124,6 +129,8 @@ public class CommonServiceImpl implements CommonService {
124129

125130
@Autowired
126131
private EmployeeSignatureRepo employeeSignatureRepo;
132+
@Autowired
133+
private CookieUtil cookieUtil;
127134

128135
@Autowired
129136
public void setNcdScreeningServiceImpl(NCDScreeningServiceImpl ncdScreeningServiceImpl) {
@@ -634,6 +641,12 @@ public ArrayList<String> getTmCaseSheet(BeneficiaryFlowStatus TmBenFlowOBJ, Bene
634641
tmReqObj.put("beneficiaryRegID", String.valueOf(TmBenFlowOBJ.getBeneficiaryRegID()));
635642

636643
logger.info("TM print data request obj - " + new Gson().toJson(tmReqObj));
644+
HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
645+
.getRequest();
646+
String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader);
647+
MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
648+
649+
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
637650

638651
// get TM case sheet by passing TM details
639652
ResponseEntity<String> response = restTemplatePost(tmCentralServer, Authorization, new Gson().toJson(tmReqObj));
@@ -699,6 +712,11 @@ public String getCaseSheetFromCentralServer(String mmuBenFlowReq, String authCen
699712
String suspectedDisease = null;
700713
int updated = 0;
701714
int allDataUpdated = 0;
715+
HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
716+
.getRequest();
717+
String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader);
718+
MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
719+
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
702720

703721
ResponseEntity<String> response = restTemplatePost(mmuCentralServer, authCentralServer, mmuBenFlowReq);
704722

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,20 @@
4343
import org.springframework.util.LinkedMultiValueMap;
4444
import org.springframework.util.MultiValueMap;
4545
import org.springframework.web.client.RestTemplate;
46+
import org.springframework.web.context.request.RequestContextHolder;
47+
import org.springframework.web.context.request.ServletRequestAttributes;
4648

4749
import com.google.gson.Gson;
4850
import com.iemr.mmu.data.syncActivity_syncLayer.MasterDownloadDataDigester;
4951
import com.iemr.mmu.data.syncActivity_syncLayer.SyncDownloadMaster;
5052
import com.iemr.mmu.data.syncActivity_syncLayer.TempVan;
5153
import com.iemr.mmu.repo.syncActivity_syncLayer.SyncDownloadMasterRepo;
5254
import com.iemr.mmu.repo.syncActivity_syncLayer.TempVanRepo;
55+
import com.iemr.mmu.utils.CookieUtil;
5356
import com.iemr.mmu.utils.mapper.InputMapper;
5457

58+
import jakarta.servlet.http.HttpServletRequest;
59+
5560
@Service
5661
@PropertySource("classpath:application.properties")
5762
public class DownloadDataFromServerImpl implements DownloadDataFromServer {
@@ -65,6 +70,8 @@ public class DownloadDataFromServerImpl implements DownloadDataFromServer {
6570
private DataSyncRepository dataSyncRepository;
6671
@Autowired
6772
private TempVanRepo tempVanRepo;
73+
@Autowired
74+
private CookieUtil cookieUtil;
6875

6976
// ben gen URL
7077
@Value("${benGenUrlCentral}")
@@ -178,11 +185,15 @@ private int downloadDataFromServer(SyncDownloadMaster syncDownloadMaster, String
178185

179186
// initializing RestTemplate
180187
RestTemplate restTemplate = new RestTemplate();
188+
HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
189+
.getRequest();
190+
String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader);
181191

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

188199
// Call rest-template to call API to download master data for given table
@@ -331,11 +342,15 @@ public int callCentralAPIToGenerateBenIDAndimportToLocal(String requestOBJ, Stri
331342
int i = 0;
332343
// Rest template
333344
RestTemplate restTemplate = new RestTemplate();
345+
HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
346+
.getRequest();
347+
String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader);
334348

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

341356
// Call rest-template to call central API to generate UNIQUE ID at central

‎src/main/java/com/iemr/mmu/service/dataSyncActivity/DownloadDataFromServerTransactionalImpl.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
import org.springframework.util.LinkedMultiValueMap;
3737
import org.springframework.util.MultiValueMap;
3838
import org.springframework.web.client.RestTemplate;
39+
import org.springframework.web.context.request.RequestContextHolder;
40+
import org.springframework.web.context.request.ServletRequestAttributes;
3941

4042
import com.iemr.mmu.data.syncActivity_syncLayer.Indent;
4143
import com.iemr.mmu.data.syncActivity_syncLayer.IndentIssue;
@@ -49,8 +51,11 @@
4951
import com.iemr.mmu.repo.syncActivity_syncLayer.IndentRepo;
5052
import com.iemr.mmu.repo.syncActivity_syncLayer.ItemStockEntryRepo;
5153
import com.iemr.mmu.repo.syncActivity_syncLayer.StockTransferRepo;
54+
import com.iemr.mmu.utils.CookieUtil;
5255
import com.iemr.mmu.utils.mapper.InputMapper;
5356

57+
import jakarta.servlet.http.HttpServletRequest;
58+
5459
@Service
5560
@PropertySource("classpath:application.properties")
5661
public class DownloadDataFromServerTransactionalImpl implements DownloadDataFromServerTransactional {
@@ -73,6 +78,8 @@ public class DownloadDataFromServerTransactionalImpl implements DownloadDataFrom
7378
private StockTransferRepo stockTransferRepo;
7479
@Autowired
7580
private ItemStockEntryRepo itemStockEntryRepo;
81+
@Autowired
82+
private CookieUtil cookieUtil;
7683

7784
public int downloadTransactionalData(int vanID, String ServerAuthorization) throws Exception {
7885
JSONObject obj;
@@ -233,13 +240,17 @@ private JSONObject downloadDataFromCentral(String schemaName, String tableName,
233240
if (facilityID != null) {
234241

235242
RestTemplate restTemplate = new RestTemplate();
243+
HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
244+
.getRequest();
245+
String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader);
236246
SyncUploadDataDigester syncUploadDataDigester = new SyncUploadDataDigester(schemaName, tableName,
237247
facilityID);
238248

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

245256
// 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
263274

264275
int result = 0;
265276
RestTemplate restTemplate = new RestTemplate();
277+
HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
278+
.getRequest();
279+
String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader);
266280
SyncUploadDataDigester syncUploadDataDigester = new SyncUploadDataDigester(schemaName, tableName, ids);
267281

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

274289
// Call rest-template to call API to download master data for given table

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
import org.springframework.util.LinkedMultiValueMap;
4141
import org.springframework.util.MultiValueMap;
4242
import org.springframework.web.client.RestTemplate;
43+
import org.springframework.web.context.request.RequestContextHolder;
44+
import org.springframework.web.context.request.ServletRequestAttributes;
4345

4446
import com.fasterxml.jackson.databind.ObjectMapper;
4547
import com.google.gson.Gson;
@@ -49,6 +51,9 @@
4951
import com.iemr.mmu.repo.login.MasterVanRepo;
5052
import com.iemr.mmu.repo.syncActivity_syncLayer.DataSyncGroupsRepo;
5153
import com.iemr.mmu.repo.syncActivity_syncLayer.SyncUtilityClassRepo;
54+
import com.iemr.mmu.utils.CookieUtil;
55+
56+
import jakarta.servlet.http.HttpServletRequest;
5257

5358
/***
5459
*
@@ -79,6 +84,8 @@ public class UploadDataToServerImpl implements UploadDataToServer {
7984

8085
@Autowired
8186
private SyncUtilityClassRepo syncutilityClassRepo;
87+
@Autowired
88+
private CookieUtil cookieUtil;
8289

8390
// batch size for data upload
8491
// private static final int BATCH_SIZE = 30;
@@ -342,6 +349,9 @@ public String syncDataToServer(int vanID, String schemaName, String tableName, S
342349
vanID, schemaName, tableName, vanAutoIncColumnName, serverColumns, user);
343350

344351
RestTemplate restTemplate = new RestTemplate();
352+
HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
353+
.getRequest();
354+
String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader);
345355

346356
Integer facilityID = masterVanRepo.getFacilityID(vanID);
347357
logger.debug("Fetched facilityID for vanID {}: {}", vanID, facilityID);
@@ -367,6 +377,7 @@ public String syncDataToServer(int vanID, String schemaName, String tableName, S
367377
MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
368378
headers.add("Content-Type", "application/json");
369379
headers.add("AUTHORIZATION", Authorization);
380+
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
370381
HttpEntity<Object> request = new HttpEntity<Object>(requestOBJ, headers);
371382
logger.info("Before Data sync upload Url" + dataSyncUploadUrl);
372383
ResponseEntity<String> response = restTemplate.exchange(dataSyncUploadUrl, HttpMethod.POST, request,

0 commit comments

Comments
 (0)