introduce timeout to WebClientBuilderHelper

Thomas · ludomikula · commit d10a516e4354 · 2024-06-05T18:42:34.000+02:00
diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/constant/Constants.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/constant/Constants.java
@@ -14,4 +14,5 @@ public final class Constants {
     public static final String UPDATE_CHANGE_SET_FORM_KEY = "updateChangeSet";
     public static final String CHANGE_SET_TYPE_KEY_VALUE_PAIRS = "KEY_VALUE_PAIRS";
     public static final String CHANGE_SET_TYPE_OBJECT = "OBJECT";
+    public static final int HTTP_TIMEOUT = 10000; //10s
 }
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/request/GenericAuthRequest.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/request/GenericAuthRequest.java
@@ -16,6 +16,7 @@
 
 import static org.lowcoder.api.authentication.util.AuthenticationUtils.mapToAuthToken;
 import static org.lowcoder.api.authentication.util.AuthenticationUtils.mapToAuthUser;
+import static org.lowcoder.sdk.plugin.common.constant.Constants.HTTP_TIMEOUT;
 
 /**
  * This class is for Generic Auth Request
@@ -30,6 +31,7 @@ public GenericAuthRequest(Oauth2GenericAuthConfig context) {
     protected Mono<AuthToken> getAuthToken(OAuth2RequestContext context) {
         return WebClientBuildHelper.builder()
                 .systemProxy()
+                .timeoutMs(HTTP_TIMEOUT)
                 .build()
                 .post()
                 .uri(config.getTokenEndpoint())
@@ -53,6 +55,7 @@ protected Mono<AuthToken> getAuthToken(OAuth2RequestContext context) {
     protected Mono<AuthToken> refreshAuthToken(String refreshToken) {
         return WebClientBuildHelper.builder()
                 .systemProxy()
+                .timeoutMs(HTTP_TIMEOUT)
                 .build()
                 .post()
                 .uri(config.getTokenEndpoint())
@@ -74,6 +77,7 @@ protected Mono<AuthToken> refreshAuthToken(String refreshToken) {
     protected Mono<AuthUser> getAuthUser(AuthToken authToken) {
         return WebClientBuildHelper.builder()
                 .systemProxy()
+                .timeoutMs(HTTP_TIMEOUT)
                 .build()
                 .get()
                 .uri(config.getUserInfoEndpoint())
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/request/GithubRequest.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/request/GithubRequest.java
@@ -2,6 +2,7 @@
 
 import static java.net.URLDecoder.decode;
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.lowcoder.sdk.plugin.common.constant.Constants.HTTP_TIMEOUT;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -18,6 +19,7 @@
 import org.lowcoder.domain.user.model.AuthUser;
 import org.lowcoder.sdk.auth.Oauth2SimpleAuthConfig;
 import org.lowcoder.sdk.util.JsonUtils;
+import org.lowcoder.sdk.webclient.WebClientBuildHelper;
 import org.lowcoder.sdk.webclient.WebClients;
 import org.springframework.core.ParameterizedTypeReference;
 
@@ -43,7 +45,10 @@ protected Mono<AuthToken> getAuthToken(OAuth2RequestContext context) {
         } catch (URISyntaxException e) {
             throw new RuntimeException(e);
         }
-        return WebClients.getInstance()
+        return WebClientBuildHelper.builder()
+                .systemProxy()
+                .timeoutMs(HTTP_TIMEOUT)
+                .build()
                 .post()
                 .uri(uri)
                 .exchangeToMono(response -> response.bodyToMono(String.class))
@@ -81,7 +86,10 @@ private Map<String, String> parseStringToMap(String s) {
 
     @Override
     protected Mono<AuthUser> getAuthUser(AuthToken authToken) {
-        return WebClients.getInstance()
+        return WebClientBuildHelper.builder()
+                .systemProxy()
+                .timeoutMs(HTTP_TIMEOUT)
+                .build()
                 .get()
                 .uri(source.userInfo())
                 .header("Authorization", "token " + authToken.getAccessToken())
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/request/GoogleRequest.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/request/GoogleRequest.java
@@ -18,6 +18,8 @@
 
 import reactor.core.publisher.Mono;
 
+import static org.lowcoder.sdk.plugin.common.constant.Constants.HTTP_TIMEOUT;
+
 public class GoogleRequest extends AbstractOauth2Request<Oauth2SimpleAuthConfig> {
 
     public GoogleRequest(Oauth2SimpleAuthConfig config) {
@@ -41,6 +43,7 @@ protected Mono<AuthToken> getAuthToken(OAuth2RequestContext context) {
 
         return WebClientBuildHelper.builder()
                 .systemProxy()
+                .timeoutMs(HTTP_TIMEOUT)
                 .build()
                 .post()
                 .uri(uri)
@@ -76,6 +79,7 @@ protected Mono<AuthToken> refreshAuthToken(String refreshToken) {
 
         return WebClientBuildHelper.builder()
                 .systemProxy()
+                .timeoutMs(HTTP_TIMEOUT)
                 .build()
                 .post()
                 .uri(uri)
@@ -98,6 +102,7 @@ protected Mono<AuthToken> refreshAuthToken(String refreshToken) {
     protected Mono<AuthUser> getAuthUser(AuthToken authToken) {
         return WebClientBuildHelper.builder()
                 .systemProxy()
+                .timeoutMs(HTTP_TIMEOUT)
                 .build()
                 .post()
                 .uri(source.userInfo())
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/request/KeycloakRequest.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/request/KeycloakRequest.java
@@ -1,5 +1,6 @@
 package org.lowcoder.api.authentication.request.oauth2.request;
 
+import static org.lowcoder.sdk.plugin.common.constant.Constants.HTTP_TIMEOUT;
 import static org.springframework.web.reactive.function.BodyInserters.fromFormData;
 
 import java.net.URI;
@@ -40,6 +41,7 @@ protected Mono<AuthToken> getAuthToken(OAuth2RequestContext context) {
 
         return WebClientBuildHelper.builder()
                 .systemProxy()
+                .timeoutMs(HTTP_TIMEOUT)
                 .build()
                 .post()
                 .uri(uri)
@@ -76,6 +78,7 @@ protected Mono<AuthToken> refreshAuthToken(String refreshToken) {
 
         return WebClientBuildHelper.builder()
                 .systemProxy()
+                .timeoutMs(HTTP_TIMEOUT)
                 .build()
                 .post()
                 .uri(uri)
@@ -105,6 +108,7 @@ protected Mono<AuthToken> refreshAuthToken(String refreshToken) {
     protected Mono<AuthUser> getAuthUser(AuthToken authToken) {
         return WebClientBuildHelper.builder()
                 .systemProxy()
+                .timeoutMs(HTTP_TIMEOUT)
                 .build()
                 .post()
                 .uri(config.replaceAuthUrlClientIdPlaceholder(source.userInfo()))
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/request/OryRequest.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/request/OryRequest.java
@@ -18,6 +18,7 @@
 import java.net.URISyntaxException;
 import java.util.Map;
 
+import static org.lowcoder.sdk.plugin.common.constant.Constants.HTTP_TIMEOUT;
 import static org.springframework.web.reactive.function.BodyInserters.fromFormData;
 
 public class OryRequest extends AbstractOauth2Request<Oauth2OryAuthConfig> {
@@ -37,6 +38,7 @@ protected Mono<AuthToken> getAuthToken(OAuth2RequestContext context) {
 
         return WebClientBuildHelper.builder()
                 .systemProxy()
+                .timeoutMs(HTTP_TIMEOUT)
                 .build()
                 .post()
                 .uri(uri)
@@ -73,6 +75,7 @@ protected Mono<AuthToken> refreshAuthToken(String refreshToken) {
 
         return WebClientBuildHelper.builder()
                 .systemProxy()
+                .timeoutMs(HTTP_TIMEOUT)
                 .build()
                 .post()
                 .uri(uri)
@@ -101,6 +104,7 @@ protected Mono<AuthToken> refreshAuthToken(String refreshToken) {
     protected Mono<AuthUser> getAuthUser(AuthToken authToken) {
         return WebClientBuildHelper.builder()
                 .systemProxy()
+                .timeoutMs(HTTP_TIMEOUT)
                 .build()
                 .post()
                 .uri(config.replaceAuthUrlClientIdPlaceholder(source.userInfo()))

Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,5 @@ public final class Constants {`
`14`	`14`	`public static final String UPDATE_CHANGE_SET_FORM_KEY = "updateChangeSet";`
`15`	`15`	`public static final String CHANGE_SET_TYPE_KEY_VALUE_PAIRS = "KEY_VALUE_PAIRS";`
`16`	`16`	`public static final String CHANGE_SET_TYPE_OBJECT = "OBJECT";`
	`17`	`+ public static final int HTTP_TIMEOUT = 10000; //10s`
`17`	`18`	`}`