From b0110d7d19426722ca38b08e2c00eb64693d6f8a Mon Sep 17 00:00:00 2001
From: Kazuhito Suda <kazuhito@fisuda.jp>
Date: Sat, 7 Oct 2023 08:04:49 +0900
Subject: [PATCH] Fix basic authorization for Wilma

---
 CHANGELOG.md             |  1 +
 lets-fiware.sh           | 11 +++++++++++
 tests/script/coverage.sh |  2 ++
 3 files changed, 14 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 191d870..b474082 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## FIWARE Big Bang v0.36.0-next
 
+-   Fix basic authorization for Wilma (#351)
 -   Fix warnings by lint (#350)
 -   Update IoT Agent for JSON to 2.4.2 (#349)
 -   Update IoT Agent for UltraLight to 2.4.2 (#348)
diff --git a/lets-fiware.sh b/lets-fiware.sh
index 92cbb0c..bc56e71 100755
--- a/lets-fiware.sh
+++ b/lets-fiware.sh
@@ -1601,6 +1601,17 @@ setup_elasticsearch() {
 
   add_rsyslog_conf "elasticsearch-db"
 
+  setup_wilma "elasticsearch" "${ELASTICSEARCH}"
+
+  if ${WILMA_AUTH_ENABLED}; then
+    local RID
+    RID=$(${NGSI_GO} applications --host "${IDM}" roles create --aid "${AID}" --name "Full access")
+    assign_permission_to_rol "${AID}" "${RID}" "GET" "^/.*$"
+    assign_permission_to_rol "${AID}" "${RID}" "POST" "^/.*$"
+    ${NGSI_GO} applications --host "${IDM}" users --aid "${AID}" assign --rid "${RID}" --uid "${IDM_ADMIN_UID}" > /dev/null
+    ${NGSI_GO} applications --host "${IDM}" trusted --aid "${AID}" add --tid "${ORION_CLIENT_ID}"  > /dev/null
+  fi
+
   ELASTICSEARCH_PASSWORD=$(${DOCKER} run -t --rm "${IMAGE_PWGEN}" | sed -z 's/[\x0d\x0a]//g')
 
   mkdir -p "${DATA_DIR}"/elasticsearch-db
diff --git a/tests/script/coverage.sh b/tests/script/coverage.sh
index b7d0dbe..4cd3966 100755
--- a/tests/script/coverage.sh
+++ b/tests/script/coverage.sh
@@ -462,6 +462,8 @@ install_wilma_auth_enabled() {
   sed -i -e "s/^\(IOTAGENT_HTTP=\).*/\1iotagent-http/" config.sh
   sed -i -e "s/^\(IOTA_HTTP_AUTH=\).*/\1bearer/" config.sh
   sed -i -e "s/^\(CYGNUS=\).*/\1cygnus/" config.sh
+  sed -i -e "s/^\(CYGNUS_ELASTICSEARCH=\).*/\1true/" config.sh
+  sed -i -e "s/^\(ELASTICSEARCH=\).*/\1elasticsearch/" config.sh
   sed -i -e "s/^\(COMET=\).*/\1comet/" config.sh
   sed -i -e "s/^\(PERSEO=\).*/\1perseo/" config.sh
   sed -i -e "s/^\(QUANTUMLEAP=\).*/\1quantumleap/" config.sh