Merge commit 'c24cc56fb00e07f6cfe16840c65471443b120daf'

spiffworkflow-backend/bin/spiffworkflow-realm.json

@@ -1280,6 +1280,7 @@
         "http://localhost:7000/*",
         "http://67.205.133.116:7000/*",
         "http://167.172.242.138:7000/*",
+        "https://api.{{SPIFF_SUBDOMAIN}}.spiffworkflow.org/*",
         "https://api.demo.spiffworkflow.org/*"
       ],
       "webOrigins": [],
@@ -1552,6 +1553,7 @@
         "http://localhost:7001/*",
         "http://67.205.133.116:7000/*",
         "http://167.172.242.138:7001/*",
+        "https://api.{{SPIFF_SUBDOMAIN}}.spiffworkflow.org/*",
         "https://api.demo.spiffworkflow.org/*"
       ],
       "webOrigins": ["*"],
@@ -1623,6 +1625,7 @@
         "http://localhost:7001/*",
         "http://67.205.133.116:7000/*",
         "http://167.172.242.138:7001/*",
+        "https://api.{{SPIFF_SUBDOMAIN}}.spiffworkflow.org/*",
         "https://api.demo.spiffworkflow.org/*"
       ],
       "webOrigins": [],

spiffworkflow-backend/bin/start_keycloak

@@ -18,7 +18,7 @@ set -o errtrace -o errexit -o nounset -o pipefail
 if ! docker network inspect spiffworkflow > /dev/null 2>&1; then
   docker network create spiffworkflow
 fi
-docker rm keycloak 2>/dev/null || echo 'no keycloak container found'
+docker rm keycloak 2>/dev/null || echo 'no keycloak container found, safe to start new container'
 docker run \
   -p 7002:8080 \
   -d \
@@ -31,7 +31,10 @@ docker run \
   -Dkeycloak.profile.feature.token_exchange=enabled \
   -Dkeycloak.profile.feature.admin_fine_grained_authz=enabled
 
-docker cp  bin/spiffworkflow-realm.json keycloak:/tmp
+cp bin/spiffworkflow-realm.json /tmp/spiffworkflow-realm.json
+spiff_subdomain="unused-for-local-dev"
+perl -pi -e "s/{{SPIFF_SUBDOMAIN}}/${spiff_subdomain}/g" /tmp/spiffworkflow-realm.json
+docker cp /tmp/spiffworkflow-realm.json keycloak:/tmp
 
 sleep 20
 remove_traps

spiffworkflow-backend/keycloak/Dockerfile

@@ -6,7 +6,7 @@ ENV KC_HEALTH_ENABLED="true"
 # ENV KC_METRICS_ENABLED=true
 ENV PROXY_ADDRESS_FORWARDING="true"
 # ENV KC_HOSTNAME="keycloak.demo.spiffworkflow.org"
-ENV KC_HOSTNAME_URL="https://keycloak.demo.spiffworkflow.org"
+# ENV KC_HOSTNAME_URL="https://keycloak.demo.spiffworkflow.org"
 ENV KC_FEATURES="token-exchange,admin-fine-grained-authz"
 # ENV KC_DB=postgres
 # Install custom providers

spiffworkflow-backend/poetry.lock

@@ -639,7 +639,7 @@ werkzeug = "*"
 type = "git"
 url = "https://github.com/sartography/flask-bpmn"
 reference = "main"
-resolved_reference = "a901d7ffb2b79abfec17c332bbe77c43c1d28705"
+resolved_reference = "cedc5253add81a18a274f2cd3289fe36bb138f8b"
 
 [[package]]
 name = "Flask-Cors"