Update apiKey regex

This commit is contained in:
Mikołaj Pich 2024-05-17 07:11:42 +02:00
parent 1eeea1e249
commit b5238db5d4
No known key found for this signature in database
2 changed files with 74 additions and 1 deletions

View file

@ -342,6 +342,65 @@ internal val ApiEndpointsMap = mapOf(
"RestoreTrash" to "c9848486-e687-4179-a73e-55b1781f3e19",
),
),
"24.04.0007.58773" to mapOf(
"uonetplus-uczen" to mapOf(
"Autoryzacja" to "48000dd3-47f4-420c-be20-02f2f8ea7519",
"DostepOffice" to "e2521d26-8247-4aa7-a30d-74957530e9d6",
"EgzaminySemestralne" to "37fd9e21-5d07-4f37-a84c-985fa219400d",
"EgzaminyZewnetrzne" to "1e7839ea-d736-4408-ba9a-2f0e5ef4e481",
"EwidencjaObecnosci" to "a894cd94-9107-49f5-b4b7-1db873bc72ff",
"FormularzeSzablony" to "8114ebf1-3d3f-45d9-b0f6-b964bf7c76fe",
"FormularzeWysylanie" to "84f76c91-a7c2-481b-94d0-5cd51764d1e1",
"Frekwencja" to "ab864850-7fbc-4699-bd2b-f4d14a1c6dfc",
"FrekwencjaStatystyki" to "24f19397-4859-405f-8574-0ea44f13ad32",
"FrekwencjaStatystykiPrzedmioty" to "79ef0465-026d-4a5b-a0af-2a5f375a1089",
"Homework" to "d3f909d5-63d0-44c2-a404-132e0ddac121",
"Jadlospis" to "61c0e909-c307-402b-8cb1-67029ffdeca6",
"LekcjeZaplanowane" to "0fe7707d-fbbd-4757-ac94-a6f58335eaea",
"LekcjeZrealizowane" to "13ac9c1d-a53d-4250-9111-ebccbd44e28b",
"Oceny" to "1bb0dc78-acef-4430-8f66-46f482259142",
"Ogloszenia" to "c30df593-1907-48ce-a752-5cfd5ed03f24",
"Oplaty" to "51ae0f70-6327-430c-a7f1-be036e8e44e2",
"PlanZajec" to "01c94be1-ac72-4aca-95e4-29342dc57782",
"Platnosc" to "6d4957dc-1418-41db-9598-18d12a870217",
"PlatnoscMetadata" to "9d2cc24a-c022-4a40-9e7c-662e398b797c",
"PodrecznikiLataSzkolne" to "e278e2c3-6fd9-472e-9963-60e1a10290d6",
"PodrecznikiUcznia" to "568a3da1-2c5c-4ea2-8f24-f1fbc0d3bae4",
"Pomoc" to "db34bd5f-1417-4479-ba4b-2e847dc7781e",
"RejestracjaUrzadzeniaToken" to "0d7ec4e7-afcb-4fca-9b9b-7102804f4af9",
"RejestracjaUrzadzeniaTokenCertyfikat" to "9c675268-4e7f-43ba-924d-cbe0bbe20321",
"RozpoczeciePlatnosci" to "f2ba09db-727b-4c61-927e-6e7b7b350926",
"ScalanieKont" to "ea1f58ea-2f27-41bb-b94d-818a8fbecabc",
"Sprawdziany" to "6f43a00d-2846-4be3-b8d3-49a42f18acd9",
"Statystyki" to "59a8772d-8082-4927-8351-a711da917995",
"SzkolaINauczyciele" to "4aafbcb8-0b92-4dcb-849a-1a69f8d0cf63",
"Uczen" to "badb2896-942f-4c80-8eeb-a6c0cdaada96",
"UczenCache" to "be5e0cdc-b442-41ea-8079-1fc2ebde99a8",
"UczenDziennik" to "1c462d92-8b30-4c3d-9803-cc1caac26da0",
"UczenZdjecie" to "8923cafb-ff76-4305-84c3-d2ae4891306c",
"Usprawiedliwienia" to "982537df-6fb1-47ef-a9e0-1ee68e3b868f",
"UwagiIOsiagniecia" to "e5cd2a74-a930-46a4-81db-66cd05506cff",
"ZarejestrowaneUrzadzenia" to "77d0875d-4c5e-4903-94cc-5757e6081288",
"Zebrania" to "f455060f-76e6-4d43-9708-0ba51a4778f6",
"ZebraniaObecnosc" to "638ed2ad-0cce-4736-bd55-40b8f6977767",
"ZgloszoneNieobecnosci" to "5e394724-80f5-4472-9858-b769cdc3c4fd",
),
"uonetplus-wiadomosciplus" to mapOf(
"Skrzynki" to "5a974012-36a9-4438-ba79-7fa49dfe0b80",
"Odebrane" to "729ab399-a18b-42d1-8d8e-64212e1ed38a",
"OdebraneSkrzynka" to "c623a66d-e5ff-4156-a89a-713c59da1258",
"Wyslane" to "f08fb519-69f0-431c-946b-6bca1459cea8",
"WyslaneSkrzynka" to "35af724e-d964-4191-ab32-7272a8d91aaa",
"Usuniete" to "f7a83737-2377-4796-bd98-c7148988c02d",
"UsunieteSkrzynka" to "fdd0ce95-b9b9-432a-ac67-45cf9dea0872",
"WiadomoscSzczegoly" to "b6cbb0b5-57bc-4efc-8d0f-cfca7f2d13c2",
"WiadomoscOdpowiedzPrzekaz" to "b8c15629-f7bd-4d18-8a7a-d414e8560ba0",
"WiadomoscNowa" to "67601f5e-c268-43d6-8083-09c4dc3381e6",
"Pracownicy" to "8c104c09-55b2-44b8-9b6a-22bd5cb86f39",
"MoveTrash" to "51a490c5-a6dc-4cff-9216-b2dadb0707df",
"RestoreTrash" to "c9848486-e687-4179-a73e-55b1781f3e19",
),
),
)
internal val ApiEndpointsVTokenMap = mapOf(
@ -410,6 +469,17 @@ internal val ApiEndpointsVTokenMap = mapOf(
"UsunieteSkrzynka" to "937cd3ba-6fa9-4e44-bb99-e4fd282803c2",
),
),
"24.04.0007.58773" to mapOf(
"uonetplus-wiadomosciplus" to mapOf(
"Skrzynki" to "3d3b9fb5-1471-4a32-9cae-cfc7e578ec44",
"Odebrane" to "7c3a7ff9-04b6-4a0a-9cfd-b62d2089becc",
"OdebraneSkrzynka" to "af38e4f6-882a-4bf7-8391-965bcbf81d98",
"Wyslane" to "e4380487-89c8-445c-a28e-984284a8bf2b",
"WyslaneSkrzynka" to "2d8ddc9b-ed39-4093-9604-7247884753cd",
"Usuniete" to "6fb7f517-7287-41c3-8d30-64e654f647a7",
"UsunieteSkrzynka" to "937cd3ba-6fa9-4e44-bb99-e4fd282803c2",
),
),
)
internal val ApiEndpointsVTokenSchemeMap = mapOf(
@ -425,4 +495,7 @@ internal val ApiEndpointsVTokenSchemeMap = mapOf(
"24.04.0006.58753" to mapOf(
"uonetplus-wiadomosciplus" to "{UUID}-{appCustomerDb}-{appVersion}-{apiKey}",
),
"24.04.0007.58773" to mapOf(
"uonetplus-wiadomosciplus" to "{UUID}-{appCustomerDb}-{appVersion}-{apiKey}",
),
)

View file

@ -89,7 +89,7 @@ internal fun getApiKey(document: Document, fallback: String = ""): String {
return fallback
}
return "(\\d{7})".toRegex().findAll(script).lastOrNull().let { result ->
return "'([a-zA-Z0-9]{8,9})'".toRegex().findAll(script).lastOrNull().let { result ->
if (null !== result) result.groupValues[1] else fallback
}
}