Skip to content

Dev -> Main 2.1.6 #496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Nov 13, 2023
Merged

Dev -> Main 2.1.6 #496

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9d5da85
Add handling for access token that enver expire (ex: GITHUB)
aq-ikhwa-tech Nov 10, 2023
03298e5
Merge pull request #491 from lowcoder-org/fix-github-oauth-bug
FalkWolsky Nov 10, 2023
c822a45
Merge branch 'main' into dev
FalkWolsky Nov 10, 2023
8571c48
fix: auth register blank page fix
raheeliftikhar5 Nov 13, 2023
db3ac6d
Merge branch 'dev' into auth-register-fix
FalkWolsky Nov 13, 2023
079d070
feat: added mapReady,zoomLevelChanged,centerPositionChange events for…
raheeliftikhar5 Nov 13, 2023
0a2761a
Merge pull request #494 from raheeliftikhar5/auth-register-fix
FalkWolsky Nov 13, 2023
5524709
feat: added switch to hide/show data on map chart
raheeliftikhar5 Nov 13, 2023
1ecf606
Merge branch 'dev' into echarts-events
FalkWolsky Nov 13, 2023
95d2973
Merge pull request #495 from raheeliftikhar5/echarts-events
FalkWolsky Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions ...ice/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/ConnectionAuthToken.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,22 @@ public boolean isRefreshTokenExpired() {
}

public static ConnectionAuthToken of(AuthToken token) {

Long accessTokenExpiry = 0L;
if(token.getExpireIn() != 0) {
accessTokenExpiry = System.currentTimeMillis() / 1000 + token.getExpireIn() - 60;
}

Long refreshTokenExpiry = 0L;
if(token.getRefreshTokenExpireIn() != 0) {
refreshTokenExpiry = System.currentTimeMillis() / 1000 + token.getRefreshTokenExpireIn() - 60;
}

return ConnectionAuthToken.builder()
.accessToken(token.getAccessToken())
.expireAt(System.currentTimeMillis() / 1000 + token.getExpireIn() - 60)
.expireAt(accessTokenExpiry)
.refreshToken(token.getRefreshToken())
.refreshTokenExpireAt(System.currentTimeMillis() / 1000 + token.getRefreshTokenExpireIn() - 60)
.refreshTokenExpireAt(refreshTokenExpiry)
.source(null)
.build();
}
Expand Down
3 changes: 3 additions & 0 deletions ...-server/src/main/java/org/lowcoder/api/framework/filter/UserSessionPersistenceFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ public Mono<Void> filter(@Nonnull ServerWebExchange exchange, WebFilterChain cha
user.getConnections().forEach(connection -> {
if(!connection.getAuthId().equals(DEFAULT_AUTH_CONFIG.getId())) {
Instant next5Minutes = Instant.now().plusSeconds( 300 );
if(connection.getAuthConnectionAuthToken().getExpireAt() == 0) {
return;
}
boolean isAccessTokenExpiryNear = (connection.getAuthConnectionAuthToken().getExpireAt()*1000) <= next5Minutes.toEpochMilli();
if(isAccessTokenExpiryNear) {
connection.getOrgIds().forEach(orgId -> {
Expand Down