Merge branch 'OP-118-reconnect-to-blockchain' into 'sprint'

fix

See merge request open-platform/api!145

Author: evgeny-krylov

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

@@ -23,7 +23,7 @@ class AuthenticationSuccessHandler(
         val principal = authentication.principal as OidcUser
         val persistUser = userService.findByGoogleId(principal.subject) ?: userService.save(User(principal.subject))
 
-        val key = persistUser.openKeys.firstOrNull { it.enabled && (it.expiredDate == null || Date().before(it.expiredDate)) }
+        val key = persistUser.openKeys.firstOrNull { it.enabled && (it.expiredDate == null || it.expiredDate.after(Date())) }
                 ?: keyService.generate(persistUser)
         CookieUtils.add(response, properties.cookieName!!, key.value)
 

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

@@ -9,6 +9,10 @@ class OpenKeyDto(
         val expiredDate: Date?
 ) {
 
-    constructor(openKey: OpenKey) : this(openKey.value, openKey.enabled, openKey.expiredDate)
+    constructor(openKey: OpenKey) : this(
+            openKey.value,
+            openKey.enabled && (openKey.expiredDate == null || openKey.expiredDate.after(Date())),
+            openKey.expiredDate
+    )
 
 }

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

@@ -13,7 +13,7 @@ data class UserDto(
     constructor(user: User) : this(
             user.id,
             user.credits,
-            user.openKeys.filter { it.enabled && (it.expiredDate == null || Date().before(it.expiredDate)) }
+            user.openKeys.filter { it.enabled && (it.expiredDate == null || it.expiredDate.after(Date())) }
                     .map { OpenKeyDto(it) },
             user.roles.map { RoleDto(it) }
     )

src/test/kotlin/io/openfuture/api/controller/api/OpenKeyApiControllerTests.kt

@@ -36,7 +36,7 @@ class OpenKeyApiControllerTests : ControllerTests() {
                 .andExpect(content().json("""
                     {
                       "value": ${newOpenKey.value},
-                      "enabled": ${newOpenKey.enabled},
+                      "enabled": false,
                       "expiredDate": ${objectMapper.writeValueAsString(newOpenKey.expiredDate)}
                     }
                     """.trimIndent(), true))