From 793ade5d3ed1377438817a5f7de9ed44505c777a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Thu, 30 May 2024 15:47:45 +0200 Subject: [PATCH] Add mapping v4 --- .github/workflows/deploy.yml | 2 +- generator/src/main/kotlin/json.kt | 2 + generator/src/main/kotlin/main.kt | 8 ++ .../src/main/kotlin/mapping/Endpoints.kt | 79 ++++++++++++------- generator/src/main/kotlin/mapping/Mapping.kt | 3 + .../src/main/kotlin/mapping/ResponseKeys.kt | 42 ++++++++++ generator/src/main/kotlin/mapping/VHeaders.kt | 6 +- generator/src/main/kotlin/mapping/VTokens.kt | 9 +++ 8 files changed, 119 insertions(+), 32 deletions(-) create mode 100644 generator/src/main/kotlin/mapping/ResponseKeys.kt diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 727665b..a4368e3 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -59,7 +59,7 @@ jobs: url: https://api.cloudflare.com/client/v4/zones/0dd93531047ba376c2a1167f841c2bfd/purge_cache headers: ${{ secrets.custom_headers }} bearer-token: ${{ secrets.bearer_token }} - body: '{"files": ["https://messages.wulkanowy.net.pl/", "https://messages.wulkanowy.net.pl/v1.json", "https://messages.wulkanowy.net.pl/mapping1.json", "https://messages.wulkanowy.net.pl/mapping2.json", "https://messages.wulkanowy.net.pl/mapping3.json", "https://messages.wulkanowy.net.pl/end.json"]}' + body: '{"files": ["https://messages.wulkanowy.net.pl/", "https://messages.wulkanowy.net.pl/v1.json", "https://messages.wulkanowy.net.pl/mapping1.json", "https://messages.wulkanowy.net.pl/mapping2.json", "https://messages.wulkanowy.net.pl/mapping3.json", "https://messages.wulkanowy.net.pl/mapping4.json", "https://messages.wulkanowy.net.pl/end.json"]}' accept: 200 log-response: false retries: 3 diff --git a/generator/src/main/kotlin/json.kt b/generator/src/main/kotlin/json.kt index 3d806aa..ebe91a3 100644 --- a/generator/src/main/kotlin/json.kt +++ b/generator/src/main/kotlin/json.kt @@ -20,6 +20,7 @@ fun generateMappingJson( vTokenMap: Map>>, vTokenSchemeMap: Map>, vHeaders: Map>> = mapOf(), + responseMap: Map>>> = mapOf(), ): String { return json.encodeToString( Mapping( @@ -27,6 +28,7 @@ fun generateMappingJson( vTokens = vTokenMap, vTokenScheme = vTokenSchemeMap, vHeaders = vHeaders, + responseMap = responseMap, ) ) } diff --git a/generator/src/main/kotlin/main.kt b/generator/src/main/kotlin/main.kt index 4d2ac79..4512c77 100644 --- a/generator/src/main/kotlin/main.kt +++ b/generator/src/main/kotlin/main.kt @@ -25,6 +25,13 @@ fun main() { vTokenSchemeMap = ApiEndpointsVTokenSchemeMap, vHeaders = ApiEndpointsVHeaders, ) + val mappingV4 = generateMappingJson( + endpoints = ApiEndpointsMapV4, + vTokenMap = ApiEndpointsVTokenMap, + vTokenSchemeMap = ApiEndpointsVTokenSchemeMap, + vHeaders = ApiEndpointsVHeaders, + responseMap = ApiEndpointsResponseMapping, + ) val html = generateHtml(filteredMessages) val end = json.encodeToString(endMessage) @@ -33,5 +40,6 @@ fun main() { File("../dist/mapping1.json").writeText(mappingV1) File("../dist/mapping2.json").writeText(mappingV2) File("../dist/mapping3.json").writeText(mappingV3) + File("../dist/mapping4.json").writeText(mappingV4) File("../dist/index.html").writeText(html) } diff --git a/generator/src/main/kotlin/mapping/Endpoints.kt b/generator/src/main/kotlin/mapping/Endpoints.kt index 9ab5205..e5ca013 100644 --- a/generator/src/main/kotlin/mapping/Endpoints.kt +++ b/generator/src/main/kotlin/mapping/Endpoints.kt @@ -547,35 +547,58 @@ val ApiEndpointsMap = mapOf( ), ) +private val UonetPlusUczen_24_04_0010_58863 = 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", +) + val ApiEndpointsMapV3 = ApiEndpointsMap + mapOf( "24.04.0010.58863" to mapOf( - "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-uczen" to UonetPlusUczen_24_04_0010_58863, + ), +) + +val ApiEndpointsMapV4 = ApiEndpointsMap + mapOf( + "24.04.0010.58863" to mapOf( + "uonetplus-uczen" to UonetPlusUczen_24_04_0010_58863, + "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", + ) ), ) diff --git a/generator/src/main/kotlin/mapping/Mapping.kt b/generator/src/main/kotlin/mapping/Mapping.kt index e993e94..718d4af 100644 --- a/generator/src/main/kotlin/mapping/Mapping.kt +++ b/generator/src/main/kotlin/mapping/Mapping.kt @@ -17,4 +17,7 @@ data class Mapping( @SerialName("vHeaders") val vHeaders: Map>>, + + @SerialName("responseMap") + val responseMap: Map>>>, ) diff --git a/generator/src/main/kotlin/mapping/ResponseKeys.kt b/generator/src/main/kotlin/mapping/ResponseKeys.kt new file mode 100644 index 0000000..2c02e3d --- /dev/null +++ b/generator/src/main/kotlin/mapping/ResponseKeys.kt @@ -0,0 +1,42 @@ +package mapping + +internal val ApiEndpointsResponseMapping = mapOf( + "24.04.0010.58863" to mapOf( + "uonetplus-wiadomosciplus" to mapOf( + "__common__" to mapOf( + "apiGlobalKey" to "rtvrHBuCAwCEEAtIsBtuHJBtFttEtCIJ", + "data" to "GFBGBsJGJFHvErwAswuGruutHHtuHEuG", + "hasZalaczniki" to "IDJArEArvBsIErGDrsuEuGssHwsHGEts", + "id" to "IDwrCCJDGFrHEuIFsvEvDDJwtBFECCHJ", + "korespondenci" to "AurrDtEJwwrEEwJtIJvEHHwICuBBDFGF", + "nieprzeczytanePrzeczytanePrzez" to "DBtuuvuGvEBsEAHAJrJECsDGuFrFsuGw", + "przeczytana" to "FuBsJwBvHErtEDAwJGuHCuIHJwBrrJFI", + "skrzynka" to "AuvBvruBGtGvEJHtIrsGvrIBDGAIFJCB", + "temat" to "rtBCHvtsICwDEEFuJwvwJDCJBIAvAGCv", + "uzytkownikRola" to "twrCEIrHrsuGEIFIsCGEDJHDwrCICwBG", + "wazna" to "AtAsGsuEIAurEGBAJBCGIIFsuwFrwsJt", + "wycofana" to "twsrwAIrvGJFEutCrBrDvHCGwGHGCAGv", + ), + "Skrzynki" to mapOf( + "globalKey" to "uwtBBGEJtGHCEEvvsuCJEtCJHCrustHu", + "nazwa" to "svttEIFJuuvGECBBrGCGtuuBFJBCAtGE", + "typUzytkownika" to "BAICCDrJHtAEEtABrJFuFtvGuICrrCGC", + ), + "WiadomoscSzczegoly" to mapOf( + "apiGlobalKey" to "IvDDwGIurwIrEHDHIBvAvBEBvCsstBCC", + "data" to "utFsEtBJsrEuEECBJDuuIEsvFDCsEIuv", + "dataWycofania" to "DDAtuGHJBIEFErBArstDrsBAvIsvBHHs", + "id" to "vFICGIHIAwvBEwIHrvstBvwvCJJIGwJE", + "nadawca" to "DuJuEEvwFwAFEsAErCEtuIBtvwDsJutA", + "nadawcaInfo" to "DDAtuGHJBIEFErBArstDrsBAvIsvBHHs", + "nadawcaTyp" to "DGswFwrIGwFsEEFFrBDwvsrIsFHHCGst", + "odbiorcy" to "srBIECHwtJEuEJFIsBHBGsGIrHuBCJAu", + "odczytana" to "wwArFDurBrDFEvrAJGrsIIFADCswFuIE", + "temat" to "wuEwstuHDJCGEuEvsBJrEGFvIwvuvCJC", + "tresc" to "BEDvtCIEBCGJEDGwswIFIvIuAHFDrAJI", + "wycofana" to "HrvHItBsstFrEABGIDtuuGJJIGBECwFu", + "zalaczniki" to "GvtvvDBGvsAHEBsDsBJIJGtAtCvFswAI", + ), + ), + ), +) diff --git a/generator/src/main/kotlin/mapping/VHeaders.kt b/generator/src/main/kotlin/mapping/VHeaders.kt index cbb68af..a9525d4 100644 --- a/generator/src/main/kotlin/mapping/VHeaders.kt +++ b/generator/src/main/kotlin/mapping/VHeaders.kt @@ -53,9 +53,9 @@ val ApiEndpointsVHeaders = mapOf( ), ), "24.04.0010.58863" to mapOf( - // "uonetplus-wiadomosciplus" to mapOf( - // "V-Apitoken" to "{UUID}-{appCustomerDb}-{appCustomerDbSig}-{appVersion}-{apiKey}", - // ), + "uonetplus-wiadomosciplus" to mapOf( + "V-TokenApi" to "{UUID}-{appCustomerDb}-{appCustomerDbSig}-{appVersion}-{apiKey}", + ), "uonetplus-uczen" to mapOf( "V-TokenApi" to "{%UUID%}-{%vTokenApiIndexed%}", ), diff --git a/generator/src/main/kotlin/mapping/VTokens.kt b/generator/src/main/kotlin/mapping/VTokens.kt index 7d19997..6df95f5 100644 --- a/generator/src/main/kotlin/mapping/VTokens.kt +++ b/generator/src/main/kotlin/mapping/VTokens.kt @@ -197,5 +197,14 @@ val ApiEndpointsVTokenMap = mapOf( "SzkolaINauczyciele.mvc" to "fWw8j4JOE", "Ogloszenia.mvc" to "XKkaYNx", ), + "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", + ), ), )