updating roadmap

docker/opencr/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:erbium-slim
+FROM node:16-slim
 
 RUN mkdir -p /var/log
 ARG branch=master

docs/dev/roadmap.md

@@ -6,6 +6,8 @@ Priority areas for feedback are the following:
 
 * **Simplify configuration for patient matching decision rules:** A longstanding request is to simplify configuration for patient matching decision rules. In 2022 this was addressed by removing the need to write a configuration for ElasticSearch for decision rules. Instead, fields required for indexing because they are in the decision rules are automatically included for indexing.
 
-* **Support for HAPI FHIR Server MDM (Master Data Management) as an optional backend:** This feature would make it possible to use the OpenCR UI with the HAPI MDM backend. OpenCR utilizes ElasticSearch for the task of matching which is scalable and fast. After the initial release of OpenCR, SmileCDR released a patient identity matching mechanism and then overhauled it to allow matching any FHIR resources. There are proprietary features in the SmileCDR product that allow managing 'golden records', meaning to promote fields as authoritative. OpenCR has an open source UI which does not exist in the HAPI or SmileCDR products. 
+* **Support for HAPI FHIR Server MDM (Master Data Management) as an optional deduplication service:** This feature would make it possible to use OpenCR with the HAPI MDM and allow implementers to either choose elasticsearch/opensearch or HAPI MDM for deduplication. OpenCR utilizes ElasticSearch/OpenSearch for the task of matching which is scalable and fast. After the initial release of OpenCR, SmileCDR released a patient identity matching mechanism and then overhauled it to allow matching any FHIR resources. There are proprietary features in the SmileCDR product that allow managing 'golden records', meaning to promote fields as authoritative. OpenCR has an open source UI which does not exist in the HAPI or SmileCDR products.
 
-* **Support Keycloak and similar:** This feature would allow for using authentication and authorization realms managed by Keycloak, a popular open source engine.
+* **Support Keycloak and similar:** This feature would allow for using authentication and authorization realms managed by Keycloak, a popular open source engine. The point in here is to enhance authentication in opencr which currently it only do basic authentication
+
+* **Support for deduplication without submitting a patient:** Currently opencr runs the deduplication service every time a new patient is submitted or an existing patient is updated. This feature will allow openCR to be run without waiting for patient submission, especially when decision rules are changed.

server/clientCertificates/openmrs_cert.pem

@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
 MIIDmjCCAoICAQEwDQYJKoZIhvcNAQELBQAwFDESMBAGA1UEAwwJbG9jYWxob3N0
