chore: replace IPS package with NEHR-IPS package

config/dhis2/dhis.conf

@@ -4,4 +4,33 @@ connection.url = jdbc:postgresql://dhis2-db:5432/dhis
 connection.username = dhis
 connection.password = dhis
 
-route.remote_servers_allowed = http://mock-relying-party-service:8888
+route.remote_servers_allowed = http://mock-relying-party-service:8888,https://mosip.integration.dhis2.org
+
+server.base.url = https://mosip.integration.dhis2.org/
+oauth2.server.enabled = on
+
+# Enables JWT Bearer tokens usage
+oidc.jwt.token.authentication.enabled = on
+
+# Enables OIDC login
+oidc.oauth2.login.enabled = on
+
+# eSignet variables:
+oidc.provider.esignet.client_id = [DHIS2_ESIGNET_CLIENT_ID]
+oidc.provider.esignet.client_secret = my-client-secret
+oidc.provider.esignet.mapping_claim = email
+oidc.provider.esignet.scopes = profile openid
+oidc.provider.esignet.authorization_uri = https://esignet-mosipid.collab.mosip.net/authorize
+oidc.provider.esignet.token_uri = https://esignet-mosipid.collab.mosip.net/v1/esignet/oauth/v2/token
+oidc.provider.esignet.user_info_uri = https://esignet-mosipid.collab.mosip.net/v1/esignet/oidc/userinfo
+oidc.provider.esignet.issuer_uri = https://esignet-mosipid.collab.mosip.net/v1/esignet
+oidc.provider.esignet.jwk_uri = https://esignet-mosipid.collab.mosip.net/.well-known/jwks.json
+oidc.provider.esignet.client_authentication_method = private_key_jwt
+oidc.provider.esignet.keystore_path = /opt/dhis2/esignet_online.jks
+oidc.provider.esignet.keystore_password = mypass
+oidc.provider.esignet.key_alias = esignet
+oidc.provider.esignet.key_password = mypass
+oidc.provider.esignet.jwk_set_url = https://mosip.integration.dhis2.org/api/publicKeys/esignet/jwks.json
+oidc.provider.esignet.redirect_url = https://mosip.integration.dhis2.org/oauth2/code/esignet
+oidc.provider.esignet.display_alias = Log in with eSignet
+oidc.provider.esignet.login_image = /dhis-web-commons/oidc/esignet.svg

config/dhis2/pluginConfig.json

