auth feature complete

authservice/src/app.ts

@@ -16,7 +16,7 @@ const corsOptions = {
 };
 
 app.use(cors(corsOptions));
-app.use(cookieParser())
+app.use(cookieParser());
 app.use(express.json({ limit: "10mb" }));
 app.use(express.urlencoded({ limit: "10mb", extended: true }));
 

authservice/src/controllers/auth.controller.ts

@@ -55,7 +55,7 @@ const signup = async (req: Request, res: Response) => {
       .status(200)
       .json(new ApiResponse(200, userData, "OTP sent successfully!"));
   } catch (error: any) {
-    res.status(error.statusCode | 500).json({
+    res.status(error.statusCode).json({
       success: false,
       message: error.message,
     });
@@ -82,14 +82,23 @@ const login = async (req: Request, res: Response) => {
 
     res
       .status(200)
-      .cookie("jwt", refreshToken, {
+      .cookie("jwt-refresh", refreshToken, {
         httpOnly: true,
         sameSite: false,
         secure: true,
         maxAge: 24 * 60 * 60 * 1000,
       })
       .json(
-        new ApiResponse(200, { accessToken }, "User logged in successfully!")
+        new ApiResponse(
+          200,
+          {
+            accessToken,
+            name: user.name,
+            email: user.email,
+            isVerified: user.isVerified,
+          },
+          "User logged in successfully!"
+        )
       );
   } catch (error: any) {
     res.status(error.statusCode | 500).json({

authservice/src/controllers/otp.controller.ts

@@ -15,7 +15,6 @@ const VerifyOtp = async (req: Request, res: Response) => {
 
     if (!user) throw new ApiError(401, "User does not exists!");
 
-
     if (user.last_otp === otp) {
       const isUpdated = await myDataSource.getRepository(userEntity).save({
         ...user,

authservice/src/middlewares/verifyJwt.middleware.ts

@@ -0,0 +1,4 @@
+// verify access token
+// if expired , verify refresh token
+// if refresh valid -> create new access token and save in cookies
+// if refresh expired -> prompt user for login

authservice/src/models/user.entity.ts

@@ -6,11 +6,12 @@ export default new EntitySchema({
   columns: {
     id: {
       type: "text",
+      unique: true,
       primary: true,
     },
     name: {
       type: "text",
-      unique: true,
+      unique: false,
       nullable: false,
     },
     email: {
@@ -29,7 +30,7 @@ export default new EntitySchema({
     last_otp: {
       type: "text",
       nullable: true,
-    }
+    },
   },
 });
 

authservice/src/routes/auth.routes.ts

@@ -17,13 +17,14 @@ router.post(
   signup
 );
 
-router.post("/login",
-[
-  check("email").normalizeEmail().isEmail(),
-  check("password").isLength({ min: 6 }),
+router.post(
+  "/login",
+  [
+    check("email").normalizeEmail().isEmail(),
+    check("password").isLength({ min: 6 }),
   ],
   validateRequest,
   login
-)
+);
 
 export default router;

authservice/src/utils/classes/ApiError.ts

@@ -5,12 +5,7 @@ class ApiError extends Error {
   success: boolean;
   errors: any;
 
-  constructor(
-    statusCode: number,
-    message: string,
-    errors = [],
-    stack = ""
-  ) {
+  constructor(statusCode: number, message: string, errors = [], stack = "") {
     super(message);
     this.statusCode = statusCode;
     this.data = null;

authservice/src/utils/email/index.ts

@@ -32,10 +32,9 @@ export default async function sendMail(
         user: process.env.SENDER_GMAIL_ADDRESS,
         refreshToken: process.env.SENDER_GMAIL_REFRESH_TOKEN,
         accessToken: process.env.SENDER_GMAIL_ACCESS_TOKEN,
-        expires: 1484314697598
-      }
+        expires: 1484314697598,
+      },
     };
-
 
     const info = await transporter.sendMail(mailOptions);
     console.log("Message sent: %s", info.messageId);

authservice/src/utils/email/template.ts

@@ -1,15 +1,12 @@
-export function newUserTemplate(
-  value: string | undefined
-): string {
-    return `
+export function newUserTemplate(value: string | undefined): string {
+  return `
       Thanks for signing up to Virtual Connect. Just one last step before you can start using our services for free.
       Here is your OTP for verification: ${value} \n \n
       Regards
       Piyush Jaiswal
       (developer)`;
 }
 
-
 export function welcomeUserTemplate() {
   return `
       Verification success! 
@@ -18,4 +15,4 @@ export function welcomeUserTemplate() {
       Regards
       Piyush Jaiswal
       (developer)`;
-}
+}

authservice/src/utils/index.ts

@@ -1,16 +1,16 @@
 // lib
 export { default as generateOtp } from "./lib/generateOtp";
 export { default as createUserId } from "./lib/createUserID";
-export { hashPassword, verifyPassword } from './lib/encryptPassword'
+export { hashPassword, verifyPassword } from "./lib/encryptPassword";
 export { default as asyncHandler } from "./lib/asyncHandler";
 
 // email
 export { default as sendMail } from "./email";
 export { newUserTemplate } from "./email/template";
 
 // classes
-export { default as ApiError } from './classes/ApiError'
-export { default as ApiResponse } from './classes/ApiResponse'
+export { default as ApiError } from "./classes/ApiError";
+export { default as ApiResponse } from "./classes/ApiResponse";
 
 // jwt
-export { default as generateToken } from './jwt/generateToken'
+export { default as generateToken } from "./jwt/generateToken";

authservice/src/utils/jwt/generateToken.ts

@@ -22,7 +22,7 @@ export default function generateToken(
 
     const token = jwt.sign(data, secret || "", {
       expiresIn: expiryTime,
-      algorithm: "RS256",
+      // algorithm: "RS256",
     });
 
     return token;

authservice/src/utils/lib/encryptPassword.ts

@@ -13,7 +13,7 @@ export function verifyPassword(
     const res = bcrypt.compareSync(currPassword + secretKey, userPassword);
     return res;
   }
-  return false
+  return false;
 }
 
 export function hashPassword(password: string) {

client/build/asset-manifest.json

@@ -1,19 +1,19 @@
 {
   "files": {
-    "main.css": "/static/css/main.b84184d6.css",
-    "main.js": "/static/js/main.29eca987.js",
+    "main.css": "/static/css/main.31d6379b.css",
+    "main.js": "/static/js/main.b1a21008.js",
     "static/media/videocall.svg": "/static/media/videocall.ea35c31b6731f8d7e26130d62bb3d94f.svg",
     "static/media/audiocall.svg": "/static/media/audiocall.4918d8229479afee0e117955fdf9ff88.svg",
     "static/media/chatting.svg": "/static/media/chatting.0d578f5c69cf5629d45bdfddfdc7841c.svg",
     "static/media/file.svg": "/static/media/file.d413d4fa944e3e36229b8d7cc7841482.svg",
     "static/media/hero3.svg": "/static/media/hero3.9c530f208327e5c056ec8b5523d8af67.svg",
     "static/media/logo.png": "/static/media/logo.6ab2f90d3594b680990f.png",
     "index.html": "/index.html",
-    "main.b84184d6.css.map": "/static/css/main.b84184d6.css.map",
-    "main.29eca987.js.map": "/static/js/main.29eca987.js.map"
+    "main.31d6379b.css.map": "/static/css/main.31d6379b.css.map",
+    "main.b1a21008.js.map": "/static/js/main.b1a21008.js.map"
   },
   "entrypoints": [
-    "static/css/main.b84184d6.css",
-    "static/js/main.29eca987.js"
+    "static/css/main.31d6379b.css",
+    "static/js/main.b1a21008.js"
   ]
 }

client/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href=""/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="Virtual Connect" content="Single platform for audio, video, and text based live communication"/><link href="/dist/output.css" rel="stylesheet"><title>Virtual Connect</title><script defer="defer" src="/static/js/main.29eca987.js"></script><link href="/static/css/main.b84184d6.css" rel="stylesheet"></head><body><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href=""/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="Virtual Connect" content="Single platform for audio, video, and text based live communication"/><link href="/dist/output.css" rel="stylesheet"><title>Virtual Connect</title><script defer="defer" src="/static/js/main.b1a21008.js"></script><link href="/static/css/main.31d6379b.css" rel="stylesheet"></head><body><div id="root"></div></body></html>