bug fixes and nginx conf change

farooqpk · Sep 22, 2024 · 8f70ad3 · 8f70ad3
1 parent 1c70899
commit 8f70ad3
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 16 deletions.
diff --git a/nginx/app.conf b/nginx/app.conf
@@ -32,7 +32,7 @@ server {
     index index.html;
 
     # Cache static files
-    location ~* \.(html|jpg|jpeg|png|webp|ico|css|js|mp3)$ {
+    location ~* \.(jpg|jpeg|png|webp|ico|css|js|mp3)$ {
         expires 30d;
         add_header Cache-Control "public, no-transform";
     }

diff --git a/src/config.ts b/src/config.ts
@@ -10,6 +10,8 @@ const {
   R2_BUCKET_NAME,
   NODE_ENV,
   GEMINI_API_KEY,
+  ACCESS_TOKEN_EXPIRY,
+  REFRESH_TOKEN_EXPIRY,
 } = process.env;
 
 if (
@@ -23,7 +25,9 @@ if (
   !R2_SECRET_KEY ||
   !R2_BUCKET_NAME ||
   !NODE_ENV ||
-  !GEMINI_API_KEY
+  !GEMINI_API_KEY ||
+  !ACCESS_TOKEN_EXPIRY ||
+  !REFRESH_TOKEN_EXPIRY
 ) {
   throw new Error("Missing environment variables");
 }
@@ -40,4 +44,6 @@ export {
   R2_BUCKET_NAME,
   NODE_ENV,
   GEMINI_API_KEY,
+  ACCESS_TOKEN_EXPIRY,
+  REFRESH_TOKEN_EXPIRY,
 };
diff --git a/src/controllers/auth/login.ts b/src/controllers/auth/login.ts
@@ -48,7 +48,6 @@ export const login = async (req: Request, res: Response) => {
 
     return res.status(200).send({
       success: true,
-      message: "User logged in successfully",
       loginToken,
       user: {
         userId: isUserNameAlreadyExist.userId,

diff --git a/src/controllers/auth/loginToken.ts b/src/controllers/auth/loginToken.ts
@@ -2,7 +2,11 @@ import { CookieOptions, Request, Response } from "express";
 import { clearFromRedis, getDataFromRedis } from "../../redis";
 import { prisma } from "../../utils/prisma";
 import { createJwtToken } from "../../utils/createJwtToken";
-import {NODE_ENV } from "../../config";
+import {
+  ACCESS_TOKEN_EXPIRY,
+  NODE_ENV,
+  REFRESH_TOKEN_EXPIRY,
+} from "../../config";
 import dayjs from "dayjs";
 
 export const loginToken = async (req: Request, res: Response) => {
@@ -63,17 +67,21 @@ export const loginToken = async (req: Request, res: Response) => {
       "refresh"
     );
 
-     const cookieOptions: CookieOptions = {
-       httpOnly: true
-     };
+    const cookieOptions: CookieOptions = {
+      httpOnly: true,
+    };
 
     res.cookie("accesstoken", accesstoken, {
       ...cookieOptions,
-      expires: dayjs().add(1, "hours").toDate(),
+      expires: dayjs()
+        .add(parseInt(ACCESS_TOKEN_EXPIRY || "2"), "hours")
+        .toDate(),
     });
     res.cookie("refreshtoken", refreshtoken, {
       ...cookieOptions,
-      expires: dayjs().add(14, "days").toDate(),
+      expires: dayjs()
+        .add(parseInt(REFRESH_TOKEN_EXPIRY || "30"), "days")
+        .toDate(),
     });
 
     return res.status(200).json({

diff --git a/src/controllers/auth/signup.ts b/src/controllers/auth/signup.ts
@@ -3,7 +3,10 @@ import { createJwtToken } from "../../utils/createJwtToken";
 import { prisma } from "../../utils/prisma";
 import * as bcrypt from "bcrypt";
 import { clearFromRedis } from "../../redis";
-import { NODE_ENV } from "../../config";
+import {
+  ACCESS_TOKEN_EXPIRY,
+  REFRESH_TOKEN_EXPIRY,
+} from "../../config";
 import dayjs from "dayjs";
 
 export const signup = async (req: Request, res: Response) => {
@@ -26,6 +29,7 @@ export const signup = async (req: Request, res: Response) => {
     }
 
     const hashedPassword = await bcrypt.hash(password, 10);
+
     const user = await prisma.user.create({
       data: {
         username,
@@ -61,11 +65,15 @@ export const signup = async (req: Request, res: Response) => {
 
     res.cookie("accesstoken", accesstoken, {
       ...cookieOptions,
-      expires: dayjs().add(1, "hours").toDate(),
+      expires: dayjs()
+        .add(parseInt(ACCESS_TOKEN_EXPIRY || "2"), "hours")
+        .toDate(),
     });
     res.cookie("refreshtoken", refreshtoken, {
       ...cookieOptions,
-      expires: dayjs().add(14, "days").toDate(),
+      expires: dayjs()
+        .add(parseInt(REFRESH_TOKEN_EXPIRY || "30"), "days")
+        .toDate(),
     });
 
     return res.status(201).send({

diff --git a/src/utils/createJwtToken.ts b/src/utils/createJwtToken.ts
@@ -1,9 +1,13 @@
-import { Prisma } from "@prisma/client";
 import jwt from "jsonwebtoken";
-import { ACCESS_TOKEN_SECRET, REFRESH_TOKEN_SECRET } from "../config";
+import {
+  ACCESS_TOKEN_SECRET,
+  REFRESH_TOKEN_SECRET,
+  ACCESS_TOKEN_EXPIRY,
+  REFRESH_TOKEN_EXPIRY,
+} from "../config";
 
 export const createJwtToken = (
-  userId: Prisma.UserCreateInput["userId"],
+  userId: string,
   username: string,
   publicKey: string,
   tokenType: "access" | "refresh"
@@ -12,7 +16,10 @@ export const createJwtToken = (
     { userId, username, publicKey },
     tokenType === "access" ? ACCESS_TOKEN_SECRET! : REFRESH_TOKEN_SECRET!,
     {
-      expiresIn: tokenType === "access" ? "1h" : "14d",
+      expiresIn:
+        tokenType === "access"
+          ? `${ACCESS_TOKEN_EXPIRY}h`
+          : `${REFRESH_TOKEN_EXPIRY}d`,
     }
   );
 };