From ea274924363a9ecb0b52f702fe71bb0cc1a2dd18 Mon Sep 17 00:00:00 2001
From: Kacper Ziubryniewicz <kapi2289@gmail.com>
Date: Sun, 17 May 2020 17:58:07 +0200
Subject: [PATCH] [API/Gdynia] Remove unnecessary login check.

---
 .../edziennik/gdynia/login/GdyniaLoginWeb.kt  | 37 ++++---------------
 1 file changed, 8 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/gdynia/login/GdyniaLoginWeb.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/gdynia/login/GdyniaLoginWeb.kt
index 1580b3a9..472541bb 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/gdynia/login/GdyniaLoginWeb.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/gdynia/login/GdyniaLoginWeb.kt
@@ -36,24 +36,7 @@ class GdyniaLoginWeb(val data: DataGdynia, val onSuccess: () -> Unit) {
     }
 
     private fun loginWithCredentials() {
-        val checkCallback = 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() {
+        val callback = object : TextCallbackHandler() {
             override fun onSuccess(text: String?, response: Response?) {
                 if (text == null || response == null) {
                     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) {
                     data.error(ApiError(TAG, ERROR_LOGIN_GDYNIA_WEB_MISSING_SESSION_ID)
@@ -84,15 +68,10 @@ class GdyniaLoginWeb(val data: DataGdynia, val onSuccess: () -> Unit) {
                     return
                 }
 
-                Request.builder()
-                        .url("$GDYNIA_WEB_URL/$GDYNIA_WEB_LOGIN_CHECK")
-                        .userAgent(SYSTEM_USER_AGENT)
-                        .addParameter("sid", sid)
-                        .addParameter("url_back", "")
-                        .get()
-                        .callback(checkCallback)
-                        .build()
-                        .enqueue()
+                data.webSid = sid
+
+                onSuccess()
+                return
             }
 
             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("url_back", "")
                 .post()
-                .callback(loginCallback)
+                .callback(callback)
                 .build()
                 .enqueue()
     }