#948 Add source mapping

fix config keys

Author: Thomas

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

@@ -4,6 +4,8 @@
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 
+import java.util.HashMap;
+
 import static org.lowcoder.sdk.auth.constants.Oauth2Constants.BASE_URL_PLACEHOLDER;
 import static org.lowcoder.sdk.auth.constants.Oauth2Constants.SCOPE_PLACEHOLDER;
 
@@ -22,6 +24,7 @@ public class Oauth2GenericAuthConfig extends Oauth2SimpleAuthConfig {
     private String tokenEndpoint;
     private String userInfoEndpoint;
     private String scope;
+    private HashMap<String, String> sourceMappings;
     private Boolean userInfoIntrospection;
 
     @Override

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/dto/AuthConfigRequest.java

@@ -97,7 +97,11 @@ public String getSourceIcon() {
     }
 
     public String getSourceCategory() {
-        return getString("sourceDescription");
+        return getString("sourceCategory");
+    }
+
+    public HashMap<String, String> getSourceMappings() {
+        return (HashMap<String, String>) MapUtils.getMap(this, "sourceMappings");
     }
 
     public String getString(String key) {

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

@@ -90,7 +90,7 @@ protected Mono<AuthUser> getAuthUser(AuthToken authToken) {
                     if (map.containsKey("error") || map.containsKey("error_description")) {
                         return Mono.error(new AuthException(JsonUtils.toJson(map)));
                     }
-                    return Mono.just(mapToAuthUser(map));
+                    return Mono.just(mapToAuthUser(map, config.getSourceMappings()));
                 });
     }
 }

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/factory/AuthConfigFactoryImpl.java

@@ -108,6 +108,7 @@ private Oauth2SimpleAuthConfig buildOauth2GenericAuthConfig(AuthConfigRequest au
                 .sourceDescription(authConfigRequest.getSourceDescription())
                 .sourceIcon(authConfigRequest.getSourceIcon())
                 .sourceCategory(authConfigRequest.getSourceCategory())
+                .sourceMappings(authConfigRequest.getSourceMappings())
                 .clientId(requireNonNull(authConfigRequest.getClientId(), "clientId can not be null."))
                 .clientSecret(authConfigRequest.getClientSecret())
                 .issuerUri(authConfigRequest.getIssuerUri())

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

@@ -4,6 +4,7 @@
 import static reactor.core.scheduler.Schedulers.newBoundedElastic;
 
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.collections4.MapUtils;
@@ -76,13 +77,16 @@ public static AuthToken mapToAuthToken(Map<String, Object> map) {
 
     /**
      * Utility method to map from Map to AuthUser
-     * @param map Object
+     *
+     * @param map            Object
+     * @param sourceMappings
      * @return AuthUser
      */
-    public static AuthUser mapToAuthUser(Map<String, Object> map) {
+    public static AuthUser mapToAuthUser(Map<String, Object> map, HashMap<String, String> sourceMappings) {
         return AuthUser.builder()
-                .uid(MapUtils.getString(map, "sub"))
-                .username(MapUtils.getString(map, "email"))
+                .uid(MapUtils.getString(map, MapUtils.getString(sourceMappings, "uid")))
+                .username(MapUtils.getString(map, MapUtils.getString(sourceMappings, "username")))
+                .avatar(MapUtils.getString(map, MapUtils.getString(sourceMappings, "avatar")))
                 .rawUserInfo(map)
                 .build();
     }