Merge pull request #99 from swingmx/fix/auth-channel-navigation

Fix Post-Login Freezing #98

Author: Ericgacoki

README.md

@@ -3,12 +3,13 @@
 </div>
 <div align="center" style="font-size: 2rem"><b>Swing Music Android Client</b></div>
 
-<div align="center"><b><sub><code>v1.0.0</code></sub></b></div>
+<div align="center"><b><sub><code>v1.0.1</code></sub></b></div>
 
 **<div align="center" style="padding-top: 1.25rem">[Download](https://github.com/swingmx/android/releases) • <a href="https://github.com/sponsors/swingmx" target="_blank">Sponsor Us ❤️</a> • [Swing Music Docs](https://swingmx.com/guide/introduction.html) • [r/SwingMusicApp](https://www.reddit.com/r/SwingMusicApp)</div>**
 
 ##
 
+![Image](.github/images/readme.webp)
 This client application allows you to stream music on your Android device from your Swing Music server.
 
 ### Features
@@ -29,9 +30,6 @@ Download the app from the [releases page](https://github.com/swingmx/android/rel
 
 You can go to `Settings > Pair device` on the webclient to get the QR code.
 
-## Screenshots
-
-![Image](.github/images/readme.webp)
 
 <!-- [![wakatime](https://wakatime.com/badge/user/99206146-a1fc-4be5-adc8-c2351f27ecef/project/018e7aae-f9e9-42e9-99e1-fc381580884d.svg)](https://wakatime.com/badge/user/99206146-a1fc-4be5-adc8-c2351f27ecef/project/018e7aae-f9e9-42e9-99e1-fc381580884d) -->
 

auth/src/main/java/com/android/swingmusic/auth/data/repository/DataAuthRepository.kt

@@ -90,12 +90,12 @@ class DataAuthRepository @Inject constructor(
             )
 
             result.toModel()
-        } catch (e: Exception) {
-            Timber.e(message = "Failed to get refresh tokens!")
-            null
         } catch (e: HttpException) {
             Timber.e(message = "Connection Failed!")
             null
+        } catch (e: Exception) {
+            Timber.e(message = "Failed to get refresh tokens!")
+            null
         }
     }
 
@@ -107,10 +107,10 @@ class DataAuthRepository @Inject constructor(
                 val result = authApiService.getAllUsers("$baseUrl/auth/users").toModel()
                 emit(Resource.Success(data = result))
 
-            } catch (e: Exception) {
-                emit(Resource.Error(message = "Failed to load users!"))
             } catch (e: HttpException) {
                 emit(Resource.Error(message = "Connection Failed!"))
+            } catch (e: Exception) {
+                emit(Resource.Error(message = "Failed to load users!"))
             }
         }
     }

auth/src/main/java/com/android/swingmusic/auth/presentation/screen/LoginWithQrCode.kt

@@ -98,12 +98,13 @@ fun LoginWithQrCode(
         else -> ""
     }
 
