Skip to content

Commit e0383d8

Browse files
Thomasludomikula
Thomas
authored andcommitted
#763 Google relogin issue fix
1 parent 0201819 commit e0383d8

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ protected Mono<AuthToken> refreshAuthToken(String refreshToken) {
7676

7777
@Override
7878
protected Mono<AuthUser> getAuthUser(AuthToken authToken) {
79+
if(!config.getUserInfoIntrospection()) return Mono.just(AuthUser.builder().build());
7980
return WebClientBuildHelper.builder()
8081
.systemProxy()
8182
.timeoutMs(HTTP_TIMEOUT)

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,11 @@ public void updateConnection(AuthUser authUser, User user) {
224224
Optional.ofNullable(authUser.getAuthToken()).map(ConnectionAuthToken::of).orElse(null));
225225
oldConnection.setRawUserInfo(authUser.getRawUserInfo());
226226

227+
//if auth by google, set refresh token
228+
if (StringUtils.isEmpty(authUser.getAuthToken().getRefreshToken()) && StringUtils.isNotEmpty(oldConnection.getAuthConnectionAuthToken().getRefreshToken())) {
229+
authUser.getAuthToken().setRefreshToken(oldConnection.getAuthConnectionAuthToken().getRefreshToken());
230+
}
231+
227232
user.setActiveAuthId(oldConnection.getAuthId());
228233
}
229234

0 commit comments

Comments
 (0)