Merge pull request #614 from lowcoder-org/fix-oauth-provider-attributes-mapping

Fix OAuth Providers Attributes Mapping With LC Attributes

Author: FalkWolsky

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

@@ -91,9 +91,10 @@ protected Mono<AuthUser> getAuthUser(AuthToken authToken) {
                     if (map.containsKey("error")) {
                         return Mono.error(new AuthException(JsonUtils.toJson(map)));
                     }
+                    String username = MapUtils.getString(map, "email");
                     AuthUser authUser = AuthUser.builder()
                             .uid(map.get("id").toString())
-                            .username(MapUtils.getString(map, "login"))
+                            .username(username == null ? MapUtils.getString(map, "login") : username)
                             .avatar(MapUtils.getString(map, "avatar_url"))
                             .rawUserInfo(map)
                             .build();

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

@@ -110,7 +110,7 @@ protected Mono<AuthUser> getAuthUser(AuthToken authToken) {
                     }
                     AuthUser authUser = AuthUser.builder()
                             .uid(MapUtils.getString(map, "sub"))
-                            .username(MapUtils.getString(map, "name"))
+                            .username(MapUtils.getString(map, "email"))
                             .avatar(MapUtils.getString(map, "picture"))
                             .rawUserInfo(map)
                             .build();

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

@@ -113,7 +113,7 @@ protected Mono<AuthUser> getAuthUser(AuthToken authToken) {
                     }
                     AuthUser authUser = AuthUser.builder()
                             .uid(MapUtils.getString(map, "sub"))
-                            .username(MapUtils.getString(map, "name"))
+                            .username(MapUtils.getString(map, "email"))
                             .avatar(MapUtils.getString(map, "picture"))
                             .rawUserInfo(map)
                             .build();

server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml

@@ -62,4 +62,4 @@ auth:
   email:
     enable: true
     enable-register: true
-  workspace-creation: false
+  workspace-creation: true