samply
/
bridgehead
mirror of https://github.com/samply/bridgehead.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add function generate_redirect_urls

This commit is contained in:
juarez 2023-11-23 10:38:50 +01:00
parent c7ea1a1432
commit fb7e1ffce1
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccp/modules/datashield-setup.sh
View File

@ -23,5 +23,5 @@ if [ "$ENABLE_DATASHIELD" == true ]; then
}]' > /tmp/bridgehead/opal-map/local.json }]' > /tmp/bridgehead/opal-map/local.json
cp -f ./$PROJECT/modules/datashield-mappings.json /tmp/bridgehead/opal-map/central.json cp -f ./$PROJECT/modules/datashield-mappings.json /tmp/bridgehead/opal-map/central.json
chown -R bridgehead:docker /tmp/bridgehead/ chown -R bridgehead:docker /tmp/bridgehead/
generate_private_oidc_client "OIDC_CLIENT_SECRET" "https://${HOST}/opal/*" generate_private_oidc_client "OIDC_CLIENT_SECRET" "$(generate_redirect_urls '/opal/*')"
fi fi

7
ccp/modules/teiler-setup.sh
View File

@ -3,10 +3,5 @@
if [ "$ENABLE_TEILER" == true ];then if [ "$ENABLE_TEILER" == true ];then
log INFO "Teiler setup detected -- will start Teiler services." log INFO "Teiler setup detected -- will start Teiler services."
OVERRIDE+=" -f ./$PROJECT/modules/teiler-compose.yml" OVERRIDE+=" -f ./$PROJECT/modules/teiler-compose.yml"
redirect_urls="https://${HOST}/ccp-teiler/*" generate_public_oidc_client "OIDC_PUBLIC" "$(generate_redirect_urls '/ccp-teiler/*')"
host_without_proxy="$(echo "$HOST" | cut -d '.' -f1)"
if [[ "$HOST" != "$host_without_proxy" ]]; then
redirect_urls+=",https://$host_without_proxy/ccp-teiler/*"
fi
generate_public_oidc_client "OIDC_PUBLIC" "$redirect_urls"
fi fi

15
lib/functions.sh
View File

@ -292,3 +292,18 @@ capitalize_first_letter() {
capitalized="$(tr '[:lower:]' '[:upper:]' <<< ${input:0:1})${input:1}" capitalized="$(tr '[:lower:]' '[:upper:]' <<< ${input:0:1})${input:1}"
echo "$capitalized" echo "$capitalized"
} }
generate_redirect_urls(){
local redirect_urls="https://${HOST}$1"
local host_without_proxy="$(echo "$HOST" | cut -d '.' -f1)"
local port="$(echo "$HOST" | rev | cut -d ':' -f1 | rev)"
if [ -z "${port}" ]; then
port=""
else
port=":$port"
fi
if [[ "$HOST" != "$host_without_proxy" ]]; then
redirect_urls+=",https://$host_without_proxy$port$1"
fi
echo "$redirect_urls"
}