From c9dd522a7cd45a70a74f1522f3d420d968a5feba Mon Sep 17 00:00:00 2001
From: Peter Carmichael <peter.carmichael22@gmail.com>
Date: Tue, 12 Nov 2019 15:48:53 -0800
Subject: [PATCH 1/2] base working code

---
 docker-compose.yml       | 21 ++++++++++++---------
 src/auth/oauth/google.js |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

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);

From a70dca60604bdedaebac92de421fa194c1cb0bf5 Mon Sep 17 00:00:00 2001
From: Peter Carmichael <peter.carmichael22@gmail.com>
Date: Tue, 12 Nov 2019 15:55:43 -0800
Subject: [PATCH 2/2] fixed for travis

---
 src/routes/google-people-router.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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) => {