From 818cb5d3a01d63c3c6fb6c9fce5400b768c9df0f Mon Sep 17 00:00:00 2001 From: Abdul Qadir Date: Wed, 3 Jan 2024 20:06:34 +0500 Subject: [PATCH] Fix auth provider attributes matching to lc attributes --- .../authentication/request/oauth2/request/GithubRequest.java | 3 ++- .../authentication/request/oauth2/request/GoogleRequest.java | 2 +- .../api/authentication/request/oauth2/request/OryRequest.java | 2 +- .../src/main/resources/application-lowcoder.yml | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) 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 index 6d5217678..135c9c383 100644 --- 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 @@ -91,9 +91,10 @@ protected Mono 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(); 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 index fa1e0be5d..de95fa41f 100644 --- 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 @@ -110,7 +110,7 @@ protected Mono 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(); 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 index 72e634a24..4c2ce21a8 100644 --- 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 @@ -113,7 +113,7 @@ protected Mono 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(); diff --git a/server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml b/server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml index d3c248caa..75ae0dba9 100644 --- a/server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml +++ b/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 \ No newline at end of file + workspace-creation: true \ No newline at end of file