Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ private void createUserMapping(User mUser, JSONObject resMap, JSONObject service
@RequestMapping(value = "/superUserAuthenticate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON)
public String superUserAuthenticate(
@Param(value = "\"{\\\"userName\\\":\\\"String\\\",\\\"doLogout\\\":\\\"Boolean\\\"}\"") @RequestBody LoginRequestModel m_User,
HttpServletRequest request) {
HttpServletRequest request,HttpServletResponse httpResponse) {
OutputResponse response = new OutputResponse();
logger.info("userAuthenticate request ");
try {
Expand All @@ -411,6 +411,9 @@ public String superUserAuthenticate(
User mUser = iemrAdminUserServiceImpl.superUserAuthenticate(m_User.getUserName(), decryptPassword);
JSONObject resMap = new JSONObject();
JSONObject previlegeObj = new JSONObject();
String jwtToken = null;
String refreshToken = null;
boolean isMobile = false;
if (m_User.getUserName() != null && (m_User.getDoLogout() == null || m_User.getDoLogout() == false)) {
String tokenFromRedis = getConcurrentCheckSessionObjectAgainstUser(
m_User.getUserName().trim().toLowerCase());
Expand All @@ -425,6 +428,35 @@ public String superUserAuthenticate(
resMap.put("userID", mUser.getUserID());
resMap.put("isAuthenticated", /* Boolean.valueOf(true) */true);
resMap.put("userName", mUser.getUserName());
jwtToken = jwtUtil.generateToken(m_User.getUserName(), mUser.getUserID().toString());

User user = new User(); // Assuming the Users class exists
user.setUserID(mUser.getUserID());
user.setUserName(mUser.getUserName());

String userAgent = request.getHeader("User-Agent");
isMobile = UserAgentUtil.isMobileDevice(userAgent);
logger.info("UserAgentUtil isMobile : " + isMobile);

if (isMobile) {
refreshToken = jwtUtil.generateRefreshToken(m_User.getUserName(), user.getUserID().toString());
logger.debug("Refresh token generated successfully for user: {}", user.getUserName());
String jti = jwtUtil.getJtiFromToken(refreshToken);
redisTemplate.opsForValue().set(
"refresh:" + jti,
user.getUserID().toString(),
jwtUtil.getRefreshTokenExpiration(),
TimeUnit.MILLISECONDS
);
} else {
cookieUtil.addJwtTokenToCookie(jwtToken, httpResponse, request);
}

String redisKey = "user_" + mUser.getUserID(); // Use user ID to create a unique key

// Store the user in Redis (set a TTL of 30 minutes)
redisTemplate.opsForValue().set(redisKey, user, 30, TimeUnit.MINUTES);

} else {
resMap.put("isAuthenticated", /* Boolean.valueOf(false) */false);
}
Expand All @@ -441,6 +473,10 @@ public String superUserAuthenticate(
if (remoteAddress == null || remoteAddress.trim().length() == 0) {
remoteAddress = request.getRemoteAddr();
}
if (isMobile && null != mUser) {
responseObj.put("jwtToken", jwtToken);
responseObj.put("refreshToken", refreshToken);
}
responseObj = iemrAdminUserServiceImpl.generateKeyAndValidateIP(responseObj, remoteAddress,
request.getRemoteHost());
response.setResponse(responseObj.toString());
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/iemr/common/utils/RestTemplateUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ public static HttpEntity<Object> createRequestEntity(Object body, String authori
headers.add(HttpHeaders.USER_AGENT, UserAgentContext.getUserAgent());
}
headers.add(HttpHeaders.AUTHORIZATION, authorization);
headers.add("JwtToken",requestHeader.getHeader("JwtToken"));
if(null != requestHeader.getHeader("JwtToken")) {
headers.add("JwtToken",requestHeader.getHeader("JwtToken"));
}
if(null != jwtTokenFromCookie) {
headers.add(HttpHeaders.COOKIE, "Jwttoken=" + jwtTokenFromCookie);
}
Expand Down
Loading