wulkanowy/sdk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Send session rebuild in separate request

Browse source
This commit is contained in:
Mikołaj Pich 2019-04-15 11:12:42 +02:00
parent c26b6cabd3
commit 59c15235e0
No known key found for this signature in database
GPG key ID: F62B26E36D4C4BAA
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/kotlin/io/github/wulkanowy/api/login/LoginHelper.kt
View file

@ -40,7 +40,10 @@ class LoginHelper(
it.action.isBlank() -> throw VulcanException("Invalid certificate page: '${it.title}'. Try again")
}
sendCertificate(it, email.substringAfter("||", ""))
sendCertificate(it)
}.flatMap {
if (email.contains("||")) switchLogin(email.substringAfter("||", ""), symbol)
else Single.just(it)
}
}
@ -59,9 +62,9 @@ class LoginHelper(
}
}
fun sendCertificate(certificate: CertificateResponse, email: String = "", url: String = certificate.action): Single<SendCertificateResponse> {
fun sendCertificate(certificate: CertificateResponse, url: String = certificate.action): Single<SendCertificateResponse> {
cookies.cookieStore.removeAll()
return api.sendCertificate(url + if (email.isNotBlank()) "?rebuild=$email" else "", mapOf(
return api.sendCertificate(url, mapOf(
"wa" to certificate.wa,
"wresult" to certificate.wresult,
"wctx" to certificate.wctx

2
src/main/kotlin/io/github/wulkanowy/api/repository/RegisterRepository.kt
View file

@ -34,7 +34,7 @@ class RegisterRepository(
fun getStudents(): Single<List<Student>> {
return getSymbols().flatMapObservable { Observable.fromIterable(it) }.flatMap { (symbol, certificate) ->
loginHelper.sendCertificate(certificate, "", certificate.action.replace(startSymbol.getNormalizedSymbol(), symbol))
loginHelper.sendCertificate(certificate, certificate.action.replace(startSymbol.getNormalizedSymbol(), symbol))
.onErrorResumeNext { t ->
if (t is AccountPermissionException) Single.just(SendCertificateResponse())
else Single.error(t)

1
src/test/kotlin/io/github/wulkanowy/api/login/LoginTest.kt
View file

@ -69,6 +69,7 @@ class LoginTest : BaseLocalTest() {
fun multiLogin_withLogin() {
server.enqueue(MockResponse().setBody(LoginTest::class.java.getResource("Logowanie-uonet.html").readText()))
server.enqueue(MockResponse().setBody(LoginTest::class.java.getResource("Login-success-account-switch.html").readText()))
server.enqueue(MockResponse().setBody(LoginTest::class.java.getResource("Login-success-account-switch.html").readText()))
server.start(3000)
val res = normal.login("jan||jan@fakelog.cf", "jan123").blockingGet()