Bump io.mockk:mockk-jvm from 1.13.10 to 1.13.11

Bumps [io.mockk:mockk-jvm](https://github.com/mockk/mockk) from 1.13.10 to 1.13.11. - [Release notes](https://github.com/mockk/mockk/releases) - [Commits](https://github.com/mockk/mockk/compare/1.13.10...1.13.11) --- updated-dependencies: - dependency-name: io.mockk:mockk-jvm dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2024-06-01 22:01:18 +00:00
6 changed files with 9 additions and 215 deletions
--- a/build.gradle
+++ b/build.gradle
@ -18,7 +18,7 @@ ext {
    moshi = "1.13.0"
 }

-version = "2.7.0"
+version = "2.6.14-SNAPSHOT"
 group = "io.github.wulkanowy"

 nexusPublishing {
--- a/sdk-hebe/build.gradle
+++ b/sdk-hebe/build.gradle
@ -16,5 +16,5 @@ dependencies {
    implementation libs.retrofit.scalars
    implementation libs.retrofit.serialization

-    testImplementation "io.mockk:mockk-jvm:1.13.10"
+    testImplementation "io.mockk:mockk-jvm:1.13.11"
 }
--- a/sdk-scrapper/build.gradle
+++ b/sdk-scrapper/build.gradle
@ -16,7 +16,7 @@ dependencies {

    implementation "com.squareup.okhttp3:okhttp-urlconnection"

-    testImplementation "io.mockk:mockk-jvm:1.13.10"
+    testImplementation "io.mockk:mockk-jvm:1.13.11"
 }

 tasks.withType(Test).configureEach {
--- a/sdk-scrapper/src/main/kotlin/io/github/wulkanowy/sdk/scrapper/ApiEndpoints.kt
+++ b/sdk-scrapper/src/main/kotlin/io/github/wulkanowy/sdk/scrapper/ApiEndpoints.kt
@ -615,76 +615,7 @@ internal val ApiEndpointsMap = mapOf(
        ),
        "uonetplus-uczenplus" to mapOf(
            "Context" to "99f04f67-d7f6-4f30-9d02-61cdd656612f",
-            "AutoryzacjaPesel" to "febb23ab-090b-45d0-9c86-b65f44c2baf0",
-            "Frekwencja" to "604fd0c1-ce58-4b60-9603-6e219b473676",
-            "Usprawiedliwienia" to "640531d3-f986-4c1d-a6dd-d57847ca9cd8",
-            "FrekwencjaStatystyki" to "1d15fb9f-dda6-42e4-a571-e8e0c2ecad72",
-            "ZarejestrowaneUrzadzenia" to "ca848077-9fbc-4716-b0ed-17c84b4fc86b",
-            "RejestracjaUrzadzeniaToken" to "2c9fc7e4-aa35-4346-9cf1-ae50008a95cb",
-            "Zebrania" to "374625d5-fd26-4082-9fc2-dcf960e6c718",
-            "RealizacjaZajec" to "0fc3ce8b-efa0-434a-b1a6-e23580ce7e0e",
-            "SprawdzianyZadaniaDomowe" to "a5371f1b-db92-48a5-88e8-604c716c36a3",
-            "SprawdzianSzczegoly" to "3365341e-56ce-42e4-a5ee-3f5e30599e02",
-            "ZadanieDomoweSzczegoly" to "f636feab-3bdf-429d-8837-fec248ac6a27",
-            "PlanZajec" to "79ad9207-6132-427d-bbfa-62a7cff7735f",
-            "DniWolne" to "c537e0ea-3a28-40a0-b1d0-4cb051588727",
-            "Uwagi" to "281cb35f-3943-43a3-910d-32c9198da099",
-            "Nauczyciele" to "298c16b8-a257-4420-aa96-627c1d8957bf",
-            "Informacje" to "6773b9c9-bd7c-47fd-9df6-9501d29c40d7",
-            "DaneUcznia" to "c40b5a6f-4eb5-4b10-b35c-dc8e063ec6f8",
-            "UczenZdjecie" to "c031961d-3700-494f-bb29-522a54a7097f",
-            "OkresyKlasyfikacyjne" to "18428deb-8f85-4f97-99b0-0ec35178edcc",
-            "Oceny" to "83cbb389-f3ab-404d-8ecc-9e687b1b958c",
-        ),
-    ),
-    "24.05.0000.59033" to mapOf(
-        "uonetplus-wiadomosciplus" to mapOf(
-            "Skrzynki" to "99d282b8-c52a-486f-b182-081f17ab575b",
-            "Odebrane" to "9a3adc9d-57c0-489a-96f4-17216ad7f39b",
-            "OdebraneSkrzynka" to "87002a35-79b5-4098-9217-2f4580ed5c4f",
-            "Wyslane" to "813de405-818e-4bea-bb27-bb9ca58e4b35",
-            "WyslaneSkrzynka" to "20fe222f-93ab-4862-ae1c-df4c6b91eed9",
-            "Usuniete" to "b7c90b28-9e16-4631-859b-416dc67988f4",
-            "UsunieteSkrzynka" to "845deb00-e600-420a-bec4-7f8424a09024",
-            "WiadomoscSzczegoly" to "69f036da-5615-4b31-af18-cec2f10d2f0e",
-            "WiadomoscOdpowiedzPrzekaz" to "05301b98-99e9-405e-b373-b6b475848191",
-            "WiadomoscNowa" to "47625b4d-8492-4177-bf98-e471e1e8345f",
-            "Pracownicy" to "89c9a7c2-e062-4d68-a66b-fb8406712351",
-            "MoveTrash" to "85be0a03-b0c0-4f2c-bd0c-660bb8ed7262",
-            "RestoreTrash" to "8aec05e6-218e-4917-9f0b-8baed1560435",
-            "Delete" to "c2a7feca-f2f8-4c29-8182-ee60d8dc0f8f",
-        ),
-        "uonetplus-uczen" to mapOf(
-            "Autoryzacja" to "325c0d1d-1b91-41e4-9bd9-7794ec90cca0",
-            "EgzaminyZewnetrzne" to "fe6b40ba-8a2f-4ad3-a519-343226a66a23",
-            "Frekwencja" to "c8dc2e1f-41e6-40c0-b04f-f49e3d5966ea",
-            "FrekwencjaStatystyki" to "fcefe7af-4324-4e70-ae42-c63dbe988099",
-            "FrekwencjaStatystykiPrzedmioty" to "bb36d4b5-a481-43f7-aae6-89b004451911",
-            "Homework" to "250e6ac4-ab2c-4784-9110-112b6c7b0410",
-            "LekcjeZrealizowane.mvc/GetPrzedmioty" to "ca9358ca-bab9-4e35-85c9-2c8eb1691a6e.mvc/Get",
-            "LekcjeZrealizowane.mvc/GetZrealizowane" to "1a83b152-3160-43db-8683-0fd25c65b78a.mvc/Get",
-            "Oceny" to "837fd82d-3b34-4ef2-9b6c-bbb4032b6975",
-            "Ogloszenia" to "ff3e1b2d-9106-4842-91e1-8db7af1b7819",
-            "PlanZajec" to "dbef1773-0db6-4d08-9a5b-85146a06dfae",
-            "RejestracjaUrzadzeniaToken" to "e581158e-8ff5-4461-9c35-0d9389fbd651",
-            "RejestracjaUrzadzeniaTokenCertyfikat" to "afd176b2-d574-470c-b83e-77ab45dfa8a1",
-            "Sprawdziany" to "81037688-53b4-4f1e-ab43-bc5eabe72501",
-            "Statystyki.mvc/GetOcenyCzastkowe" to "c56368dc-3530-4960-94e2-2b5435732bae.mvc/Get",
-            "Statystyki.mvc/GetPunkty" to "387d3492-5d9d-44f5-b028-4948a16e3e42.mvc/Get",
-            "Statystyki.mvc/GetOcenyRoczne" to "462d4b6d-f1d2-4c4b-8ebc-1aee25c69354.mvc/Get",
-            "SzkolaINauczyciele" to "0e484bbe-bc2e-4f80-9bc8-7ee67097f426",
-            "Uczen" to "630cd54b-b952-43ee-aeb4-4438a2b21e75",
-            "UczenCache" to "333dce23-9766-4f2a-bc30-689bc04f0765",
-            "UczenDziennik" to "6a523e4e-28dd-4123-98e5-ee10604f9e0b",
-            "UczenZdjecie" to "f3e2de45-912f-4d47-943f-25667b3e8a7b",
-            "Usprawiedliwienia" to "f13695db-b9d1-403e-8c7a-ad29b6e9ae7a",
-            "UwagiIOsiagniecia" to "6ac1eafd-38c0-48ab-adce-75c5f901592c",
-            "ZarejestrowaneUrzadzenia" to "1d63088d-02da-4feb-8906-08172e5fea1c",
-            "Zebrania" to "2dd7a794-62d9-4711-b000-b73de88a7990",
-        ),
-        "uonetplus-uczenplus" to mapOf(
-            "Context" to "99f04f67-d7f6-4f30-9d02-61cdd656612f",
-            "AutoryzacjaPesel" to "febb23ab-090b-45d0-9c86-b65f44c2baf0",
+            // "AutoryzacjaPesel" to "",
            "Frekwencja" to "604fd0c1-ce58-4b60-9603-6e219b473676",
            "Usprawiedliwienia" to "640531d3-f986-4c1d-a6dd-d57847ca9cd8",
            "FrekwencjaStatystyki" to "1d15fb9f-dda6-42e4-a571-e8e0c2ecad72",
@ -923,66 +854,6 @@ internal val ApiEndpointsVTokenMap = mapOf(
            "UsunieteSkrzynka" to "W8vyUYqP",
        ),
    ),
-    "24.05.0000.59033" to mapOf(
-        "uonetplus-uczen" to mapOf(
-            "Autoryzacja.mvc" to "QIQqZdfpO",
-            "Frekwencja.mvc" to "FFWp52i",
-            "Usprawiedliwienia.mvc" to "wogKm",
-            "ZarejestrowaneUrzadzenia.mvc" to "M6VmD",
-            "Zebrania.mvc" to "hkpEC",
-            "EgzaminyZewnetrzne.mvc" to "swrH0YR",
-            "FrekwencjaStatystyki.mvc" to "hIyXiyb84",
-            "FrekwencjaStatystykiPrzedmioty.mvc" to "jJ4WL",
-            "LekcjeZrealizowane.mvc/GetZrealizowane" to "0Zbt",
-            "Oceny.mvc" to "RY5yLKL",
-            "Statystyki.mvc/GetOcenyCzastkowe" to "tvZiHv5mwi",
-            "Statystyki.mvc/GetPunkty" to "2ukYOklF",
-            "Statystyki.mvc/GetOcenyRoczne" to "iPrK0ohLA",
-            "LekcjeZrealizowane.mvc/GetPrzedmioty" to "Rxc0Zje7",
-            "Sprawdziany.mvc" to "LQXXXOMQD",
-            "PlanZajec.mvc" to "dFsnz4Tpjx",
-            "RejestracjaUrzadzeniaToken.mvc" to "QiHSC",
-            "RejestracjaUrzadzeniaTokenCertyfikat" to "JO6TnIxMW",
-            "UczenZdjecie.mvc" to "gCglTHSh2",
-            "Uczen.mvc" to "Qmj4F",
-            "UczenDziennik.mvc" to "Uh6DV",
-            "UwagiIOsiagniecia.mvc" to "UcwhGmBp",
-            "UczenCache.mvc" to "1BzK3",
-            "Homework.mvc" to "bQFjG",
-            "SzkolaINauczyciele.mvc" to "fWw8j4JOE",
-            "Ogloszenia.mvc" to "XKkaYNx",
-        ),
-        "uonetplus-uczenplus" to mapOf(
-            "Context" to "aeRN",
-            "Frekwencja" to "ElWdgwf2ki",
-            "Usprawiedliwienia" to "nvlW",
-            "FrekwencjaStatystyki" to "dpJo",
-            "ZarejestrowaneUrzadzenia" to "YnPgEHfG",
-            "Zebrania" to "o4rvVwYB",
-            "RealizacjaZajec" to "K1KaR",
-            "SprawdzianyZadaniaDomowe" to "bX5ulTq4v",
-            "SprawdzianSzczegoly" to "ZZJHeiCbhw",
-            "ZadanieDomoweSzczegoly" to "yxAp3xo",
-            "PlanZajec" to "JpSGlO",
-            "DniWolne" to "ZxeNJWAk",
-            "Uwagi" to "u8SLfDJ",
-            "Nauczyciele" to "hCuAORdV",
-            "Informacje" to "0QwjEyw",
-            "DaneUcznia" to "6H06ch",
-            "UczenZdjecie" to "Jgftgt",
-            "OkresyKlasyfikacyjne" to "AmJ7o7",
-            "Oceny" to "Tm6DXpBUiG",
-        ),
-        "uonetplus-wiadomosciplus" to mapOf(
-            "Skrzynki" to "MevM",
-            "Odebrane" to "KfA5",
-            "OdebraneSkrzynka" to "YhQzStvs3U",
-            "Wyslane" to "9pNDCfZWVU",
-            "WyslaneSkrzynka" to "9pTPrt",
-            "Usuniete" to "eu0uh61KM",
-            "UsunieteSkrzynka" to "W8vyUYqP",
-        ),
-    ),
 )

 internal val ApiEndpointsResponseMapping = mapOf(
@ -1052,72 +923,6 @@ internal val ApiEndpointsResponseMapping = mapOf(
            ),
        ),
    ),
-    "24.05.0000.59033" to mapOf(
-        "uonetplus-wiadomosciplus" to mapOf(
-            "__common__" to mapOf(
-                "rtvrHBuCAwCEEAtIsBtuHJBtFttEtCIJ" to "apiGlobalKey",
-                "GFBGBsJGJFHvErwAswuGruutHHtuHEuG" to "data",
-                "IDJArEArvBsIErGDrsuEuGssHwsHGEts" to "hasZalaczniki",
-                "IDwrCCJDGFrHEuIFsvEvDDJwtBFECCHJ" to "id",
-                "AurrDtEJwwrEEwJtIJvEHHwICuBBDFGF" to "korespondenci",
-                "DBtuuvuGvEBsEAHAJrJECsDGuFrFsuGw" to "nieprzeczytanePrzeczytanePrzez",
-                "FuBsJwBvHErtEDAwJGuHCuIHJwBrrJFI" to "przeczytana",
-                "AuvBvruBGtGvEJHtIrsGvrIBDGAIFJCB" to "skrzynka",
-                "rtBCHvtsICwDEEFuJwvwJDCJBIAvAGCv" to "temat",
-                "twrCEIrHrsuGEIFIsCGEDJHDwrCICwBG" to "uzytkownikRola",
-                "AtAsGsuEIAurEGBAJBCGIIFsuwFrwsJt" to "wazna",
-                "twsrwAIrvGJFEutCrBrDvHCGwGHGCAGv" to "wycofana",
-            ),
-            "Skrzynki" to mapOf(
-                "uwtBBGEJtGHCEEvvsuCJEtCJHCrustHu" to "globalKey",
-                "svttEIFJuuvGECBBrGCGtuuBFJBCAtGE" to "nazwa",
-                "BAICCDrJHtAEEtABrJFuFtvGuICrrCGC" to "typUzytkownika",
-            ),
-            "WiadomoscSzczegoly" to mapOf(
-                "IvDDwGIurwIrEHDHIBvAvBEBvCsstBCC" to "apiGlobalKey",
-                "utFsEtBJsrEuEECBJDuuIEsvFDCsEIuv" to "data",
-                "DDAtuGHJBIEFErBArstDrsBAvIsvBHHs" to "dataWycofania",
-                "vFICGIHIAwvBEwIHrvstBvwvCJJIGwJE" to "id",
-                "DuJuEEvwFwAFEsAErCEtuIBtvwDsJutA" to "nadawca",
-                "DDAtuGHJBIEFErBArstDrsBAvIsvBHHs" to "nadawcaInfo",
-                "DGswFwrIGwFsEEFFrBDwvsrIsFHHCGst" to "nadawcaTyp",
-                "srBIECHwtJEuEJFIsBHBGsGIrHuBCJAu" to "odbiorcy",
-                "wwArFDurBrDFEvrAJGrsIIFADCswFuIE" to "odczytana",
-                "wuEwstuHDJCGEuEvsBJrEGFvIwvuvCJC" to "temat",
-                "BEDvtCIEBCGJEDGwswIFIvIuAHFDrAJI" to "tresc",
-                "HrvHItBsstFrEABGIDtuuGJJIGBECwFu" to "wycofana",
-                "GvtvvDBGvsAHEBsDsBJIJGtAtCvFswAI" to "zalaczniki",
-
-                // attachments
-                "CtItswwCCvwuEtEDsCGtAutIuuCABEBB" to "nazwaPliku",
-                "HCIICHrHBsvHECCAsFCEGGBsIFJvuHrt" to "url",
-            ),
-            "WiadomoscOdpowiedzPrzekaz" to mapOf(
-                "AsrstFGtsDuuEsHCJFBDuICHHtCuwEuG" to "adresaci",
-                "CFHDJEstCsAvErGrJFCvvrvEJuABHFuD" to "apiGlobalKey",
-                "BArtutvvEurtEwBuJrvrCAHFIsFrJCJu" to "data",
-                "HtIFwvAFwsJIEAsrJIrJCEvGuIrrCAIG" to "id",
-                "AswHHvHvJDJsEIrJIHvrvDtCFErwBGtE" to "nadawcaInfo",
-                "BHuHEFHuDGHGEFIwsrssEIFBAuADsrFE" to "nadawcaSkrzynkaGlobalKey",
-                "DwGFGAHvJtvDEEGFstwICEwEBEDrAFID" to "nadawcaSkrzynkaNazwa",
-                "CHCsGwHIAIGJErwGsHJAHGBsArsDvBBG" to "temat",
-                "FJFFFtAFHJvvErrEssGBGIwDJGrEGwrH" to "tresc",
-                "AsvwvAGGJsCCECrGJJIAvIrtBtwBttFG" to "uzytkownikSkrzynkaGlobalKey",
-                "vvtvEJDDIFEGEuCIstEJsHIutAIDGrGJ" to "zalaczniki",
-
-                // recipients
-                "IAACDtCusJrAEJsuJICCvIDCHrrAvEtw" to "nazwa",
-                "BrHECCDIvBCJEvsIJtGJAHwBuAFIHDGG" to "skrzynkaGlobalKey",
-
-                // attachments
-                "vvwssJwwwHHEEuFEJtDEIIrwtrCuGJCH" to "id",
-                "FJFEEvAusIvBEvADIEEJwItwrvDtAsCD" to "idZewnetrzne",
-                "AwHsFrrwGIsAEHGCIsvJCtDICCCJItDF" to "nazwaPliku",
-                "wGBHDwCCFHssEJrFrIuIItFvuFtGtDBB" to "url",
-                "FvDrCwEBtwIvECBsIwIuAItCvBvGCvvB" to "zrodlo",
-            ),
-        ),
-    ),
 )

 internal val ApiEndpointsVHeaders = mapOf(
@ -1176,15 +981,4 @@ internal val ApiEndpointsVHeaders = mapOf(
            "V-TokenApi" to "{UUID}-{appCustomerDb}-{appCustomerDbSig}-{appVersion}-{apiKey}",
        ),
    ),