-    LaunchedEffect(key1 = authUiState.authState, block = {
-        if (authUiState.authState == AuthState.AUTHENTICATED) {
-            // authNavigator.gotoHomeNavGraph()
-            authNavigator.gotoFolders()
+    LaunchedEffect(Unit) {
+        authViewModel.authStateEvent.collect { state ->
+            if (state == AuthState.AUTHENTICATED) {
+                authNavigator.gotoFolders()
+            }
         }
-    })
+    }
 
     Scaffold {
         Scaffold(

auth/src/main/java/com/android/swingmusic/auth/presentation/screen/LoginWithUsername.kt

@@ -349,12 +349,13 @@ fun LoginWithUsernameScreen(
 ) {
     val authUiState by authViewModel.authUiState.collectAsState()
 
-    LaunchedEffect(key1 = authUiState.authState, block = {
-        if (authUiState.authState == AuthState.AUTHENTICATED) {
-            // authNavigator.gotoHomeNavGraph()
-            authNavigator.gotoFolders()
+    LaunchedEffect(Unit) {
+        authViewModel.authStateEvent.collect { state ->
+            if (state == AuthState.AUTHENTICATED) {
+                authNavigator.gotoFolders()
+            }
         }
-    })
+    }
 
     LoginWithUsername(
         authUiState = authUiState,

auth/src/main/java/com/android/swingmusic/auth/presentation/viewmodel/AuthViewModel.kt

@@ -16,10 +16,12 @@ import com.android.swingmusic.auth.presentation.state.AuthUiState
 import com.android.swingmusic.auth.presentation.util.AuthError
 import com.android.swingmusic.core.data.util.Resource
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -36,6 +38,9 @@ class AuthViewModel @Inject constructor(
     private val _isUserLoggedIn = MutableStateFlow<Boolean?>(null)
     val isUserLoggedIn: StateFlow<Boolean?> = _isUserLoggedIn.asStateFlow()
 
+    private val _authStateEvent = Channel<AuthState>(Channel.BUFFERED)
+    val authStateEvent = _authStateEvent.receiveAsFlow()
+
     init {
         viewModelScope.launch {
             authRepository.initializeBaseUrlAndAuthTokens()
@@ -151,6 +156,8 @@ class AuthViewModel @Inject constructor(
                             authError = AuthError.None,
                             baseUrl = baseUrl
                         )
+
+                        _authStateEvent.trySend(AuthState.AUTHENTICATED)
                     }
                 }
             }
@@ -165,7 +172,7 @@ class AuthViewModel @Inject constructor(
             val url = pair.first
             val pairCode = pair.second
 
-            if (url.isEmpty() or pairCode.isEmpty()) {
+            if (url.isEmpty() || pairCode.isEmpty()) {
                 _authUiState.value = _authUiState.value.copy(
                     authState = AuthState.LOGGED_OUT,
                     isLoading = false,
@@ -210,6 +217,8 @@ class AuthViewModel @Inject constructor(
                             authError = AuthError.None,
                             baseUrl = url
                         )
+
+                        _authStateEvent.trySend(AuthState.AUTHENTICATED)
                     }
                 }
             }

docs/auth-module.md

@@ -0,0 +1,87 @@
+# Auth Module
+
+Self-contained authentication feature module using MVVM + Repository pattern.
+
+## Structure
+
+```
+auth/
+├── data/
+│   ├── api/           # Retrofit API service
+│   ├── datastore/     # Token persistence (DataStore)
+│   ├── di/            # Hilt modules
+│   ├── dto/           # API response models
+│   ├── repository/    # AuthRepository implementation
+│   ├── tokenholder/   # In-memory token storage
+│   └── workmanager/   # Background token refresh
+├── domain/
+│   ├── model/         # Domain models
+│   └── repository/    # Repository interface
+└── presentation/
+    ├── screen/        # Login screens (QR, Username)
+    ├── state/         # UI state classes
+    └── viewmodel/     # AuthViewModel
+```
+
+## API Endpoints
+
+| Endpoint | Method | Purpose |
+|----------|--------|---------|
+| `/auth/login` | POST | Username/password login |
+| `/auth/pair?code=` | GET | QR code pairing |
+| `/auth/refresh` | POST | Token refresh |
+| `/auth/users` | GET | Get all users |
+| `/auth/profile/create` | POST | Create user |
+
+## Authentication Flows
+
+### Username/Password
+1. User enters server URL + credentials
+2. ViewModel validates input, calls API
+3. Tokens stored in DataStore + memory
+4. Navigate to home
+
+### QR Code
+1. Scan QR from web client (format: `URL CODE`)
+2. API call to `/auth/pair`
+3. Same token storage and navigation
+
+### Token Refresh
+- `TokenRefreshWorker` runs every 6 hours via WorkManager
+- Automatically refreshes tokens in background
+
+## Key Classes
+
+| Class | Location | Responsibility |
+|-------|----------|----------------|
+| `AuthApiService` | `data/api/` | Retrofit API calls |
+| `AuthTokensDataStore` | `data/datastore/` | Persistent token storage |
+| `AuthTokenHolder` | `data/tokenholder/` | In-memory token access |
+| `DataAuthRepository` | `data/repository/` | Coordinates API + storage |
+| `AuthViewModel` | `presentation/viewmodel/` | UI state management |
+| `LoginWithQrCode` | `presentation/screen/` | QR scanner screen |
+| `LoginWithUsername` | `presentation/screen/` | Form login screen |
+
+## State Management
+
+```kotlin
+data class AuthUiState(
+    val baseUrl: String?,
+    val username: String?,
+    val password: String?,
+    val authState: AuthState,  // LOGGED_OUT | AUTHENTICATED
+    val isLoading: Boolean,
+    val authError: AuthError   // None | InputError | LoginError
+)
+```
+
+## Dependencies
+
+- `:database` - User entity, DAOs
+- `:core` - Resource wrapper
+- `:uicomponent` - UI components
+
+## Error Codes
+
+- `401` - Incorrect password
+- `404` - User not found