diff --git a/spiffworkflow-backend/keycloak/bin/start_keycloak b/spiffworkflow-backend/keycloak/bin/start_keycloak index 53f6f17dd..807c95ec6 100755 --- a/spiffworkflow-backend/keycloak/bin/start_keycloak +++ b/spiffworkflow-backend/keycloak/bin/start_keycloak @@ -52,8 +52,8 @@ docker run \ script_dir="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" cp "${script_dir}/../realm_exports/${realm_name}-realm.json" /tmp/${realm_name}-realm.json -spiff_subdomain="unused-for-local-dev" -perl -pi -e "s/{{SPIFF_SUBDOMAIN}}/${spiff_subdomain}/g" /tmp/${realm_name}-realm.json +spiff_subdomain="for-local-dev.spiffworkflow.org" +perl -pi -e "s/replace-me-with-spiff-domain-and-api-path-prefix/${spiff_subdomain}/g" /tmp/${realm_name}-realm.json docker cp /tmp/${realm_name}-realm.json keycloak:/tmp sleep 20 diff --git a/spiffworkflow-backend/keycloak/realm_exports/spiffworkflow-realm.json b/spiffworkflow-backend/keycloak/realm_exports/spiffworkflow-realm.json index 9bacd5066..196f997c8 100644 --- a/spiffworkflow-backend/keycloak/realm_exports/spiffworkflow-realm.json +++ b/spiffworkflow-backend/keycloak/realm_exports/spiffworkflow-realm.json @@ -3250,7 +3250,7 @@ "alwaysDisplayInConsole" : false, "clientAuthenticatorType" : "client-secret", "secret" : "JXeQExm0JhQPLumgHtIIqf52bDalHz0q", - "redirectUris" : [ "http://localhost:7000/*", "https://api.unused-for-local-dev.spiffworkflow.org/*", "https://api.replace-me-with-spiff-subdomain.spiffworkflow.org/*", "http://67.205.133.116:7000/*", "http://167.172.242.138:7000/*" ], + "redirectUris" : [ "http://localhost:7000/*", "https://replace-me-with-spiff-domain-and-api-path-prefix/*", "http://67.205.133.116:7000/*", "http://167.172.242.138:7000/*" ], "webOrigins" : [ ], "notBefore" : 0, "bearerOnly" : false, @@ -3267,7 +3267,7 @@ "saml.force.post.binding" : "false", "saml.multivalued.roles" : "false", "frontchannel.logout.session.required" : "false", - "post.logout.redirect.uris" : "https://replace-me-with-spiff-subdomain.spiffworkflow.org/*##http://localhost:7001/*", + "post.logout.redirect.uris" : "https://replace-me-with-spiff-domain/*##http://localhost:7001/*", "oauth2.device.authorization.grant.enabled" : "false", "backchannel.logout.revoke.offline.tokens" : "false", "saml.server.signature.keyinfo.ext" : "false", diff --git a/spiffworkflow-frontend/src/components/NavigationBar.tsx b/spiffworkflow-frontend/src/components/NavigationBar.tsx index f532d3106..e032f6ecd 100644 --- a/spiffworkflow-frontend/src/components/NavigationBar.tsx +++ b/spiffworkflow-frontend/src/components/NavigationBar.tsx @@ -29,7 +29,7 @@ import { useUriListForPermissions } from '../hooks/UriListForPermissions'; import { PermissionsToCheck } from '../interfaces'; import { usePermissionFetcher } from '../hooks/PermissionService'; import { UnauthenticatedError } from '../services/HttpService'; -import { SPIFF_ENVIRONMENT } from '../config'; +import { DOCUMENTATION_URL, SPIFF_ENVIRONMENT } from '../config'; import appVersionInfo from '../helpers/appVersionInfo'; // for ref: https://react-bootstrap.github.io/components/navbar/ @@ -61,8 +61,8 @@ export default function NavigationBar() { // default to readthedocs and let someone specify an environment variable to override: // let documentationUrl = 'https://spiffworkflow.readthedocs.io'; - if ('DOCUMENTATION_URL' in window.spiffworkflowFrontendJsenv) { - documentationUrl = window.spiffworkflowFrontendJsenv.DOCUMENTATION_URL; + if (DOCUMENTATION_URL) { + documentationUrl = DOCUMENTATION_URL; } const versionInfo = appVersionInfo(); diff --git a/spiffworkflow-frontend/src/config.tsx b/spiffworkflow-frontend/src/config.tsx index 78565d2e1..8edba04f4 100644 --- a/spiffworkflow-frontend/src/config.tsx +++ b/spiffworkflow-frontend/src/config.tsx @@ -13,6 +13,7 @@ declare global { let spiffEnvironment = ''; let appRoutingStrategy = 'subdomain_based'; let backendBaseUrl = null; +let documentationUrl = null; if ('spiffworkflowFrontendJsenv' in window) { if ('APP_ROUTING_STRATEGY' in window.spiffworkflowFrontendJsenv) { appRoutingStrategy = window.spiffworkflowFrontendJsenv.APP_ROUTING_STRATEGY; @@ -23,6 +24,9 @@ if ('spiffworkflowFrontendJsenv' in window) { if ('BACKEND_BASE_URL' in window.spiffworkflowFrontendJsenv) { backendBaseUrl = window.spiffworkflowFrontendJsenv.BACKEND_BASE_URL; } + if ('DOCUMENTATION_URL' in window.spiffworkflowFrontendJsenv) { + documentationUrl = window.spiffworkflowFrontendJsenv.DOCUMENTATION_URL; + } } if (!backendBaseUrl) { @@ -66,6 +70,7 @@ if (!backendBaseUrl.endsWith('/v1.0')) { } export const BACKEND_BASE_URL = backendBaseUrl; +export const DOCUMENTATION_URL = documentationUrl; export const PROCESS_STATUSES = [ 'not_started',