From fd9ffc3226cb1eae9d4d89d16af271e2769b2b11 Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Tue, 17 Jun 2025 13:17:34 +0530 Subject: [PATCH 1/3] removed issanjeevani variable --- .../controller/users/IEMRAdminController.java | 2 +- .../java/com/iemr/common/data/users/Role.java | 44 +------------------ .../data/users/UserServiceRoleMapping.java | 8 ++-- .../users/UserRoleMappingRepository.java | 2 +- .../users/IEMRAdminUserServiceImpl.java | 4 +- 5 files changed, 10 insertions(+), 50 deletions(-) diff --git a/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java b/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java index 94367bfe..81acd8ca 100644 --- a/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java +++ b/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java @@ -406,7 +406,7 @@ private void createUserMapping(User mUser, JSONObject resMap, JSONObject service JSONArray roles = previlegeObj.getJSONObject(serv).getJSONArray("roles"); // roles.put(new JSONObject(m_UserServiceRoleMapping.getM_Role().toString())); JSONObject roleObject = new JSONObject(m_UserServiceRoleMapping.getM_Role().toString()); - roleObject.put("isSanjeevani", m_UserServiceRoleMapping.getIsSanjeevani()); + roleObject.put("teleConsultation", m_UserServiceRoleMapping.getTeleConsultation()); roles.put(roleObject); } } diff --git a/src/main/java/com/iemr/common/data/users/Role.java b/src/main/java/com/iemr/common/data/users/Role.java index 580e183a..90a1759c 100644 --- a/src/main/java/com/iemr/common/data/users/Role.java +++ b/src/main/java/com/iemr/common/data/users/Role.java @@ -99,11 +99,8 @@ public class Role @Expose @Transient - private Boolean isSanjeevani; + private String teleConsultation; - // protected Role() { - // } - // public Role createRole(Integer roleID, String roleName, String roleDesc, Boolean deleted, String createdBy, Timestamp createdDate, String modifiedBy, Timestamp lastModDate, Set m_UserServiceRoleMapping) @@ -124,35 +121,7 @@ public Role createRole(Integer roleID, String roleName, String roleDesc, Boolean return this; } -// public Integer getRoleID() -// { -// return this.RoleID; -// } -// -// public void setRoleID(int roleID) -// { -// this.RoleID = Integer.valueOf(roleID); -// } -// -// public String getRoleName() -// { -// return this.RoleName; -// } -// -// public void setRoleName(String roleName) -// { -// this.RoleName = roleName; -// } -// -// public String getRoleDesc() -// { -// return this.RoleDesc; -// } -// -// public void setRoleDesc(String roleDesc) -// { -// this.RoleDesc = roleDesc; -// } + public boolean isDeleted() { @@ -204,15 +173,6 @@ public void setLastModDate(Timestamp lastModDate) this.LastModDate = lastModDate; } - // public Set getM_UserServiceRoleMapping() - // { - // return this.m_UserServiceRoleMapping; - // } - // - // public void setM_UserServiceRoleMapping(Set m_UserServiceRoleMapping) - // { - // this.m_UserServiceRoleMapping = m_UserServiceRoleMapping; - // } public void setServiceRoleScreenMappings(List serviceRoleScreenMappings) { diff --git a/src/main/java/com/iemr/common/data/users/UserServiceRoleMapping.java b/src/main/java/com/iemr/common/data/users/UserServiceRoleMapping.java index 105cce5e..6c34e9c6 100644 --- a/src/main/java/com/iemr/common/data/users/UserServiceRoleMapping.java +++ b/src/main/java/com/iemr/common/data/users/UserServiceRoleMapping.java @@ -110,8 +110,8 @@ public class UserServiceRoleMapping private Boolean outbound; @Expose - @Column(name = "isSanjeevani") - private Boolean isSanjeevani; + @Column(name = "teleConsultation") + private String teleConsultation; // @Expose @@ -302,7 +302,7 @@ public String toString() public static UserServiceRoleMapping initializeUserRoleMappingObjs(Long USRMappingID, Long UserID, Integer roleID, Role m_Role, Integer providerServiceMapID, ProviderServiceMapping m_ProviderServiceMapping, - String agentID,Boolean inbound, Boolean outbound, Boolean isSanjeevani, String agentPassword, Integer workingLocationID, + String agentID,Boolean inbound, Boolean outbound, String teleConsultation, String agentPassword, Integer workingLocationID, ProviderServiceAddressMapping providerServiceAddressMapping) { UserServiceRoleMapping userRoleMapping = new UserServiceRoleMapping(); @@ -317,7 +317,7 @@ public static UserServiceRoleMapping initializeUserRoleMappingObjs(Long USRMappi userRoleMapping.agentID = agentID; userRoleMapping.inbound = inbound; userRoleMapping.outbound = outbound; - userRoleMapping.isSanjeevani = isSanjeevani; + userRoleMapping.teleConsultation = teleConsultation; userRoleMapping.agentPassword = agentPassword; userRoleMapping.workingLocationID = workingLocationID; userRoleMapping.m_Role.setWorkingLocationID(workingLocationID); diff --git a/src/main/java/com/iemr/common/repository/users/UserRoleMappingRepository.java b/src/main/java/com/iemr/common/repository/users/UserRoleMappingRepository.java index 7ec4276a..65fb8c2f 100644 --- a/src/main/java/com/iemr/common/repository/users/UserRoleMappingRepository.java +++ b/src/main/java/com/iemr/common/repository/users/UserRoleMappingRepository.java @@ -36,7 +36,7 @@ public interface UserRoleMappingRepository extends CrudRepository { @Query("select map.USRMappingID, map.UserID, map.RoleID, map.m_Role, map.providerServiceMapID, " - + "map.agentID, map.inbound, map.outbound, map.isSanjeevani, map.agentPassword, map.workingLocationID, map.providerServiceAddressMapping from " + + "map.agentID, map.inbound, map.outbound, map.teleConsultation, map.agentPassword, map.workingLocationID, map.providerServiceAddressMapping from " + "UserServiceRoleMapping map left join map.m_ProviderServiceMapping psm left join psm.serviceProvider sp " + "left join map.m_Role left join map.providerServiceAddressMapping " + "where map.Deleted = false and UserID = :UserID and sp.statusID in (1,2) " diff --git a/src/main/java/com/iemr/common/service/users/IEMRAdminUserServiceImpl.java b/src/main/java/com/iemr/common/service/users/IEMRAdminUserServiceImpl.java index 9a46eaef..a0efd373 100644 --- a/src/main/java/com/iemr/common/service/users/IEMRAdminUserServiceImpl.java +++ b/src/main/java/com/iemr/common/service/users/IEMRAdminUserServiceImpl.java @@ -473,7 +473,7 @@ public void updateCTIPasswordForUser(Long userID, String password) { .initializeUserRoleMappingObjs((Long) object[0], (Long) object[1], (Integer) object[2], (Role) object[3], (Integer) object[4], getUserProviderServiceRoleMapping((Integer) object[4]), (String) object[5], - (Boolean) object[6], (Boolean) object[7], (Boolean) object[8], (String) object[9], + (Boolean) object[6], (Boolean) object[7], (String) object[8], (String) object[9], (Integer) object[10], (ProviderServiceAddressMapping) object[11]); userRoles.add(userServiceRoleMapping); } @@ -670,7 +670,7 @@ public List getUserServiceRoleMapping(Long userID) throw UserServiceRoleMapping userServiceRoleMapping = UserServiceRoleMapping.initializeUserRoleMappingObjs( (Long) object[0], (Long) object[1], (Integer) object[2], (Role) object[3], (Integer) object[4], getUserProviderServiceRoleMapping((Integer) object[4]), (String) object[5], (Boolean) object[6], - (Boolean) object[7], (Boolean) object[8], (String) object[9], (Integer) object[10], + (Boolean) object[7], (String) object[8], (String) object[9], (Integer) object[10], (ProviderServiceAddressMapping) object[11]); List serviceRoleScreenMappings = getActiveScreenMappings( userServiceRoleMapping.getProviderServiceMapID(), userServiceRoleMapping.getRoleID()); From aa6a55897ececf502558e30ae8504a790eca5b91 Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Mon, 4 Aug 2025 11:48:02 +0530 Subject: [PATCH 2/3] Jwttoken added in Header for Identity-API calls --- .../iemr/common/utils/RestTemplateUtil.java | 80 +++++++++++++------ .../com/iemr/common/utils/http/HttpUtils.java | 31 ++----- 2 files changed, 62 insertions(+), 49 deletions(-) diff --git a/src/main/java/com/iemr/common/utils/RestTemplateUtil.java b/src/main/java/com/iemr/common/utils/RestTemplateUtil.java index 447ba80f..13b8e078 100644 --- a/src/main/java/com/iemr/common/utils/RestTemplateUtil.java +++ b/src/main/java/com/iemr/common/utils/RestTemplateUtil.java @@ -10,14 +10,17 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; +import com.iemr.common.constant.Constants; + import jakarta.servlet.http.HttpServletRequest; public class RestTemplateUtil { private final static Logger logger = LoggerFactory.getLogger(RestTemplateUtil.class); - + public static HttpEntity createRequestEntity(Object body, String authorization) { - - ServletRequestAttributes servletRequestAttributes = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()); + + ServletRequestAttributes servletRequestAttributes = ((ServletRequestAttributes) RequestContextHolder + .getRequestAttributes()); if (servletRequestAttributes == null) { MultiValueMap headers = new LinkedMultiValueMap<>(); headers.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE + ";charset=utf-8"); @@ -25,29 +28,54 @@ public static HttpEntity createRequestEntity(Object body, String authori return new HttpEntity<>(body, headers); } HttpServletRequest requestHeader = servletRequestAttributes.getRequest(); - String jwtTokenFromCookie = null; + + String jwtTokenFromCookie = extractJwttoken(requestHeader); + + MultiValueMap headers = new LinkedMultiValueMap<>(); + headers.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE + ";charset=utf-8"); + if (null != UserAgentContext.getUserAgent()) { + headers.add(HttpHeaders.USER_AGENT, UserAgentContext.getUserAgent()); + } + headers.add(HttpHeaders.AUTHORIZATION, authorization); + if (null != requestHeader.getHeader(Constants.JWT_TOKEN)) { + headers.add(Constants.JWT_TOKEN, requestHeader.getHeader(Constants.JWT_TOKEN)); + } + if (null != jwtTokenFromCookie) { + headers.add(HttpHeaders.COOKIE, "Jwttoken=" + jwtTokenFromCookie); + } + + return new HttpEntity<>(body, headers); + } + + private static String extractJwttoken(HttpServletRequest requestHeader) { + String jwtTokenFromCookie = null; try { jwtTokenFromCookie = CookieUtil.getJwtTokenFromCookie(requestHeader); - + } catch (Exception e) { - logger.error("Error while getting jwtToken from Cookie" + e.getMessage() ); - } - - MultiValueMap headers = new LinkedMultiValueMap<>(); - headers.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE + ";charset=utf-8"); - if(null != UserAgentContext.getUserAgent()) { - logger.info("Common-API getting User-Agent as : "+UserAgentContext.getUserAgent()); - headers.add(HttpHeaders.USER_AGENT, UserAgentContext.getUserAgent()); - } - headers.add(HttpHeaders.AUTHORIZATION, authorization); - if(null != requestHeader.getHeader("JwtToken")) { - headers.add("JwtToken",requestHeader.getHeader("JwtToken")); - } - if(null != jwtTokenFromCookie) { - headers.add(HttpHeaders.COOKIE, "Jwttoken=" + jwtTokenFromCookie); - } - - return new HttpEntity<>(body, headers); - } - -} \ No newline at end of file + logger.error("Error while getting jwtToken from Cookie" + e.getMessage()); + } + return jwtTokenFromCookie; + } + + public static void getJwttokenFromHeaders(HttpHeaders headers) { + ServletRequestAttributes servletRequestAttributes = ((ServletRequestAttributes) RequestContextHolder + .getRequestAttributes()); + if (servletRequestAttributes == null) { + return; + } + HttpServletRequest requestHeader = servletRequestAttributes.getRequest(); + String jwtTokenFromCookie = extractJwttoken(requestHeader); + headers.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE + ";charset=utf-8"); + if (null != UserAgentContext.getUserAgent()) { + headers.add(HttpHeaders.USER_AGENT, UserAgentContext.getUserAgent()); + } + if (null != jwtTokenFromCookie) { + headers.add(HttpHeaders.COOKIE, Constants.JWT_TOKEN + "=" + jwtTokenFromCookie); + } else if (null != requestHeader.getHeader(Constants.JWT_TOKEN)) { + headers.add(Constants.JWT_TOKEN, requestHeader.getHeader(Constants.JWT_TOKEN)); + } + + } + +} diff --git a/src/main/java/com/iemr/common/utils/http/HttpUtils.java b/src/main/java/com/iemr/common/utils/http/HttpUtils.java index 0f308619..c80a07bb 100644 --- a/src/main/java/com/iemr/common/utils/http/HttpUtils.java +++ b/src/main/java/com/iemr/common/utils/http/HttpUtils.java @@ -40,6 +40,7 @@ import org.springframework.stereotype.Component; import org.springframework.web.client.RestTemplate; +import com.iemr.common.utils.RestTemplateUtil; import com.sun.jersey.multipart.FormDataBodyPart; import com.sun.jersey.multipart.FormDataMultiPart; @@ -54,9 +55,6 @@ public class HttpUtils { // @Autowired private HttpStatus status; private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); - - // @Autowired(required = true) - // @Qualifier("hibernateCriteriaBuilder") public HttpUtils() { if (rest == null) { rest = new RestTemplate(); @@ -64,33 +62,20 @@ public HttpUtils() { headers.add("Content-Type", "application/json"); } } - // public HttpUtils() { - // if (rest == null) { - // rest = new RestTemplate(); - // headers = new HttpHeaders(); - // headers.add("Content-Type", "application/json"); - // } - // } - - // @Bean - // public HttpUtils httpUtils() { - // return new HttpUtils(); - // } - + public String get(String uri) { String body; + RestTemplateUtil.getJwttokenFromHeaders(headers); HttpEntity requestEntity = new HttpEntity("", headers); ResponseEntity responseEntity = rest.exchange(uri, HttpMethod.GET, requestEntity, String.class); setStatus((HttpStatus) responseEntity.getStatusCode()); - // if (status == HttpStatus.OK){ body = responseEntity.getBody(); - // }else{ - // responseEntity - // } + return body; } public ResponseEntity getV1(String uri) throws URISyntaxException, MalformedURLException { + RestTemplateUtil.getJwttokenFromHeaders(headers); HttpEntity requestEntity = new HttpEntity("", headers); ResponseEntity responseEntity = rest.exchange(uri, HttpMethod.GET, requestEntity, String.class); return responseEntity; @@ -107,6 +92,7 @@ public String get(String uri, HashMap header) { } else { headers.add("Content-Type", MediaType.APPLICATION_JSON); } + RestTemplateUtil.getJwttokenFromHeaders(headers); HttpEntity requestEntity = new HttpEntity("", headers); ResponseEntity responseEntity = rest.exchange(uri, HttpMethod.GET, requestEntity, String.class); setStatus((HttpStatus) responseEntity.getStatusCode()); @@ -116,6 +102,7 @@ public String get(String uri, HashMap header) { public String post(String uri, String json) { String body; + RestTemplateUtil.getJwttokenFromHeaders(headers); HttpEntity requestEntity = new HttpEntity(json, headers); ResponseEntity responseEntity = rest.exchange(uri, HttpMethod.POST, requestEntity, String.class); setStatus((HttpStatus) responseEntity.getStatusCode()); @@ -129,9 +116,7 @@ public String post(String uri, String data, HashMap header) { if (header.containsKey(headers.AUTHORIZATION)) { headers.add(headers.AUTHORIZATION, header.get(headers.AUTHORIZATION).toString()); } - - // headers.add("Content-Type", MediaType.APPLICATION_JSON); - + RestTemplateUtil.getJwttokenFromHeaders(headers); headers.add("Content-Type", MediaType.APPLICATION_JSON + ";charset=utf-8"); ResponseEntity responseEntity = new ResponseEntity(HttpStatus.BAD_REQUEST); HttpEntity requestEntity; From fd7aa1fa341f0f7f837365260297847215a18bde Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Wed, 6 Aug 2025 16:58:37 +0530 Subject: [PATCH 3/3] Coderabbit comments addressed --- src/main/java/com/iemr/common/utils/RestTemplateUtil.java | 8 ++++++-- src/main/java/com/iemr/common/utils/http/HttpUtils.java | 6 ++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/iemr/common/utils/RestTemplateUtil.java b/src/main/java/com/iemr/common/utils/RestTemplateUtil.java index 13b8e078..c8299fe7 100644 --- a/src/main/java/com/iemr/common/utils/RestTemplateUtil.java +++ b/src/main/java/com/iemr/common/utils/RestTemplateUtil.java @@ -66,9 +66,13 @@ public static void getJwttokenFromHeaders(HttpHeaders headers) { } HttpServletRequest requestHeader = servletRequestAttributes.getRequest(); String jwtTokenFromCookie = extractJwttoken(requestHeader); - headers.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE + ";charset=utf-8"); + if (!headers.containsKey(HttpHeaders.CONTENT_TYPE)) { + headers.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE + ";charset=utf-8"); + } if (null != UserAgentContext.getUserAgent()) { - headers.add(HttpHeaders.USER_AGENT, UserAgentContext.getUserAgent()); + if (!headers.containsKey(HttpHeaders.USER_AGENT)) { + headers.add(HttpHeaders.USER_AGENT, UserAgentContext.getUserAgent()); + } } if (null != jwtTokenFromCookie) { headers.add(HttpHeaders.COOKIE, Constants.JWT_TOKEN + "=" + jwtTokenFromCookie); diff --git a/src/main/java/com/iemr/common/utils/http/HttpUtils.java b/src/main/java/com/iemr/common/utils/http/HttpUtils.java index c80a07bb..4f49e662 100644 --- a/src/main/java/com/iemr/common/utils/http/HttpUtils.java +++ b/src/main/java/com/iemr/common/utils/http/HttpUtils.java @@ -65,8 +65,10 @@ public HttpUtils() { public String get(String uri) { String body; - RestTemplateUtil.getJwttokenFromHeaders(headers); - HttpEntity requestEntity = new HttpEntity("", headers); + HttpHeaders requestHeaders = new HttpHeaders(); + requestHeaders.add("Content-Type", "application/json"); + RestTemplateUtil.getJwttokenFromHeaders(requestHeaders); + HttpEntity requestEntity = new HttpEntity("", requestHeaders); ResponseEntity responseEntity = rest.exchange(uri, HttpMethod.GET, requestEntity, String.class); setStatus((HttpStatus) responseEntity.getStatusCode()); body = responseEntity.getBody();