Merge pull request #27 from andela/ft-social-login-165412915

#165412915 enable social login/signup
andela · May 8, 2019 · 87c7f8b · 87c7f8b
2 parents 8150687 + ffd5756
commit 87c7f8b
Show file tree

Hide file tree

Showing 74 changed files with 1,312 additions and 417 deletions.
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -8,8 +8,7 @@ exclude_patterns:
 - "src/config/"
 - "src/models/"
 - "src/migrations/"
-- "src/dist/"
-- "features/"
+- "src/helpers/factory"
 - "**/node_modules/"
 - "script/"
 - "**/spec/"

diff --git a/.env.sample b/.env.sample
@@ -13,3 +13,11 @@ DB_HOST_TEST=localhost
 DB_USER_TEST=postgres
 DB_PASSWORD_TEST=12345
 DB_PORT_TEST=5432
+
+APP_URL=http://localhost:3000
+FACEBOOK_APP_ID=FacebookId
+FACEBOOK_APP_SECRET=FacebookSecret
+TWITTER_CONSUMER_KEY=TwitterKey
+TWITTER_CONSUMER_SECRET=TwitterKey
+GOOGLE_CONSUMER_KEY=ToogleKey
+GOOGLE_CONSUMER_SECRET=GoogleSecret
diff --git a/.nycrc b/.nycrc
@@ -1,10 +1,9 @@
 {
- "reporter": [
-   "lcov",
-   "text"
- ],
- "exclude": [
-   "src/migartions",
-   "src/helpers"
- ]
+  "reporter": [
+    "lcov",
+    "text"
+  ],
+  "exclude": [
+    "src/tests"
+  ]
 }
diff --git a/.sequelizerc b/.sequelizerc
@@ -3,7 +3,7 @@ require("@babel/register");
 const path = require('path');
 
 module.exports = {
-  "config": path.resolve('./src/config', 'db-config.js'),
+  "config": path.resolve('./src/config', 'dbConfig.js'),
   "models-path": path.resolve('./src/models'),
   "migrations-path": path.resolve('./src/migrations')
 };
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,27 @@
 env:
   global:
-  - CC_TEST_REPORTER_ID=d570e2625aaffa20e7828eaddfbec748c525e866b6d413472bc26e188cb2bc6a
+    - SECRET_KEY=12345
+    - NODE_ENV=test
+    - CC_TEST_REPORTER_ID=d570e2625aaffa20e7828eaddfbec748c525e866b6d413472bc26e188cb2bc6a
+    - DATABASE_URL_TEST=postgres://postgres@localhost:5432/authorhavens_test
+    - APP_URL=http://localhost:3000
+    - FACEBOOK_APP_ID=FacebookId
+    - FACEBOOK_APP_SECRET=FacebookSecret
+    - TWITTER_CONSUMER_KEY=TwitterKey
+    - TWITTER_CONSUMER_SECRET=TwitterKey
+    - GOOGLE_CONSUMER_KEY=ToogleKey
+    - GOOGLE_CONSUMER_SECRET=GoogleSecret
 language: node_js
 node_js:
   - "stable"
 cache:
   directories:
-  - "node_modules"
+    - "node_modules"
+services:
+  - postgresql
 before_script:
+  - psql -c 'CREATE DATABASE authorhavens_test;' -U postgres
+  - npm i sequelize-cli -g
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter
   - ./cc-test-reporter before-build

diff --git a/nodemon.json b/nodemon.json
@@ -1,3 +1,4 @@
 {
-  "watch": ["src/"]
+  "watch": ["src/"],
+  "ignore": ["src/tests/"]
 }
diff --git a/old_structure/config/index.js b/old_structure/config/index.js
diff --git a/old_structure/config/passport.js b/old_structure/config/passport.js
diff --git a/old_structure/index.js b/old_structure/index.js
diff --git a/old_structure/models/User.js b/old_structure/models/User.js
diff --git a/old_structure/routes/api/index.js b/old_structure/routes/api/index.js
diff --git a/old_structure/routes/api/users.js b/old_structure/routes/api/users.js
diff --git a/old_structure/routes/index.js b/old_structure/routes/index.js