diff --git a/docker-compose.yml b/docker-compose.yml index c7b7e2c..9aefae3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,17 +10,20 @@ services: port: 4466 databases: default: - connector: mysql - host: mysql - port: 3306 - user: root + connector: postgres + host: localhost + schema: public + database: casehawk + port: 5432 + user: prisma password: prisma - mysql: - image: mysql:5.7 + postgres: + image: postgres:10.3 restart: always environment: - MYSQL_ROOT_PASSWORD: prisma + POSTGRES_USER: prisma + POSTGRES_PASSWORD: prisma volumes: - - mysql:/var/lib/mysql + - postgres:/var/lib/postgresql/data volumes: - mysql: ~ \ No newline at end of file + postgres: ~ \ No newline at end of file diff --git a/src/auth/oauth/google.js b/src/auth/oauth/google.js index 1d0101b..115bc9d 100644 --- a/src/auth/oauth/google.js +++ b/src/auth/oauth/google.js @@ -17,7 +17,7 @@ const authorize = (request) => { code: request.query.code, client_id: process.env.GOOGLE_CLIENT_ID, client_secret: process.env.GOOGLE_CLIENT_SECRET, - redirect_uri: `${process.env.CLIENT_URL}/oauth`, + redirect_uri: `${process.env.API_URL}/oauth`, grant_type: 'authorization_code', }; console.log('this is googleData, ', googleData); diff --git a/src/routes/google-people-router.js b/src/routes/google-people-router.js index bd55027..f7fd6b7 100644 --- a/src/routes/google-people-router.js +++ b/src/routes/google-people-router.js @@ -25,7 +25,7 @@ fs.readFile('credentials.json', (err, content) => { function authorize(credentials, callback) { const {client_secret, client_id, redirect_uris} = credentials.installed; const oAuth2Client = new google.auth.OAuth2( - client_id, client_secret, redirect_uris[1]); + client_id, client_secret, redirect_uris[1]); // Check if we have previously stored a token. fs.readFile(TOKEN_PATH, (err, token) => {