Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions .devcontainer/.env.development
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion .devcontainer/scripts/config-cli.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion packages/admin-portal/public/global-settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
3 changes: 2 additions & 1 deletion packages/sequent-core/src/services/keycloak/realm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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}/*"),
]);
}

Expand Down
Binary file modified packages/step-cli/rust-local-target/release/step-cli
Binary file not shown.
2 changes: 1 addition & 1 deletion packages/voting-portal/public/global-settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down