[Rahul] | BAH-3417 | Refactor. Change Login Caller Logic

Bahmni · Jan 3, 2024 · 8421c81 · 8421c81
1 parent 6b7d664
commit 8421c81
Showing 1 changed file with 19 additions and 20 deletions.
diff --git a/openerp-client/src/main/java/org/bahmni/openerp/web/http/client/RestClient.java b/openerp-client/src/main/java/org/bahmni/openerp/web/http/client/RestClient.java
@@ -32,32 +32,31 @@ public RestClient(String baseURL, String username, String password, int connecti
     }
 
     private void login() {
-        if (isSessionInvalid()) {
-            String requestBody = buildLoginRequest();
-            WebClient client = getWebClient(baseURL);
-            HttpHeaders headers = getHttpHeaders();
-            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 {
-                            session = 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));
-                        }
+        String requestBody = buildLoginRequest();
+        WebClient client = getWebClient(baseURL);
+        HttpHeaders headers = getHttpHeaders();
+        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 {
+                        session = 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);
-                }).timeout(Duration.ofMillis(connectionTimeout)).block();
-                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);
-            }
+                }
+                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, session);
+        } catch (Exception e) {
+            logger.warn("Failed to login for user {}", username);
         }
     }
 
     public String post(String URL, String requestBody) {
-        try {
+        if(isSessionInvalid())
             login();
+        try {
             logger.debug("Post Data: {}", requestBody);
             WebClient client = getWebClient(baseURL);
             HttpHeaders headers = getHttpHeaders();