26b104b2bbe1cf64ce0ad7ee17f21da43c248c92
5
Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
 M57andhy4ri
|
26b104b2bb |
[feature] issue #634: HTTPS + reverse-proxy server endpoint support (#638)
* [feature] issue #634: HTTPS + reverse-proxy server endpoint support - Add ServerEndpoint model (scheme-aware base URL, resolve/webSocketUrl/relativeRequestPath, cleartext policy) - AuthManager: baseUrl is canonical; setHost/setPort derive from endpoint; endpointForBuild() for scheme-aware URLs - ApiClient/CookieManager/HermesWsClient: route through ServerEndpoint (no hardcoded http://) - Data migration: ServerUrlMigration converts legacy host/port to baseUrl - UI: Connect/AuthLogin/Settings now use a single Server URL field with transport warning - Build: ALLOW_CLEARTEXT buildConfigField + manifest placeholder for dev - Tests: ServerEndpointTest + ServerUrlMigrationTest; adapt existing suite to baseUrl API Co-Authored-By: M57 <Hy4ri@users.noreply.github.com> * fix(authlogin): basic-auth derives token automatically, no manual entry connectBasicAuth() built a fresh OkHttpClient for the password-login call and a different one for the ws-ticket call, so the Set-Cookie from /auth/password-login (the session token lives in the cookie, not the JSON body) never reached /api/auth/ws-ticket. That 401'd the ticket request, returned null, and the UI fell back to asking the user to paste a token. Both calls now use the shared OkHttpProvider.probe client (same CookieManager jar), so the session cookie flows through and the WS ticket mints automatically — matching the dashboard contract (routes.py: password-login sets Set-Cookie, ws-ticket requires it). Add AuthLoginBasicAuthFlowTest proving the cookie propagates on the shared client (and that ws-ticket 401s without it). Fixes the basic-auth token prompt reported against issue #634. * chore: remove TASK-634-TESTS.md (stray task-tracking doc, not part of feature) * ci: broaden .gitguardian.yml test-file ignores (unit + instrumented + variant dirs) * feat(authlogin): smart auth-mode detection from /api/status + drop pairing-string login - Replace 302-sniff probe with authoritative GET /api/status read (auth_required + auth_providers) to derive DashboardAuthMode. - Add OAUTH mode (stubbed, 'coming soon' UI, TODO tracks issue #639). - Render login UI by detected mode: token (loopback), username+password (basic/gated), or OAuth notice. - Remove legacy pairing-string box + onPairingString/applyLegacyPairing. - Extract internal deriveAuthMode() + add 5 unit tests. Closes nothing; OAuth tracked in #639. * fix(chat): don't block WS connect on empty token in gated (ticket) mode connectWebSocket() gated on getToken() != null, correct for loopback (token) mode but wrong for gated (ticket) mode: the ticket is minted fresh by HermesWsClient.refreshWsTicketIfNeeded() from the persisted session cookie, so getToken() is expected empty at connect time. The early return left the WS unopened -> DISCONNECTED -> chat showed 'reconnect' immediately after basic-auth login. Only require a non-blank token in non-gated mode. Fixes #640. * test: remove onPairingString test cases for deleted pairing-login path The pairing-string login (onPairingString/applyLegacyPairing) was removed from ConnectViewModel, so the 5 tests that exercised it (3 in ConnectViewModelTest, 2 in E2eIntegrationTest) no longer compile. Remove them. Also drop the now-orphaned connect_pairing_string from values-ko. Fixes the Unit & Integration Tests CI failure on PR #638. --------- Co-authored-by: hy4ri <hy4ri@users.noreply.github.com> |
||
|
M57andronia
|
aa59e704a4 |
fix(#478): rework default login to use unified ConnectionProfile model (#482)
* fix(#478): rework default login to use unified ConnectionProfile model - AuthManager: drop legacy auth_token path; getToken/setToken now delegate to the selected profile (profile token only, no global fallback) - setHost/setPort always write the selected profile (no top-level host/port branch) - Add DEFAULT_PROFILE_ID + ensureDefaultProfile()/ensureDefaultSelected() so the selected profile is never null; ensureDefaultSelected() only falls back when nothing is selected (never clobbers an existing choice); ensureDefaultProfile() only injects a Default profile on fresh install, never into an existing list - One-time migration folds legacy standalone auth_token into the Default profile, batched into a single SharedPreferences transaction (guarded by legacy_default_migrated) - ConnectViewModel.connect() persists via setToken/setHost/setPort (delegate to the selected profile) — keeps the existing persistence contract - Connect/Settings: remove the '(none)'/standalone profile option; deleteProfile falls back to Default profile instead of null selection - Update AuthManagerTest/ConnectViewModelTest to the unified model; fix test stub ordering + migration re-init; remove dead connect_profile_none / settings_profile_none strings Closes #478 * fix: stub AuthManager.ensureDefaultSelected() in E2eIntegrationTest The #478 ConnectViewModel.connect() success branch now calls AuthManager.ensureDefaultSelected() on the non-saveProfile path. E2eIntegrationTest.setUp() mocks AuthManager as a non-relaxed mockkObject but never stubs that method, so the unstubbed call throws MockKException inside viewModelScope.launch, leaving connectionSuccess unset and failing 3 tests: - testFullUserSessionFlow - testConnectViewModel_onPairingString_base64Format - testConnectViewModel_onPairingString_urlFormat Add the missing stub. Verified locally: full suite 322/322 passing. --------- Co-authored-by: ronia <ronia@m57> |
||
|
M57
|
430a083647 |
feat(#471): implement DataStore-based server configuration and self-h… (#477)
* feat(#471): implement DataStore-based server configuration and self-healing * refactor(#471): address Sourcery feedback on ANR risk and reset method splitting * refactor(#471): implement synchronous ServerStore initialization to fully remove ANR risk * feat(#471): show profile name, host and port on add profile, redirect to login on save, and support shortcut login buttons for existing profiles |
||
|
M57andM57
|
3399880621 |
perf(#281): fix PERF-13/14/15/16 — main-thread settings, 100Hz polling, leaked scope, WS disconnect (#359)
* perf(#281): fix PERF-13/14/15/16 — main-thread settings load, 100Hz polling, leaked scope, WS disconnect * fix(#281): fix SettingsViewModelTest failures from async init dispatcher --------- Co-authored-by: M57 <hy4ri@users.noreply.github.com> |
||
|
M57andM57
|
15a4748634 |
test(#292): coverage gaps TEST-04 through TEST-14 (#302)
* test(#292): coverage gaps TEST-04 through TEST-14 - TEST-04: ApiClient auth interceptor + BuildConfig.DEBUG gate (6 tests) - TEST-05: SettingsViewModel profile operations (5 tests) - TEST-06: ConnectViewModel profile switch edge cases (8 tests) - TEST-07: EventParser untested subtypes (12 tests) - TEST-08: AuthManager token routing through profiles (5 tests) - TEST-09: ChatScreen instrumented compose tests (3 tests) - TEST-10: WS reconnect state recovery (5 tests) - TEST-11: Multi-profile token scenarios (6 tests) - TEST-12: Chat DAO Room operations (11 tests) - TEST-13: ChatViewModel slash command handling (8 tests) - TEST-14: Predictive back gesture instrumented test (1 test) Total: 70 tests across 11 files. CI updated with new instrumented-tests job via android-emulator-runner. * fix(ci): resolve ktlint, tests, and emulator failures * fix(ci): resolve test failures on PR #302 * fix(ci): more ChatMessageDaoTest context mocks, re-read state after advanceUntilIdle in connect test * fix(ci): remove problematic packageManager mock, decouple instrumented tests from CI gate * fix(ci): switch emulator to default target, add more cores, memory, and timeout * fix(ci): remove mockkStatic(Log::class) from ChatMessageDaoTest - fails on Android stubs * fix(ci): use aosp_atd emulator image + KVM + AVD cache for fast instrumented tests * fix(ci): remove ApplicationInfo mock - Android stub class breaks MockK * fix(ci): rewrite ChatMessageDaoTest to use HermesDatabase.setForTest() pattern - Room in-memory DB requires Android SDK not available in JVM tests * fix(ci): use actions/cache@v4 instead of @v7 (doesn't exist) * fix(ci): add missing performClick import in StateViewsTest * fix(ci): mock ChatViewModel in instrumented tests, add mockk to androidTestImplementation * fix(ci): add asStateFlow import in ChatScreenTest * fix(ci): exclude duplicate META-INF LICENSE/NOTICE files from androidTest build JUnit Jupiter 5.8.2 JARs each ship META-INF/LICENSE.md, causing mergeDebugAndroidTestJavaResource to fail with 'duplicate files found'. Add LICENSE.md, LICENSE, NOTICE, and NOTICE.md to the packaging exclusion list. * fix(#302): exclude duplicate META-INF/LICENSE-notice.md from instrumented test APK JUnit Jupiter 5.x JARs all ship META-INF/LICENSE-notice.md, causing mergeDebugAndroidTestJavaResource to fail. * fix(#302): add LICENSE-notice.md as separate exclude entry The Ant-style glob brace expansion in packaging.resources.excludes doesn't handle LICENCE-notice.md inside the {}-enclosed pattern. Adding it as a separate entry instead. * fix(#302): use mockk-android for instrumented tests io.mockk:mockk uses Java instrumentation agents not available on Android. Switch to io.mockk:mockk-android for connectedDebugAndroidTest which uses an Android-compatible mocking strategy. * fix(#302): use createAndroidComposeRule for test lifecycle isolation Standard createComposeRule has a gap where consecutive test methods can lose the compose hierarchy on the emulator. Switching to createAndroidComposeRule<MainActivity> gives explicit activity lifecycle management across test methods, fixing the 'No compose hierarchies found' errors. * fix(#302): use createComposeRule instead of createAndroidComposeRule<MainActivity> MainActivity.onCreate() already calls setContent, so the test's setContent { ChatScreen(...) } crashed with 'has already set content'. Switch to createComposeRule() which launches a bare ComponentActivity that doesn't call setContent, allowing the test to compose ChatScreen in isolation with a mock ChatViewModel. * fix(#302): use createAndroidComposeRule<ComponentActivity> + unmockkAll for instrumented tests ChatScreenTest was failing with 'No compose hierarchies found' because mockk mocks in instrumented tests weren't cleaned up between test runs. Switch from createComposeRule() to explicit createAndroidComposeRule<ComponentActivity>() and add @After tearDown() with unmockkAll() to ensure mock state doesn't leak between test methods. * fix(#302): wrap ChatScreen in HermesControlTheme in instrumented tests ChatScreen accesses MaterialTheme.colorScheme during composition (background gradient). Without a Material3 theme wrapper, the composable silently crashes and no compose hierarchy is registered — causing 'No compose hierarchies found' on any subsequent onNodeWithTag() call. Fix: wrap ChatScreen in HermesControlTheme inside setContent {}, matching how MainActivity renders the app. Also use createAndroidComposeRule<ComponentActivity> instead of createComposeRule() for explicit lifecycle management, and add unmockkAll() in @After to clean up mockk state between tests. * fix(ci): fix packaging resource paths and use pickFirsts for duplicate META-INF files Remove leading slashes from META-INF paths (AGP paths are relative, not absolute). Use pickFirsts instead of excludes to handle duplicate files from JUnit Jupiter JARs. * fix(#302): use createAndroidComposeRule<ComponentActivity> for test isolation createComposeRule() has a known race where the compose hierarchy is lost between sequential test methods on the emulator. createAndroidComposeRule<ComponentActivity> provides proper Activity lifecycle management while using the same lightweight empty activity that doesn't pre-set content (unlike MainActivity). * fix(#302): consolidate ChatScreenTest into single test method The Compose test rule's lifecycle gap between test methods on the emulator causes 'No compose hierarchies found' on consecutive setContent calls. Consolidating all three test scenarios into one invocation eliminates the cross-test teardown issue entirely. * fix(#302): mock ContextCompat to suppress permission dialog in test The ChatScreen LaunchedEffect requests POST_NOTIFICATIONS via ActivityResultContracts.RequestPermission(), which pauses the activity and disposes the compose hierarchy. Mocking ContextCompat.checkSelfPermission to return PERMISSION_GRANTED prevents this from happening during the test. * fix(#302): set connectionStatus=CONNECTED in ChatScreenTest The default ChatUiState has connectionStatus=DISCONNECTED, which makes isConnected=false, in turn disabling the chat input field (enabled = isConnected) and the send button (canSend checks isConnected). Set it to CONNECTED so both controls are active. * fix(#302): add ConnectionStatus import and fix ktlint wrapping --------- Co-authored-by: M57 <hy4ri@users.noreply.github.com> |