Merge remote-tracking branch 'origin/features/google_auth'

Author: AlexanderDmitriev

.env.example

@@ -1,2 +1,8 @@
-DB_HOST =
-SECRET_KEY = 
+DB_HOST = 
+SECRET_KEY = 
+
+PORT = 
+BASE_URL = 
+FRONTEND_URL = 
+GOOGLE_CLIENT_ID = 
+GOOGLE_CLIENT_SECRET = 

app.js

@@ -1,11 +1,14 @@
-const express = require ("express");
+const express = require("express");
+
+const path = require("path");
 
 const logger = require("morgan");
 const cors = require("cors");
 const swaggerUi = require('swagger-ui-express');
 const swaggerDocument = require('./swagger.json');
 
-require('dotenv').config();
+// require('dotenv').config();
+require("dotenv").config({ path: path.join(__dirname, "./.env") });
 
 const authRouter = require('./routes/api/auth');
 const booksRouter = require("./routes/api/books");
@@ -19,9 +22,16 @@ app.use(logger(formatsLogger));
 app.use(cors());
 app.use(express.json());
 
+app.use(express.static("public"))
+
 app.use('/api/users', authRouter);
+app.use('/link', (req, res) => {
+  res.sendFile(path.join(__dirname, "./public/link.html"));
+});
 app.use("/api/books", booksRouter);
 app.use("/api/training", statsRouter);
+// app.use("/api/stats", statsRouter);
+
 app.use('/', swaggerUi.serve, swaggerUi.setup(swaggerDocument));
 
 app.use((req, res) => {
@@ -33,4 +43,4 @@ app.use((req, res) => {
     res.status(status).json({ message });
   });
 
-module.exports = app;
+module.exports = app;

controllers/auth/index.js

@@ -2,10 +2,12 @@ const signup = require('./signup');
 const login = require('./login');
 const logout = require('./logout');
 const currentUser = require('./currentUser');
+const signupEndLogin = require('./signupEndLogin')
 
 module.exports = {
     signup,
     login,
     logout,
     currentUser,
+    signupEndLogin,
 }

controllers/auth/login.js

@@ -7,7 +7,8 @@ const { User } = require('../../models/user');
 const { SECRET_KEY } = process.env;
 
 const login = async (req, res) => {
-    const { email, password, } = req.body;
+    let { email, password, } = req.body;
+    email = email.toLowerCase();
     const user = await User.findOne({ email });
     if (!user) {
         throw RequestError(401, "Email not found");
@@ -16,16 +17,16 @@ const login = async (req, res) => {
     if (!comparePassword) {
         throw RequestError(401, "Password wrong");
     }
-    // if(!user.verify) {
-    //     throw RequestError(403, "Email not verify");
-    // }
+
     const peyload = {
         id: user._id
     }
     const token = jwt.sign(peyload, SECRET_KEY, { expiresIn: "24h" });
     await User.findByIdAndUpdate(user._id, { token });
+    
     res.json({
         token,
+        name: user.name,
     });
 };
 

controllers/auth/signup.js

@@ -4,12 +4,14 @@ const { User } = require('../../models/user');
 const { RequestError } = require('../../helpers/index');
 
 const signup = async (req, res) => {
-    const { name, email, password } = req.body;
+    let { name, email, password } = req.body;
+    email = email.toLowerCase();
     const user = await User.findOne({ email });
     if (user) {
         throw RequestError(409, "Email already exist");
     }
     const hashPassword = await bcrypt.hash(password, 10);
+
     const result = await User.create({ name, email, password: hashPassword });
     res.status(201).json({
         name: result.name,

controllers/auth/signupEndLogin.js

@@ -0,0 +1,35 @@
+const bcrypt = require('bcryptjs');
+const jwt = require('jsonwebtoken');
+
+const { User } = require('../../models/user');
+const { RequestError } = require('../../helpers/index');
+const { SECRET_KEY } = process.env;
+
+const signupEndLogin = async (req, res) => { 
+    let { name, email, password } = req.body;
+    // SINGUP *********************************************
+    email = email.toLowerCase();
+    let user = await User.findOne({ email });
+    if (user) {
+        throw RequestError(409, "Email already exist");
+    }
+    const hashPassword = await bcrypt.hash(password, 10);
+    
+    const result = await User.create({ name, email, password: hashPassword });
+
+    //  LOGIN *********************************************
+    user = await User.findOne({ email });
+    const peyload = {
+        id: user._id
+    }
+    const token = jwt.sign(peyload, SECRET_KEY, { expiresIn: "24h" });
+    await User.findByIdAndUpdate(user._id, { token });
+
+    res.status(201).json({
+        name: result.name,
+        email: result.email,
+        token,
+    });
+}
+
+module.exports = signupEndLogin;

models/user.js

@@ -3,8 +3,8 @@ const Joi = require('joi');
 
 const { handleSchemaValidationErrors } = require("../helpers");
 
-const emailRegexp = /^([a-z0-9_-]+\.)*[a-z0-9_-]+@[a-z0-9_-]+(\.[a-z0-9_-]+)*\.[a-z]{2,6}$/;
-// const emailRegexp = /^[\w.]+@[\w]+.[\w]+$/;
+// const emailRegexp = /^([a-z0-9_-]+\.)*[a-z0-9_-]+@[a-z0-9_-]+(\.[a-z0-9_-]+)*\.[a-z]{2,6}$/;
+const emailRegexp = /^[\w.]+@[\w]+.[\w]+$/;
 
 const userShema = new Schema({
   name: {
@@ -13,6 +13,8 @@ const userShema = new Schema({
   },
   email: {
     type: String,
+    minlength: 6,
+    maxLength: 63,
     required: [true, 'Email is required'],
     match: emailRegexp,
     unique: true,
@@ -34,13 +36,13 @@ userShema.post("save", handleSchemaValidationErrors);
 // ** Joi schemas ***************************************
 const singupSchema = Joi.object({
   name: Joi.string().required(),
-  email: Joi.string().pattern(emailRegexp).required(),
-  password: Joi.string().min(6).required(), 
+  email: Joi.string().pattern(emailRegexp).min(6).required(),
+  password: Joi.string().min(6).max(6).required(), 
   repeat_password: Joi.string().required().valid(Joi.ref('password')),
 })
 
 const loginSchema = Joi.object({
-  email: Joi.string().pattern(emailRegexp).required(),
+  email: Joi.string().min(6).max(6).pattern(emailRegexp).required(),
   password: Joi.string().min(6).required(),
 })