Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
335061a
build: rename project to coder-toolbox
fioan89 Feb 18, 2025
4fe83ce
chore: update license
fioan89 Feb 18, 2025
7151981
import code from coder/jetbrains-coder
fioan89 Feb 18, 2025
36fba63
fix: remove Gateway string from title
fioan89 Feb 18, 2025
e39cd05
impl: initial support for opening urls
fioan89 Feb 19, 2025
94a6ff3
fix: use new URL opener
fioan89 Feb 19, 2025
915d347
chore: replaces references to Gateway with Toolbox
fioan89 Feb 19, 2025
5973b0d
impl: go to main page after signing in
fioan89 Feb 20, 2025
b031c65
fix: connection status rendering
fioan89 Feb 20, 2025
8faed95
fix: url glitch on new environment page
fioan89 Feb 20, 2025
90d199c
impl: read plugin version from the extension.json
fioan89 Feb 21, 2025
38e3e2b
fix: user agent did not have a proper version
fioan89 Feb 21, 2025
33b4a60
Merge branch 'main' into fix-connection-issues
fioan89 Feb 24, 2025
383ee49
build: upgrade plugin api dependencies to 0.7.2.6.0.38311
fioan89 Feb 24, 2025
7a6b512
build: upgrade kotlin dependencies
fioan89 Feb 24, 2025
aa24f03
fix: compiler errors (1)
fioan89 Feb 24, 2025
3023aea
fix: compiler errors (2)
fioan89 Feb 24, 2025
ce35939
fix: compiler errors (3)
fioan89 Feb 25, 2025
500d397
fix: message logging
fioan89 Feb 25, 2025
2d69d5e
Merge branch 'main' into support-for-toolbox-2_6_0_38311
fioan89 Feb 26, 2025
b025c64
impl: initial stubs for removing a workspace
fioan89 Feb 26, 2025
9f059a4
impl: support for removing the workspace
fioan89 Feb 27, 2025
3e7edda
Merge branch 'main' into support-for-deleting-workspaces
fioan89 Feb 27, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: user agent did not have a proper version
- use plugin's version
  • Loading branch information
fioan89 committed Feb 21, 2025
commit 38e3e2b47565a1c5b7c0aaca47ced9f30369cffa
11 changes: 9 additions & 2 deletions src/main/kotlin/com/coder/toolbox/util/LinkHandler.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.coder.toolbox.util

import com.coder.toolbox.cli.ensureCLI
import com.coder.toolbox.models.WorkspaceAndAgentStatus
import com.coder.toolbox.plugin.PluginManager
import com.coder.toolbox.sdk.CoderRestClient
import com.coder.toolbox.sdk.ex.APIResponseException
import com.coder.toolbox.sdk.v2.models.Workspace
Expand Down Expand Up @@ -146,8 +147,14 @@ open class LinkHandler(
}
// The http client Toolbox gives us is already set up with the
// proxy config, so we do net need to explicitly add it.
// TODO: How to get the plugin version?
val client = CoderRestClient(deploymentURL.toURL(), token?.first, settings, proxyValues = null, "production", httpClient)
val client = CoderRestClient(
deploymentURL.toURL(),
token?.first,
settings,
proxyValues = null,
PluginManager.pluginInfo.version,
httpClient
)
return try {
client.authenticate()
client
Expand Down
11 changes: 9 additions & 2 deletions src/main/kotlin/com/coder/toolbox/views/ConnectPage.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.coder.toolbox.views

import com.coder.toolbox.cli.CoderCLIManager
import com.coder.toolbox.cli.ensureCLI
import com.coder.toolbox.plugin.PluginManager
import com.coder.toolbox.sdk.CoderRestClient
import com.coder.toolbox.settings.CoderSettings
import com.coder.toolbox.util.humanizeConnectionError
Expand Down Expand Up @@ -83,8 +84,14 @@ class ConnectPage(
try {
// The http client Toolbox gives us is already set up with the
// proxy config, so we do net need to explicitly add it.
// TODO: How to get the plugin version?
val client = CoderRestClient(url, token, settings, proxyValues = null, "production", httpClient)
val client = CoderRestClient(
url,
token,
settings,
proxyValues = null,
PluginManager.pluginInfo.version,
httpClient
)
client.authenticate()
updateStatus("Checking Coder binary...", error = null)
val cli = ensureCLI(client.url, client.buildVersion, settings) { status ->
Expand Down