Finalize ory support

Author: aq-ikhwa-tech

server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/Oauth2OryAuthConfig.java

@@ -38,7 +38,7 @@ public Oauth2OryAuthConfig(
     }
 
     @Override
-    protected String replaceAuthUrlClientIdPlaceholder(String url) {
+    public String replaceAuthUrlClientIdPlaceholder(String url) {
         return super.replaceAuthUrlClientIdPlaceholder(url).replace(INSTANCE_ID_PLACEHOLDER, instanceId);
     }
 }

server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/Oauth2SimpleAuthConfig.java

@@ -74,7 +74,7 @@ public void merge(AbstractAuthConfig oldConfig) {
         }
     }
 
-    protected String replaceAuthUrlClientIdPlaceholder(String url) {
+    public String replaceAuthUrlClientIdPlaceholder(String url) {
         return url.replace(CLIENT_ID_PLACEHOLDER, clientId);
     }
 }

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/request/OryRequest.java

@@ -8,16 +8,18 @@
 import org.lowcoder.domain.user.model.AuthToken;
 import org.lowcoder.domain.user.model.AuthUser;
 import org.lowcoder.sdk.auth.Oauth2OryAuthConfig;
-import org.lowcoder.sdk.auth.Oauth2SimpleAuthConfig;
 import org.lowcoder.sdk.util.JsonUtils;
 import org.lowcoder.sdk.webclient.WebClientBuildHelper;
 import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.MediaType;
 import reactor.core.publisher.Mono;
 
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Map;
 
+import static org.springframework.web.reactive.function.BodyInserters.fromFormData;
+
 public class OryRequest extends AbstractOauth2Request<Oauth2OryAuthConfig> {
 
     public OryRequest(Oauth2OryAuthConfig config) {
@@ -28,13 +30,7 @@ public OryRequest(Oauth2OryAuthConfig config) {
     protected Mono<AuthToken> getAuthToken(OAuth2RequestContext context) {
         URI uri;
         try {
-            uri = new URIBuilder(source.accessToken())
-                    .addParameter("code", context.getCode())
-                    .addParameter("client_id", config.getClientId())
-                    .addParameter("client_secret", config.getClientSecret())
-                    .addParameter("grant_type", "authorization_code")
-                    .addParameter("redirect_uri", context.getRedirectUrl())
-                    .build();
+            uri = new URIBuilder(config.replaceAuthUrlClientIdPlaceholder(source.accessToken())).build();
         } catch (URISyntaxException e) {
             throw new RuntimeException(e);
         }
@@ -44,6 +40,12 @@ protected Mono<AuthToken> getAuthToken(OAuth2RequestContext context) {
                 .build()
                 .post()
                 .uri(uri)
+                .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+                .body(fromFormData("code", context.getCode())
+                        .with("client_id", config.getClientId())
+                        .with("client_secret", config.getClientSecret())
+                        .with("grant_type", "authorization_code")
+                        .with("redirect_uri", context.getRedirectUrl()))
                 .exchangeToMono(response -> response.bodyToMono(new ParameterizedTypeReference<Map<String, Object>>() {
                 }))
                 .flatMap(map -> {
@@ -64,12 +66,7 @@ protected Mono<AuthToken> refreshAuthToken(String refreshToken) {
 
         URI uri;
         try {
-            uri = new URIBuilder(source.refresh())
-                    .addParameter("refresh_token", refreshToken)
-                    .addParameter("client_id", config.getClientId())
-                    .addParameter("client_secret", config.getClientSecret())
-                    .addParameter("grant_type", "refresh_token")
-                    .build();
+            uri = new URIBuilder(config.replaceAuthUrlClientIdPlaceholder(source.refresh())).build();
         } catch (URISyntaxException e) {
             throw new RuntimeException(e);
         }
@@ -79,6 +76,11 @@ protected Mono<AuthToken> refreshAuthToken(String refreshToken) {
                 .build()
                 .post()
                 .uri(uri)
+                .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+                .body(fromFormData("refresh_token", refreshToken)
+                        .with("client_id", config.getClientId())
+                        .with("client_secret", config.getClientSecret())
+                        .with("grant_type", "refresh_token"))
                 .exchangeToMono(response -> response.bodyToMono(new ParameterizedTypeReference<Map<String, Object>>() {
                 }))
                 .flatMap(map -> {
@@ -88,6 +90,7 @@ protected Mono<AuthToken> refreshAuthToken(String refreshToken) {
                     AuthToken authToken = AuthToken.builder()
                             .accessToken(MapUtils.getString(map, "access_token"))
                             .expireIn(MapUtils.getIntValue(map, "expires_in"))
+                            .refreshToken(MapUtils.getString(map, "refresh_token"))
                             .build();
                     return Mono.just(authToken);
                 });
@@ -100,7 +103,7 @@ protected Mono<AuthUser> getAuthUser(AuthToken authToken) {
                 .systemProxy()
                 .build()
                 .post()
-                .uri(source.userInfo())
+                .uri(config.replaceAuthUrlClientIdPlaceholder(source.userInfo()))
                 .header("Authorization", "Bearer " + authToken.getAccessToken())
                 .exchangeToMono(response -> response.bodyToMono(new ParameterizedTypeReference<Map<String, Object>>() {
                 }))

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/UserSessionPersistenceFilter.java

@@ -59,7 +59,7 @@ public Mono<Void> filter(@Nonnull ServerWebExchange exchange, WebFilterChain cha
                     user.getConnections().forEach(connection -> {
                         if(!connection.getAuthId().equals(DEFAULT_AUTH_CONFIG.getId())) {
                             Instant next5Minutes = Instant.now().plusSeconds( 300 );
-                            boolean isAccessTokenExpiryNear = connection.getAuthConnectionAuthToken().getExpireAt() <= next5Minutes.toEpochMilli();
+                            boolean isAccessTokenExpiryNear = (connection.getAuthConnectionAuthToken().getExpireAt()*1000) <= next5Minutes.toEpochMilli();
                             if(isAccessTokenExpiryNear) {
                                 connection.getOrgIds().forEach(orgId -> {
                                     FindAuthConfig findAuthConfig = authenticationService.findAuthConfigByAuthId(orgId, connection.getAuthId()).block();