-MB4XDTIyMDUwOTA1MzMyMloXDTIzMDUwOTA1MzMyMlowEjEQMA4GA1UEAwwHb3Bl
-bm1yczCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOGAayPbcQGaJy79
-Ta/TZf/nypBe8m8df26hUG2qR5RexHI5BRWR9NXXeD2li7zpne0xGXMFCMn3JN5K
-ot5LV57xbPEfYT4RD/9Rjm5BkU43/LiPgYEBejS1W/s0VOX3nUVk76uwxnSS75s/
-yWFEQr2POcM/ca76G0Zi4c8pn9kJb/KcqRTG+9nhCPHPfsetfivk3wvJV1P7dZts
-jsZ2O7XjsVMBJltON8/N1UgaOJcvyOL61hTqnk+wOxBbYxcOkkWuM6fmxBhZVLBl
-zEnHGBU40dupIl+nuaOISmbgt4pnyAScJ3mleBXZMnU1RRFd2HrC5LeCP3yVnUzJ
-To+v0QlaytIrbMwDUPtLnWNBaXaBfrE1TP8k9201ZsiP+4hneWs/D1+RXM0YQEMM
-I0nexqEnXMqs8qxslpr+uD2FYXtGzPaNl1xD9r9nYI+cfKZlnFWFmRbikxG6PBkv
-7AAdtJidLLZgW/E107t1BfbVnSYfMe3/y+jVYJCabkZhzj9W/amn6MAqEx6SCNkm
-Qb0dvfIdEB3kJvwD+GO5ITdvVZ5PLpGljLgaxLHK2jZrIlbfMXN848OSjQmY8BsF
-sWxWqzi01neNNQpJ/QDCsbAWYXcR6XFv3Al0eqYsYNlWum6FIlYvNNm6X/8986Aw
-z9kq39dcCsK/KJcug8I3DLg+tJopAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAByA
-vl8t1dzbwg52pbaA2cress+WGsQg836H4mhd5t0Zy7X//suwWt/V07NOWXLde4n3
-aC6pitmClOE9Y0PyKdFR61dxWzwi8Awp77gQiScZw5CIrjLe7/z6ufY7pm1B7KTi
-yk43knpSgVKFA4hVwvdVFh98sCwtXQVn9io1+NpGsTUGSOoKd3OH5ubUOda5bEQS
-5qU4qSenv4SZwtMIgiwqNeuuhoifUUIeYOjw5vojhX3c8Ua1y24606grKF510tUs
-CBLR0twTxAVfJks2SimWBrHJRyUYI3I5cflWwRVbi/6+OKPgwZGzf7jPxb6MXNC/
-PtGcuL8ulK0djoduPrw=
+MB4XDTIzMDUzMDA2NDAxNFoXDTI0MDUyOTA2NDAxNFowEjEQMA4GA1UEAwwHb3Bl
+bm1yczCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOZFxz9iS76B07Lk
+Fzfka53njoKdJ4R6pvVSXUzVhbmFvHgmGmPROemZy9rJlOoXFvIkDb/qAmwGqEei
+DPc0Uom25W8ODUA6Yf0ZbvzsW6EoQtQqA6dVK8/S53di3YNi3qkqOHwoMl9XYsuv
+3wrNa7Xig2h53GNVYcsdUr2IffBX0SSYiQhi5seyEqKk0H7izOl/9JVK/Zbd2EU+
+Ok0BsM8ot7rZ+LroeqE0qZEUmqkKZHfXBOV3QJ3uZl2F717igME4loI2gI5cTvWZ
+ETdhE4JI1DJhZsjLwP0UkMbN7+eZEIHAMXFELwEvChQOMQKWn9Yj9W8hjxo2oHPG
+ZEuB4BpEWtb5lt2YD9LnBkPXYtJKEI1CTnspwRR576/ex3eUf0pNpcSfxx0JdDES
+BX4QbWttEV7hr8MtCHPupHKnKo/q5D7kdpNbve+KSGnYIkXcgcoQFcqPqV+24+0Y
+9RlLOB0ijDdtbfjZnVRNeUObG/dMwO25tBb2WIRcFiBQ2f57b6XfbKH8M5KQwXWW
+RtQcjWvZw/rUx+SRkeN6nfnvqACl/EtmkiZ3O6QalSHs86uHHu/ox0uteS5MPDSp
++k531I6EqlLhM3cyK/2ITnZ+ZXOKNWes+RpKXrKvBy8of2tSb6h0AisroCZ1IG/O
+oyKS7eSF+oxuUOGV7OJ/SaQzojOzAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAAcz
+1YyT5FxqKsNZiGFhNJu99J5l/ASmh4R9J5VTGUg1/Auh/v9BTIycpx9+WW68XLPB
+hctPU99ejm8xfdjyThFFO01tbOnA01huEbygUntxyNaomPaRY47DaFCYqVO3A6Hz
+IgIEzJ1rs0QxCxGUhEDBe5CH6pNyAY/VLlNMsKGzX6Dg9VTjFyWBK2gxINT1wL9W
+3CoAOJFoO9PtW/GwUBXnsAMn1DNcnCWw79xNswAdMEYChX8Y9s/9fnnyrmJGJgWR
+VDv8ZVkfMDsUlfxKSTpC8nX/wmXQ+D2kBkn2OdF3Rir+FbAVRS1sNB6EPhKml2rT
+Aapy3mvQPQxCRhgKRHQ=
 -----END CERTIFICATE-----

