Added Auto Validate for Login and Register GitHub OAuth

stanleyowen · Mar 13, 2021 · 1486be3 · 1486be3
1 parent 71f2290
commit 1486be3
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 15 deletions.
diff --git a/server/index.js b/server/index.js
@@ -1,8 +1,8 @@
-const express = require('express');
 const cors = require('cors');
+const helmet = require('helmet');
+const express = require('express');
 const passport = require('passport');
 const mongoose = require('mongoose');
-const helmet = require('helmet');
 
 const app = express();
 const PORT = process.env.PORT || 5000;

diff --git a/server/routes/oauth.route.js b/server/routes/oauth.route.js
@@ -1,11 +1,12 @@
-const router = require('express').Router();
 const axios = require('axios');
-const passport = require('passport');
 const jwt = require('jsonwebtoken');
+const passport = require('passport');
+const router = require('express').Router();
 const jwtSecret = require('../config/jwtConfig');
 let User = require('../models/users.model');
 
 const CLIENT_ID = process.env.GITHUB_ID;
+const CLIENT_URL = process.env.CLIENT_URL;
 const CLIENT_SECRET = process.env.GITHUB_SECRET;
 
 const ERR_MSG = [
@@ -42,18 +43,33 @@ router.get('/github', async (req, res) => {
             })
             .then(user => {
                 const email = user.data.email;
-                const dataModel = new User ({
-                    email,
-                    password: null,
-                    thirdParty: {
-                        isThirdParty: true,
-                        provider: 'github',
-                        status: 'Pending'
+                User.findOne({ email }, (err, user) => {
+                    if(err) return res.status(500).json({statusCode: 500, message: ERR_MSG[0]});
+                    else if(!user){
+                        const dataModel = new User ({
+                            email,
+                            password: null,
+                            thirdParty: {
+                                isThirdParty: true,
+                                provider: 'github',
+                                status: 'Pending'
+                            }
+                        });
+                        dataModel.save()
+                        res.redirect(`${CLIENT_URL}/oauth/github/${encodeURIComponent(email)}`);
+                    }else if(user){
+                        if (user.thirdParty.status === "Pending") res.redirect(`${CLIENT_URL}/oauth/github/${encodeURIComponent(email)}`);
+                        else {
+                            const token = jwt.sign({ id: user.id }, jwtSecret.secret, { expiresIn: '1d' });
+                            res.json({
+                                statusCode: 200,
+                                status: ERR_MSG[11],
+                                id: user.id,
+                                token: token
+                            });
+                        }
                     }
-                });
-                dataModel.save()
-                .then(() => res.redirect(`http://localhost:3000/oauth/github/${encodeURIComponent(email)}`))
-                .catch(() => res.json('Error in Registering Due to Duplicate Email Address'))
+                })
             })
             .catch(err => console.log(err))
         }else res.json(result.data);