Merge pull request #2 from oslabs-beta/Oauth

Oauth

Author: pmhua

app/electron/main.js

@@ -204,6 +204,8 @@ app.on('ready', createWindow);
 
 // Quit when all windows are closed.
 app.on('window-all-closed', () => {
+  require('electron').app.getPath('userData');
+  win.webContents.executeJavaScript('window.localStorage.clear();');
   app.quit();
 });
 
@@ -258,7 +260,6 @@ app.on('web-contents-created', (event, contents) => {
       'https://www.html5rocks.com',
       'app://rse/'
     ];
-
     // Log and prevent the app from redirecting to a new page
     if (
       !validOrigins.includes(parsedUrl.origin)
@@ -368,7 +369,6 @@ ipcMain.on('set_cookie', event => {
       // this if statement is necessary or the setInterval on main app will constantly run and will emit this event.reply, causing a memory leak
       // checking for a cookie inside array will only emit reply when a cookie exists
       if (cookie[0]) {
-        //console.log(cookie);
         event.reply('give_cookie', cookie);
       }
     })
@@ -466,7 +466,7 @@ ipcMain.on('github', event => {
       github.close();
       win.webContents
         .executeJavaScript(`window.localStorage.setItem('ssid', '${ssid}')`)
-        .then(result => win.loadURL(`app://rse?=${ssid}`))
+        .then(result => win.loadURL(`${redirectUrl}`))
         .catch(err => console.log(err));
     }
   });

app/src/components/bottom/BottomTabs.tsx

@@ -116,9 +116,9 @@ const useStyles = makeStyles(theme => ({
     boxShadow: '0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23)',
 
   },
-  rootLight: isThemeLight => ({
-    backgroundColor: isThemeLight ? 'blue': 'red'
-  }),
+  rootLight: {
+    backgroundColor: '#003366'
+  },
   bottomHeader: {
     flex: 1,
     flexDirection: 'row',

app/src/components/right/TableStateProps.tsx

@@ -13,7 +13,6 @@ import { StatePropsPanelProps } from '../../interfaces/Interfaces';
 
 const getColumns = (props) => {
   const { deleteHandler } : StatePropsPanelProps = props;
-  console.log('isThemeLight: ',props.isThemeLight)
   return [
     {
       field: 'id',
@@ -71,7 +70,6 @@ const TableStateProps = (props) => {
 
 
   useEffect(() => {
-  console.log('isThemeLight: ',props.isThemeLight)
     setGridColumns(getColumns(props));
   }, [props.isThemeLight])
   // get currentComponent by using currently focused component's id

app/src/helperFunctions/gitHubOauth.ts

@@ -1,5 +1,4 @@
 const handleGitHubOauth = () => {
-  console.log('git hub');
   const gitHubUrl = 'https://github.com/login/oauth/authorize?';
   const authUrl =
   `${gitHubUrl}client_id=`;

app/src/utils/createApplication.util.ts

@@ -346,7 +346,6 @@ async function createApplicationUtil({
   appName: string;
   components: Component[];
 }) {
-  console.log('in the createApplication util');
 
   await createIndexHtml(path, appName);
   await createIndexTsx(path, appName);

app/src/utils/createGatsbyApp.util.ts

@@ -147,14 +147,11 @@ async function createGatsbyAppUtil({
   components: Component[];
   rootComponents: number[];
 }) {
-  console.log('in the createGatsbyApplication util');
-
   await initFolders(path, appName);
   await createBaseTsx(path, appName);
   await createDefaultCSS(path, appName, components);
   await createPackage(path, appName);
   await createTsConfig(path, appName);
   await createGatsbyFiles(components, path, appName, rootComponents);
-
 }
 export default createGatsbyAppUtil;

app/src/utils/createNextApp.util.ts

@@ -146,14 +146,11 @@ async function createNextAppUtil({
   components: Component[];
   rootComponents: number[];
 }) {
-  console.log('in the createNextApplication util');
-
   await initFolders(path, appName);
   await createBaseTsx(path, appName);
   await createDefaultCSS(path, appName, components);
   await createPackage(path, appName);
   await createTsConfig(path, appName);
   await createNextFiles(components, path, appName, rootComponents);
-
 }
 export default createNextAppUtil;

server/controllers/sessionController.js

@@ -40,7 +40,7 @@ sessionController.startSession = (req, res, next) => {
         log: `Error in sessionController.startSession find session: ${err}`,
         message: {
           err:
-            'Error in sessionController.startSession find session, check server logs for details'
+          'Error in sessionController.startSession find session, check server logs for details'
         }
       });
       // if session doesn't exist, create a session
@@ -69,19 +69,13 @@ sessionController.startSession = (req, res, next) => {
 };
 
 sessionController.gitHubResponse = (req, res, next) => {
-  console.log('hi')
   const { code } = req.query;
-  console.log('code:',code)
-  console.log('code =>', code);
-  console.log('JSON:', )
-  console.log(process.env.GITHUB_ID)
   if (!code)
     return next({
       log: 'Undefined or no code received from github.com',
       message: 'Undefined or no code received from github.com',
       status: 400
     });
-    console.log('heyyyy');
     fetch(`https://github.com/login/oauth/access_token?client_id=${process.env.GITHUB_ID}&client_secret=${process.env.GITHUB_SECRET}&code=${code}`, {
       method: 'POST',
       headers: {
@@ -96,13 +90,10 @@ sessionController.gitHubResponse = (req, res, next) => {
     })
       .then(res => res.json())
       .then(token => {
-        console.log('hi');
-        console.log('token: ',token['access_token'] )
         res.locals.token = token['access_token'];
         return next();
       })
       .catch(err => {
-        console.log('hi');
         res.status(500).json({ message: `${err.message} in gitHubResponse` })
       }
       );
@@ -120,7 +111,6 @@ sessionController.gitHubSendToken = (req, res, next) => {
   })
     .then(res => res.json())
     .then(data => {
-      console.log('this is data:', data);
       res.locals.githubEmail = data[0]['email'];
       res.locals.signUpType = 'oauth';
       return next();

server/controllers/userController.js

@@ -85,7 +85,6 @@ 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/package.json

@@ -10,7 +10,7 @@
     "test": "jest --verbose ",
     "test:watch": "jest --watch",
     "start": "cross-env NODE_ENV=production node server.js",
-    "prod": "cross-env NODE_ENV=production server.js",
+    "prod": "cross-env NODE_ENV=production nodemon server.js",
     "dev": "cross-env NODE_ENV=development nodemon server.js"
   },
   "keywords": [],

server/server.js

@@ -55,6 +55,7 @@ app.get(
     if (isDev) {
       return res.status(200).redirect(`http://localhost:8080?=${res.locals.ssid}`);
     } else {
+      console.log('res.locals.ssid: ',res.locals.ssid);
       return res.status(200).redirect(`app://rse?=${res.locals.ssid}`);
     }
   }