Finished Auth Route(s) Migration (#11)

Nyumat · Jan 8, 2023 · ce74237 · ce74237
1 parent 2758b3f
commit ce74237
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/backend/routes/auth/login.ts b/backend/routes/auth/login.ts
@@ -1,11 +1,11 @@
 import { compare } from "bcrypt";
 import joi from "joi";
-import { Router } from "express";
+import { Router, Request, Response }  from "express";
 import generateAuthToken from "../../utils/generateToken.js";
 import User from "../../models/user.js";
 const router = Router();
 
-router.post("/", async (req, res) => {
+router.post("/", async (req: Request, res: Response) => {
  const schema = joi.object({
  username: joi.string().min(3).max(200).required(),
  pin: joi.number().min(0).max(9999).required()

diff --git a/backend/routes/auth/logout.ts b/backend/routes/auth/logout.ts
@@ -1,10 +1,10 @@
 // @ts-nocheck
 import User from "../../models/user.js";
-import { Router } from "express";
+import { Router, Request, Response }  from "express";
 import Dixon from "../../models/dixon.js";
 const router = Router();
 
-router.patch("/", async (req, res) => {
+router.patch("/", async (req: Request, res: Response) => {
  let username = req.body.username;
  try {
  let user = await User.findOne({ username: username }).exec();

diff --git a/backend/routes/auth/register.ts b/backend/routes/auth/register.ts
@@ -1,6 +1,6 @@
 import { genSalt, hash } from "bcrypt";
 import joi from "joi";
-import { Router } from "express";
+import { Router, Request, Response }  from "express";
 import generateAuthToken from "../../utils/generateToken.js";
 import User from '../../models/user.js';
 const router = Router();
@@ -15,7 +15,7 @@ interface Register {
 }
 
 
-router.post("/", async (req, res) => {
+router.post("/", async (req: Request, res: Response) => {
  const schema = joi.object({
  username: joi.string().min(3).max(200).required(),
  pin: joi.number().min(0).max(9999).required(),
@@ -59,7 +59,11 @@ router.post("/", async (req, res) => {
 
  return res.status(200).json({
  msg: `User ${username} created successfully!`,
- token: generateAuthToken(user)
+ token: generateAuthToken({
+ _id: user._id,
+ username: user.username,
+ key: process.env.JWT_SECRET_KEY as string
+ })
  });
 });