No need to login without password and username.

This commit is contained in:
aminecmi 2022-12-06 21:39:32 +01:00
parent 7f0ba193ec
commit c4c92e6dd9

View File

@ -4,6 +4,7 @@ import bou.amine.apps.readerforselfossv2.model.*
import bou.amine.apps.readerforselfossv2.service.AppSettingsService import bou.amine.apps.readerforselfossv2.service.AppSettingsService
import io.github.aakira.napier.Napier import io.github.aakira.napier.Napier
import io.ktor.client.* import io.ktor.client.*
import io.ktor.client.call.*
import io.ktor.client.plugins.* import io.ktor.client.plugins.*
import io.ktor.client.plugins.cache.* import io.ktor.client.plugins.cache.*
import io.ktor.client.plugins.contentnegotiation.* import io.ktor.client.plugins.contentnegotiation.*
@ -76,11 +77,15 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
private fun hasLoginInfo() = appSettingsService.getUserName() != null && appSettingsService.getPassword() != null private fun hasLoginInfo() = appSettingsService.getUserName() != null && appSettingsService.getPassword() != null
suspend fun login(): SuccessResponse = suspend fun login(): SuccessResponse =
if (appSettingsService.getUserName().isNotEmpty() && appSettingsService.getPassword().isNotEmpty()) {
if (shouldHavePostLogin()) { if (shouldHavePostLogin()) {
postLogin() postLogin()
} else { } else {
getLogin() getLogin()
} }
} else {
SuccessResponse(true)
}
private suspend fun getLogin() = maybeResponse(client.get(url("/login")) { private suspend fun getLogin() = maybeResponse(client.get(url("/login")) {
parameter("username", appSettingsService.getUserName()) parameter("username", appSettingsService.getUserName())