Use tokenLifetimeSeconds property for Xirsys turn requests

FAForever · Nov 21, 2023 · 28f8d4d · 28f8d4d
1 parent 8b7bc70
commit 28f8d4d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/kotlin/com/faforever/icebreaker/service/xirsys/XirsysResponse.kt b/src/main/kotlin/com/faforever/icebreaker/service/xirsys/XirsysResponse.kt
@@ -19,7 +19,7 @@ sealed interface XirsysResponse<T : Any> {
 @JsonInclude(JsonInclude.Include.NON_NULL)
 data class TurnRequest(
     @JsonFormat(shape = JsonFormat.Shape.STRING)
-    val expire: Int = 30,
+    val expire: Long = 30,
 ) {
     val format: String = "urls"
 }

diff --git a/src/main/kotlin/com/faforever/icebreaker/service/xirsys/XirsysSessionHandler.kt b/src/main/kotlin/com/faforever/icebreaker/service/xirsys/XirsysSessionHandler.kt
@@ -1,5 +1,6 @@
 package com.faforever.icebreaker.service.xirsys
 
+import com.faforever.icebreaker.config.FafProperties
 import com.faforever.icebreaker.service.Server
 import com.faforever.icebreaker.service.Session
 import com.faforever.icebreaker.service.SessionHandler
@@ -12,6 +13,7 @@ private val LOG: Logger = LoggerFactory.getLogger(XirsysSessionHandler::class.ja
 @Singleton
 class XirsysSessionHandler(
     xirsysProperties: XirsysProperties,
+    private val fafProperties: FafProperties,
     private val xirsysApiAdapter: XirsysApiAdapter,
 ) : SessionHandler {
     companion object {
@@ -42,7 +44,7 @@ class XirsysSessionHandler(
     override fun getIceServersSession(sessionId: String): List<Session.Server> =
         xirsysApiAdapter.requestIceServers(
             channelName = sessionId,
-            turnRequest = TurnRequest(),
+            turnRequest = TurnRequest(expire = fafProperties.tokenLifetimeSeconds()),
         ).iceServers.let {
             listOf(
                 Session.Server(