Fix #647: resolve Default profile URL from top-level login URL (#649)

* Fix #647: resolve Default profile URL from top-level login URL

ConnectionProfile.resolvedBaseUrl (used directly by ConnectionSection for
the profile list display) silently fell back to the hardcoded loopback
127.0.0.1:9119 whenever a profile's own baseUrl was null, instead of using
the URL the user actually authenticated against.

- Add ConnectionProfile.resolveBaseUrl(topLevelBaseUrl) that prefers the
  profile's own baseUrl, then the top-level login URL, then legacy loopback.
- Store-level ServerCollectionOps.resolvedBaseUrl now applies the same
  fallback so a null-baseUrl profile still shows the real gateway.
- ConnectionSection, SettingsViewModel and ConnectViewModel resolve against
  AuthManager.getBaseUrl() so the loopback fallback can never surface.
- Add Issue647ProfileUrlTest covering login-stamp, null-baseUrl fallback,
  own-URL precedence, fresh-install loopback, and store-level resolution.
- Update existing AuthManagerTest assertions to the new property form.

* Fix #647 (root cause): cache login URL at top-level baseUrl

The previous change only made profile resolution prefer the top-level
login URL, but setBaseUrl() never actually wrote the top-level baseUrl
field — so it stayed DEFAULT_BASE_URL (https://127.0.0.1:9119/) forever.
A Default profile seeded with the loopback default (or whose own baseUrl
was never stamped) therefore still displayed the loopback URL after
logging in via a custom LAN address.

setBaseUrl() now also stamps the top-level baseUrl, making it the
authoritative "last successful login URL" cache. getBaseUrl() and the
store-level resolvedBaseUrl (profile-list display) now reflect the URL
actually authenticated against.

Add regression tests mirroring the exact AuthLoginViewModel.connect()
sequence (seed with loopback -> setBaseUrl(loginUrl) -> token) asserting
the Default profile, top-level baseUrl and store display all resolve to
the login URL, never loopback.

---------

Co-authored-by: M57 <Hy4ri@users.noreply.github.com>
This commit is contained in:
M57andM57 authored and GitHub committed 2026-07-20 22:03:31 +03:00
1 parent c8a5055a84
commit e44a53366b
7 files changed
+301 -17

No files matched your search

@@ -14,16 +14,44 @@ data class ConnectionProfile(
val port: Int = 9119,
val baseUrl: String? = null,
) {
/**
* Resolves this profile's own base URL, falling back to the legacy loopback
* default when [baseUrl] was never stamped. Prefer [resolveBaseUrl] at the
* store/UI level so a real gateway URL used to log in takes precedence over
* the hardcoded loopback (issue #647).
*/
val resolvedBaseUrl: String
get() =
baseUrl
?.let {
ServerEndpoint
.parse(
it,
CleartextPolicy.ALLOW_WITH_WARNING,
).baseUrl
.toString()
}
?: ServerEndpoint.fromLegacy(host, port).baseUrl.toString()
get() = resolveBaseUrl(null)
}
/**
* Resolves the base URL actually used to talk to this profile's server.
*
* Prefers the profile's own [ConnectionProfile.baseUrl]; if that was never
* stamped (legacy or a freshly-seeded Default profile) it falls back to
* [topLevelBaseUrl] — the URL the user last authenticated against — and only
* then to the legacy loopback default. This prevents the connection-profile
* list from showing the hardcoded `127.0.0.1:9119` when a real gateway URL was
* used to log in (issue #647).
*/
fun ConnectionProfile.resolveBaseUrl(topLevelBaseUrl: String?): String {
baseUrl
?.let {
return ServerEndpoint
.parse(
it,
CleartextPolicy.ALLOW_WITH_WARNING,
).baseUrl
.toString()
}
return topLevelBaseUrl
?.let {
ServerEndpoint
.parse(
it,
CleartextPolicy.ALLOW_WITH_WARNING,
).baseUrl
.toString()
}
?: ServerEndpoint.fromLegacy(host, port).baseUrl.toString()
}
@@ -37,7 +37,13 @@ fun ServerStoreState.selfHealed(): ServerStoreState {
val ServerStoreState.resolvedBaseUrl: String
get() {
val selected = connectionProfiles.firstOrNull { it.id == selectedProfileId }
if (selected != null) return selected.resolvedBaseUrl
if (selected != null) {
// Prefer the selected profile's own URL, but fall back to the
// top-level login URL (and only then to legacy loopback) so a profile
// whose baseUrl was never stamped still shows the gateway used to
// authenticate, not the hardcoded 127.0.0.1:9119 (issue #647).
return selected.resolveBaseUrl(baseUrl)
}
return baseUrl
?.let {
ServerEndpoint
@@ -441,7 +441,16 @@ object AuthManager {
profile
}
}
state.copy(connectionProfiles = profiles)
// Also cache the login URL at the top level so that getBaseUrl() and
// the store-level resolvedBaseUrl (used by the profile list display)
// reflect the URL actually authenticated against, never the hardcoded
// loopback default. Fixes issue #647: a Default profile whose own
// baseUrl was never stamped must still resolve to this URL, not
// 127.0.0.1:9119.
state.copy(
baseUrl = normalized,
connectionProfiles = profiles,
)
}
}
@@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.viewModelScope
import com.m57.hermescontrol.R
import com.m57.hermescontrol.data.config.ConnectionProfile
import com.m57.hermescontrol.data.config.resolveBaseUrl
import com.m57.hermescontrol.data.local.AuthManager
import com.m57.hermescontrol.data.remote.ApiClient
import com.m57.hermescontrol.data.remote.CleartextPolicy
@@ -53,7 +54,7 @@ class ConnectViewModel(
_uiState.update {
it.copy(
token = savedToken,
baseUrl = selectedProfile?.resolvedBaseUrl ?: savedBaseUrl,
baseUrl = selectedProfile?.resolveBaseUrl(savedBaseUrl) ?: savedBaseUrl,
profiles = profiles,
selectedProfile = selectedProfile,
profileName = selectedProfile?.name ?: "",
@@ -76,7 +77,7 @@ class ConnectViewModel(
it.copy(
selectedProfile = profile,
profileName = profile.name,
baseUrl = profile.resolvedBaseUrl,
baseUrl = profile.resolveBaseUrl(AuthManager.getBaseUrl()),
token = token,
)
}
@@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.m57.hermescontrol.ScreenRegistry
import com.m57.hermescontrol.data.config.ConnectionProfile
import com.m57.hermescontrol.data.config.resolveBaseUrl
import com.m57.hermescontrol.data.local.AuthManager
import com.m57.hermescontrol.data.remote.ApiClient
import com.m57.hermescontrol.data.remote.CleartextPolicy
@@ -170,7 +171,7 @@ class SettingsViewModel(
showProfileDialog = true,
editingProfileId = profileId,
dialogProfileName = profile.name,
dialogProfileBaseUrl = profile.resolvedBaseUrl,
dialogProfileBaseUrl = profile.resolveBaseUrl(AuthManager.getBaseUrl()),
dialogProfileToken = token,
dialogProfileError = null,
)
@@ -35,6 +35,7 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel
import com.m57.hermescontrol.R
import com.m57.hermescontrol.data.config.resolveBaseUrl
import com.m57.hermescontrol.ui.settings.SectionCard
import com.m57.hermescontrol.ui.settings.SettingsUiState
import com.m57.hermescontrol.ui.settings.SettingsViewModel
@@ -85,7 +86,7 @@ internal fun ConnectionSection(
style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.Medium),
)
Text(
text = profile.resolvedBaseUrl,
text = profile.resolveBaseUrl(state.baseUrl),
style =
MaterialTheme.typography.bodySmall.copy(
color = MaterialTheme.colorScheme.onSurfaceVariant,