Bazsalanszky/MastodonKlient
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed account construction

Browse source
This commit is contained in:
Balazs Toldi 2021-05-13 20:34:46 +02:00
parent a774c2cd7a
commit 2b3914da86
Signed by: Bazsalanszky
GPG key ID: 933820884952BE27
3 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/kotlin/eu/toldi/mastodon/entities/Account.kt
View file

@ -2,7 +2,7 @@ package eu.toldi.mastodon.entities
import com.google.gson.annotations.Expose
open class Account(val id: String,
data class Account(val id: String,
@Expose
val acct: String,
val avatar :String,

2
src/main/kotlin/eu/toldi/mastodon/entities/LoginAccount.kt
View file

@ -1,4 +1,4 @@
package eu.toldi.mastodon.entities
class LoginAccount(id: String,var token: Token) : Account(id) {
class LoginAccount(var token: Token, val account: Account) {
}

26
src/main/kotlin/eu/toldi/mastodon/helpers/ApiHelper.kt
View file

@ -4,7 +4,6 @@ import com.google.gson.annotations.Expose
import eu.toldi.mastodon.entities.Client
import eu.toldi.mastodon.entities.LoginAccount
import eu.toldi.mastodon.entities.Token
import eu.toldi.mastodon.view.MainModel
import io.ktor.client.*
import io.ktor.client.engine.apache.*
import io.ktor.client.features.json.*
@ -12,7 +11,6 @@ import io.ktor.client.request.*
import io.ktor.client.request.forms.*
import io.ktor.http.*
import kotlinx.coroutines.runBlocking
import java.io.InvalidObjectException
import java.lang.IllegalArgumentException
class ApiHelper (host: String){
@ -22,12 +20,8 @@ class ApiHelper (host: String){
else -> "https://$host"
}
@PublishedApi
internal val client: HttpClient
init {
client = HttpClient(Apache) {
install(JsonFeature)
}
internal val client: HttpClient = HttpClient(Apache) {
install(JsonFeature)
}
@ -94,15 +88,17 @@ class ApiHelper (host: String){
}
}
fun constructLoginAccount(token: Token) :LoginAccount {
val result: LoginAccount = get(accounts_verify_credentials, mapOf("Authorization" to "Bearer ${token.access_token}")) ?: throw InvalidObjectException("Failed to create Login Account")
result.token = token
return result
fun constructLoginAccount(token: Token): LoginAccount {
return LoginAccount(
token,
get(accounts_verify_credentials, mapOf("Authorization" to "Bearer ${token.access_token}"))
).also {
println("Logged in as ${it.account.acct}")
}
}
fun constructClient(token: Token) :Client {
val result: Client = get(apps_verify_credentials, mapOf("Authorization" to "Bearer ${token.access_token}")) ?: throw InvalidObjectException("Failed to create Login Account")
return result
fun constructClient(token: Token): Client {
return get(apps_verify_credentials, mapOf("Authorization" to "Bearer ${token.access_token}"))
}
}