Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Rahul] | BAH-3417 | Add. Session Expiry Handler #97

Merged
merged 4 commits into from
Jan 3, 2024
+27 −32
Merged

[Rahul] | BAH-3417 | Add. Session Expiry Handler #97

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8ae960c
[Rahul] | BAH-3417 | Add. Session Expiry Handler
rahu1ramesh Dec 26, 2023
6b7d664
[Rahul] | BAH-3417 | Refactor. Set Session As A ResponseCookie
rahu1ramesh Dec 27, 2023
eb839b0
[Rahul] | BAH-3417 | Refactor. Change Login Caller Logic
rahu1ramesh Jan 3, 2024
3ced1a3
Merge branch 'master' into BAH-3417
rahu1ramesh Jan 3, 2024
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
53 changes: 37 additions & 16 deletions openerp-client/src/main/java/org/bahmni/openerp/web/http/client/RestClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
import org.bahmni.openerp.web.OpenERPException;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseCookie;
import org.springframework.web.reactive.function.client.WebClient;
import java.time.LocalDateTime;

import java.time.Duration;
import java.util.HashMap;
Expand All @@ -20,7 +22,7 @@ public class RestClient {
private final String username;
private final String password;
private final int connectionTimeout;
private String sessionId;
private static final HashMap<String, String> session = new HashMap<>();

public RestClient(String baseURL, String username, String password, int connectionTimeout, String database) {
this.database = database;
Expand All @@ -31,28 +33,25 @@ public RestClient(String baseURL, String username, String password, int connecti
}

private void login() {
rahu1ramesh marked this conversation as resolved.
Show resolved Hide resolved
if (sessionId == null) {
if (isSessionInvalid()) {
String requestBody = buildLoginRequest();
WebClient client = getWebClient(baseURL);
HttpHeaders headers = getHttpHeaders();
Consumer < HttpHeaders > consumer = httpHeaders -> httpHeaders.addAll(headers);
Consumer<HttpHeaders> consumer = httpHeaders -> httpHeaders.addAll(headers);
try {
client.post().uri("web/session/authenticate").headers(consumer).bodyValue(requestBody).exchangeToMono(loginResponse -> {
if(loginResponse.statusCode().is2xxSuccessful()) {
try {
sessionId = loginResponse.cookies().get("session_id").get(0).getValue();
logger.debug("Login session_id: {}", sessionId);
} catch (Exception e) {
logger.warn("Failed to login for user {}", username);
throw new OpenERPException(String.format("Failed to login. The login user is : %s", username));
if (loginResponse.statusCode().is2xxSuccessful()) {
try {
session.putAll(getSession(loginResponse.cookies().get("session_id").get(0)));
} catch (Exception e) {
throw new OpenERPException(String.format("Failed to login. The login user is : %s, no session cookie set.", username));
}
}
}
return loginResponse.bodyToMono(String.class);
return loginResponse.bodyToMono(String.class);
}).timeout(Duration.ofMillis(connectionTimeout)).block();
logger.debug("\n-----------------------------------------------------Login Initiated-----------------------------------------------------\n* Request : {}\n* Session Id : {}\n-----------------------------------------------------End of Login-----------------------------------------------------", requestBody, sessionId);
logger.debug("\n-----------------------------------------------------Login Initiated-----------------------------------------------------\n* Request : {}\n* Session Id : {}\n-----------------------------------------------------End of Login-----------------------------------------------------", requestBody, session);
} catch (Exception e) {
logger.warn("Failed to login for user {}", username);
throw new OpenERPException(String.format("Failed to login. The login user is : %s", username));
}
}
}
Expand All @@ -64,8 +63,8 @@ public String post(String URL, String requestBody) {
WebClient client = getWebClient(baseURL);
HttpHeaders headers = getHttpHeaders();
Consumer < HttpHeaders > consumer = httpHeaders -> httpHeaders.addAll(headers);
String response = client.post().uri(URL).headers(consumer).cookie("session_id", sessionId).bodyValue(requestBody).retrieve().bodyToMono(String.class).timeout(Duration.ofMillis(connectionTimeout)).block();
logger.debug("\n-----------------------------------------------------{} Initiated-----------------------------------------------------\n* Cookies : {}\n* Request : {}\n* Response : {}\n-----------------------------------------------------End of {}-----------------------------------------------------", URL, sessionId, requestBody, response, URL);
String response = client.post().uri(URL).headers(consumer).cookie("session_id", session.get("session_id")).bodyValue(requestBody).retrieve().bodyToMono(String.class).timeout(Duration.ofMillis(connectionTimeout)).block();
logger.debug("\n-----------------------------------------------------{} Initiated-----------------------------------------------------\n* Cookies : {}\n* Request : {}\n* Response : {}\n-----------------------------------------------------End of {}-----------------------------------------------------", URL, session, requestBody, response, URL);
if (response == null) {
throw new OpenERPException(String.format("Could not post to %s", URL));
}
Expand All @@ -79,6 +78,28 @@ public String post(String URL, String requestBody) {
}
}

private HashMap<String, String> getSession(ResponseCookie cookie) {
HashMap<String, String> session = new HashMap<>();
session.put("session_id", cookie.getValue());
rahu1ramesh marked this conversation as resolved.
Show resolved Hide resolved
LocalDateTime currentDate = LocalDateTime.now();
LocalDateTime expiryDateTime = currentDate.plusNanos(cookie.getMaxAge().toNanos());
session.put("expiry", expiryDateTime.toString());
return session;
}

private boolean isSessionInvalid() {
rahu1ramesh marked this conversation as resolved.
Show resolved Hide resolved
try {
if (session.isEmpty()) {
return true;
}
LocalDateTime currentDate = LocalDateTime.now();
LocalDateTime expiryDateTime = LocalDateTime.parse(session.get("expiry"));
return currentDate.isAfter(expiryDateTime);
} catch (Exception e) {
return true;
}
}

private WebClient getWebClient(String baseURL) {
if (webClient == null) {
webClient = WebClient.builder()
Expand Down
Loading