Skip to content
Merged
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
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
x-frontend: &frontend
environment:
VITE_ZONE: TEST
VITE_USER_POOLS_ID: ca-central-1_t2HSZBHur
VITE_USER_POOLS_WEB_CLIENT_ID: 1uhcp67qtfl3jra6b595e9f6jn
VITE_USER_POOLS_ID: ca-central-1_UpeAqsYt4
VITE_USER_POOLS_WEB_CLIENT_ID: 4e7gnonatuf3q7pfcpv7d8gfiv
VITE_BACKEND_URL: http://localhost:8080
healthcheck:
test: curl http://localhost:3000"
Expand Down Expand Up @@ -60,7 +60,7 @@ services:
SERVICE_NAME: ${SERVICE_NAME}
ORACLEDB_KEYSTORE: /app/jssecacerts
ORACLEDB_SECRET: changeit
AWS_COGNITO_ISSUER_URI: https://cognito-idp.ca-central-1.amazonaws.com/ca-central-1_t2HSZBHur
AWS_COGNITO_ISSUER_URI: https://cognito-idp.ca-central-1.amazonaws.com/ca-central-1_UpeAqsYt4
POSTGRES_HOST: localhost
DASHBOARD_JOB_IDIR_USERS: ${DASHBOARD_JOB_IDIR_USERS}
<<: *db-vars
Expand Down
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"start": "vite --host",
"prebuild": "tsc",
"build": "vite build",
"build:env": "echo \"window.config = { \\\"VITE_USER_POOLS_ID\\\": \\\"ca-central-1_t2HSZBHur\\\", \\\"VITE_USER_POOLS_WEB_CLIENT_ID\\\": \\\"1uhcp67qtfl3jra6b595e9f6jn\\\", \\\"VITE_ZONE\\\": \\\"TEST\\\" };\" > build/env.js",
"build:env": "echo \"window.config = { \\\"VITE_USER_POOLS_ID\\\": \\\"ca-central-1_UpeAqsYt4\\\", \\\"VITE_USER_POOLS_WEB_CLIENT_ID\\\": \\\"4e7gnonatuf3q7pfcpv7d8gfiv\\\", \\\"VITE_ZONE\\\": \\\"TEST\\\" };\" > build/env.js",
"preview": "vite preview --port 4173",
"generate:openapi": "rm -rf ./src/services/OpenApi && npx bcgov-typescript-codegen --input http://localhost:8080/v3/api-docs --output ./src/services/OpenApi --client axios",
"lint": "eslint src --ext .ts",
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/amplifyconfiguration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const logoutDomain = isProd

const returnUrlHost = isProd
? 'loginproxy'
: 'test.loginproxy';
: 'dev.loginproxy.gov';

const retUrl = `https://${returnUrlHost}.gov.bc.ca/auth/realms/standard/protocol/openid-connect/logout`;

Expand All @@ -29,7 +29,7 @@ const amplifyconfig = {
signUpVerificationMethod: verificationMethods,
loginWith: {
oauth: {
domain: 'prod-fam-user-pool-domain.auth.ca-central-1.amazoncognito.com',
domain: 'lza-prod-fam-user-pool-domain.auth.ca-central-1.amazoncognito.com',
scopes: ['openid'],
redirectSignIn: [`${redirectUri}/dashboard`],
redirectSignOut: [redirectSignOut],
Expand Down
Loading