MindCraft/MindCraft-front
8
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 1 Wiki Activity

.

Browse Source
This commit is contained in:
Niktia 2025-02-19 18:56:38 +03:00
parent 90727a314b
commit 8097e200c7
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/ru/myitschool/work/data/auth/AuthNetworkDataSource.kt
View File

@ -4,6 +4,7 @@ import android.util.Log
import io.ktor.client.call.body import io.ktor.client.call.body
import io.ktor.client.request.get import io.ktor.client.request.get
import io.ktor.client.request.header import io.ktor.client.request.header
import io.ktor.client.request.patch
import io.ktor.client.request.post import io.ktor.client.request.post
import io.ktor.client.request.setBody import io.ktor.client.request.setBody
import io.ktor.http.ContentType import io.ktor.http.ContentType
@ -24,6 +25,7 @@ object AuthNetworkDataSource {
runCatching { runCatching {
val result = client.get("$SERVER_ADDRESS/api/login") { val result = client.get("$SERVER_ADDRESS/api/login") {
header(HttpHeaders.Authorization, token) header(HttpHeaders.Authorization, token)
} }
Log.d("result", "${result.status}") Log.d("result", "${result.status}")
if (result.status == HttpStatusCode.Unauthorized) { if (result.status == HttpStatusCode.Unauthorized) {
@ -31,7 +33,5 @@ object AuthNetworkDataSource {
} }
result.body<UserDto>() result.body<UserDto>()
} }
} }
} }

2
app/src/main/java/ru/myitschool/work/domain/user/GetUserUseCase.kt
View File

@ -7,7 +7,7 @@ class GetUserUseCase(
private val repo: UserRepo, private val repo: UserRepo,
private val authStorageDataSource: AuthStorageDataSource private val authStorageDataSource: AuthStorageDataSource
) { ) {
suspend fun getUserFromStorage() : UserDto? { private fun getUserFromStorage() : UserDto? {
return authStorageDataSource.userInfo return authStorageDataSource.userInfo
} }
suspend operator fun invoke() = repo.getUser(getUserFromStorage()?.login!!) suspend operator fun invoke() = repo.getUser(getUserFromStorage()?.login!!)

1
app/src/main/java/ru/myitschool/work/ui/qr/scan/QrScanFragment.kt
View File

@ -66,7 +66,6 @@ class QrScanFragment : Fragment(R.layout.fragment_qr_scan) {
} }
is QrScanViewModel.Action.CloseWithResult -> { is QrScanViewModel.Action.CloseWithResult -> {
sendResult(QrScanDestination.packToBundle(action.result)) sendResult(QrScanDestination.packToBundle(action.result))
goBack()
} }
} }
} }

2
app/src/main/java/ru/myitschool/work/ui/qr/scan/QrScanViewModel.kt
View File

@ -13,6 +13,7 @@ import kotlinx.coroutines.flow.asSharedFlow
import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.update import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import ru.myitschool.work.domain.user.EnterUseCase
import ru.myitschool.work.utils.MutablePublishFlow import ru.myitschool.work.utils.MutablePublishFlow
// НЕ ИЗМЕНЯЙТЕ ЭТОТ ФАЙЛ. В ТЕСТАХ ОН БУДЕМ ВОЗВРАЩЁН В ИСХОДНОЕ СОСТОЯНИЕ // НЕ ИЗМЕНЯЙТЕ ЭТОТ ФАЙЛ. В ТЕСТАХ ОН БУДЕМ ВОЗВРАЩЁН В ИСХОДНОЕ СОСТОЯНИЕ
@ -90,4 +91,5 @@ class QrScanViewModel(
const val CAMERA_PERMISSION = Manifest.permission.CAMERA const val CAMERA_PERMISSION = Manifest.permission.CAMERA
} }
} }