Skip to content

Commit 1ff58b2

Browse files
indraniBanIN40068837
and
IN40068837
authored
401 unauthorized issue resolved (#56)
Co-authored-by: IN40068837 <[email protected]>
1 parent cbeeecc commit 1ff58b2

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

src/main/java/com/iemr/ecd/service/associate/BeneficiaryRegistrationServiceImpl.java

+15-1
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;
@@ -48,7 +50,9 @@
4850
import com.iemr.ecd.repo.call_conf_allocation.MotherRecordRepo;
4951
import com.iemr.ecd.repo.call_conf_allocation.OutboundCallsRepo;
5052
import com.iemr.ecd.utils.advice.exception_handler.ECDException;
53+
import com.iemr.ecd.utils.mapper.CookieUtil;
5154

55+
import jakarta.servlet.http.HttpServletRequest;
5256
import jakarta.transaction.Transactional;
5357

5458
@Service
@@ -69,6 +73,8 @@ public class BeneficiaryRegistrationServiceImpl {
6973
@Value("${beneficiaryEditUrl}")
7074
private String beneficiaryEditUrl;
7175
ObjectMapper objectMapper = new ObjectMapper();
76+
@Autowired
77+
private CookieUtil cookieUtil;
7278

7379
@Transactional(rollbackOn = Exception.class)
7480
public String beneficiaryRegistration(RequestBeneficiaryRegistrationDTO request, String Authorization) {
@@ -100,11 +106,15 @@ public String beneficiaryRegistration(RequestBeneficiaryRegistrationDTO request,
100106
// request.setEdd(getTimestampFromString(request.getEddStr()));
101107

102108
RestTemplate restTemplate = new RestTemplate();
109+
HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
110+
.getRequest();
111+
String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader);
103112
MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
104113
headers.add("Content-Type", MediaType.APPLICATION_JSON + ";charset=utf-8");
105114
headers.add("AUTHORIZATION", Authorization);
115+
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
106116
String json = objectMapper.writeValueAsString(request);
107-
117+
108118
HttpEntity<Object> requestObj = new HttpEntity<Object>(json, headers);
109119

110120
ResponseEntity<String> response = restTemplate.exchange(registerBeneficiaryUrl, HttpMethod.POST, requestObj,
@@ -174,9 +184,13 @@ public String updateBeneficiaryDetails(RequestBeneficiaryRegistrationDTO request
174184
}
175185

176186
RestTemplate restTemplate = new RestTemplate();
187+
HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
188+
.getRequest();
189+
String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader);
177190
MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
178191
headers.add("Content-Type", MediaType.APPLICATION_JSON + ";charset=utf-8");
179192
headers.add("AUTHORIZATION", Authorization);
193+
headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
180194
HttpEntity<Object> requestObj = new HttpEntity<Object>(request, headers);
181195
ResponseEntity<String> response = restTemplate.exchange(beneficiaryEditUrl, HttpMethod.POST, requestObj,
182196
String.class);

0 commit comments

Comments
 (0)