server/clientCertificates/openmrs_csr.pem

@@ -1,26 +1,26 @@
 -----BEGIN CERTIFICATE REQUEST-----
 MIIEVzCCAj8CAQAwEjEQMA4GA1UEAwwHb3Blbm1yczCCAiIwDQYJKoZIhvcNAQEB
-BQADggIPADCCAgoCggIBAOGAayPbcQGaJy79Ta/TZf/nypBe8m8df26hUG2qR5Re
-xHI5BRWR9NXXeD2li7zpne0xGXMFCMn3JN5Kot5LV57xbPEfYT4RD/9Rjm5BkU43
-/LiPgYEBejS1W/s0VOX3nUVk76uwxnSS75s/yWFEQr2POcM/ca76G0Zi4c8pn9kJ
-b/KcqRTG+9nhCPHPfsetfivk3wvJV1P7dZtsjsZ2O7XjsVMBJltON8/N1UgaOJcv
-yOL61hTqnk+wOxBbYxcOkkWuM6fmxBhZVLBlzEnHGBU40dupIl+nuaOISmbgt4pn
-yAScJ3mleBXZMnU1RRFd2HrC5LeCP3yVnUzJTo+v0QlaytIrbMwDUPtLnWNBaXaB
-frE1TP8k9201ZsiP+4hneWs/D1+RXM0YQEMMI0nexqEnXMqs8qxslpr+uD2FYXtG
-zPaNl1xD9r9nYI+cfKZlnFWFmRbikxG6PBkv7AAdtJidLLZgW/E107t1BfbVnSYf
-Me3/y+jVYJCabkZhzj9W/amn6MAqEx6SCNkmQb0dvfIdEB3kJvwD+GO5ITdvVZ5P
-LpGljLgaxLHK2jZrIlbfMXN848OSjQmY8BsFsWxWqzi01neNNQpJ/QDCsbAWYXcR
-6XFv3Al0eqYsYNlWum6FIlYvNNm6X/8986Awz9kq39dcCsK/KJcug8I3DLg+tJop
-AgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAgEAc6MyzoVecuuit95Q4uRlNBB8fFbA
-5Z0MP1dvrd24Op7XPoJ1sUnG01i3xDUueyWjuOzLQopVgLEewWCTS6JAFliIfGek
-ZZj70S6NM87wbiSHDb5eIaAtjmVBoVfQVewFC+SGi5AObAfLjHkgfixMR2yuo/Gv
-0mebU5DCdxgPBU6SpeDdDj0VB8eGKnXpMjTNwce/uHpzn4GON21vo9QMHOCf9FHX
-mCiy+UUzSkt3sYH9h+zFOOvNjgQLg6oBDJyZ1D6AYS85zGj3L9wCac6XTLex5vfR
-S2V4jQPhArbE6ARwMUt2A7tGTtIPtRcSdgidEgH3RbfoiDsUf4rE47J9rQaWTDgl
-+IJQO4kaSW5nENIrDfrTT5vhquxKs05LMM1YMU5+BiiuTHq/CeYB3seEqwP+xYe7
-zVLxHdV0qy6EvO8Qoi9Wh1ZQf00XZ1zpZ11vPE6j37IYjeT2TRrnusB8f5RGN/dP
-0Yv4Pqrj55WvmYdtMJFRql5CidM7eFzGJU5gSiplfYvlv6gjW+oznqLWykmGGZdN
-Nf/YhdExX/sYQzRQikiq1c71Z+PcUuZ6oiQbM8GPu1pbKDl/MDsX0AC4PRYR4YIq
-r1o+9tIn7O3xeA4M/FgiSQIPzOuwaK8eUGVc3tIOSt097AfB8l7exjeBxzKiHKme
-NIlsfE3e6id7A9w=
+BQADggIPADCCAgoCggIBAOZFxz9iS76B07LkFzfka53njoKdJ4R6pvVSXUzVhbmF
+vHgmGmPROemZy9rJlOoXFvIkDb/qAmwGqEeiDPc0Uom25W8ODUA6Yf0ZbvzsW6Eo
+QtQqA6dVK8/S53di3YNi3qkqOHwoMl9XYsuv3wrNa7Xig2h53GNVYcsdUr2IffBX
+0SSYiQhi5seyEqKk0H7izOl/9JVK/Zbd2EU+Ok0BsM8ot7rZ+LroeqE0qZEUmqkK
+ZHfXBOV3QJ3uZl2F717igME4loI2gI5cTvWZETdhE4JI1DJhZsjLwP0UkMbN7+eZ
+EIHAMXFELwEvChQOMQKWn9Yj9W8hjxo2oHPGZEuB4BpEWtb5lt2YD9LnBkPXYtJK
+EI1CTnspwRR576/ex3eUf0pNpcSfxx0JdDESBX4QbWttEV7hr8MtCHPupHKnKo/q
+5D7kdpNbve+KSGnYIkXcgcoQFcqPqV+24+0Y9RlLOB0ijDdtbfjZnVRNeUObG/dM
+wO25tBb2WIRcFiBQ2f57b6XfbKH8M5KQwXWWRtQcjWvZw/rUx+SRkeN6nfnvqACl
+/EtmkiZ3O6QalSHs86uHHu/ox0uteS5MPDSp+k531I6EqlLhM3cyK/2ITnZ+ZXOK
+NWes+RpKXrKvBy8of2tSb6h0AisroCZ1IG/OoyKS7eSF+oxuUOGV7OJ/SaQzojOz
+AgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAgEAU0g4VDmRFWXkPxh1nUbisud5lzFV
+8rRVs7XWhKYnCBg8PezUky2lTycPRHHz6DZkw2U3q0LajPJf0wmzvle+7508d/hn
+ZIOvEvRl5q30i79I7v/2E+L+eyKx4gpaQXlJj6emch7kiFnUuT7QQgh+P4tm5e8B
+Sx+pnw+nY2rKfg3DB7niVk/keAN9SS88Aa7gKI5Hxg/bVLeJtPHB/np8gNb5ko3u
+Fvc4XGcbR9FM3luguSBGNZZ8Mn0JMin1jY5uFsIhtuKCU+9/ZTK4KFoFc0pTBqDK
+srj7ouVIyLwieAHKcXd86TfneHoCGrij/leLlQGjaDIz237/a23R1PVjAczBmOot
+4NfG0j8k4tx/DWGQIVDZswU0Ckbm3wYecRiyzH4Vla8eawBAIeD23u+DcTYZgFGY
+2DlFujuojMK5z+pX5S4wn2i5F+UQkmHtAvRK/90LJIP1PMO+67z32UHp2yS5VZVc
+5S/NqRsYox7Z9lg7KpkPxKthPuXffTLe/9YDaK7P3dafZ7HizMgmm9SrH5Gll0ql
+/6qvuOWlZJqxj+uZZfb1sVA++zWAqfgcgJermxnf0Y4h5CNpvdnVCBOL+g6URIcj
+jcoWkRdJs2vwPovLAyD/sX4CBHgHdW0veUg2RToFTPMS2Cwv/gox3fL+TAWqVU9/
+KWndIQgdlkjWsKQ=
 -----END CERTIFICATE REQUEST-----

