Commit03298e5

authored

Merge pull request#491 from lowcoder-org/fix-github-oauth-bug

Add Handling For Access Tokens That Never Expire (ex: GITHUB)

2 parents05c0cc8 +9d5da85 commit03298e5Copy full SHA for 03298e5

File tree

+16

-2

lines changed

server/api-service
- lowcoder-domain/src/main/java/org/lowcoder/domain/user/model
  - ConnectionAuthToken.java
- lowcoder-server/src/main/java/org/lowcoder/api/framework/filter
  - UserSessionPersistenceFilter.java

+16

-2

lines changed

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,22 @@ public boolean isRefreshTokenExpired() {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`publicstaticConnectionAuthTokenof(AuthTokentoken) {`
	`33`	`+`
	`34`	`+LongaccessTokenExpiry =0L;`
	`35`	`+if(token.getExpireIn() !=0) {`
	`36`	`+accessTokenExpiry =System.currentTimeMillis() /1000 +token.getExpireIn() -60;`
	`37`	`+ }`
	`38`	`+`
	`39`	`+LongrefreshTokenExpiry =0L;`
	`40`	`+if(token.getRefreshTokenExpireIn() !=0) {`
	`41`	`+refreshTokenExpiry =System.currentTimeMillis() /1000 +token.getRefreshTokenExpireIn() -60;`
	`42`	`+ }`
	`43`	`+`
`33`	`44`	`returnConnectionAuthToken.builder()`
`34`	`45`	`.accessToken(token.getAccessToken())`
`35`		`- .expireAt(System.currentTimeMillis() /1000 +token.getExpireIn() -60)`
	`46`	`+ .expireAt(accessTokenExpiry)`
`36`	`47`	`.refreshToken(token.getRefreshToken())`
`37`		`- .refreshTokenExpireAt(System.currentTimeMillis() /1000 +token.getRefreshTokenExpireIn() -60)`
	`48`	`+ .refreshTokenExpireAt(refreshTokenExpiry)`
`38`	`49`	`.source(null)`
`39`	`50`	`.build();`
`40`	`51`	`}`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,9 @@ public Mono<Void> filter(@Nonnull ServerWebExchange exchange, WebFilterChain cha`
`59`	`59`	`user.getConnections().forEach(connection -> {`
`60`	`60`	`if(!connection.getAuthId().equals(DEFAULT_AUTH_CONFIG.getId())) {`
`61`	`61`	`Instantnext5Minutes =Instant.now().plusSeconds(300 );`
	`62`	`+if(connection.getAuthConnectionAuthToken().getExpireAt() ==0) {`
	`63`	`+return;`
	`64`	`+ }`
`62`	`65`	`booleanisAccessTokenExpiryNear = (connection.getAuthConnectionAuthToken().getExpireAt()*1000) <=next5Minutes.toEpochMilli();`
`63`	`66`	`if(isAccessTokenExpiryNear) {`
`64`	`67`	`connection.getOrgIds().forEach(orgId -> {`

Comments

(0)