Commita6d9332

committed

chore: rename misleading method

The REST client doesn't do any authentication but ratherretrieves the user and build info - the user is alreadyauthenticated via the API token. So `authenticate` is misleading here.

1 parent5dfbdca commita6d9332Copy full SHA for a6d9332

File tree

5 files changed

+12

-8

lines changed

src/main/kotlin/com/coder/toolbox
- CoderRemoteProvider.kt
- cli
  - CoderCLIManager.kt
- sdk
  - CoderRestClient.kt
- util
  - CoderProtocolHandler.kt
- views
  - ConnectStep.kt

5 files changed

+12

-8

lines changed

`‎src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,7 @@ class CoderRemoteProvider(`
`346`	`346`	`// Show sign in page if we have not configured the client yet.`
`347`	`347`	`if (client==null) {`
`348`	`348`	`val errorBuffer= mutableListOf<Throwable>()`
`349`		`-// When coming back to the application,authenticate immediately.`
	`349`	`+// When coming back to the application,initializeSession immediately.`
`350`	`350`	`val autologin= shouldDoAutoLogin()`
`351`	`351`	`context.secrets.lastToken.let { lastToken->`
`352`	`352`	`context.secrets.lastDeploymentURL.let { lastDeploymentURL->`

`‎src/main/kotlin/com/coder/toolbox/cli/CoderCLIManager.kt`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ class CoderCLIManager(`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`/**`
`206`		`- * Use the provided token toauthenticate the CLI.`
	`206`	`+ * Use the provided token toinitializeSession the CLI.`
`207`	`207`	`*/`
`208`	`208`	`funlogin(token:String):String {`
`209`	`209`	`logger.info("Storing CLI credentials in$coderConfigPath")`

`‎src/main/kotlin/com/coder/toolbox/sdk/CoderRestClient.kt`

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -131,12 +131,11 @@ open class CoderRestClient(`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`/**`
`134`		`- * Authenticate and load information about the current user and the build`
`135`		`- * version.`
	`134`	`+ * Load information about the current user and the build version.`
`136`	`135`	`*`
`137`	`136`	`* @throws [APIResponseException].`
`138`	`137`	`*/`
`139`		`-suspendfunauthenticate():User {`
	`138`	`+suspendfuninitializeSession():User {`
`140`	`139`	`me= me()`
`141`	`140`	`buildVersion= buildInfo().version`
`142`	`141`	`return me`
`@@ -149,7 +148,12 @@ open class CoderRestClient(`
`149`	`148`	`suspendfunme():User {`
`150`	`149`	`val userResponse= retroRestClient.me()`
`151`	`150`	`if (!userResponse.isSuccessful) {`
`152`		`-throwAPIResponseException("authenticate", url, userResponse.code(), userResponse.parseErrorBody(moshi))`
	`151`	`+throwAPIResponseException(`
	`152`	`+"initializeSession",`
	`153`	`+ url,`
	`154`	`+ userResponse.code(),`
	`155`	`+ userResponse.parseErrorBody(moshi)`
	`156`	`+ )`
`153`	`157`	`}`
`154`	`158`
`155`	`159`	`return userResponse.body()!!`

`‎src/main/kotlin/com/coder/toolbox/util/CoderProtocolHandler.kt`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ open class CoderProtocolHandler(`
`143`	`143`	`if (settings.requireTokenAuth) tokenelsenull,`
`144`	`144`	`PluginManager.pluginInfo.version`
`145`	`145`	`)`
`146`		`- client.authenticate()`
	`146`	`+ client.initializeSession()`
`147`	`147`	`return client`
`148`	`148`	`}`
`149`	`149`

`‎src/main/kotlin/com/coder/toolbox/views/ConnectStep.kt`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ class ConnectStep(`
`86`	`86`	`)`
`87`	`87`	`// allows interleaving with the back/cancel action`
`88`	`88`	`yield()`
`89`		`- client.authenticate()`
	`89`	`+ client.initializeSession()`
`90`	`90`	`statusField.textState.update { (context.i18n.ptrl("Checking Coder binary...")) }`
`91`	`91`	`val cli= ensureCLI(context, client.url, client.buildVersion)`
`92`	`92`	`// We only need to log in if we are using token-based auth.`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commita6d9332

File tree

5 files changed

5 files changed

`‎src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt`

`‎src/main/kotlin/com/coder/toolbox/cli/CoderCLIManager.kt`

`‎src/main/kotlin/com/coder/toolbox/sdk/CoderRestClient.kt`

`‎src/main/kotlin/com/coder/toolbox/util/CoderProtocolHandler.kt`

`‎src/main/kotlin/com/coder/toolbox/views/ConnectStep.kt`

0 commit comments