add jwt

add maputils

Author: Thomas

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/AuthToken.java

@@ -18,6 +18,7 @@ public class AuthToken implements Serializable {
     private int expireIn;
     private String refreshToken;
     private int refreshTokenExpireIn;
+    private String jwt;
 
     private String openId;
     private String code;

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

@@ -1,6 +1,5 @@
 package org.lowcoder.api.authentication.request.oauth2.request;
 
-import lombok.Setter;
 import org.lowcoder.api.authentication.request.AuthException;
 import org.lowcoder.api.authentication.request.oauth2.GenericOAuthProviderSource;
 import org.lowcoder.api.authentication.request.oauth2.OAuth2RequestContext;
@@ -48,7 +47,7 @@ protected Mono<AuthToken> getAuthToken(OAuth2RequestContext context) {
                     if (map.containsKey("error") || map.containsKey("error_description")) {
                         return Mono.error(new AuthException(JsonUtils.toJson(map)));
                     }
-                    return Mono.just(mapToAuthToken(map));
+                    return Mono.just(mapToAuthToken(map, config.getSourceMappings()));
                 });
     }
 
@@ -70,7 +69,7 @@ protected Mono<AuthToken> refreshAuthToken(String refreshToken) {
                     if (map.containsKey("error") || map.containsKey("error_description")) {
                         return Mono.error(new AuthException(JsonUtils.toJson(map)));
                     }
-                    return Mono.just(mapToAuthToken(map));
+                    return Mono.just(mapToAuthToken(map, config.getSourceMappings()));
                 });
     }
 

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/util/AdvancedMapUtils.java

@@ -0,0 +1,54 @@
+package org.lowcoder.api.authentication.util;
+
+import java.util.Map;
+
+public class AdvancedMapUtils {
+
+    /**
+     * Retrieves a string value from a nested map structure using a key format that supports array indices and nested objects.
+     *
+     * @param map The map from which to retrieve the value.
+     * @param key The key in the format "abc[0].def.hi".
+     * @return The string value if found, otherwise null.
+     */
+    public static String getString(Map<String, Object> map, String key) {
+        String[] parts = key.split("\\.");
+        Object current = map;
+
+        for (String part : parts) {
+            if (current == null) {
+                return null;
+            }
+
+            if (part.contains("[")) {
+                int startIdx = part.indexOf('[');
+                int endIdx = part.indexOf(']');
+                String arrayKey = part.substring(0, startIdx);
+                int index = Integer.parseInt(part.substring(startIdx + 1, endIdx));
+
+                if (!(current instanceof Map)) {
+                    return null;
+                }
+
+                current = ((Map<String, Object>) current).get(arrayKey);
+
+                if (current instanceof java.util.List) {
+                    java.util.List<?> list = (java.util.List<?>) current;
+                    if (index < 0 || index >= list.size()) {
+                        return null;
+                    }
+                    current = list.get(index);
+                } else {
+                    return null;
+                }
+            } else {
+                if (!(current instanceof Map)) {
+                    return null;
+                }
+                current = ((Map<String, Object>) current).get(part);
+            }
+        }
+
+        return current instanceof String ? (String) current : null;
+    }
+}

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/util/AuthenticationUtils.java

@@ -64,14 +64,17 @@ public String getName() {
 
     /**
      * Utility method to map from Map to AuthToken
-     * @param map Object
+     *
+     * @param map            Object
+     * @param sourceMappings
      * @return AuthToken
      */
-    public static AuthToken mapToAuthToken(Map<String, Object> map) {
+    public static AuthToken mapToAuthToken(Map<String, Object> map, HashMap<String, String> sourceMappings) {
         return AuthToken.builder()
                 .accessToken(MapUtils.getString(map, "access_token"))
                 .expireIn(MapUtils.getIntValue(map, "expires_in"))
                 .refreshToken(MapUtils.getString(map, "refresh_token"))
+                .jwt(AdvancedMapUtils.getString(map, MapUtils.getString(sourceMappings, "jwt")))
                 .build();
     }
 
@@ -84,9 +87,9 @@ public static AuthToken mapToAuthToken(Map<String, Object> map) {
      */
     public static AuthUser mapToAuthUser(Map<String, Object> map, HashMap<String, String> sourceMappings) {
         return AuthUser.builder()
-                .uid(MapUtils.getString(map, MapUtils.getString(sourceMappings, "uid")))
-                .username(MapUtils.getString(map, MapUtils.getString(sourceMappings, "username")))
-                .avatar(MapUtils.getString(map, MapUtils.getString(sourceMappings, "avatar")))
+                .uid(AdvancedMapUtils.getString(map, MapUtils.getString(sourceMappings, "uid")))
+                .username(AdvancedMapUtils.getString(map, MapUtils.getString(sourceMappings, "username")))
+                .avatar(AdvancedMapUtils.getString(map, MapUtils.getString(sourceMappings, "avatar")))
                 .rawUserInfo(map)
                 .build();
     }

server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/AdvancedMapUtilsTest.java

@@ -0,0 +1,26 @@
+package org.lowcoder.api.authentication;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.lowcoder.api.authentication.util.AdvancedMapUtils;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+public class AdvancedMapUtilsTest {
+    @Test
+    public void testGetStringFromMap() throws Exception {
+        Map<String, Object> nestedMap = new HashMap<>();
+        nestedMap.put("abc", Arrays.asList(
+                Collections.singletonMap("def", Collections.singletonMap("hi", "hello world")),
+                Collections.singletonMap("def", Collections.singletonMap("hi", "another value"))
+        ));
+
+        String value0 = AdvancedMapUtils.getString(nestedMap, "abc[0].def.hi");
+        String value1 = AdvancedMapUtils.getString(nestedMap, "abc[1].def.hi");
+        Assertions.assertSame("hello world", value0);
+        Assertions.assertSame("another value", value1);
+    }
+}