Skip to content

Commit d6b3e87

Browse files
committed
fix
1 parent 36b2d44 commit d6b3e87

3 files changed

Lines changed: 7 additions & 3 deletions

File tree

src/main/kotlin/io/openfuture/api/config/handler/AuthenticationSuccessHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class AuthenticationSuccessHandler(
2323
val principal = authentication.principal as OidcUser
2424
val persistUser = userService.findByGoogleId(principal.subject) ?: userService.save(User(principal.subject))
2525

26-
val key = persistUser.openKeys.firstOrNull { it.enabled && (it.expiredDate == null || Date().before(it.expiredDate)) }
26+
val key = persistUser.openKeys.firstOrNull { it.enabled && (it.expiredDate == null || it.expiredDate.after(Date())) }
2727
?: keyService.generate(persistUser)
2828
CookieUtils.add(response, properties.cookieName!!, key.value)
2929

src/main/kotlin/io/openfuture/api/domain/auth/OpenKeyDto.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ class OpenKeyDto(
99
val expiredDate: Date?
1010
) {
1111

12-
constructor(openKey: OpenKey) : this(openKey.value, openKey.enabled, openKey.expiredDate)
12+
constructor(openKey: OpenKey) : this(
13+
openKey.value,
14+
openKey.enabled && (openKey.expiredDate == null || openKey.expiredDate.after(Date())),
15+
openKey.expiredDate
16+
)
1317

1418
}

src/main/kotlin/io/openfuture/api/domain/auth/UserDto.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ data class UserDto(
1313
constructor(user: User) : this(
1414
user.id,
1515
user.credits,
16-
user.openKeys.filter { it.enabled && (it.expiredDate == null || Date().before(it.expiredDate)) }
16+
user.openKeys.filter { it.enabled && (it.expiredDate == null || it.expiredDate.after(Date())) }
1717
.map { OpenKeyDto(it) },
1818
user.roles.map { RoleDto(it) }
1919
)

0 commit comments

Comments
 (0)