Merge branch 'release/v1.2.0'

ehrbase · Jul 6, 2021 · 6d0ab7f · 6d0ab7f
2 parents d8b057a + 4ed0630
commit 6d0ab7f
Show file tree

Hide file tree

Showing 590 changed files with 84,910 additions and 15,930 deletions.
diff --git a/.attach_pid132846 b/.attach_pid132846
diff --git a/.attach_pid15295 b/.attach_pid15295
diff --git a/.attach_pid15520 b/.attach_pid15520
diff --git a/README.md b/README.md
@@ -81,29 +81,3 @@ $ docker run -p 8888:8888 -e "FHIR_BRIDGE_EHRBASE_BASE_URL=http://172.17.0.1:808
 $ cd docker
 $ docker-compose -f docker-compose-full.yml up
 ```
-
-## Configuration Properties
-
-| Key                                                        | Default Value                                    | Description                                                 |
-| :--------------------------------------------------------- | :----------------------------------------------- | :---------------------------------------------------------- |
-| `fhir-bridge.ehrbase.base-url`                             | `http://localhost:8080/ehrbase/rest/openehr/v1/` | Base URL for the EHRbase running instance.                  |
-| `fhir-bridge.ehrbase.security.type`                        | `basic_auth`                                     | HTTP authorization type used by EHRbase.                    |
-| `fhir-bridge.ehrbase.security.username`                    | `myuser`                                         | Basic Auth username.                                        |
-| `fhir-bridge.ehrbase.security.password`                    | `myPassword432`                                  | Basic Auth password.                                        |
-| `fhir-bridge.ehrbase.template.prefix`                      | `classpath:/opt/`                                | Prefix to apply to template names.                          |
-| `fhir-bridge.fhir.jpa.allow-external-references`           | `true`                                           | Allow remote references.                                    |
-| `fhir-bridge.fhir.validation.terminology.mode`             | `none`                                           | Terminology validation mode: `embedded`, `server`, `none`   |
-| `fhir-bridge.fhir.validation.terminology.server-url`       |                                                  | Base URL of the server used for the terminology validation. |
-| `fhir-bridge.compositon.debug`                             | `false`                                          | Enables that the last executed Mapping is logged            |
-| `fhir-bridge.compositon.output-directory`                  |                                                  | Output directory where last mapping stored                  |
-| `ipf.atna.audit-enabled`                                   | `true`                                           | Whether auditing is enabled.                                |
-| `ipf.atna.audit-repository-host`                           | `localhost`                                      | Host of the ATNA repository to send the events to.          |
-| `ipf.atna.audit-repository-port`                           | `3001`                                           | Port of the ATNA repository to send the events to.          |
-| `spring.application.name`                                  | `FHIR Bridge`                                    | Application name.                                           |
-| `spring.datasource.password`                               |                                                  | Login password of the database.                             |
-| `spring.datasource.url`                                    |                                                  | JDBC URL of the database.                                   |
-| `spring.datasource.username`                               |                                                  | Login username of the database.                             |
-| `spring.jpa.properties.hibernate.dialect`                  | `org.hibernate.dialect.H2Dialect`                | Tells Hibernate to generate the appropriate SQL statements. |
-| `spring.jpa.properties.hibernate.search.default.indexBase` | `${java.io.tmpdir}/fhir-bridge-poc/indexes`      | Default base directory for the indexes.                     |
-| `server.port`                                              | `8888`                                           | Server HTTP port.                                           |
-| `server.servlet.context-path`                              | `/fhir-bridge-poc`                               | Context path of the application.                            |
diff --git a/config/postman/fhir-bridge.postman_collection.json b/config/postman/fhir-bridge.postman_collection.json
diff --git a/config/postman/fhir-bridge.postman_environment.json b/config/postman/fhir-bridge.postman_environment.json
@@ -1,5 +1,5 @@
 {
-	"id": "f0768b4d-dafd-40a8-9e5f-bd51cccda99d",
+	"id": "8b5426eb-2d0e-40a1-829f-aff33117740e",
 	"name": "fhir-bridge",
 	"values": [
 		{
@@ -11,9 +11,29 @@
 			"key": "patientId",
 			"value": "07f602e0-579e-4fe3-95af-381728bf0d49",
 			"enabled": true
+		},
+		{
+			"key": "tokenUrl",
+			"value": "http://localhost:8081/auth/realms/ehrbase/protocol/openid-connect/token",
+			"enabled": true
+		},
+		{
+			"key": "clientId",
+			"value": "fhir-bridge",
+			"enabled": true
+		},
+		{
+			"key": "clientSecret",
+			"value": "e694dbaa-9c19-4712-b607-70ef6379ff39",
+			"enabled": true
+		},
+		{
+			"key": "access_token",
+			"value": "",
+			"enabled": true
 		}
 	],
 	"_postman_variable_scope": "environment",
-	"_postman_exported_at": "2021-01-13T18:07:58.741Z",
-	"_postman_exported_using": "Postman/7.36.1"
+	"_postman_exported_at": "2021-06-30T17:00:59.472Z",
+	"_postman_exported_using": "Postman/8.7.0"
 }