server/clientCertificates/openmrs_key.pem

@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-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
-AZM7rm0c9pZdQLg6sogap/y4hzvxktQ=
+MIIJRAIBADANBgkqhkiG9w0BAQEFAASCCS4wggkqAgEAAoICAQDmRcc/Yku+gdOy
+5Bc35Gud546CnSeEeqb1Ul1M1YW5hbx4Jhpj0TnpmcvayZTqFxbyJA2/6gJsBqhH
+ogz3NFKJtuVvDg1AOmH9GW787FuhKELUKgOnVSvP0ud3Yt2DYt6pKjh8KDJfV2LL
+r98KzWu14oNoedxjVWHLHVK9iH3wV9EkmIkIYubHshKipNB+4szpf/SVSv2W3dhF
+PjpNAbDPKLe62fi66HqhNKmRFJqpCmR31wTld0Cd7mZdhe9e4oDBOJaCNoCOXE71
+mRE3YROCSNQyYWbIy8D9FJDGze/nmRCBwDFxRC8BLwoUDjEClp/WI/VvIY8aNqBz
+xmRLgeAaRFrW+ZbdmA/S5wZD12LSShCNQk57KcEUee+v3sd3lH9KTaXEn8cdCXQx
+EgV+EG1rbRFe4a/DLQhz7qRypyqP6uQ+5HaTW73vikhp2CJF3IHKEBXKj6lftuPt
+GPUZSzgdIow3bW342Z1UTXlDmxv3TMDtubQW9liEXBYgUNn+e2+l32yh/DOSkMF1
+lkbUHI1r2cP61MfkkZHjep3576gApfxLZpImdzukGpUh7POrhx7v6MdLrXkuTDw0
+qfpOd9SOhKpS4TN3Miv9iE52fmVzijVnrPkaSl6yrwcvKH9rUm+odAIrK6AmdSBv
+zqMiku3khfqMblDhlezif0mkM6IzswIDAQABAoICAQDJ7LR9C3g6NWRrgYIuu/n2
+vMAGH0Mw89EGXNR99NtPxUtw3JDVqPoss3XEhHI2GEtByIXaHZ1EF05nil3uRI6A
+PsbQbLUH9mpI5I2j8qujFUgM/k635IMHufzJfwOaHA/+rYxcq28IlfuHe9CNi3cB
+RwFOk1XEMXIRB8SveUpegNNgUPYRSZDv2mJnBznhmoZv14mlhN389sqYZaoALxRZ
+hG4gxtVLKWOniyOKmlPJGdjiEcY0Zi9ejlhreHBgdyTKyxGIW7y9mYqP6Urkkhbm
+b3DMQQc92xZ/lxIhkyLlpx6HeP6iQVUqp5Ih5hPqHiVJRb0KV5ZCOVbYT0dRwzC8
+jhJ9s7ObsvGZUUS+XNlpmLtOFcDj0g5SrKJxqpL4jTM0m49c8i5kLR6mEWN3X0+M
+KoQgLFTOLOGZemZ7zfmRpK+Z8UvTlXV6Stz3ae/gkMqY1JwToF9UK9uMaOES7kkX
+OKn/W3FtmvHbM5Gsu46JOZeUm8Bg5wvX1oF0TFcJU9g80kkGz6jqt8SAwCvTbgTM
+4bOyyDYulPIIv501CcGLhnj/1ht7n83OLTM5ketNayqDFc9XkJBC87w/DTxSy9cL
+cmGiKJ7+TN43/j/5/c/esWirCYjBYdjYMGG8r3pC+o9q3Yq4gp+l20gjWR/EXgmR
+2o+nX/RxsrP3QHvFY4MiaQKCAQEA9FjxKRC/1D6duOUVAWV6b9V9fEJBmfvuReCd
+xt+hWk1HjPCJMtNm9LYlxKs7vg2jKN1Qj9EjpSI+FjkPUot3ARrogtG5UVclCkHk
+BBtfr9qxoDa8cjTdoZpf0eb/9F2ZfIV+eCSOimKMHSUdOrz8gvu2qh/WE2UK7JMw
+VpbD9sXLe5Sf0ZEd1YiOS2+g/4VzU5wbz7u04GM3AzzPOV0EDzh48y+JX3fG+Mfm
+EAevYYoCK81vyevlFZDD+Gb3/znUVicmyAm/Ek1aHNkZ4jgqSmGX/SN4+o+b+x+G
+tLpt10qBpeoLVWzFvtbdCqGXOAcuzRxHGwVYWsPSa2UHMPURnQKCAQEA8UEBtnMr
+Tw6YVvJV+J20tj9BEnh2yjxb/PNm52orEYNGxCoxlBxUuDQrdIKne1Iqv3XMRjQD
+3x7wEIC06f/iMlCVnnjitmEJbIWujWlmoesvcadPPSwAx4Qg2xHOWErUZK05u8d3
+V4foaUo4JQxZJhwxuQkiWBSwLSMSRRNiKz6I8daohijV4fDCYzxbHuIaV0g4/Bbw
+yLaNj+Jma99HOs6J1O4Z2K1vYneL8TaFmFhk8hYE46MmtVtf5vdmmI/uvCCgMBcJ
+fzDaRXTjdJk+togDwottGfhNYJCI/jjui67mBbhpwkUtFpqwNY/CSi73z0SekfDI
+137HJ4CAc27BjwKCAQEAyfxIBllJKctFGBWOgqP/TTkezTv7/K1ML0lZQ4+TUxF0
+5yXjVDd68SktGWEvNpERYfNo6CnLHHOs/TPX3bVZ/3jd4V46oem2vb7wHRD/zV+r
+27PDnWjkGPWC5gHdbYR+H3g+rlQR3IVQK7uFaQvWdPRc8E726Ptqx1t45uskPPcO
+mS6n2lXqYpzKe8NgRDlttxzhxJv3DlIVpMB80H96npZhLS4LkfZybS7ZmECyEqBB
+4TGmijVNHsGXrdx4fuuwAjPFFDEyWI/GwPgaNG2XT/tS57eOBxn1p+ZMtVMy/3gg
+qiVJjykmYfY9rM8dMPyHDJimksidXBJp+8r84dSD5QKCAQA0fIIU4YWAk5pNADf3
++MeCBszvacneQbd5lrLCkfSAwOC6eLuEj41W7fKuTGaHi97E/KnOdC6Lcj2kOXwi
+lIrvi1yht4cLSp00QPkyxsWPYI1X2qCAnHwm6/YB8yPDTbRbmtw+oCy0nFrR3VXN
+qZwTkHq42OXh585UY5br9EWdRuOgSaUsWuH9X9XKpSzl0ScN6iaLoaoM4Lp3nTfP
+LCpg/uI5svtoioL7FysY9VWnSUPc7zFtHOek+RYqN5TYiCfWQfrXu4tTYpt6FO4P
+Re/A4mJ/BrpbtguPgKJtPJGZThm5EN/hZg9jJZBEdtw8K2+6ZiFhetMXHvvQ+kH3
+2xa9AoIBAQDO+P8EIYuM5bFjXlglAXQf+CAOhiclscBzZkKVfEf4Pr7beuPNTBI1
+yHyP9XY6SVCDLf+NJpoAhvb9gnxcMnr8gxNjP8H8BqGzBUpO97OaH7d3EJTnH+DA
+DOACzAqP9OkjWZR5W59LnHieVcDKUyXFRyVuB4lrZzCeDznqF9QJBGOB7QafjgUh
+xA9ZLZ+Fg/LWl+xvaNFxbsqVnbMAniEbp/8Iqu0+Xpn923B0s5/YU6zBWp3RCWbG
+eY709J6AYa5vvyNV3P8mVzvSJq1iwXbBqEHI7slk0nmRwJCKMq3q/IR79Ax3PIq1
+BYza8SwTuZUKlhXyCwf6RwlO+Uj03ul3
 -----END PRIVATE KEY-----

