diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/config/default.py b/spiffworkflow-backend/src/spiffworkflow_backend/config/default.py index fe4cd8a9e..6e20357e8 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/config/default.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/config/default.py @@ -17,12 +17,10 @@ RUN_BACKGROUND_SCHEDULER = ( environ.get("RUN_BACKGROUND_SCHEDULER", default="false") == "true" ) SPIFFWORKFLOW_FRONTEND_URL = environ.get( - # "SPIFFWORKFLOW_FRONTEND_URL", default="http://localhost:7001" - "SPIFFWORKFLOW_FRONTEND_URL", default="http://spiff.localdev" + "SPIFFWORKFLOW_FRONTEND_URL", default="http://localhost:7001" ) SPIFFWORKFLOW_BACKEND_URL = environ.get( - # "SPIFFWORKFLOW_BACKEND_URL", default="http://localhost:7000" - "SPIFFWORKFLOW_BACKEND_URL", default="http://api.spiff.localdev" + "SPIFFWORKFLOW_BACKEND_URL", default="http://localhost:7000" ) # service task connector proxy CONNECTOR_PROXY_URL = environ.get( @@ -32,8 +30,7 @@ CONNECTOR_PROXY_URL = environ.get( # Open ID server OPEN_ID_SERVER_URL = environ.get( # "OPEN_ID_SERVER_URL", default="http://localhost:7002/realms/spiffworkflow" - # "OPEN_ID_SERVER_URL", default="http://keycloak.spiff.localdev/realms/spiffworkflow" - "OPEN_ID_SERVER_URL", default="http://api.spiff.localdev/openid" + "OPEN_ID_SERVER_URL", default="http://localhost:7000/openid" ) # Replace above line with this to use the built-in Open ID Server. diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/routes/health_controller.py b/spiffworkflow-backend/src/spiffworkflow_backend/routes/health_controller.py index 5d8856a4a..30757e2ac 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/routes/health_controller.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/routes/health_controller.py @@ -1,5 +1,6 @@ """APIs for dealing with process groups, process models, and process instances.""" import json +from flask import current_app import flask.wrappers from flask.wrappers import Response @@ -11,6 +12,6 @@ def status() -> flask.wrappers.Response: """Status.""" ProcessInstanceModel.query.filter().first() response = Response(json.dumps({"ok": True}), status=200, mimetype="application/json") - response.set_cookie('TEST_COOKIE', 'HEY') - response.set_cookie('TEST_COOKIE', 'HEY', domain='spiff.localdev') + # print(f"current_app.config.get('SPIFFWORKFLOW_FRONTEND_URL').replace('http://', ''): {current_app.config.get('SPIFFWORKFLOW_FRONTEND_URL').replace('http://', '')}") + response.set_cookie('TEST_COOKIE1', 'HEY', domain=None) return response diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_groups_controller.py b/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_groups_controller.py index d972d18c7..5a593cd5e 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_groups_controller.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_groups_controller.py @@ -92,7 +92,7 @@ def process_group_list( # response = make_response(jsonify(response_json), 200) response = Response(json.dumps(response_json), status=200, mimetype="application/json") current_app.logger.info("SETTING COOKIE") - response.set_cookie('TEST_COOKIE', 'HEY1', domain='spiff.localdev') + response.set_cookie('TEST_COOKIE', 'HEY1') return response