Co-authored-by: Philip Hua <[email protected]>

Co-authored-by: Miles818 <[email protected]>
Co-authored-by: wbrittwage <[email protected]>

Author: dreille

server/controllers/sessionController.js

@@ -1,3 +1,5 @@
+const fetch = require ('node-fetch');
+
 require('dotenv').config();
 const { Sessions } = require('../models/reactypeModels');
 
@@ -108,7 +110,7 @@ sessionController.gitHubResponse = (req, res, next) => {
 
 sessionController.gitHubSendToken = (req, res, next) => {
   const { token } = res.locals;
-  fetch(`https://api.github.com/user/emails`, {
+  fetch(`https://api.github.com/user/public_emails`, {
     method: 'GET',
     headers: {
       Accept: 'application/vnd.github.v3+json',

server/controllers/userController.js

@@ -26,13 +26,16 @@ const randomPassword = () => {
 }
 
 userController.createUser = (req, res, next) => {
-  const { email, username, password } = req.body;
 
+  let email, username, password;
   // use this condition for Oauth login
   if (res.locals.signUpType === 'oauth') {
     email = res.locals.githubEmail;
     username = email;
     password = randomPassword();
+    res.locals.githubPassword = password;
+  } else {
+    ({ email, username, password } = req.body);
   }
 
   if (!username) {
@@ -82,6 +85,7 @@ userController.createUser = (req, res, next) => {
 userController.verifyUser = (req, res, next) => {
   let { username, password, isFbOauth } = req.body;
   // handle Oauth
+  console.log('We verifying');
   if (res.locals.signUpType === 'oauth') {
     username = res.locals.githubEmail;
     password = res.locals.githubPassword;

server/models/reactypeModels.js

@@ -10,7 +10,8 @@
  */
 const mongoose = require('mongoose');
 const bcrypt = require('bcryptjs');
-const URI = process.env.NODE_ENV === 'production' ? process.env.URI : process.env.URI;
+const URI = process.env.NODE_ENV === 'production' ? process.env.URI : 'mongodb+srv://Daniel:[email protected]/Cluster0?retryWrites=true&w=majority';
+// const mongoURI = ('mongodb+srv://Daniel:[email protected]/Cluster0?retryWrites=true&w=majority');
 
 const SALT_WORK_FACTOR = 14;
 // connect to mongo db