server/serverCertificates/server_cert.pem

@@ -1,19 +1,19 @@
 -----BEGIN CERTIFICATE-----
-MIIDCTCCAfGgAwIBAgIUeUP/fYCfMubuKGxOn5nvEz8tZtMwDQYJKoZIhvcNAQEL
-BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTIyMDUwOTA1MzExOVoXDTIzMDUw
-OTA1MzExOVowFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAwKQ8EDg7DoNqbDeH0uvjgjjPpwOmuPB03+VEHI9XZ6/c
-hcnpSvz4a4G6LOkAYU8x8LFM3uTvKww+kK18noyjskfOsDCT+mbiZTqmHuldWOZ4
-Rg126HlqNRb8tQ9OLq/MLMqXzMXYmDHIDlkhrnaKPfQsWyBWyii0t4LvDEo8wgs2
-1EvvBH2KF+s2T3uRsWw++cFv/qvwEqVQ7z0j/lnAXhNZE5bXGMbYs0l+6hIJ9qvx
-rEP2YBEI5hLhxYrnUwPwauO5C7WvGnV9Rq/VMr6Q6bIV+EeTHJucg+18HGJnGpUR
-YfhKghQfzuTRDnaryTvj8+k6brVAqgVlqMKk+2lvwwIDAQABo1MwUTAdBgNVHQ4E
-FgQUAMSUBveZkq+ZtG0jnHtbO/LYpRYwHwYDVR0jBBgwFoAUAMSUBveZkq+ZtG0j
-nHtbO/LYpRYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAm52+
-5YgpcTBRAVGYrPSt/MqMrFTxC9/t3JEe4v0MnJpBi7vRFUtsrgYZLcQXdEK0zADz
-yQ9IiQNrS9vNqErtHKu6L0y2l4s2I59oj7OGskc49BdgcNBWAn7KvdjSA/JIW62l
-0UZ1ctzSzt32ogaJFjZwIGHxgdcM7Z1V0GWBNEd0NioeQIhF1g+RATLIaQCYMnGK
-5AOiItNyb3CLCeiMhrtHlTlK/rxgurQZXFC40+Ej9k25cIpHE2cS1YIz7P/jI+ue
-oyeTWNE3cZ3ujDPpd5F2+pgxCtKNPnK1MA+j1iI9gP8tGjK1dRWdlGQKXsxNs65j
-+xfwMNkhXHVWHHO+2g==
+MIIDCTCCAfGgAwIBAgIUN6F0+0P4CPZrIz5iMAbgEok34egwDQYJKoZIhvcNAQEL
+BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTIzMDUzMDA2MzkzNloXDTI0MDUy
+OTA2MzkzNlowFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAqohAf5UsmabEj+k9vWaoVq3gFt2973xxGxH3dfeS8WVx
+Th5GNNbgTk9uz6eLcAvgUBfI69TX8GLmMq13YVgakpaoW1Fg9ZX6IeJviTi7KZga
+oPZeFLaT6Znsqf0ov8NdbtPi/asuAH9PhqiVGe8Ik0ufwHXtUoJ/4g8jLzG0+Btj
+ju+VaZmpgaJOL2h+3gzHECo6zD8yzOKmSoI2J548m652J+hRMhKZo1Mbt2+w86Yv
+NIZlKi+p8QD0wwwS8YTU2YS0dFYSElQQY6P4Qa2m7XHk9lkXz1XdV0hEFO0KdAJ6
+24Ihpl9Mq2TB54ZyGdAloVGxyVbJ3l++rlbJqnPAHwIDAQABo1MwUTAdBgNVHQ4E
+FgQUVQarn2FlnH5o0/e28UmbtNneoxkwHwYDVR0jBBgwFoAUVQarn2FlnH5o0/e2
+8UmbtNneoxkwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAfoyq
+65VFOxdug88CwUeTShWie+DYpxOnaNBYddJTlpfMw43vlH2oC84j/7SuTsT3gXLj
+No4rDqJCc52SnxNqvtOGlj5PUVtRUWUVWsN/j91pwVGrAluLAQWqHYN+qmOFVgsE
+ZtmwBQ47UyBnLVJ0an5SMKGbnQ4j36OJ+6WGgiCeoUKjW8g2tc27PKUq7gbKG/hN
+O8A1Q9mjcQkd5B0wgIoPJuR93x0Rd5R9Q/k0LkeIdZiIFuOqjm+L8bAA7TukjMFs
+V9adHDHiYjhiajoxX69nv6KEyC9FiagVQZej1eEnb0WfJvm678l+I/+mNUlMSUN9
+oxR4wQsAUBmVJehBEg==
 -----END CERTIFICATE-----