Commite0383d8

Thomas

authored and

committed

lowcoder-org#763 Google relogin issue fix

1 parent0201819 commite0383d8Copy full SHA for e0383d8

File tree

-0

lines changed

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

-0

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ protected Mono<AuthToken> refreshAuthToken(String refreshToken) {`
`76`	`76`
`77`	`77`	`@Override`
`78`	`78`	`protectedMono<AuthUser>getAuthUser(AuthTokenauthToken) {`
	`79`	`+if(!config.getUserInfoIntrospection())returnMono.just(AuthUser.builder().build());`
`79`	`80`	`returnWebClientBuildHelper.builder()`
`80`	`81`	`.systemProxy()`
`81`	`82`	`.timeoutMs(HTTP_TIMEOUT)`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -224,6 +224,11 @@ public void updateConnection(AuthUser authUser, User user) {`
`224`	`224`	`Optional.ofNullable(authUser.getAuthToken()).map(ConnectionAuthToken::of).orElse(null));`
`225`	`225`	`oldConnection.setRawUserInfo(authUser.getRawUserInfo());`
`226`	`226`
	`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`	`+`
`227`	`232`	`user.setActiveAuthId(oldConnection.getAuthId());`
`228`	`233`	`}`
`229`	`234`

Comments

(0)