fix authentication

Author: Dmitry Shibanov

src/controller/auth.ts

@@ -19,14 +19,14 @@ export const postSignUp: RequestHandler = async (req, res, next) => {
 
         const exitingUser = await User.findOne({
             where: {
-                login: login
+                email: email
             }
         });
 
         console.debug(`exitingUser ${exitingUser}`);
 
         if (exitingUser) {
-            throw new Error("Пользователь с таким login уже существует, придумаете другой");
+            throw new Error("Пользователь с таким email уже существует, придумаете другой");
         }
         const hashPassword = bcrypt.hashSync(password,12);
         const newUser = await User.create({ email: email, password: hashPassword, login: login });
@@ -88,7 +88,7 @@ export const postLogin: RequestHandler = async (req, res, next) => {
 }
 
 export const getUserCourses: RequestHandler = (req, res, next) => {
-    const userID = req.body.id;
+    const userID = res.locals.jwtPayload.userId;;
 
 
 }

src/controller/blog.ts

@@ -31,7 +31,7 @@ export const postUpdateBlog: RequestHandler = async (req,res, next) => {
     const id = req.body.id;
     const tytle = req.body.description;
     const description = req.body.description;
-    const userId = req.body.userId;
+    const userId = res.locals.jwtPayload.userId;;
     const commentId = req.body.commentId;
 
     try{

src/controller/user.ts

@@ -7,7 +7,7 @@ export const postAddToCart: RequestHandler = async (req, res, next) => {
     const productId = req.body.productId;
 
     try {
-        const userId = req.cookies("userId") as number;
+        const userId = res.locals.jwtPayload.userId as number;
         const user = await User.findByPk(userId);
         const basket = user?.basket;
         // basket?.addProductToBasket(productId);
@@ -19,7 +19,7 @@ export const postAddToCart: RequestHandler = async (req, res, next) => {
 }
 
 export const getCatalog: RequestHandler = async (req,res,next) => {
-    const userId = req.body.userId;
+    const userId = res.locals.jwtPayload.userId;;
 
 }
 

src/middleware/user_session.ts

@@ -11,9 +11,14 @@ const sessionUser: RequestHandler = (req, res, next) => {
         throw err;
     }
     const token = authHeader.split(' ')[1];
+    const tokenCopy = <string>req.headers["auth"];
+    console.log(`token ${token}`)
+    console.log(`token ${tokenCopy}`)
+
     let decodedToken;
     try {
         decodedToken = jwt.verify(token, 'secret');
+        res.locals.jwtPayLoad = decodedToken;
     } catch (err) {
         err.statusCode = 500;
         throw err;
@@ -25,7 +30,7 @@ const sessionUser: RequestHandler = (req, res, next) => {
     }
 
     // req.res?.set("userId", (<AuthUser>decodedToken).userId)
-    req.res?.cookie('sessionId', decodedToken);
+    // req.res?.cookie('sessionId', decodedToken);
 
     console.log(decodedToken);
     next();

src/models/video.ts

@@ -1,12 +1,13 @@
 import { Model } from "sequelize";
 
-// class Video extends Model{
-//     id!: string;
-//     id_cource: number;
-//     time: number;
+class Video extends Model{
+    id!: string;
+    url!: string;
+    id_cource!: number;
+    time!: number;
 
-//     public readonly createdAt!: Date;
-//     public readonly updatedAt!: Date;
-// }
+    public readonly createdAt!: Date;
+    public readonly updatedAt!: Date;
+}
 
-export default null;
+export default Video;