Merge pull request #11 from yashrajverma/yashrajverma

Yashrajverma

.history/app_20210519122521.js

@@ -0,0 +1,112 @@
+const express = require("express");
+const mongoose = require("mongoose");
+const bodyparser = require("body-parser");
+const authRoute = require("./routes/auth");
+const profileRoute = require("./routes/profile");
+const paymentRoute = require("./routes/payment");
+const courseRoute = require("./routes/course");
+const couponRoute = require("./routes/Coupon");
+const queryRoute = require("./routes/query");
+const adminRoute = require("./routes/admin");
+const blogRouter = require("./routes/blog");
+const port = process.env.PORT || 5000;
+const cors = require("cors");
+const app = express();
+
+//const passport = require('passport');
+//const cookieSession = require('cookie-session') ;
+//require('./passport-setup') ;
+
+<<<<<<< HEAD
+=======
+const app = express();
+
+>>>>>>> ef4c9b6a526e0ef10b94f271654809ce636d8ab0
+const MONGO_URI = `mongodb+srv://${process.env.MONGO_USER}:${process.env.MONGO_PASSWORD}@cluster0.dqxva.mongodb.net/${process.env.MONGO_DEFAULT_DATABASE}?retryWrites=true&w=majority`;
+
+app.use(cors());
+app.use(bodyparser.json());
+
+// app.use(cookieSession({
+//     name: 'test-session',
+//     keys: ['key1', 'key2']
+//   }))
+
+// const isLoggedIn = (req , res , next) => {
+//     if(req.user)
+//     {
+//         next()
+//     }
+//     else
+//     {
+//         res.json({
+//             error : "No user"
+//         })
+//     }
+// }
+
+// app.use(passport.initialize());
+// app.use(passport.session());
+
+// app.get('/failed' , (req , res) => {
+//     res.json({
+//         error : "You have failed to login"
+//     })
+// })
+
+// app.get('/' , (req , res) => {
+//     console.log('you are not logged in');
+
+// })
+
+// app.get('/good' ,isLoggedIn ,  (req , res) => {
+//     res.json({
+//         message:"success" ,
+//         user : req.user
+//     })
+// })
+
+// app.get('/auth/google',
+//   passport.authenticate('google', { scope: ['profile' , 'email'] }));
+
+// app.get('/auth/google/callback',
+//   passport.authenticate('google', { failureRedirect: '/failed' }),
+//   function(req, res) {
+//     res.redirect('/good');
+//   });
+
+// app.get('/logout', (req , res) => {
+//     req.session = null ;
+//     req.logout() ;
+//     res.redirect('/') ;
+// })
+mongoose
+  .connect(MONGO_URI, {
+    useNewUrlParser: true,
+    useUnifiedTopology: true,
+    useFindAndModify: false,
+  })
+  .then((result) => {
+    console.log("connected");
+    app.listen(port, () => {
+      console.log("server is running on port", port);
+    });
+  })
+  .catch((err) => {
+    console.log(err);
+  });
+app.use(authRoute);
+
+app.use(profileRoute);
+
+app.use(paymentRoute);
+
+app.use(courseRoute);
+
+app.use(adminRoute);
+
+app.use(couponRoute);
+
+app.use(blogRouter);
+
+app.use(queryRoute);

.history/app_20210519122841.js

@@ -0,0 +1,107 @@
+const express = require("express");
+const mongoose = require("mongoose");
+const bodyparser = require("body-parser");
+const authRoute = require("./routes/auth");
+const profileRoute = require("./routes/profile");
+const paymentRoute = require("./routes/payment");
+const courseRoute = require("./routes/course");
+const couponRoute = require("./routes/Coupon");
+const queryRoute = require("./routes/query");
+const adminRoute = require("./routes/admin");
+const blogRouter = require("./routes/blog");
+const port = process.env.PORT || 5000;
+const cors = require("cors");
+const app = express();
+
+//const passport = require('passport');
+//const cookieSession = require('cookie-session') ;
+//require('./passport-setup') ;
+
+const MONGO_URI = `mongodb+srv://${process.env.MONGO_USER}:${process.env.MONGO_PASSWORD}@cluster0.dqxva.mongodb.net/${process.env.MONGO_DEFAULT_DATABASE}?retryWrites=true&w=majority`;
+
+app.use(cors());
+app.use(bodyparser.json());
+
+// app.use(cookieSession({
+//     name: 'test-session',
+//     keys: ['key1', 'key2']
+//   }))
+
+// const isLoggedIn = (req , res , next) => {
+//     if(req.user)
+//     {
+//         next()
+//     }
+//     else
+//     {
+//         res.json({
+//             error : "No user"
+//         })
+//     }
+// }
+
+// app.use(passport.initialize());
+// app.use(passport.session());
+
+// app.get('/failed' , (req , res) => {
+//     res.json({
+//         error : "You have failed to login"
+//     })
+// })
+
+// app.get('/' , (req , res) => {
+//     console.log('you are not logged in');
+
+// })
+
+// app.get('/good' ,isLoggedIn ,  (req , res) => {
+//     res.json({
+//         message:"success" ,
+//         user : req.user
+//     })
+// })
+
+// app.get('/auth/google',
+//   passport.authenticate('google', { scope: ['profile' , 'email'] }));
+
+// app.get('/auth/google/callback',
+//   passport.authenticate('google', { failureRedirect: '/failed' }),
+//   function(req, res) {
+//     res.redirect('/good');
+//   });
+
+// app.get('/logout', (req , res) => {
+//     req.session = null ;
+//     req.logout() ;
+//     res.redirect('/') ;
+// })
+mongoose
+  .connect(MONGO_URI, {
+    useNewUrlParser: true,
+    useUnifiedTopology: true,
+    useFindAndModify: false,
+  })
+  .then((result) => {
+    console.log("connected");
+    app.listen(port, () => {
+      console.log("server is running on port", port);
+    });
+  })
+  .catch((err) => {
+    console.log(err);
+  });
+app.use(authRoute);
+
+app.use(profileRoute);
+
+app.use(paymentRoute);
+
+app.use(courseRoute);
+
+app.use(adminRoute);
+
+app.use(couponRoute);
+
+app.use(blogRouter);
+
+app.use(queryRoute);

controllers/auth.js

@@ -13,11 +13,11 @@ const smtpTransport = require("nodemailer-smtp-transport");
 
 var transport = nodemailer.createTransport(
   smtpTransport({
-    host: `email-smtp.us-east-1.amazonaws.com`, //`${process.env.HOST}`
+    host: `${process.env.HOST}`, //`${process.env.HOST}`
     port: 465,
     auth: {
-      user: `AKIA2G7743RRTZMVXE3X`, //`${process.env.EMAIL}`
+      user: `${process.env.EMAIL}`, //`${process.env.EMAIL}`
-      pass: `BJSjV3jArJfsnk1LhFc/hUmisEyEtbLNGgrRbv0noh8c`, //`${process.env.PASS}`
+      pass: `${process.env.PASS}`, //`${process.env.PASS}`
     },
   })
 );
@@ -391,6 +391,9 @@ module.exports.resetpassword = async (req, res, next) => {
 };
 
 //                                     Forgot password Ends
+
+//                                      Email verification Ends
+
 // -----------------------------------------------------------------------------------------------
 
 module.exports.checkProtected = (req, res, next) => {