feat(OAuth2): implemet support for OAuth2 (1)

CHANGELOG.md

@@ -6,11 +6,13 @@
 
 - `Binary destination` can now point directly to an executable, used as-is; otherwise it is treated as a base directory
   as before
+- support for OAuth2
 
 ### Removed
 
 - support for enabling or disabling the fallback to data dir. CLI resolution will always fall back on data dir if binary
   destination is not configured.
+- redesigned the Settings page, all the options are now grouped in a couple of sections for easy navigation
 
 ## 0.8.6 - 2026-03-05
 

build.gradle.kts

@@ -1,17 +1,6 @@
-import com.fasterxml.jackson.databind.SerializationFeature
-import com.fasterxml.jackson.module.kotlin.jacksonMapperBuilder
 import com.github.jk1.license.filter.ExcludeTransitiveDependenciesFilter
 import com.github.jk1.license.render.JsonReportRenderer
-import com.jetbrains.plugin.structure.toolbox.ToolboxMeta
-import com.jetbrains.plugin.structure.toolbox.ToolboxPluginDescriptor
-import org.jetbrains.intellij.pluginRepository.PluginRepositoryFactory
-import org.jetbrains.intellij.pluginRepository.model.ProductFamily
-import org.jetbrains.kotlin.com.intellij.openapi.util.SystemInfoRt
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import java.nio.file.Path
-import kotlin.io.path.createDirectories
-import kotlin.io.path.div
-import kotlin.io.path.writeText
 
 plugins {
     alias(libs.plugins.kotlin)
@@ -23,25 +12,14 @@ plugins {
     alias(libs.plugins.changelog)
     alias(libs.plugins.gettext)
     alias(libs.plugins.detekt)
+    id("toolbox-convention")
 }
 
-
 repositories {
     mavenCentral()
     maven("https://packages.jetbrains.team/maven/p/tbx/toolbox-api")
 }
 
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath(libs.marketplace.client)
-        classpath(libs.plugin.structure)
-    }
-}
-
 jvmWrapper {
     unixJvmInstallDir = "jvm"
     winJvmInstallDir = "jvm"
@@ -64,37 +42,23 @@ dependencies {
     implementation(libs.retrofit)
     implementation(libs.retrofit.moshi)
     implementation(libs.bundles.bouncycastle)
+
     testImplementation(kotlin("test"))
     testImplementation(libs.coroutines.test)
     testImplementation(libs.mokk)
     testImplementation(libs.bundles.toolbox.plugin.api)
-    testImplementation(libs.coroutines.test)
 }
 
-val extension = ExtensionJson(
-    id = properties("group"),
-
-    version = properties("version"),
-    meta = ExtensionJsonMeta(
-        name = "Coder",
-        description = "Connects your JetBrains IDE to Coder workspaces",
-        vendor = "coder",
-        url = "https://github.com/coder/coder-jetbrains-toolbox",
-    )
-)
-
-val extensionJsonFile = layout.buildDirectory.file("generated/extension.json")
-val extensionJson by tasks.registering {
-    inputs.property("extension", extension.toString())
-
-    outputs.file(extensionJsonFile)
-    doLast {
-        generateExtensionJson(extension, extensionJsonFile.get().asFile.toPath())
-    }
+toolbox {
+    pluginName.set("Coder")
+    pluginDescription.set("Connects your JetBrains IDE to Coder workspaces")
+    pluginVendor.set("coder")
+    pluginUrl.set("https://github.com/coder/coder-jetbrains-toolbox")
+    apiVersion.set(libs.versions.toolbox.plugin.api)
 }
 
 changelog {
-    version.set(extension.version)
+    version.set(project.version.toString())
     groups.set(emptyList())
     title.set("Coder Toolbox Plugin Changelog")
 }
@@ -132,165 +96,7 @@ tasks.withType<io.gitlab.arturbosch.detekt.Detekt>().configureEach {
     ignoreFailures = false
 }
 
-
-tasks.jar {
-    archiveBaseName.set(extension.id)
-    dependsOn(extensionJson)
-    from(extensionJson.get().outputs)
-}
-
-val copyPlugin by tasks.creating(Sync::class.java) {
-    dependsOn(tasks.jar)
-    dependsOn(tasks.getByName("generateLicenseReport"))
-
-    fromCompileDependencies()
-    into(getPluginInstallDir())
-}
-
-fun CopySpec.fromCompileDependencies() {
-    from(tasks.jar)
-    from(extensionJson.get().outputs.files)
-    from("src/main/resources") {
-        include("dependencies.json")
-    }
-    from("src/main/resources") {
-        include("icon.svg")
-        include("pluginIcon.svg")
-    }
-
-    // Copy dependencies, excluding those provided by Toolbox.
-    from(
-        configurations.compileClasspath.map { configuration ->
-            configuration.files.filterNot { file ->
-                listOf(
-                    "kotlin",
-                    "remote-dev-api",
-                    "core-api",
-                    "ui-api",
-                    "annotations",
-                    "localization-api",
-                    "slf4j-api"
-                ).any { file.name.contains(it) }
-            }
-        },
-    )
-}
-
-/**
- * Useful when doing manual local install.
- */
-val pluginPrettyZip by tasks.creating(Zip::class) {
-    archiveBaseName.set(properties("name"))
-    dependsOn(tasks.jar)
-    dependsOn(tasks.getByName("generateLicenseReport"))
-
-    fromCompileDependencies()
-    into(extension.id) // folder like com.coder.toolbox
-}
-
-val pluginZip by tasks.creating(Zip::class) {
-    dependsOn(tasks.jar)
-    dependsOn(tasks.getByName("generateLicenseReport"))
-
-    fromCompileDependencies()
-    archiveBaseName.set(extension.id)
-}
-
-tasks.register("cleanAll", Delete::class.java) {
-    dependsOn(tasks.clean)
-    delete(getPluginInstallDir())
-    delete()
-}
-
-private fun getPluginInstallDir(): Path {
-    val userHome = System.getProperty("user.home").let { Path.of(it) }
-    val toolboxCachesDir = when {
-        SystemInfoRt.isWindows -> System.getenv("LOCALAPPDATA")?.let { Path.of(it) } ?: (userHome / "AppData" / "Local")
-        // currently this is the location that TBA uses on Linux
-        SystemInfoRt.isLinux -> System.getenv("XDG_DATA_HOME")?.let { Path.of(it) } ?: (userHome / ".local" / "share")
-        SystemInfoRt.isMac -> userHome / "Library" / "Caches"
-        else -> error("Unknown os")
-    } / "JetBrains" / "Toolbox"
-
-    val pluginsDir = when {
-        SystemInfoRt.isWindows ||
-                SystemInfoRt.isLinux ||
-                SystemInfoRt.isMac -> toolboxCachesDir
-
-        else -> error("Unknown os")
-    } / "plugins"
-
-    return pluginsDir / extension.id
-}
-
-val publishPlugin by tasks.registering {
-    dependsOn(pluginZip)
-
-    doLast {
-        val pluginMarketplaceToken: String = if (System.getenv("JETBRAINS_MARKETPLACE_PUBLISH_TOKEN").isNullOrBlank()) {
-            error("Env. variable `JETBRAINS_MARKETPLACE_PUBLISH_TOKEN` does not exist. Please set the env. variable to a token obtained from the marketplace.")
-        } else {
-            System.getenv("JETBRAINS_MARKETPLACE_PUBLISH_TOKEN")
-        }
-
-        println("Plugin Marketplace Token: ${pluginMarketplaceToken.take(5)}*****")
-
-        val instance = PluginRepositoryFactory.create(
-            "https://plugins.jetbrains.com",
-            pluginMarketplaceToken
-        )
-
-        // !!! subsequent updates !!!
-        instance.uploader.uploadUpdateByXmlIdAndFamily(
-            extension.id,  // do not change
-            ProductFamily.TOOLBOX,  // do not change
-            pluginZip.outputs.files.singleFile,  // do not change
-            null,  // do not change. Channels will be available later
-            "Bug fixes and improvements",
-            false
-        )
-    }
-}
-
-fun properties(key: String) = project.findProperty(key).toString()
-
 gettext {
     potFile = project.layout.projectDirectory.file("src/main/resources/localization/defaultMessages.pot")
     keywords = listOf("ptrc:1c,2", "ptrl")
 }
-
-// region will be moved to the gradle plugin late
-data class ExtensionJsonMeta(
-    val name: String,
-    val description: String,
-    val vendor: String,
-    val url: String?,
-)
-
-data class ExtensionJson(
-    val id: String,
-    val version: String,
-    val meta: ExtensionJsonMeta,
-)
-
-fun generateExtensionJson(extensionJson: ExtensionJson, destinationFile: Path) {
-    val descriptor = ToolboxPluginDescriptor(
-        id = extensionJson.id,
-        version = extensionJson.version,
-        apiVersion = libs.versions.toolbox.plugin.api.get(),
-        meta = ToolboxMeta(
-            name = extensionJson.meta.name,
-            description = extensionJson.meta.description,
-            vendor = extensionJson.meta.vendor,
-            url = extensionJson.meta.url,
-        )
-    )
-    destinationFile.parent.createDirectories()
-    destinationFile.writeText(
-        jacksonMapperBuilder()
-            .enable(SerializationFeature.INDENT_OUTPUT)
-            .build()
-            .writeValueAsString(descriptor)
-    )
-}
-// endregion

buildSrc/build.gradle.kts

@@ -0,0 +1,14 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    mavenCentral()
+    maven("https://packages.jetbrains.team/maven/p/tbx/toolbox-api")
+}
+
+dependencies {
+    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.18.2")
+    implementation("org.jetbrains.intellij.plugins:structure-toolbox:3.321")
+    implementation("org.jetbrains.intellij:plugin-repository-rest-client:2.0.50")
+}

buildSrc/src/main/kotlin/CleanAllTask.kt

@@ -0,0 +1,13 @@
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Delete
+import org.gradle.api.tasks.Input
+
+abstract class CleanAllTask : Delete() {
+
+    @get:Input
+    abstract val extensionId: Property<String>
+
+    init {
+        delete(extensionId.map { getPluginInstallDir(it).toFile() })
+    }
+}

buildSrc/src/main/kotlin/ExtensionJson.kt

@@ -0,0 +1,41 @@
+import com.fasterxml.jackson.databind.SerializationFeature
+import com.fasterxml.jackson.module.kotlin.jacksonMapperBuilder
+import com.jetbrains.plugin.structure.toolbox.ToolboxMeta
+import com.jetbrains.plugin.structure.toolbox.ToolboxPluginDescriptor
+import java.nio.file.Path
+import kotlin.io.path.createDirectories
+import kotlin.io.path.writeText
+
+data class ExtensionJsonMeta(
+    val name: String,
+    val description: String,
+    val vendor: String,
+    val url: String?,
+)
+
+data class ExtensionJson(
+    val id: String,
+    val version: String,
+    val meta: ExtensionJsonMeta,
+)
+
+fun generateExtensionJson(extensionJson: ExtensionJson, apiVersion: String, destinationFile: Path) {
+    val descriptor = ToolboxPluginDescriptor(
+        id = extensionJson.id,
+        version = extensionJson.version,
+        apiVersion = apiVersion,
+        meta = ToolboxMeta(
+            name = extensionJson.meta.name,
+            description = extensionJson.meta.description,
+            vendor = extensionJson.meta.vendor,
+            url = extensionJson.meta.url,
+        )
+    )
+    destinationFile.parent.createDirectories()
+    destinationFile.writeText(
+        jacksonMapperBuilder()
+            .enable(SerializationFeature.INDENT_OUTPUT)
+            .build()
+            .writeValueAsString(descriptor)
+    )
+}