sadorowo/szkolnyplus
1
0
Fork 0
forked from github/szkolny
Code Pull Requests Activity

[API/Gdynia] Remove unnecessary login check.

Browse Source
This commit is contained in:
Kacper Ziubryniewicz 2020-05-17 17:58:07 +02:00
parent 3fcd47cf91
commit ea27492436
1 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/gdynia/login/GdyniaLoginWeb.kt
View File

@ -36,24 +36,7 @@ class GdyniaLoginWeb(val data: DataGdynia, val onSuccess: () -> Unit) {
} }
private fun loginWithCredentials() { private fun loginWithCredentials() {
val checkCallback = object : TextCallbackHandler() { val callback = object : TextCallbackHandler() {
override fun onSuccess(text: String?, response: Response?) {
val cookies = data.app.cookieJar.getAll("nasze.miasto.gdynia.pl")
data.webSid = cookies["sid"]
onSuccess()
return
}
override fun onFailure(response: Response?, throwable: Throwable?) {
data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
.withResponse(response)
.withThrowable(throwable))
}
}
val loginCallback = object : TextCallbackHandler() {
override fun onSuccess(text: String?, response: Response?) { override fun onSuccess(text: String?, response: Response?) {
if (text == null || response == null) { if (text == null || response == null) {
data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY) data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
@ -75,7 +58,8 @@ class GdyniaLoginWeb(val data: DataGdynia, val onSuccess: () -> Unit) {
} }
} }
val sid = "sid=(.*?)&".toRegex().find(text)?.get(1) val cookies = data.app.cookieJar.getAll("nasze.miasto.gdynia.pl")
val sid = cookies["sid"]
if (sid == null) { if (sid == null) {
data.error(ApiError(TAG, ERROR_LOGIN_GDYNIA_WEB_MISSING_SESSION_ID) data.error(ApiError(TAG, ERROR_LOGIN_GDYNIA_WEB_MISSING_SESSION_ID)
@ -84,15 +68,10 @@ class GdyniaLoginWeb(val data: DataGdynia, val onSuccess: () -> Unit) {
return return
} }
Request.builder() data.webSid = sid
.url("$GDYNIA_WEB_URL/$GDYNIA_WEB_LOGIN_CHECK")
.userAgent(SYSTEM_USER_AGENT) onSuccess()
.addParameter("sid", sid) return
.addParameter("url_back", "")
.get()
.callback(checkCallback)
.build()
.enqueue()
} }
override fun onFailure(response: Response?, throwable: Throwable?) { override fun onFailure(response: Response?, throwable: Throwable?) {
@ -111,7 +90,7 @@ class GdyniaLoginWeb(val data: DataGdynia, val onSuccess: () -> Unit) {
.addParameter("pass_md5", data.loginPassword?.md5()) .addParameter("pass_md5", data.loginPassword?.md5())
.addParameter("url_back", "") .addParameter("url_back", "")
.post() .post()
.callback(loginCallback) .callback(callback)
.build() .build()
.enqueue() .enqueue()
} }