Update endpoint mapping, change VToken calc schema

build.gradle

@@ -18,7 +18,7 @@ ext {
     moshi = "1.13.0"
 }
 
-version = "2.6.4"
+version = "2.6.5-SNAPSHOT"
 group = "io.github.wulkanowy"
 
 nexusPublishing {

sdk-scrapper/src/main/kotlin/io/github/wulkanowy/sdk/scrapper/ApiEndpoints.kt

@@ -165,10 +165,61 @@ internal val ApiEndpointsMap = mapOf(
             "RestoreTrash" to "caf5eacb-a2ab-44d7-82c1-bcbd0b7612ed",
         ),
     ),
+    "24.04.0004.58722" to mapOf(
+        "uonetplus-uczen" to mapOf(
+            "EgzaminyZewnetrzne" to "18d9c26a-0ee4-400b-959b-56a01d5e3bea",
+            "Frekwencja" to "26517c9a-a193-410f-b9a2-70cbcc98a542",
+            "FrekwencjaStatystyki" to "9a216ff7-4a99-48ce-9876-e1d1ec756e25",
+            "FrekwencjaStatystykiPrzedmioty" to "47d27f71-0ebb-4e2a-b0bd-664281397420",
+            "Homework" to "c913fbbb-e163-4427-b2f9-82cdf3f3db8c",
+            "LekcjeZaplanowane" to "bf20db85-be85-41b1-a857-a663bdc9e112",
+            "LekcjeZrealizowane" to "5bde0359-6b17-45d5-8004-d8f86b3991b5",
+            "Oceny" to  "52d0e143-54b9-4131-8e40-44478135e7d7",
+            "Ogloszenia" to "3fc35e9e-1b0a-4589-b517-f09c66a27704",
+            "PlanZajec" to "f6d28f27-284a-40bc-af75-060838ad9b54",
+            "PodrecznikiLataSzkolne" to "87d29cc9-eeb9-4185-bbf3-3c60beb0560c",
+            "PodrecznikiUcznia" to "828eb747-99c4-42d8-99ee-a0b6c0cc00d1",
+            "RejestracjaUrzadzeniaToken" to "da3c352f-81ec-4aa9-9481-e3fc79d55701",
+            "RejestracjaUrzadzeniaTokenCertyfikat" to "da3c352f-81ec-4aa9-9481-e3fc79d55701",
+            "Sprawdziany" to "1ce3d57f-72a0-487e-84f2-ad1690ec41bb",
+            "SzkolaINauczyciele" to "4642415b-947d-4ec9-955f-0af48a7e5b9b",
+            "Uczen" to "d8756ab6-cffa-4c36-a525-08796c6540e7",
+            "UczenCache" to "a0bb024d-647e-4ee9-8bc6-6fc649925585",
+            "UczenDziennik" to "7459f626-08ff-4ae5-874e-ab5f9e68a565",
+            "UczenZdjecie" to "b56f7048-2630-4950-a941-47d8f7f97386",
+            "UwagiIOsiagniecia" to "74fd052f-eb86-496b-a5e7-7f1a53e908f5",
+            "ZarejestrowaneUrzadzenia" to "32e18d4e-5702-4bdb-ab9d-1987cb5749f8",
+            "Zebrania" to "94ae9ded-cc09-48e1-898f-84bbb6cc85a5",
+        ),
+        "uonetplus-wiadomosciplus" to mapOf(
+            "Skrzynki" to "bbf0d83f-0890-4af1-9e09-16cda1a9b785",
+            "Odebrane" to "db26ce00-2069-40bd-a7fe-94be0c763c7e",
+            "OdebraneSkrzynka" to "66419d85-5f94-4d07-ba97-82a1678d7d82",
+            "Wyslane" to "dd345c3b-3676-4771-aa2a-7c898ca4428d",
+            "WyslaneSkrzynka" to "806febc4-ff14-47c0-b6ca-6e337d188a30",
+            "Usuniete" to "8173b1bf-c6c9-44a7-bc43-84fcb92a8ec5",
+            "UsunieteSkrzynka" to "e06d5032-2214-4797-8142-27bf0f32846c",
+            "WiadomoscSzczegoly" to "ba1abab4-5725-4483-942e-c6f016fdf25c",
+            "WiadomoscOdpowiedzPrzekaz" to "24592d75-3dbb-4238-9a5f-48f7da951673",
+            "WiadomoscNowa" to "28409679-2864-454c-add1-5c7025f51489",
+            "Pracownicy" to "3c6002ef-477d-4258-81ac-ebfd4d6b9759",
+            "MoveTrash" to "1dbc70aa-be5d-463d-9763-0d82cf8f22de",
+            "RestoreTrash" to "e47d302c-035d-4bbe-bdb7-ae1b7658c549",
+        ),
+    ),
 )
 
 internal val ApiEndpointsVTokenMap = mapOf(
     "24.04.0003.58698" to mapOf(
+        "uonetplus-wiadomosciplus" to mapOf(
+            "Skrzynki" to "7d4b1844-d114-40e3-a565-696564703b38",
+            "Odebrane" to "a94f324b-0ab8-43eb-830e-814d4a0b4aca",
+            "OdebraneSkrzynka" to "e17a1168-a8d1-45ba-b8e8-409cb25768a8",
+            "Wyslane" to "16d74af5-d36e-4c1e-93cb-21e20624d053",
+            "WyslaneSkrzynka" to "17a55992-7275-4c0c-945b-e0eca7bbc847",
+            "Usuniete" to "cf13626d-df9d-4401-8a32-bd5c3e1a13d0",
+            "UsunieteSkrzynka" to "bc17a165-2619-466e-bb40-2bbcd977d634",
+        ),
         "uonetplus-uczenplus" to mapOf(
             "Context" to "e89f6a8e-bc6b-403b-a23d-2a807512d3bd",
             "Frekwencja" to "479fdac8-aa1f-4086-8a8a-b4b68640b810",
@@ -190,14 +241,16 @@ internal val ApiEndpointsVTokenMap = mapOf(
             "OkresyKlasyfikacyjne" to "1ff9466c-2ebb-4649-9563-b005aab2a92a",
             "Oceny" to "353ebbfa-a387-4c61-8f36-1f499d21c665",
         ),
+    ),
+    "24.04.0004.58722" to mapOf(
         "uonetplus-wiadomosciplus" to mapOf(
-            "Skrzynki" to "7d4b1844-d114-40e3-a565-696564703b38",
-            "Odebrane" to "a94f324b-0ab8-43eb-830e-814d4a0b4aca",
-            "OdebraneSkrzynka" to "e17a1168-a8d1-45ba-b8e8-409cb25768a8",
-            "Wyslane" to "16d74af5-d36e-4c1e-93cb-21e20624d053",
-            "WyslaneSkrzynka" to "17a55992-7275-4c0c-945b-e0eca7bbc847",
-            "Usuniete" to "cf13626d-df9d-4401-8a32-bd5c3e1a13d0",
-            "UsunieteSkrzynka" to "bc17a165-2619-466e-bb40-2bbcd977d634",
+            "Skrzynki" to "843345c5-c9bc-45a6-8bc3-de19867e28f4",
+            "Odebrane" to "f97337b2-8408-4655-8175-70269479c01d",
+            "OdebraneSkrzynka" to "958fad5a-4e94-42f9-894b-7ca5352ea192",
+            "Wyslane" to "5e8ddfb1-7af0-4f5a-a4c4-9a2884258e0f",
+            "WyslaneSkrzynka" to "68fffbaf-7f32-4b1a-9da1-af926536d6d3",
+            "Usuniete" to "c8ee2a38-7cf2-440f-bab1-befdf11f3830",
+            "UsunieteSkrzynka" to "82dd1d9b-6dd9-4f55-8698-5af0c5c55dd1",
         ),
     ),
 )

sdk-scrapper/src/main/kotlin/io/github/wulkanowy/sdk/scrapper/Utils.kt

@@ -277,8 +277,6 @@ private fun getVToken(uuid: String, headers: ModuleHeaders?): String? {
     return buildString {
         append(uuid)
         append("-")
-        append(headers?.email)
-        append("-")
         append(headers?.symbol)
         append("-")
         append(headers?.appVersion)