test(connect): phase 5 — restart lands on the selected profile, no login (#827)
* test(connect): pin restart-with-scoped-profile token resolution (phase 5) * fix(profiles): scope switch via un-clamped active-profile state The switch persisted the server profile through serverStore.selectedProfileId, whose selfHealed() clamps ids absent from the local connection list — server profiles like "meow" never exist there, so the scope silently reset to default and the re-dialed socket created the fresh session in the wrong profile (live logcat 2026-08-06: session.create carried profile=default right after switching to meow). - AuthManager: prefs-backed activeProfileId state, immune to the clamp, restored on startup; resetAuthStateForTest clears it - ProfileScopeInterceptor + WsProfileParams + ChatViewModel fetchContextUsage: read the active profile instead of the connection selection - ProfileSwitchCoordinator: write activeProfileId; dial the socket on Dispatchers.IO (the ticket mint did blocking I/O on the main thread — NetworkOnMainThreadException — and fell back to a 1s reconnect) - ProfilesViewModel: inject the IO dispatcher; ProfilesViewModelTest drops its static Dispatchers mock (JVM-wide bleed class) - Tests: WsProfileParams/Interceptor tests use the real prefs-backed state instead of mockkObject(AuthManager) (re-mock breaks in suite order after real AuthManager init); AuthManagerTest + Issue647ProfileUrlTest cancel the init() DataStore scope in tearDown (UncaughtExceptionsBeforeTest phantoms); regression test pins the clamp on the old path vs the new state * fix(profiles): resolve getter/property JVM collision; de-poison slash test - AuthManager.activeProfileId (StateFlow) and a getActiveProfileId() function generated the same JVM getter name — calls silently resolved to the property getter at runtime (ReadonlyStateFlow -> String ClassCastException, CI unit red 2026-08-06). Function removed; callers read activeProfileId.value. - ChatViewModel: inject ioDispatcher (38 sites) so SlashCommandDispatchRpcTest can drop its mockkStatic(Dispatchers) bleed without racing real IO. - SlashCommandDispatchRpcTest: drop the static Dispatchers mock (JVM-wide bleed; CI cross-wired COMMAND_DISPATCH captures in suite order), construct the VM with the test dispatcher. --------- Co-authored-by: M57 <hy4ri@users.noreply.github.com>
This commit is contained in:
1 parent
dd8dabecb0
commit
d9f437939a
14 files changed
+225
-73
No files matched your search
@@ -11,7 +11,7 @@ import com.m57.hermescontrol.data.local.AuthManager
|
||||
* (usually "default"), even after the user switches profiles in the app.
|
||||
*
|
||||
* Rules (mirror the REST interceptor contract):
|
||||
* - If [AuthManager.getSelectedProfileId] is `null` → pass through unchanged
|
||||
* - If [AuthManager.activeProfileId] is `null` → pass through unchanged
|
||||
* (legacy single-profile behavior).
|
||||
* - If the caller already supplied an explicit `"profile"` key in [params] →
|
||||
* explicit wins; do **not** overwrite.
|
||||
@@ -29,7 +29,7 @@ object WsProfileParams {
|
||||
params: Map<String, Any>,
|
||||
): Map<String, Any> {
|
||||
// No active profile → legacy single-profile behavior.
|
||||
val profile = AuthManager.getSelectedProfileId() ?: return params
|
||||
val profile = AuthManager.activeProfileId.value ?: return params
|
||||
|
||||
// Only scoped methods get the profile key.
|
||||
if (method !in WsMethods.PROFILE_SCOPED_METHODS) return params
|
||||
|
||||
Reference in new issue
Block a user