-    "24.05.0000.59033" to mapOf(
-        "uonetplus-wiadomosciplus" to mapOf(
-            "V-TokenApi" to "{UUID}-{appCustomerDb}-{appCustomerDbSig}-{apiKey}",
-        ),
-        "uonetplus-uczen" to mapOf(
-            "V-TokenApi" to "{%UUID%}-{%vTokenApiIndexed%}",
-        ),
-        "uonetplus-uczenplus" to mapOf(
-            "V-TokenApi" to "{UUID}-{appCustomerDb}-{appCustomerDbSig}-{apiKey}",
-        ),
-    ),
 )
--- a/sdk-scrapper/src/main/kotlin/io/github/wulkanowy/sdk/scrapper/Utils.kt
+++ b/sdk-scrapper/src/main/kotlin/io/github/wulkanowy/sdk/scrapper/Utils.kt
@ -160,7 +160,7 @@ internal fun Recipient.toMailbox() = Mailbox(
 internal fun String.capitalise() = replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() }

 internal val defaultUserAgentTemplate = buildString {
-    append("Mozilla/5.0 (Linux; Androidx %1\$s; %2\$s) ")
+    append("Mozilla/5.0 (Linux; Android %1\$s; %2\$s) ")
    append("AppleWebKit/%3\$s (KHTML, like Gecko) ")
    append("Chrome/%4\$s Mobile ")
    append("Safari/%5\$s")
@ -171,7 +171,7 @@ internal fun getFormattedString(
    androidVersion: String,
    buildTag: String,
    webKitRev: String = "537.36",
-    chromeRev: String = "125.0.0.0",
+    chromeRev: String = "120.0.0.0",
 ): String {
    return String.format(template, androidVersion, buildTag, webKitRev, chromeRev, webKitRev)
 }
--- a/sdk-scrapper/src/main/kotlin/io/github/wulkanowy/sdk/scrapper/grades/GradesResponse.kt
+++ b/sdk-scrapper/src/main/kotlin/io/github/wulkanowy/sdk/scrapper/grades/GradesResponse.kt
@ -36,13 +36,13 @@ internal data class GradesResponse(
 internal data class GradesSettings(

    @SerialName("isSrednia")
-    val isAverage: Boolean = false,
+    val isAverage: Boolean,

    @SerialName("isPunkty")
-    val isPoints: Boolean = false,
+    val isPoints: Boolean,

    @SerialName("isDorosli")
-    val isForAdults: Boolean = false,
+    val isForAdults: Boolean,
 )

@Serializable