diff --git a/docker/docker-compose-demo.yml b/docker/docker-compose-demo.yml
@@ -21,7 +21,13 @@ services:
       DB_URL: jdbc:postgresql://ehrbase-db:5432/ehrbase
       DB_USER: ehrbase
       DB_PASS: ehrbase
-      AUTH_TYPE: NONE
+      SECURITY_AUTHTYPE: BASIC
+      SECURITY_AUTHUSER: myuser
+      SECURITY_AUTHPASSWORD: myPassword432
+      SECURITY_AUTHADMINUSER: myadmin
+      SECURITY_AUTHADMINPASSWORD: mySuperAwesomePassword123
+      SYSTEM_NAME: local.ehrbase.org
+      ADMIN_API_ACTIVE: 'true'
     depends_on:
       - ehrbase-db
   fhir-bridge:

diff --git a/docker/docker-compose-dev-postgres.yml b/docker/docker-compose-dev-postgres.yml
@@ -16,6 +16,7 @@ services:
       SECURITY_AUTHADMINUSER: myadmin
       SECURITY_AUTHADMINPASSWORD: mySuperAwesomePassword123
       SYSTEM_NAME: local.ehrbase.org
+      ADMIN_API_ACTIVE: 'true'
     depends_on:
       - ehrbase-db
     restart: on-failure

diff --git a/docker/docker-compose-dev.yml b/docker/docker-compose-dev.yml
@@ -16,6 +16,7 @@ services:
       SECURITY_AUTHADMINUSER: myadmin
       SECURITY_AUTHADMINPASSWORD: mySuperAwesomePassword123
       SYSTEM_NAME: local.ehrbase.org
+      ADMIN_API_ACTIVE: 'true'
     depends_on:
       - ehrbase-db
     restart: on-failure

diff --git a/docker/docker-compose-full.yml b/docker/docker-compose-full.yml
@@ -16,6 +16,7 @@ services:
       SECURITY_AUTHADMINUSER: myadmin
       SECURITY_AUTHADMINPASSWORD: mySuperAwesomePassword123
       SYSTEM_NAME: local.ehrbase.org
+      ADMIN_API_ACTIVE: 'true'
     depends_on:
       - ehrbase-db
     restart: on-failure

diff --git a/docker/docker-compose-light-postgres.yml b/docker/docker-compose-light-postgres.yml
@@ -16,6 +16,7 @@ services:
       SECURITY_AUTHADMINUSER: myadmin
       SECURITY_AUTHADMINPASSWORD: mySuperAwesomePassword123
       SYSTEM_NAME: local.ehrbase.org
+      ADMIN_API_ACTIVE: 'true'
     depends_on:
       - ehrbase-db
     restart: on-failure

diff --git a/docker/docker-compose-light.yml b/docker/docker-compose-light.yml
@@ -16,6 +16,7 @@ services:
       SECURITY_AUTHADMINUSER: myadmin
       SECURITY_AUTHADMINPASSWORD: mySuperAwesomePassword123
       SYSTEM_NAME: local.ehrbase.org
+      ADMIN_API_ACTIVE: 'true'
     depends_on:
       - ehrbase-db
     restart: on-failure

diff --git a/docker/docker-compose-oauth2.yml b/docker/docker-compose-oauth2.yml
@@ -0,0 +1,46 @@
+version: '3'
+services:
+  keycloak:
+    image: jboss/keycloak
+    ports:
+      - 8081:8080
+    environment:
+      KEYCLOAK_USER: admin
+      KEYCLOAK_PASSWORD: admin
+      KEYCLOAK_IMPORT: /tmp/ehrbase-realm.json
+      DB_VENDOR: H2
+    volumes:
+      - ./keycloak/ehrbase-realm.json:/tmp/ehrbase-realm.json
+    networks:
+      - ehrbase-network
+  ehrbase-db:
+    image: ehrbase/ehrbase-postgres:latest
+    ports:
+      - 5432:5432
+    networks:
+      - ehrbase-network
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      EHRBASE_USER: ehrbase
+      EHRBASE_PASSWORD: ehrbase
+#  ehrbase:
+#    image: ehrbase/ehrbase:next
+#    ports:
+#      - 8080:8080
+#    networks:
+#      - ehrbase-network
+#    environment:
+#      DB_URL: jdbc:postgresql://ehrbase-db:5432/ehrbase
+#      DB_USER: ehrbase
+#      DB_PASS: ehrbase
+#      SECURITY_AUTHTYPE: OAUTH
+#      SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUERURI: http://keycloak:8080/auth/realms/ehrbase
+#      SYSTEM_NAME: local.ehrbase.org
+#      ADMIN_API_ACTIVE: 'true'
+#    depends_on:
+#      - keycloak
+#      - ehrbase-db
+#    restart: on-failure
+networks:
+  ehrbase-network: { }
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -16,6 +16,7 @@ services:
       SECURITY_AUTHADMINUSER: myadmin
       SECURITY_AUTHADMINPASSWORD: mySuperAwesomePassword123
       SYSTEM_NAME: local.ehrbase.org
+      ADMIN_API_ACTIVE: 'true'
     depends_on:
       - ehrbase-db
     restart: on-failure