Fix: support for the new Coder auth cookie

fioan89 · fioan89 · commit 7477fcfd988f · 2022-11-22T01:02:22.000+02:00
- cookie was renamed from seesion_token to coder_session_token - resolves #86
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,13 +3,23 @@
 # coder-gateway Changelog
 
 ## [Unreleased]
+### Added
+
+- upgraded API models
+
+### Fixed
+
+- support for the new Coder auth cookies
 
 ## [2.1.1]
-### Added
-- support for remembering last opened Coder session
 
-### Changed
-- minimum supported Gateway build is now 222.3739.54
+### Added
+
+- support for remembering last opened Coder session
+
+### Changed
+
+- minimum supported Gateway build is now 222.3739.54
 - some dialog titles
 
 ## [2.1.0]
diff --git a/src/main/kotlin/com/coder/gateway/models/WorkspaceAgentStatus.kt b/src/main/kotlin/com/coder/gateway/models/WorkspaceAgentStatus.kt
@@ -2,7 +2,7 @@ package com.coder.gateway.models
 
 import com.coder.gateway.sdk.v2.models.ProvisionerJobStatus
 import com.coder.gateway.sdk.v2.models.Workspace
-import com.coder.gateway.sdk.v2.models.WorkspaceBuildTransition
+import com.coder.gateway.sdk.v2.models.WorkspaceTransition
 
 enum class WorkspaceAgentStatus(val label: String) {
     QUEUED("◍ Queued"), STARTING("⦿ Starting"), STOPPING("◍ Stopping"), DELETING("⦸ Deleting"),
@@ -12,16 +12,16 @@ enum class WorkspaceAgentStatus(val label: String) {
     companion object {
         fun from(workspace: Workspace) = when (workspace.latestBuild.job.status) {
             ProvisionerJobStatus.PENDING -> QUEUED
-            ProvisionerJobStatus.RUNNING -> when (workspace.latestBuild.workspaceTransition) {
-                WorkspaceBuildTransition.START -> STARTING
-                WorkspaceBuildTransition.STOP -> STOPPING
-                WorkspaceBuildTransition.DELETE -> DELETING
+            ProvisionerJobStatus.RUNNING -> when (workspace.latestBuild.transition) {
+                WorkspaceTransition.START -> STARTING
+                WorkspaceTransition.STOP -> STOPPING
+                WorkspaceTransition.DELETE -> DELETING
             }
 
-            ProvisionerJobStatus.SUCCEEDED -> when (workspace.latestBuild.workspaceTransition) {
-                WorkspaceBuildTransition.START -> RUNNING
-                WorkspaceBuildTransition.STOP -> STOPPED
-                WorkspaceBuildTransition.DELETE -> DELETED
+            ProvisionerJobStatus.SUCCEEDED -> when (workspace.latestBuild.transition) {
+                WorkspaceTransition.START -> RUNNING
+                WorkspaceTransition.STOP -> STOPPED
+                WorkspaceTransition.DELETE -> DELETED
             }
 
             ProvisionerJobStatus.CANCELING -> CANCELING
diff --git a/src/main/kotlin/com/coder/gateway/sdk/CoderRestClientService.kt b/src/main/kotlin/com/coder/gateway/sdk/CoderRestClientService.kt
@@ -46,7 +46,7 @@ class CoderRestClientService {
         val cookieJar = JavaNetCookieJar(CookieManager()).apply {
             saveFromResponse(
                 cookieUrl,
-                listOf(Cookie.parse(cookieUrl, "session_token=$token")!!)
+                listOf(Cookie.parse(cookieUrl, "coder_session_token=$token")!!)
             )
         }
         val gson: Gson = GsonBuilder()
@@ -55,7 +55,7 @@ class CoderRestClientService {
             .create()
 
         val interceptor = HttpLoggingInterceptor()
-        interceptor.setLevel(HttpLoggingInterceptor.Level.BASIC)
+        interceptor.setLevel(HttpLoggingInterceptor.Level.BODY)
         retroRestClient = Retrofit.Builder()
             .baseUrl(url.toString())
             .client(
diff --git a/src/main/kotlin/com/coder/gateway/sdk/v2/models/ProvisionerJob.kt b/src/main/kotlin/com/coder/gateway/sdk/v2/models/ProvisionerJob.kt
@@ -9,9 +9,12 @@ data class ProvisionerJob(
     @SerializedName("created_at") val createdAt: Instant,
     @SerializedName("started_at") val startedAt: Instant,
     @SerializedName("completed_at") val completedAt: Instant,
+    @SerializedName("canceled_at") val canceledAt: Instant,
     @SerializedName("error") val error: String,
     @SerializedName("status") val status: ProvisionerJobStatus,
     @SerializedName("worker_id") val workerID: UUID,
+    @SerializedName("file_id") val fileID: UUID,
+    @SerializedName("tags") val tags: Map<String, String>,
 )
 
 enum class ProvisionerJobStatus {
diff --git a/src/main/kotlin/com/coder/gateway/sdk/v2/models/WorkspaceResourceMetadata.kt b/src/main/kotlin/com/coder/gateway/sdk/v2/models/WorkspaceResourceMetadata.kt
@@ -0,0 +1,9 @@
+package com.coder.gateway.sdk.v2.models
+
+import com.google.gson.annotations.SerializedName
+
+data class WorkspaceResourceMetadata(
+    @SerializedName("key") val key: String,
+    @SerializedName("value") val value: String,
+    @SerializedName("sensitive") val sensitive: Boolean
+)
