diff --git a/api/src/config/index.ts b/api/src/config/index.ts index b1f4ccd..f993aed 100644 --- a/api/src/config/index.ts +++ b/api/src/config/index.ts @@ -60,6 +60,9 @@ const dbURI: string = (process.env.VCAP_SERVICES && JSON.parse(process.env.VCAP_SERVICES)["aws-rds"][0].credentials.uri) || 'postgres://docker_pg_user:docker_pg_pw@docker_db:5432/docker_db'; +// Disable SSL connections to PostgreSQL for local development. +const dbDisableSSL:boolean = process.env.POSTGRES_DISABLE_SSL === 'true' + const openIdConfig: OpenIDConfiguration = { issuerDiscover: process.env.ISSUER_DISCOVER || 'https://idp.int.identitysandbox.gov/.well-known/openid-configuration', clientId: process.env.CLIENT_ID || 'urn:gov:gsa:openidconnect.profiles:sp:sso:opm_usds:smeqa_staging', @@ -73,6 +76,7 @@ const headerTokens: { [tokenName: string]: string } = headerTokenString; export { env }; export { dbURI }; +export { dbDisableSSL }; export { openIdConfig }; export { sessionConfig }; export { headerTokens }; diff --git a/api/src/database/index.ts b/api/src/database/index.ts index 9658439..c159c08 100644 --- a/api/src/database/index.ts +++ b/api/src/database/index.ts @@ -1,5 +1,5 @@ import Sequelize, { QueryOptionsWithType, QueryTypes, Transaction } from 'sequelize'; -import { dbURI, env } from '../config'; +import { dbURI, env, dbDisableSSL } from '../config'; import { logger } from '../utils/logger'; import { initModels } from '../models/init-models'; @@ -43,11 +43,7 @@ export default class DB implements DBInterface { dialect: "postgres", // https://node-postgres.com/features/ssl // https://sequelize.org/docs/v6/other-topics/dialect-specific-things/ - dialectOptions: { - ssl:{ - rejectUnauthorized: false, - } - } + dialectOptions: dbDisableSSL ? { ssl: false } : { ssl: { rejectUnauthorized: false } } }); try { initModels(this.sequelize); diff --git a/api/src/database/sessionDb.ts b/api/src/database/sessionDb.ts index be294f4..8f61eb5 100644 --- a/api/src/database/sessionDb.ts +++ b/api/src/database/sessionDb.ts @@ -1,5 +1,5 @@ import { Pool } from 'pg'; -import { dbURI, env } from '../config'; +import { dbURI, env, dbDisableSSL } from '../config'; // We had to change this out for the conn string in postgres 15+ // https://node-postgres.com/features/ssl @@ -10,10 +10,7 @@ import { dbURI, env } from '../config'; max:20, idleTimeoutMillis:60000, connectionTimeoutMillis: 2000, - ssl:{ - rejectUnauthorized: false - } - + ssl: dbDisableSSL ? false : { rejectUnauthorized: false } }); }; -export default CreatePool; \ No newline at end of file +export default CreatePool; diff --git a/docker-compose.yml b/docker-compose.yml index 181bd5f..7bb67b0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,11 +2,13 @@ version: "3.7" services: api: + container_name: api build: context: api dockerfile: Dockerfile.compose environment: - POSTGRES_URI=postgres://docker_pg_user:docker_pg_pw@db:5432/docker_db + - POSTGRES_DISABLE_SSL=true - NODE_ENV=docker - PORT=9000 - APP_ENV=docker @@ -43,6 +45,7 @@ services: depends_on: - api db: + container_name: db image: postgres environment: - POSTGRES_DB=docker_db diff --git a/docs/Cold Start.md b/docs/Cold Start.md index 5e34924..b44f900 100644 --- a/docs/Cold Start.md +++ b/docs/Cold Start.md @@ -47,7 +47,7 @@ To change your space or org for the cloud foundry session: export POSTGRES=postgres://:@localhost:/ # You should only need to replace the URL with "localhost". The username, password, port, and db name should all work. ``` - > Once this is done, you should be able to run `db/migrations.sh` + > Once this is done, you should be able to run `/db/migrations.sh` 9. Create the Admin token for uploads: `$ cf set-env $APP_NAME ADMIN_TOKEN ` `$ cf restage $APP_NAME` diff --git a/frontend/src/App/Error/ErrorView.jsx b/frontend/src/App/Error/ErrorView.jsx index 9c10ebe..9ea2a81 100644 --- a/frontend/src/App/Error/ErrorView.jsx +++ b/frontend/src/App/Error/ErrorView.jsx @@ -30,9 +30,8 @@ class ErrorPage extends React.Component { return; } - const primarySupportEmail = "kelvin.t.luu2@omb.eop.gov"; - const secondarySupportEmails = - "william.slack@cms.hhs.gov"; + const primarySupportEmail = "william.slack@gsa.gov"; + const secondarySupportEmails =""; const subject = "Resume Review - Support Request"; const messageBody = `Error ID: ${errorId}%0D%0A%0D%0APlease describe the error you encountered:`; const mailToLink = `mailto:${primarySupportEmail}?subject=${subject}&cc=${secondarySupportEmails}&body=${messageBody}`; diff --git a/frontend/src/App/Error/index.jsx b/frontend/src/App/Error/index.jsx index c5aa032..af72fc6 100644 --- a/frontend/src/App/Error/index.jsx +++ b/frontend/src/App/Error/index.jsx @@ -23,9 +23,8 @@ const ErrorPage = () => { return; } - const primarySupportEmail = "kelvin.t.luu@omb.eop.gov"; - const secondarySupportEmails = - "neil.s.sharma@omb.eop.gov;william.slack@cms.hhs.gov"; + const primarySupportEmail = "william.slack@gsa.gov"; + const secondarySupportEmails = ""; const subject = "Resume Review - Support Request"; const messageBody = `Error ID: ${errorId}%0D%0A%0D%0APlease describe the error you encountered:`; const mailToLink = `mailto:${primarySupportEmail}?subject=${subject}&cc=${secondarySupportEmails}&body=${messageBody}`; diff --git a/frontend/src/App/LoginPage/index.jsx b/frontend/src/App/LoginPage/index.jsx index 7e46dbc..e4c6264 100644 --- a/frontend/src/App/LoginPage/index.jsx +++ b/frontend/src/App/LoginPage/index.jsx @@ -110,7 +110,7 @@ class LoginPage extends React.Component { required for the specified position. HR can review written justification statements. If you have any trouble using this website, please contact{" "} - Kelvin Luu. + Will Slack.

{LoginButton}