Oauth functioning

Author: dreille

app/electron/main.js

@@ -256,6 +256,7 @@ app.on('web-contents-created', (event, contents) => {
       'https://www.facebook.com',
       'https://www.smashingmagazine.com',
       'https://www.html5rocks.com',
+      'app://rse/'
     ];
 
     // Log and prevent the app from redirecting to a new page
@@ -465,7 +466,7 @@ ipcMain.on('github', event => {
       github.close();
       win.webContents
         .executeJavaScript(`window.localStorage.setItem('ssid', '${ssid}')`)
-        .then(result => win.loadURL(selfHost))
+        .then(result => win.loadURL(`app://rse?=${ssid}`))
         .catch(err => console.log(err));
     }
   });

app/src/components/login/SignIn.tsx

@@ -165,7 +165,6 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = props => {
       e.preventDefault();
         window.api.github();
         props.history.push('/');
-
     }
   const responseFacebook = response => {
     if (response.accessToken) {

server/controllers/sessionController.js

@@ -106,6 +106,7 @@ sessionController.gitHubResponse = (req, res, next) => {
         res.status(500).json({ message: `${err.message} in gitHubResponse` })
       }
       );
+      
 };
 
 sessionController.gitHubSendToken = (req, res, next) => {

server/models/reactypeModels.js

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

server/package.json

@@ -6,29 +6,26 @@
   "engines": {
     "node": "12.17.0"
   },
-
   "scripts": {
     "test": "jest --verbose ",
     "test:watch": "jest --watch",
     "start": "cross-env NODE_ENV=production node server.js",
     "prod": "cross-env NODE_ENV=production server.js",
     "dev": "cross-env NODE_ENV=development nodemon server.js"
   },
-
-
   "keywords": [],
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "apollo-server-express": "^2.24.0", 
+    "apollo-server-express": "^2.24.0",
     "bcryptjs": "^2.4.3",
     "body-parser": "^1.19.0",
     "cookie-parser": "^1.4.5",
     "cors": "^2.8.5",
     "cross-env": "^7.0.2",
     "dotenv": "^8.2.0",
     "express": "^4.17.1",
-    "graphql": "^15.5.0", 
+    "graphql": "^15.5.0",
     "mongoose": "^5.9.22",
     "nodemon": "^2.0.4",
     "passport": "^0.4.1",

server/server.js

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