Commit f55fb7f

Thomasrludomikula

Thomasr

authored and

committed

#1088 Fix issue that refresh token was lost

1 parent 2cd0b06 commit f55fb7fCopy full SHA for f55fb7f

File tree

-10

lines changed

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

-10

lines changed

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,7 @@ public Mono<AuthUser> auth(AuthRequestContext authRequestContext) {`
`39`	`39`
`40`	`40`	`public Mono<AuthUser> refresh(String refreshToken) {`
`41`	`41`	`return refreshAuthToken(refreshToken)`
`42`		`- .flatMap(authToken -> getAuthUser(authToken).doOnNext(authUser -> {`
`43`		`- assert authUser.getAuthToken() != null;`
`44`		`- authUser.getAuthToken().setAccessToken(authToken.getAccessToken());`
`45`		`- authUser.getAuthToken().setExpireIn(authToken.getExpireIn());`
`46`		`- }))`
	`42`	`+ .flatMap(authToken -> getAuthUser(authToken).doOnNext(authUser -> authUser.setAuthToken(authToken)))`
`47`	`43`	`.onErrorResume(throwable -> {`
`48`	`44`	`log.error("failed to refresh token: ", throwable);`
`49`	`45`	`return deferredError(FAIL_TO_GET_OIDC_INFO, "FAIL_TO_GET_OIDC_INFO", throwable.getMessage());`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -206,16 +206,16 @@ public void updateConnection(AuthUser authUser, User user) {`
`206`	`206`	`// clean old data`
`207`	`207`	`oldConnection.setAuthId(authUser.getAuthContext().getAuthConfig().getId());`
`208`	`208`
`209`		`- // Save the auth token which may be used in the future datasource or query.`
`210`		`- oldConnection.setAuthConnectionAuthToken(`
`211`		`- Optional.ofNullable(authUser.getAuthToken()).map(ConnectionAuthToken::of).orElse(null));`
`212`		`- oldConnection.setRawUserInfo(authUser.getRawUserInfo());`
`213`		`-`
`214`	`209`	`//if auth by google, set refresh token`
`215`	`210`	`if (authUser.getAuthToken()!=null && oldConnection.getAuthConnectionAuthToken()!=null && StringUtils.isEmpty(authUser.getAuthToken().getRefreshToken()) && StringUtils.isNotEmpty(oldConnection.getAuthConnectionAuthToken().getRefreshToken())) {`
`216`	`211`	`authUser.getAuthToken().setRefreshToken(oldConnection.getAuthConnectionAuthToken().getRefreshToken());`
`217`	`212`	`}`
`218`	`213`
	`214`	`+ // Save the auth token which may be used in the future datasource or query.`
	`215`	`+ oldConnection.setAuthConnectionAuthToken(`
	`216`	`+ Optional.ofNullable(authUser.getAuthToken()).map(ConnectionAuthToken::of).orElse(null));`
	`217`	`+ oldConnection.setRawUserInfo(authUser.getRawUserInfo());`
	`218`	`+`
`219`	`219`	`user.setActiveAuthId(oldConnection.getAuthId());`
`220`	`220`	`}`
`221`	`221`

Comments

(0)