@@ -1,5 +1,5 @@
 {
-  "WSGAb5XwJ3Y": [
+  "eozjj9UivfS": [
     {
       "id": "default",
       "elements": [
@@ -8,104 +8,87 @@
           "type": "plugin",
           "fieldMap": [
             {
-              "IdFromApp": "A6Hb0Kvg4vb",
+              "IdFromApp": "EOMGwaUTMrU",
               "objectType": "TrackedEntityAttribute",
               "IdFromPlugin": "address"
             },
             {
-              "IdFromApp": "NI0QRzJvQ0k",
+              "IdFromApp": "Yie7mOY913J",
               "objectType": "TrackedEntityAttribute",
               "IdFromPlugin": "dateOfBirth"
             },
             {
-              "IdFromApp": "sB1IHYu2xQT",
+              "IdFromApp": "VQl0wK3eqiw",
               "objectType": "TrackedEntityAttribute",
-              "IdFromPlugin": "givenName"
+              "IdFromPlugin": "fullName"
             },
             {
-              "IdFromApp": "ENRjVGxVL6l",
+              "IdFromApp": "gGAQeOr1Pgu",
               "objectType": "TrackedEntityAttribute",
-              "IdFromPlugin": "familyName"
+              "IdFromPlugin": "phone"
             },
             {
-              "IdFromApp": "ciCR6BBvIT4",
+              "IdFromApp": "CSZevH4P5yV",
               "objectType": "TrackedEntityAttribute",
-              "IdFromPlugin": "phone"
+              "IdFromPlugin": "registrationNumber"
+            },
+            {
+              "IdFromApp": "p7zizFkC6Lv",
+              "objectType": "TrackedEntityAttribute",
+              "IdFromPlugin": "gender"
+            },
+            {
+              "IdFromApp": "u5AESfSOhIG",
+              "objectType": "TrackedEntityAttribute",
+              "IdFromPlugin": "age"
+            },
+            {
+              "IdFromApp": "CJLJmmp8r9g",
+              "objectType": "TrackedEntityAttribute",
+              "IdFromPlugin": "subjectId"
             },
             {
-              "IdFromApp": "PpEGiQurAll",
+              "IdFromApp": "M6NNPC3hNrb",
               "objectType": "TrackedEntityAttribute",
-              "IdFromPlugin": "uniqueId"
+              "IdFromPlugin": "individualId"
             }
           ],
-          "pluginSource": "http://localhost:8080/api/apps/esignet-capture-plugin/plugin.html"
-        },
-        {
-          "id": "PpEGiQurAll",
-          "type": "TrackedEntityAttribute"
-        },
-        {
-          "id": "sB1IHYu2xQT",
-          "type": "TrackedEntityAttribute"
-        },
-        {
-          "id": "ENRjVGxVL6l",
-          "type": "TrackedEntityAttribute"
-        },
-        {
-          "id": "NI0QRzJvQ0k",
-          "type": "TrackedEntityAttribute"
-        },
-        {
-          "id": "B6TnnFMgmCk",
-          "type": "TrackedEntityAttribute"
-        },
-        {
-          "id": "A6Hb0Kvg4vb",
-          "type": "TrackedEntityAttribute"
-        },
-        {
-          "id": "ciCR6BBvIT4",
-          "type": "TrackedEntityAttribute"
-        },
-        {
-          "id": "qJdyXIggXXJ",
-          "type": "TrackedEntityAttribute"
+          "pluginSource": "https://mosip.integration.dhis2.org/api/apps/esignet-capture-plugin/plugin.html"
         },
         {
-          "id": "Y2smKuoVgDU",
+          "id": "CSZevH4P5yV",
           "type": "TrackedEntityAttribute"
         },
         {
-          "id": "ALeyhBFw22F",
+          "id": "u5AESfSOhIG",
           "type": "TrackedEntityAttribute"
         },
         {
-          "id": "LiiC5TIaqva",
+          "id": "Yie7mOY913J",
           "type": "TrackedEntityAttribute"
         },
         {
-          "id": "NihUionWia1",
+          "id": "VQl0wK3eqiw",
           "type": "TrackedEntityAttribute"
         },
         {
-          "id": "AoOp84H5Vt1",
+          "id": "p7zizFkC6Lv",
           "type": "TrackedEntityAttribute"
         },
         {
-          "id": "ruUzdQRiYpy",
+          "id": "EOMGwaUTMrU",
           "type": "TrackedEntityAttribute"
         },
         {
-          "id": "QjdN4mhh4UN",
+          "id": "M6NNPC3hNrb",
           "type": "TrackedEntityAttribute"
         },
         {
-          "id": "rYnea37ReDs",
+          "id": "IrUmPkFMDU5",
           "type": "TrackedEntityAttribute"
         },
         {
-          "id": "MRGgEyilusR",
+          "id": "gGAQeOr1Pgu",
           "type": "TrackedEntityAttribute"
         }
       ]

config/ehr/hapi.application.yaml

@@ -161,8 +161,10 @@ hapi:
     implementationguides:
       ips:
         packageUrl: file:///package.tgz
-        name: hl7.fhir.uv.ips
-        version: 2.0.0
+        name: lk-nehr-fhir-ips.r4
+        version: 0.1.0
+        installMode: STORE_AND_INSTALL
+        validate_resource_status_for_package_upload: false
     ###    example from registry (packages.fhir.org)
     #  swiss:
     #    name: swiss.mednet.fhir
@@ -322,7 +324,8 @@ hapi:
         server_address: "http://hapi.fhir.org/baseR4"
         refuse_to_fetch_third_party_urls: false
         fhir_version: R4
-    #    validation:
+  #      validation:
+    #      enabled: true
     #      requests_enabled: true
     #      responses_enabled: true
     #    binary_storage_enabled: true

config/reverse-proxy/nginx.conf

@@ -0,0 +1,78 @@
+worker_processes 1;
+
+events {
+  worker_connections 1024;
+}
+
+http {
+  gzip on; # Enables compression, incl Web API content-types
+  gzip_types
+    "application/json;charset=utf-8" application/json
+    "application/javascript;charset=utf-8" application/javascript text/javascript
+    "application/xml;charset=utf-8" application/xml text/xml
+    "text/css;charset=utf-8" text/css
+    "text/plain;charset=utf-8" text/plain;
+
+  upstream dhis2 {
+    server dhis2:8080 max_fails=3 fail_timeout=60s;
+  }
+
+  upstream nehr {
+    server ehr:8080 max_fails=3 fail_timeout=60s;
+  }
+
+  upstream esignet-ui {
+    server esignet-ui:4000 max_fails=3 fail_timeout=60s;
+  }
+
+  # HTTP server - rewrite to force use of SSL
+  server {
+    listen     80;
+    rewrite    ^ https://mosip.integration.dhis2.org$request_uri? permanent;
+  }
+
+  # HTTPS server
+  server {
+    listen               443 ssl;
+    client_max_body_size 10M;
+
+    ssl_certificate      /etc/letsencrypt/live/mosip.integration.dhis2.org/fullchain.pem;
+    ssl_certificate_key  /etc/letsencrypt/live/mosip.integration.dhis2.org/privkey.pem;
+
+    include /etc/letsencrypt/options-ssl-nginx.conf;
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
+
+    # Proxy pass to servlet container
+    location / {
+      proxy_pass                http://dhis2/;
+      proxy_redirect            off;
+      proxy_set_header          Host               $host;
+      proxy_set_header          X-Real-IP          $remote_addr;
+      proxy_set_header          X-Forwarded-For    $proxy_add_x_forwarded_for;
+      proxy_set_header          X-Forwarded-Proto  https;
+      proxy_buffer_size         128k;
+      proxy_buffers             8 128k;
+      proxy_busy_buffers_size   256k;
+      proxy_cookie_path         ~*^/(.*) "/$1; SameSite=Lax";
+    }
+
+    location /nehr/ {
+      proxy_set_header Host $http_host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_pass http://nehr/;
+
+      sub_filter_types text/html;
+      sub_filter_once off;
+      sub_filter 'href="/'  'href="/nehr/';
+      sub_filter 'src="/'   'src="/nehr/';
+    }
+
+    location /esignet/ {
+      proxy_set_header Host $http_host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_pass http://esignet-ui/;
+    }
+  }
+}

docker-compose.demo.yml

@@ -0,0 +1,36 @@
+services:
+  dhis2-db:
+    volumes:
+      - dhis2-db:/var/lib/postgresql/data
+  reverse-proxy:
+    ports:
+      - "80:80"
+      - "443:443"
+    networks:
+      - ehr
+    volumes:
+      - ./config/reverse-proxy/nginx.conf:/etc/nginx/nginx.conf:ro
+      - /etc/letsencrypt:/etc/letsencrypt:ro
+  ehr:
+    volumes:
+      - ehr-db:/tmp
+    environment:
+      HAPI_FHIR_TESTER_HOME_SERVER_ADDRESS: https://mosip.integration.dhis2.org/nehr/fhir
+      HAPI_FHIR_SERVER_ADDRESS: https://mosip.integration.dhis2.org/nehr/fhir
+      SPRING_DATASOURCE_URL: jdbc:h2:file:/tmp/data/h2
+  esignet-db:
+    volumes:
+      - esignet-db:/var/lib/postgresql/data
+  mock-relying-party-service:
+    environment:
+      - ESIGNET_SERVICE_URL=${ESIGNET_SERVICE_URL}
+      - ESIGNET_AUD_URL=${ESIGNET_AUD_URL}
+      - CLIENT_PRIVATE_KEY=${CLIENT_PRIVATE_KEY}
+  fhir-sync-agent:
+    environment:
+      DHIS2APIURL: http://dhis2:8080/api
+
+volumes:
+  dhis2-db:
+  esignet-db:
+  ehr-db: