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
21 changes: 12 additions & 9 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ~
postgres: ~
2 changes: 1 addition & 1 deletion src/auth/oauth/google.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/routes/google-people-router.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down