Merge branch 'main' into e2e-tests

# Conflicts:
#	package-lock.json
#	src/app.module.ts

.env

@@ -2,14 +2,16 @@
 ; CouchDb Basic Auth credentials for different clients
 COUCH_DB_CLIENT_NOTIFICATION_BASIC_AUTH_USER=admin
 COUCH_DB_CLIENT_NOTIFICATION_BASIC_AUTH_PASSWORD=docker
-COUCH_DB_CLIENT_REPORT_BASIC_AUTH_USER=admin
-COUCH_DB_CLIENT_REPORT_BASIC_AUTH_PASSWORD=docker
+
+COUCH_DB_CLIENT_APP_BASIC_AUTH_USER=admin
+COUCH_DB_CLIENT_APP_BASIC_AUTH_PASSWORD=docker
+
 COUCH_DB_CLIENT_REPORT_CALCULATION_BASIC_AUTH_USER=admin
 COUCH_DB_CLIENT_REPORT_CALCULATION_BASIC_AUTH_PASSWORD=docker
 
 ; SQS Basic Auth credentials
-SQS_CLIENT_BASIC_AUTH_USER=admin
-SQS_CLIENT_BASIC_AUTH_PASSWORD=docker
+QUERY_SQS_CLIENT_BASIC_AUTH_USER=admin
+QUERY_SQS_CLIENT_BASIC_AUTH_PASSWORD=docker
 
 ; Encryption Key for server side secret encryption
 ; e.g. webhook credentials stored encrypted in database

README.md

@@ -34,7 +34,7 @@ curl -X "POST" "https://keycloak.aam-digital.net/realms/<your_realm>/protocol/op
      --data-urlencode "client_id=<your_client_id>" \
      --data-urlencode "client_secret=<your_client_secret>" \
      --data-urlencode "grant_type=client_credentials" \
-     --data-urlencode "scopes=openid reports_read reports_write"
+     --data-urlencode "scopes=openid reporting_read reporting_write"
 ```
 Check API docs for the required "scopes".
 This returns a JWT access token required to provided as Bearer Token for any request to the API endpoints. Sample token:
@@ -45,7 +45,7 @@ This returns a JWT access token required to provided as Bearer Token for any req
   "refresh_expires_in": 0,
   "token_type": "Bearer",
   "not-before-policy": 0,
-  "scope": "openid reports_read reports_write"
+  "scope": "openid reporting_read reporting_write"
 }
 ```