Merge branch 'API-v2.1.0' into main

.gitignore

-.env
-
 secrets
 
 aws.xml
@@ -186,11 +184,10 @@ web_modules/
 .yarn-integrity
 
 # dotenv environment variable files
-.env
-.env.development.local
-.env.test.local
-.env.production.local
-.env.local
+.env*
+.flaskenv*
+!.env.project
+!.env.vault
 
 # parcel-bundler cache (https://parceljs.org/)
 .cache

.gitlab-ci.yml

@@ -3,22 +3,29 @@ variables:
     GIT_SUBMODULE_FORCE_HTTPS: "true"
     SECURE_FILES_DOWNLOAD_PATH: './'
 
+
 stages:
     - deploy
 
+
 deploy:
     image: docker:latest
     stage: deploy
     tags:
         - dojo_backend_deployment
     script:
-        - API_VERSION=$(jq -r .version API/ExpressAPI/package.json)
-        # Download secure files
-        - curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash
-        # Prepare environment
-        - mv env_$API_VERSION .env
-        - cp .env API/.env
+        - cd "API/ExpressAPI"
+
+        # Get API version
+        - API_VERSION=$(jq -r .version package.json)
+
+        # Get env file
+        - |
+            echo "Decrypt production env vars" # Do not remove this line because it is used for hide the production key from the ci/cd console
+            npx dotenv-vault local decrypt "${DOTENV_PROD_KEY}" > ../.env
+
         # Deploy
+        - cd ../../
         - ./infra --run
-    only:
-        - main
+    rules:
+        - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
\ No newline at end of file

API @ d7409df1

-Subproject commit 7884e53cc8bdeb0575323467b34d7123af842eee
+Subproject commit d7409df1a14b8ddbe8442e3ebc327f63b94289d8