Support creds.json for atcoder

icpc · Sep 8, 2023 · 4401865 · 4401865
1 parent 5a3a2fe
commit 4401865
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/atcoder/AtcoderDataSource.kt b/src/cds/src/main/kotlin/org/icpclive/cds/atcoder/AtcoderDataSource.kt
@@ -43,10 +43,10 @@ internal class ContestData(
     val StandingsData: List<AtcoderTeam>
 )
 
-internal class AtcoderDataSource(val settings: AtcoderSettings) : FullReloadContestDataSource(5.seconds) {
+internal class AtcoderDataSource(val settings: AtcoderSettings, creds: Map<String, String>) : FullReloadContestDataSource(5.seconds) {
     val teamIds = Enumerator<String>()
     val problemIds = Enumerator<String>()
-    private val loader = jsonLoader<ContestData>(settings.network, ClientAuth.CookieAuth("REVEL_SESSION", settings.sessionCookie)) { "https://atcoder.jp/contests/${settings.contestId}/standings/json" }
+    private val loader = jsonLoader<ContestData>(settings.network, ClientAuth.CookieAuth("REVEL_SESSION", settings.sessionCookie.get(creds))) { "https://atcoder.jp/contests/${settings.contestId}/standings/json" }
 
     var submissionId: Int = 1
     val runs = mutableMapOf<Pair<Int, Int>, List<RunInfo>>()

diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/settings/CDSSettings.kt b/src/cds/src/main/kotlin/org/icpclive/cds/settings/CDSSettings.kt
@@ -230,15 +230,15 @@ class CodeDrillsSettings(
 @Serializable
 class AtcoderSettings(
     val contestId: String,
-    val sessionCookie: String,
+    val sessionCookie: Credential,
     @Serializable(with = HumanTimeSerializer::class)
     val startTime: Instant,
     @Serializable(with = DurationInSecondsSerializer::class)
     @SerialName("contestLengthSeconds") val contestLength: Duration,
     override val emulation: EmulationSettings? = null,
     override val network: NetworkSettings? = null
 ) : CDSSettings() {
-    override fun toDataSource(creds: Map<String, String>) = AtcoderDataSource(this)
+    override fun toDataSource(creds: Map<String, String>) = AtcoderDataSource(this, creds)
 }
 
 @SerialName("cms")