fix(auth): use ServerEndpoint in relogin() to fix HTTPS/proxy 404 (#812)
relogin() hardcoded http://host:port, dropping scheme + path prefix. Use endpointForBuild().resolve(...) like connectBasicAuth(). Fixes #802. Co-authored-by: M57 <hy4ri@users.noreply.github.com>
This commit is contained in:
@@ -2887,9 +2887,7 @@ class ChatViewModel(
|
|||||||
onResult: (Boolean, String?) -> Unit,
|
onResult: (Boolean, String?) -> Unit,
|
||||||
) {
|
) {
|
||||||
viewModelScope.launch(Dispatchers.IO) {
|
viewModelScope.launch(Dispatchers.IO) {
|
||||||
val host = AuthManager.getHost()
|
val endpoint = AuthManager.endpointForBuild()
|
||||||
val port = AuthManager.getPort()
|
|
||||||
val baseUrl = "http://$host:$port"
|
|
||||||
val jsonMediaType = "application/json; charset=utf-8".toMediaType()
|
val jsonMediaType = "application/json; charset=utf-8".toMediaType()
|
||||||
val jsonBody =
|
val jsonBody =
|
||||||
JSONObject()
|
JSONObject()
|
||||||
@@ -2910,7 +2908,7 @@ class ChatViewModel(
|
|||||||
val loginReq =
|
val loginReq =
|
||||||
Request
|
Request
|
||||||
.Builder()
|
.Builder()
|
||||||
.url("$baseUrl/auth/password-login")
|
.url(endpoint.resolve("auth/password-login").toString())
|
||||||
.header("Content-Type", "application/json")
|
.header("Content-Type", "application/json")
|
||||||
.post(jsonBody.toRequestBody(jsonMediaType))
|
.post(jsonBody.toRequestBody(jsonMediaType))
|
||||||
.build()
|
.build()
|
||||||
@@ -2939,7 +2937,7 @@ class ChatViewModel(
|
|||||||
val ticketReq =
|
val ticketReq =
|
||||||
Request
|
Request
|
||||||
.Builder()
|
.Builder()
|
||||||
.url("$baseUrl/api/auth/ws-ticket")
|
.url(endpoint.resolve("api/auth/ws-ticket").toString())
|
||||||
.post("{}".toRequestBody(jsonMediaType))
|
.post("{}".toRequestBody(jsonMediaType))
|
||||||
.build()
|
.build()
|
||||||
ticketClient.newCall(ticketReq).execute().use { ticketResp ->
|
ticketClient.newCall(ticketReq).execute().use { ticketResp ->
|
||||||
|
|||||||
Reference in New Issue
Block a user