WIP on master: d6924a6 Merge pull request #32 from jinsoolim/tutorial

diegovazquezny · diegovazquezny · commit d19a5a051eb0 · 2020-11-10T12:27:05.000-05:00
diff --git a/__tests__/users.test.js b/__tests__/users.test.js
@@ -1,10 +1,13 @@
 const request = require('supertest');
-let server = 'https://reactype.herokuapp.com';
+//let server = 'https://reactype.herokuapp.com';
+let server = 'http://localhost:5000';
 const isDev = process.env.NODE_ENV === 'development';
 if (isDev) {
   server = 'http://localhost:5000';
 }
 
+console.log('is Dev====???', process.env.NODE_ENV);
+
 // tests user signup and login routes
 describe('User authentication tests', () => {
   let num = Math.floor(Math.random() * 1000);
@@ -42,11 +45,11 @@ describe('User authentication tests', () => {
       it('responds with status 200 and json object on verified user login', () => {
         return request(server)
           .post('/login')
-          .send({ username: 'reactyp3test', password: 'codesmith1!' })
+          .send({ username: 'testing', password: 'codesmith1!' })
           .expect(200)
           .expect('Content-Type', /json/)
           .then((res) =>
-            expect(res.body.sessionId).toEqual('5f0df0636678ba002ba43b88')
+            expect(res.body.sessionId).toEqual('5fa99d1930e67b513c17ba61')
           );
       });
       it('responds with status 400 and json string on invalid user login', () => {
@@ -60,5 +63,22 @@ describe('User authentication tests', () => {
     });
   });
 });
-
-describe('User Login Tests', () => {});
+describe('Github oauth tests', () => {
+  describe('/github/callback?code=', () => {
+    describe('GET', () => {
+      it('responds with status 400 and error message if no code received', () => {
+        return request(server)
+          .get('/github/callback?code=')
+          .expect(400)
+          .then(res => {
+            return expect(res.text).toEqual('\"Undefined or no code received from github.com\"');
+          });
+      });
+      it('responds with status 400 if invalid code received', () => {
+        return request(server)
+          .get('/github/callback?code=123456')
+          .expect(400)
+      });
+    });
+  });
+});
diff --git a/app/electron/main.js b/app/electron/main.js
@@ -404,8 +404,6 @@ ipcMain.on('github', event => {
       zoomFactor: 1.0
     }
   });
-  // const authUrl =
-  //   githubUrl + 'client_id=' + options.client_id + '&scope=' + options.scopes;
   const authUrl =
     `${githubUrl}client_id=${process.env.GITHUB_ID}`;
   github.loadURL(authUrl);
diff --git a/app/src/components/login/SignIn.tsx b/app/src/components/login/SignIn.tsx
@@ -1,9 +1,8 @@
-import React, { Component, useState, useEffect } from 'react';
+import React, { useState, useEffect } from 'react';
 import { LoginInt } from '../../interfaces/Interfaces';
 import {
   Link as RouteLink,
   withRouter,
-  useHistory,
   RouteComponentProps
 } from 'react-router-dom';
 import { sessionIsCreated } from '../../helperFunctions/auth';
@@ -12,18 +11,14 @@ import Avatar from '@material-ui/core/Avatar';
 import Button from '@material-ui/core/Button';
 import CssBaseline from '@material-ui/core/CssBaseline';
 import TextField from '@material-ui/core/TextField';
-import FormControlLabel from '@material-ui/core/FormControlLabel';
-import Checkbox from '@material-ui/core/Checkbox';
-import Link from '@material-ui/core/Link';
 import Grid from '@material-ui/core/Grid';
 import Box from '@material-ui/core/Box';
 import Typography from '@material-ui/core/Typography';
-import { makeStyles, withStyles } from '@material-ui/core/styles';
+import { makeStyles } from '@material-ui/core/styles';
 import Container from '@material-ui/core/Container';
 import GitHubIcon from '@material-ui/icons/GitHub';
 import LockOutlinedIcon from '@material-ui/icons/LockOutlined';
-import { ipcRenderer } from 'electron';
-import { newUserIsCreated, isNewUser } from '../../helperFunctions/auth';
+import { newUserIsCreated } from '../../helperFunctions/auth';
 import randomPassword from '../../helperFunctions/randomPassword';
 
 function Copyright() {
@@ -60,36 +55,6 @@ const useStyles = makeStyles(theme => ({
       borderColor: '#3EC1AC'
     }
   },
-  facebookBtn: {
-    backgroundColor: 'blue',
-    color: 'white',
-    // margin: theme.spacing(1, 0, 1),
-    // fontSize: '20px',
-    cursor: 'pointer',
-    border: '0',
-    outline: '0',
-    position: 'relative',
-    alignItems:' center',
-    userSelect: 'none',
-    verticalAlign: 'middle',
-    justifyCcontent: 'center',
-    textDecoration: 'none',
-    padding: '6px 16px',
-    fontSize: '0.875rem',
-    minWidth: '64px',
-    // box-sizing: border-box,
-    transition: 'background-color 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,border 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms',
-    // font-family: "Roboto", "Helvetica", "Arial", sans-serif,
-    // fontWeight: '500',
-    // line-height: 1.75,
-    // border-radius: 4px,
-    // letter-spacing: 0.02857em,
-    // text-transform: uppercase,
-    // color: rgba(0, 0, 0, 0.87),
-    boxShadow: '0px 3px 1px -2px rgba(0,0,0,0.2),0px 2px 2px 0px rgba(0,0,0,0.14),0px 1px 5px 0px rgba(0,0,0,0.12)',
-    width: '396px',
-    // margin: 8px 0px 8px
-  }
 }));
 
 const SignIn: React.FC<LoginInt & RouteComponentProps> = props => {
@@ -258,32 +223,20 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = props => {
           color="default"
           className={classes.submit}
           onClick={() => {
-            // messages the main proces to open new window for github oauth
-            console.log('open github');
-            // ipcRenderer.send('github-oauth', 'getToken');
             window.api.github();
           }}
-          //onClick={handleGitHubOauth}
         >
-          <GitHubIcon />
+        <GitHubIcon />
         </Button>
-      {/* <Button
-        fullWidth
-        variant="contained"
-        color="primary"
-        className={classes.submit}
-        onClick={e => handleLoginGuest(e)}
-      > */}
         <FacebookLogin
           appId={FBAPPID} 
           autoLoad={false}
           fields="name, email, picture"
           callback={responseFacebook}
           icon="fa-facebook-square"
-          cssClass={classBtn}
+          cssClass={'oauth-btn'}
           textButton=' Login with Facebook'
         />
-      {/* </Button> */}
         <Button
           fullWidth
           variant="contained"
diff --git a/app/src/public/styles/style.css b/app/src/public/styles/style.css
@@ -16,6 +16,11 @@ body {
   font-weight: 400;
   overflow: hidden;
 }
+
+/* span > button {
+  background-color: #01d46d;
+  width: 600px;
+}  */
 /**************
 *
 * for Material React Table found in Add Child Props
@@ -408,3 +413,39 @@ h3 {
   height: 100%;
   width: 100%;
 }
+
+.oauth-btn {
+  -webkit-font-smoothing: antialiased;
+  border: 0;
+  display: inline-flex;
+  outline: 0;
+  position: relative;
+  align-items: center;
+  user-select: none;
+  vertical-align: middle;
+  justify-content: center;
+  text-decoration: none;
+  -webkit-appearance: none;
+  -webkit-tap-highlight-color: transparent;
+  padding: 6px 16px;
+  font-size: 0.875rem;
+  min-width: 64px;
+  box-sizing: border-box;
+  transition: background-color 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,border 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;
+  font-family: "Roboto", "Helvetica", "Arial", sans-serif;
+  font-weight: 500;
+  line-height: 1.75;
+  border-radius: 4px;
+  letter-spacing: 0.02857em;
+  text-transform: uppercase;
+  color: white;
+  box-shadow: 0px 3px 1px -2px rgba(0,0,0,0.2),0px 2px 2px 0px rgba(0,0,0,0.14),0px 1px 5px 0px rgba(0,0,0,0.12);
+  background-color:#4267B2;
+  width: 396px;
+  cursor: pointer;
+  margin: 8px 0px 8px;
+}
+
+.oauth-btn:hover {
+  background-color: #4e76c7;
+}
diff --git a/server/controllers/sessionController.js b/server/controllers/sessionController.js
@@ -67,7 +67,14 @@ sessionController.startSession = (req, res, next) => {
 
 //
 sessionController.gitHubResponse = (req, res, next) => {
+  // console.log(req)
   const { code } = req.query;
+  // console.log('code =>', code);
+  if (!code) return next({
+    log: 'Undefined or no code received from github.com',
+    message: 'Undefined or no code received from github.com',
+    status: 400
+  });
   fetch(
     `https://github.com/login/oauth/access_token`,{
       method: 'POST',
@@ -105,7 +112,13 @@ sessionController.gitHubSendToken = (req, res, next) => {
       res.locals.signUpType = 'oauth';
       return next();
     })
-    .catch(err => res.status(500).json({message: `${err.message} in gitHubSendToken`}))
+    .catch(err =>{ 
+      if (err.message === `Cannot read property 'email' of undefined`) {
+        return res.status(400).json({message: `${err.message} in gitHubSendToken`});
+      } else {
+        return res.status(500).json({message: `${err.message} in gitHubSendToken`});
+      }
+    });
 }
 
 // creates a session when logging in with github
diff --git a/server/server.js b/server/server.js
@@ -1,9 +1,8 @@
 const express = require('express');
-// const https = require('https');
 const fs = require('fs');
 const path = require('path');
-const passport = require('passport');
-require('./passport-setup');
+// const passport = require('passport');
+// require('./passport-setup');
 const bodyParser = require('body-parser');
 const cookieParser = require('cookie-parser');
 const cors = require('cors');
@@ -18,10 +17,9 @@ const isDev = process.env.NODE_ENV === 'development';
 
 console.log('PORT is ', PORT);
 
-// handle parsing request body
 app.use(express.json());
-// cookie parser
 app.use(cookieParser());
+
 // enable cors
 // options: origin: allows from localhost when in dev or the app://rse when using prod, credentials: allows credentials header from origin (needed to send cookies)
 app.use(
@@ -36,23 +34,8 @@ app.use(
 // subsequent logins seem to be working fine, however
 
 // initializes passport and passport sessions
-app.use(passport.initialize());
-app.use(passport.session());
-
-// routes for initial github oauth and callback
-app.get(
-  '/github', 
-  (req, res) => {
-    console.log('git hub');
-    res.redirect(`https://github.com/login/oauth/authorize?client_id=${clientId}`);
-  });
-
-// app.post(
-//   '/facebook', 
-//   userController.doesUserExist,
-//   (req, res) => {
-//     return res.status(200).json({ userStatus: res.locals.userExists });
-// });
+// app.use(passport.initialize());
+// app.use(passport.session());
 
 app.get(
   '/github/callback',
@@ -63,16 +46,12 @@ app.get(
   cookieController.setSSIDCookie,
   sessionController.startSession,
   (req, res) => {
-    // TODO - figure out how to send a response that closes window
     if (isDev) {
       return res.status(200).redirect(`http://localhost:8080?=${res.locals.ssid}`);
     } else {
       return res.status(200).redirect('app://rse');
     }
   }
-  // (req, res) => {
-  //   return res.status(200).json({ sessionId: res.locals.ssid });
-  // }
 );
 
 app.post(

Original file line number	Diff line number	Diff line change
`@@ -404,8 +404,6 @@ ipcMain.on('github', event => {`
`404`	`404`	`zoomFactor: 1.0`
`405`	`405`	`}`
`406`	`406`	`});`
`407`		`- // const authUrl =`
`408`		`- // githubUrl + 'client_id=' + options.client_id + '&scope=' + options.scopes;`
`409`	`407`	`const authUrl =`
`410`	`408`	`${githubUrl}client_id=${process.env.GITHUB_ID}`;
`411`	`409`	`github.loadURL(authUrl);`