Фиксы аунтификации

This commit is contained in:
2023-04-18 01:50:35 +03:00
parent 4029e93768
commit 8b06ccdaa2
4 changed files with 46 additions and 19 deletions
@@ -53,13 +53,18 @@ class MainActivity : ComponentActivity() {
GlobalScope.launch(Dispatchers.IO) {
val credentialsDao = app.database.credentialsDao()
val globalUserContext = app.database.globalUserContextDao()
if(credentialsDao.credentialsIsExists()) {
val credentials = credentialsDao.getCredentials()
if (!credentials.rememberMe)
if (!credentials.rememberMe) {
credentialsDao.deleteCredentials()
globalUserContext.deleteGlobalUserContext()
}
}
}
}
}
@@ -1,5 +1,6 @@
package ru.megboyzz.dnevnik.authorization
import android.util.Log
import com.google.gson.Gson
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
import org.jsoup.Connection
@@ -88,6 +89,7 @@ class AuthorizationManager(dataBase: AppDataBase) {
.execute()
}.onFailure {
Log.e("Auth", it.message.toString())
return AuthorizationStatus.NO_INTERNET
}.onSuccess { response1 ->
val htmlByLines = response1.body().split("\n")
@@ -1,5 +1,8 @@
package ru.megboyzz.dnevnik.screens
import androidx.compose.foundation.layout.Column
import androidx.compose.material.Button
import androidx.compose.material.Text
import androidx.compose.runtime.*
import androidx.compose.ui.platform.LocalContext
import androidx.lifecycle.viewmodel.compose.viewModel
@@ -52,6 +55,19 @@ fun LoginScreen(navController: NavController) {
if(loginStatus.value == AuthorizationStatus.LOGGED)
navController.navigate(AppNavRoute.Marks)
Column() {
Button(onClick = {
login.value = "08012002@mail.ru"
password.value = "1282565121024QWEasdfZXC"
}) {
Text("Я")
}
Button(onClick = {
login.value = "kitsekaterina"
password.value = "k12345"
}) {
Text("Катя")
}
LoginScreenContent(
login = login.value,
@@ -69,10 +85,11 @@ fun LoginScreen(navController: NavController) {
onRememberChange = { rememberMe.value = it },
onSignIn = {
if(loginStatus.value != AuthorizationStatus.LOGGED)
if (loginStatus.value != AuthorizationStatus.LOGGED)
authorizationViewModel.login()
},
onSignUp = { /*TODO*/ },
onForgetPassword = { /* TODO */ }
)
}
}
@@ -1,5 +1,6 @@
package ru.megboyzz.dnevnik.viewmodel
import android.util.Log
import androidx.lifecycle.AndroidViewModel
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
@@ -33,7 +34,9 @@ class AuthorizationViewModel(application: App) : AndroidViewModel(application) {
viewModelScope.launch(Dispatchers.IO) {
loginStatus.emit(AuthorizationStatus.LOGGING)
loginStatus.emit(authManager.login(login.value, password.value, rememberMe.value))
val login1 = authManager.login(login.value, password.value, rememberMe.value)
Log.i("Auth", login1.toString())
loginStatus.emit(login1)
}