FIXED GITHUB OAUTH!

Author: calvincao

app/electron/main.js

@@ -375,9 +375,8 @@ ipcMain.on('delete_cookie', event => {
 
 // opens new window for github oauth when button on sign in page is clicked
 ipcMain.on('github', event => {
-  // your  applications credentials
-  const githubUrl = 'https://github.com/login/oauth/authorize?';
-  // const githubUrl = 'http://localhost:5000/auth/github';
+  console.log('inside main.js in electron');
+  const githubURL = 'http://localhost:5000/auth/github';
   const options = {
     client_id: process.env.GITHUB_ID,
     client_secret: process.env.GITHUB_SECRET,
@@ -397,8 +396,8 @@ ipcMain.on('github', event => {
       zoomFactor: 1.0
     }
   });
-  const authUrl = `${githubUrl}client_id=${process.env.GITHUB_ID}`;
-  github.loadURL(authUrl);
+
+  github.loadURL(githubURL);
   github.show();
   const handleCallback = url => {
     const raw_code = /code=([^&]\*)/.exec(url) || null;
@@ -443,6 +442,9 @@ ipcMain.on('github', event => {
     if (isDev) {
       redirectUrl = 'http://localhost:8080/';
     }
+    console.log(callbackUrl === redirectUrl);
+    console.log('callbackUrl', callbackUrl);
+    console.log('redirectUrl', redirectUrl);
     if (callbackUrl === redirectUrl) {
       dialog.showMessageBox({
         type: 'info',

app/src/components/login/SignIn.tsx

@@ -68,8 +68,8 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = props => {
 
   useEffect(() => {
     const githubCookie = setInterval(() => {
-      window.api.setCookie();
-      window.api.getCookie(cookie => {
+      window.api?.setCookie();
+      window.api?.getCookie(cookie => {
         // if a cookie exists, set localstorage item with cookie data, clear interval, go back to '/' route to load app
         if (cookie[0]) {
           window.localStorage.setItem('ssid', cookie[0].value);

app/src/components/right/LoginButton.tsx

@@ -12,11 +12,10 @@ export default function LoginButton() {
     e.preventDefault();
     // clear local storage
     window.localStorage.clear();
+    // destroy cookie in production via electron main process
     window.api.delCookie();
     // destroys cookie by backdating expiration time
     // document.cookie = 'ssid=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;';
-    // destroy cookie in production via electron main process
-    // window.api.delCookie();
     // uses useHistory to return to the login page
     history.push('/login');
   };