access-tokens-instead-of google-id

middleware/PassportMiddleware.js

@@ -11,7 +11,7 @@ passport.use(
       callbackURL: "http://localhost:3000/auth/google/callback"
     },
     async function (accessToken, refreshToken, profile, done) {
-      User.findOne({ googleId: profile.id }, async function (err, user) {
+      User.findOne({ email: profile.emails[0].value }, async function (err, user) {
         if (err) {
           return done(err);
         }
@@ -22,6 +22,10 @@ passport.use(
             email: profile.emails[0].value,
             displayPicture: profile.photos[0].value
           });
+          user.accessToken.push(accessToken);
+          await user.save();
+        } else if (user) {
+          user.accessToken.push(accessToken);
           await user.save();
         }
         return done(err, user);

middleware/authadmin.js

@@ -4,9 +4,15 @@ const Admin = require("../models/Admin");
 const auth = async (req, res, next) => {
   try {
     if (req.session.token) {
-      Admin.findOne({ googleId: req.session.token }, function (err, admin) {
+      Admin.findOne({ email: req.user.email }, function (err, admin) {
         if (admin) {
-          next();
+          var x = admin.accessToken.indexOf(req.session.token);
+          if (x !== -1) {
+            next();
+          } else {
+            res.cookie("token", "");
+            res.redirect("/auth/logout");
+          }
         } else if (err) {
           res.cookie("token", "");
           res.redirect("/");

middleware/authuser.js

@@ -4,9 +4,15 @@ const User = require("../models/User");
 const auth = async (req, res, next) => {
   try {
     if (req.session.token) {
-      User.findOne({ googleId: req.session.token }, function (err, user) {
+      User.findOne({ email: req.user.email }, function (err, user) {
         if (user) {
-          next();
+          var x = user.accessToken.indexOf(req.session.token);
+          if (x !== -1) {
+            next();
+          } else {
+            res.cookie("token", "");
+            res.redirect("/auth/logout");
+          }
         } else if (err) {
           res.cookie("token", "");
           res.redirect("/");

models/Admin.js

@@ -2,7 +2,8 @@ const mongoose = require("mongoose");
 
 const AdminSchema = new mongoose.Schema({
   email: String,
-  googleId: String
+  googleId: String,
+  accessToken: [String]
 });
 
 const Admin = mongoose.model("admin", AdminSchema);

models/User.js

@@ -6,6 +6,7 @@ const UserSchema = new mongoose.Schema({
     trim: true,
     required: true
   },
+  accessToken: [String],
   name: {
     type: String,
     trim: true,

routes/api/auth.js

@@ -16,29 +16,49 @@ router.get(
   "/google/callback",
   passport.authenticate("google", { failureRedirect: "/" }),
   (req, res) => {
-    req.session.token = req.user.googleId;
+    req.session.token = req.user.accessToken[req.user.accessToken.length - 1];
+    console.log(req.session.token);
     res.cookie("token", req.session.token);
     Admin.findOne({ email: req.user.email }, function (err, admin) {
       if (err) Error(err);
       if (!admin) {
-        req.session.client = "user";
-        res.redirect("/user/dashboard");
+        User.findOne({ email: req.user.email }, function (err, user) {
+          if (err) Error(err);
+          var x = user.accessToken.indexOf(req.session.token);
+          if (x !== -1) {
+            req.session.client = "user";
+            res.redirect("/user/dashboard");
+          } else {
+            res.redirect("/");
+          }
+        });
       } else {
         User.deleteOne({ email: req.user.email }, function (err, user) {
           if (err) {
             res.redirect("/");
           } else if (user) {
+            Admin.findOne({ email: req.user.email }, async function (err, admin) {
+              if (err) Error(err);
+              admin.accessToken.push(req.session.token);
+              await admin.save();
+              var x = admin.accessToken.indexOf(req.session.token);
+              if (x !== -1) {
+                req.session.status = "applied";
+                req.session.client = "admin";
+                res.redirect("/admin/dashboard");
+              } else {
+                res.redirect("/");
+              }
+            });
           }
         });
-        req.session.status = "applied";
-        req.session.client = "admin";
-        res.redirect("/admin/dashboard");
       }
     });
   }
 );
 
-router.get("/logout", (req, res) => {
+router.get("/logout", async (req, res) => {
+  await User.update({ email: req.user.email }, { $pull: { accessToken: { $in: [req.session.token] } } });
   req.logout();
   req.session = null;
   req.token = null;