This reverts commit a5baf41545.
This commit is contained in:
10 files changed
+4
-217
No files matched your search
@@ -8,7 +8,6 @@ import androidx.lifecycle.viewModelScope
|
||||
import com.m57.hermescontrol.R
|
||||
import com.m57.hermescontrol.data.config.ConnectionProfile
|
||||
import com.m57.hermescontrol.data.local.AuthManager
|
||||
import com.m57.hermescontrol.data.local.AuthSessionState
|
||||
import com.m57.hermescontrol.data.remote.ApiClient
|
||||
import com.m57.hermescontrol.data.remote.AuthPayloads
|
||||
import com.m57.hermescontrol.data.remote.CleartextPolicy
|
||||
@@ -81,20 +80,9 @@ class AuthLoginViewModel(
|
||||
|
||||
init {
|
||||
loadLoggedInProfiles()
|
||||
viewModelScope.launch {
|
||||
AuthSessionState.signInRequired.collect { required ->
|
||||
if (required) {
|
||||
_uiState.update { it.copy(loggedInProfiles = emptyList()) }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun loadLoggedInProfiles() {
|
||||
if (AuthSessionState.signInRequired.value) {
|
||||
_uiState.update { it.copy(loggedInProfiles = emptyList()) }
|
||||
return
|
||||
}
|
||||
val allProfiles = AuthManager.getConnectionProfiles()
|
||||
val loggedIn =
|
||||
allProfiles.filter { profile ->
|
||||
@@ -107,7 +95,6 @@ class AuthLoginViewModel(
|
||||
fun useExistingProfile(profileId: String) {
|
||||
AuthManager.setSelectedProfileId(profileId)
|
||||
ApiClient.rebuild()
|
||||
AuthSessionState.markAuthenticated()
|
||||
HermesWsClient.connect()
|
||||
_uiState.update { it.copy(connectionSuccess = true) }
|
||||
}
|
||||
@@ -358,7 +345,6 @@ class AuthLoginViewModel(
|
||||
AuthManager.setWsAuthParam("ticket")
|
||||
}
|
||||
ApiClient.rebuild()
|
||||
AuthSessionState.markAuthenticated()
|
||||
HermesWsClient.connect()
|
||||
_uiState.update { it.copy(isLoading = false, connectionSuccess = true) }
|
||||
}
|
||||
@@ -380,7 +366,7 @@ class AuthLoginViewModel(
|
||||
}
|
||||
|
||||
val tempApi = ApiClient.createTempService(endpoint.baseUrl.toString(), token)
|
||||
val result = safeApiCall(reportAuthExpiry = false) { tempApi.getSessions() }
|
||||
val result = safeApiCall { tempApi.getSessions() }
|
||||
|
||||
return when (result) {
|
||||
is com.m57.hermescontrol.data.remote.NetworkResult.Success -> {
|
||||
|
||||
@@ -8,7 +8,6 @@ import android.util.Log
|
||||
import androidx.lifecycle.AndroidViewModel
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import com.m57.hermescontrol.data.local.AuthManager
|
||||
import com.m57.hermescontrol.data.local.AuthSessionState
|
||||
import com.m57.hermescontrol.data.local.HermesDatabase
|
||||
import com.m57.hermescontrol.data.model.Attachment
|
||||
import com.m57.hermescontrol.data.model.ModelProvider
|
||||
@@ -1871,7 +1870,6 @@ class ChatViewModel(
|
||||
}
|
||||
|
||||
fun reconnect() {
|
||||
AuthSessionState.markAuthenticated()
|
||||
_uiState.update {
|
||||
it.copy(
|
||||
isLoading = true,
|
||||
@@ -1969,7 +1967,6 @@ class ChatViewModel(
|
||||
|
||||
AuthManager.setWsAuthParam("ticket")
|
||||
AuthManager.setToken(ticket)
|
||||
AuthSessionState.markAuthenticated()
|
||||
|
||||
withContext(Dispatchers.Main) {
|
||||
onResult(true, null)
|
||||
|
||||
@@ -8,7 +8,6 @@ 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.local.AuthSessionState
|
||||
import com.m57.hermescontrol.data.remote.ApiClient
|
||||
import com.m57.hermescontrol.data.remote.CleartextPolicy
|
||||
import com.m57.hermescontrol.data.remote.NetworkError
|
||||
@@ -116,7 +115,7 @@ class ConnectViewModel(
|
||||
val result =
|
||||
withContext(Dispatchers.IO) {
|
||||
val tempApi = ApiClient.createTempService(endpoint.baseUrl.toString(), state.token)
|
||||
safeApiCall(reportAuthExpiry = false) { tempApi.getStatus() }
|
||||
safeApiCall { tempApi.getStatus() }
|
||||
}
|
||||
when (result) {
|
||||
is NetworkResult.Success -> {
|
||||
@@ -124,7 +123,6 @@ class ConnectViewModel(
|
||||
AuthManager.setToken(state.token)
|
||||
AuthManager.setBaseUrl(state.baseUrl)
|
||||
ApiClient.rebuild()
|
||||
AuthSessionState.markAuthenticated()
|
||||
|
||||
if (state.saveProfile) {
|
||||
val currentProfiles = AuthManager.getConnectionProfiles()
|
||||
|
||||
Reference in new issue
Block a user