Merge remote-tracking branch 'origin/dmp-refactoring' into dmp-refactoring

deployment/.env

@@ -4,9 +4,9 @@ PROXY_TAG=mainline-alpine
 MAIN_APP_TAG=2.1.10
 NOTIFICATION_APP_TAG=2.1.11
 ANNOTATION_APP_TAG=2.1.10
-DOCX_APP_TAG=0.0.13
+DOCX_APP_TAG=0.0.14
 JSON_APP_TAG=0.0.9
-ZENODO_APP_TAG=2.0.9
+ZENODO_APP_TAG=2.0.10
 POSTGRES_TAG=16-alpine
 ELK_TAG=8.13.0
 KEYCLOAK_TAG=24.0.2

deployment/opencdmp/zenodo/config/app.env

@@ -1,9 +1,20 @@
+#Keycloak
 IDP_ISSUER_URI=http://host.docker.internal:8081/keycloak/realms/OpenCDMP
 
+#Server
 WEB_PORT=8080
 
+#Zenodo
+ZENODO_AUTHORIZATION_URL=https://sandbox.zenodo.org/oauth/authorize
+ZENODO_ACCESS_TOKEN_URL=https://sandbox.zenodo.org/oauth/token
+
 ZENODO_CLIENT_ID=mdwl77ZpDaY4DKxzaHdfpUz4vpjtusfSdLuHzfxe
 ZENODO_CLIENT_SECRET=cvTkkzmfkO7OBYIJQ2ZEWfc309ELwJBJe3rtOHZL2ITcX27woE7IUAw5NMsU
 ZENODO_ACCESS_TOKEN=uUwXiySNn637uWQpcsfOtifsmLfP0lgp0N8uOssppb7ajeJCq5WicHbcC2Vk
 
+ZENODO_URL=https://sandbox.zenodo.org/api/
+ZENODO_RECORD_URL=https://sandbox.zenodo.org/record/
+REDIRECT_URL=http://host.docker.internal:8081/login/external/zenodo
+
+#Storage
 STORAGE_PATH=/storage

deployment/opencdmp/zenodo/config/zenodo-test.yml

@@ -3,16 +3,5 @@ zenodo:
   affiliation: ARGOS
   domain: https://argos.openaire.eu/
   logo: /zenodo.jpg
-  depositConfiguration: 
-    deposit-type: 2
-    repository-id: Zenodo
-    access-token: ${ZENODO_ACCESS_TOKEN}
-    repository-url: https://sandbox.zenodo.org/api/
-    repository-authorization-url: https://sandbox.zenodo.org/oauth/authorize
-    repository-record-url: https://sandbox.zenodo.org/record/
-    repository-access-token-url: https://sandbox.zenodo.org/oauth/token
-    repository-client-id: ${ZENODO_CLIENT_ID}
-    repository-client-secret: ${ZENODO_CLIENT_SECRET}
-    redirect-uri: http://host.docker.internal:8081/login/external/zenodo
-    has-logo: false
-    useSharedStorage: false
+  depositConfiguration:
+    has-logo: false