diff --git a/.devcontainer/.env.development b/.devcontainer/.env.development index 38d61661a70..13b9805524b 100644 --- a/.devcontainer/.env.development +++ b/.devcontainer/.env.development @@ -291,14 +291,9 @@ LOW_SQL_LIMIT="50000" DEFAULT_SQL_LIMIT="50000" DEFAULT_SQL_BATCH_SIZE="100000" -################################################################################ -# Base URL of the voting portal, used by keycloak-nginx for redirect targets. -# Must be an absolute URL in order for nginx error_page redirects to be valid. -VOTING_PORTAL_URL=http://localhost:3000 - ################################################################################ # This is the base url of the ballot verifier. This is used by windmill. -BALLOT_VERIFIER_URL=http://localhost:3001 +BALLOT_VERIFIER_URL=http://127.0.0.1:3001 ################################################################################ # Configuration related to communications sent to voters, used by windmill. @@ -495,6 +490,6 @@ SP_CERT_DATA=MIIDOzCCAiMCBgGaMBMbKzANBgkqhkiG9w0BAQsFADBhMV8wXQYDVQQDDFZ0ZW5hbnQ # The voting portal base URL (where users access the voting interface) # Sequent uses subdomain pattern: voting-{SUBDOMAIN}.sequent.vote -# Local Development: https://localhost:3000 +# Local Development: http://127.0.0.1:3000 # Production: https://voting-example.sequent.vote (Sequent will provide your subdomain) -VOTING_PORTAL_URL=http://localhost:3000 +VOTING_PORTAL_URL=http://127.0.0.1:3000 diff --git a/.devcontainer/scripts/config-cli.sh b/.devcontainer/scripts/config-cli.sh index 5645ad4f7c7..41dd949f24f 100755 --- a/.devcontainer/scripts/config-cli.sh +++ b/.devcontainer/scripts/config-cli.sh @@ -12,7 +12,7 @@ if [ -z "$SUPER_ADMIN_TENANT_ID" ] \ then echo "missing default environments for auto config" else - cli step config \ + step-cli step config \ --tenant-id "$SUPER_ADMIN_TENANT_ID" \ --endpoint-url "$HASURA_ENDPOINT" \ --keycloak-url "$KEYCLOAK_URL" \ diff --git a/packages/admin-portal/public/global-settings.json b/packages/admin-portal/public/global-settings.json index 5096b3a62cc..9f999c7b16b 100644 --- a/packages/admin-portal/public/global-settings.json +++ b/packages/admin-portal/public/global-settings.json @@ -17,7 +17,7 @@ "en": "Enter in {{vote_url}} to vote" }, "PUBLIC_BUCKET_URL": "http://127.0.0.1:9002/public/", - "VOTING_PORTAL_URL": "http://localhost:3000", + "VOTING_PORTAL_URL": "http://127.0.0.1:3000", "ACTIVATE_MIRU_EXPORT": true, "CUSTOM_URLS_DOMAIN_NAME": "google.com" } \ No newline at end of file diff --git a/packages/sequent-core/src/services/keycloak/realm.rs b/packages/sequent-core/src/services/keycloak/realm.rs index 154d3286ddf..fb0b9faa8db 100644 --- a/packages/sequent-core/src/services/keycloak/realm.rs +++ b/packages/sequent-core/src/services/keycloak/realm.rs @@ -640,7 +640,8 @@ impl KeycloakAdminClient { client.base_url = login_url.clone(); client.redirect_uris = Some(vec![ "/*".to_string(), - format!("{}/*", ballot_verifier_url), + format!("{ballot_verifier_url}/*"), + format!("{voting_portal_url_env}/*"), ]); } diff --git a/packages/step-cli/rust-local-target/release/step-cli b/packages/step-cli/rust-local-target/release/step-cli index e7841e3fc64..a1a32886144 100755 Binary files a/packages/step-cli/rust-local-target/release/step-cli and b/packages/step-cli/rust-local-target/release/step-cli differ diff --git a/packages/voting-portal/public/global-settings.json b/packages/voting-portal/public/global-settings.json index d910cf67e0c..0384752bf11 100644 --- a/packages/voting-portal/public/global-settings.json +++ b/packages/voting-portal/public/global-settings.json @@ -8,7 +8,7 @@ "HASURA_URL": "http://localhost:8080/v1/graphql", "APP_VERSION": "dev", "APP_HASH": "dev", - "BALLOT_VERIFIER_URL": "http://localhost:3001/", + "BALLOT_VERIFIER_URL": "http://127.0.0.1:3001/", "PUBLIC_BUCKET_URL": "http://127.0.0.1:9002/public/", "KEYCLOAK_ACCESS_TOKEN_LIFESPAN_SECS": 900, "POLLING_DURATION_TIMEOUT": 12000