Add mapping v4

2024-05-30 15:47:45 +02:00 · 2024-05-30 15:47:45 +02:00 · 793ade5d3e
commit 793ade5d3e
parent 312fa55ab8
8 changed files with 119 additions and 32 deletions
--- 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
--- a/generator/src/main/kotlin/json.kt
+++ b/generator/src/main/kotlin/json.kt
@ -20,6 +20,7 @@ fun generateMappingJson(
    vTokenMap: Map<String, Map<String, Map<String, String>>>,
    vTokenSchemeMap: Map<String, Map<String, String>>,
    vHeaders: Map<String, Map<String, Map<String, String>>> = mapOf(),
+    responseMap: Map<String, Map<String, Map<String, Map<String, String>>>> = mapOf(),
 ): String {
    return json.encodeToString(
        Mapping(
@ -27,6 +28,7 @@ fun generateMappingJson(
            vTokens = vTokenMap,
            vTokenScheme = vTokenSchemeMap,
            vHeaders = vHeaders,
+            responseMap = responseMap,
        )
    )
 }
--- 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)
 }
--- a/generator/src/main/kotlin/mapping/Endpoints.kt
+++ b/generator/src/main/kotlin/mapping/Endpoints.kt
@ -547,9 +547,7 @@ val ApiEndpointsMap = mapOf(
    ),
 )

-val ApiEndpointsMapV3 = ApiEndpointsMap + mapOf(
-    "24.04.0010.58863" to mapOf(
-        "uonetplus-uczen" to 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",
@ -576,6 +574,31 @@ val ApiEndpointsMapV3 = ApiEndpointsMap + mapOf(
    "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 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",
+        )
    ),
 )
--- 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<String, Map<String, Map<String, String>>>,
+
+    @SerialName("responseMap")
+    val responseMap: Map<String, Map<String, Map<String, Map<String, String>>>>,
 )
--- a/generator/src/main/kotlin/mapping/ResponseKeys.kt
+++ 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",
+            ),
+        ),
+    ),
+)
--- 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%}",
        ),
--- 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",
+        ),
    ),
 )