feat-#3: made the login, signup and add-blog workflow correctly

krishnaacharyaa · Aug 19, 2024 · 4a7d159 · 4a7d159
1 parent 2a8a535
commit 4a7d159
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 21 deletions.
diff --git a/backend/app.ts b/backend/app.ts
@@ -15,7 +15,7 @@ const app = express();
 app.use(
   cors({
     // added origin
-    origin: ['http://localhost:3000'],
+    origin: [FRONTEND_URL as string, 'http://localhost:3000'],
     credentials: true,
   })
 );

diff --git a/backend/controllers/posts-controller.ts b/backend/controllers/posts-controller.ts
@@ -13,7 +13,6 @@ export const createPostHandler = async (req: Request, res: Response) => {
       description,
       isFeaturedPost = false,
     } = req.body;
-
     const userId = req.user._id;
 
     // Validation - check if all fields are filled
@@ -50,17 +49,17 @@ export const createPostHandler = async (req: Request, res: Response) => {
 
     const [savedPost] = await Promise.all([
       post.save(), // Save the post
-      deleteDataFromCache(REDIS_KEYS.ALL_POSTS), // Invalidate cache for all posts
-      deleteDataFromCache(REDIS_KEYS.FEATURED_POSTS), // Invalidate cache for featured posts
-      deleteDataFromCache(REDIS_KEYS.LATEST_POSTS), // Invalidate cache for latest posts
+      // deleteDataFromCache(REDIS_KEYS.ALL_POSTS), // Invalidate cache for all posts
+      // deleteDataFromCache(REDIS_KEYS.FEATURED_POSTS), // Invalidate cache for featured posts
+      // deleteDataFromCache(REDIS_KEYS.LATEST_POSTS), // Invalidate cache for latest posts
     ]);
 
     // updating user doc to include the ObjectId of the created post
     await User.findByIdAndUpdate(userId, { $push: { posts: savedPost._id } });
 
     res.status(HTTP_STATUS.OK).json(savedPost);
   } catch (err: any) {
-    res.status(HTTP_STATUS.INTERNAL_SERVER_ERROR).json({ message: err.message });
+    res.status(HTTP_STATUS.INTERNAL_SERVER_ERROR).json({ message: err });
   }
 };
 

diff --git a/backend/middlewares/auth-middleware.ts b/backend/middlewares/auth-middleware.ts
@@ -6,13 +6,14 @@ import { Role } from '../types/role-type';
 import User from '../models/user';
 
 import { Request, Response, NextFunction } from 'express';
+import { ObjectId } from 'mongoose';
 
 interface JwtPayload {
-  _id: string;
+  _id: ObjectId;
 }
 
 export const authMiddleware = async (req: Request, res: Response, next: NextFunction) => {
-  const token = req.cookies?.access_token;
+  const token = await req.cookies.access_token;
   if (!token) {
     return next(
       new ApiError({
@@ -24,11 +25,10 @@ export const authMiddleware = async (req: Request, res: Response, next: NextFunc
 
   try {
     const { _id } = jwt.verify(token, JWT_SECRET as string) as JwtPayload;
-
     req.user = await User.findById(_id);
     next();
   } catch (error: any) {
-    console.log('Token verification error:', error.message);
+    console.log('Token verification error:', error);
     return next(
       new ApiError({
         status: HTTP_STATUS.FORBIDDEN,

diff --git a/backend/models/user.ts b/backend/models/user.ts
@@ -6,7 +6,6 @@ import { ACCESS_TOKEN_EXPIRES_IN, JWT_SECRET, REFRESH_TOKEN_EXPIRES_IN } from '.
 import { Role } from '../types/role-type';
 
 interface UserObject extends Document {
-  id: number;
   userName: string;
   fullName: string;
   email: string;

diff --git a/backend/package.json b/backend/package.json
@@ -8,9 +8,11 @@
     "@types/cors": "^2.8.17",
     "@types/express": "^4.17.21",
     "@types/express-session": "^1.18.0",
+    "@types/ioredis": "^5.0.0",
     "@types/jsonwebtoken": "^9.0.6",
     "@types/passport": "^1.0.16",
     "@types/passport-google-oauth20": "^2.0.16",
+    "@types/redis": "^4.0.11",
     "@types/supertest": "^6.0.2",
     "axios": "^1.6.8",
     "bcryptjs": "^2.4.3",

diff --git a/backend/services/redis.ts b/backend/services/redis.ts
@@ -2,7 +2,6 @@ import { createClient } from 'redis';
 import { REDIS_URL } from '../config/utils';
 
 let redis: any = null;
-
 export async function connectToRedis() {
   try {
     if (REDIS_URL) {
@@ -19,6 +18,6 @@ export async function connectToRedis() {
   }
 }
 
-export function getRedisClient() {
+export function getRedisClient(): any {
   return redis;
 }
diff --git a/backend/types/types.d.ts b/backend/types/types.d.ts
@@ -1,8 +1,8 @@
 declare namespace Express {
   export interface Request {
-    user?: any;
+    user: any;
   }
   export interface Response {
-    user?: any;
+    user: any;
   }
 }
diff --git a/backend/utils/cache-posts.ts b/backend/utils/cache-posts.ts
@@ -6,7 +6,7 @@ function isRedisEnabled() {
   return getRedisClient() !== null;
 }
 
-export async function retrieveDataFromCache(key: string) {
+export async function retrieveDataFromCache(key: any) {
   if (!isRedisEnabled()) return null; // Skip cache if Redis is not available
 
   const cacheKey = `${REDIS_PREFIX}:${key}`;
@@ -17,16 +17,17 @@ export async function retrieveDataFromCache(key: string) {
   return null;
 }
 
-export async function storeDataInCache(key: string, data: any) {
+export async function storeDataInCache(key: any, data: any) {
   if (!isRedisEnabled()) return; // Skip cache if Redis is not available
 
   const cacheKey = `${REDIS_PREFIX}:${key}`;
   await getRedisClient().set(cacheKey, JSON.stringify(data));
 }
 
-export async function deleteDataFromCache(key: string) {
+export async function deleteDataFromCache(key: any): Promise<void> {
   if (!isRedisEnabled()) return; // Skip cache if Redis is not available
-
   const cacheKey = `${REDIS_PREFIX}:${key}`;
-  await getRedisClient().del(cacheKey);
+  if (getRedisClient().exists(cacheKey)) {
+    await getRedisClient().del(cacheKey);
+  }
 }
diff --git a/backend/utils/cookie_options.ts b/backend/utils/cookie_options.ts
@@ -4,7 +4,7 @@ interface CookieObject {
   httpOnly: boolean;
   sameSite: 'lax' | 'strict' | 'none';
   secure: boolean;
-  maxAge?: number | undefined;
+  maxAge: number;
 }
 const maxAge =
   typeof ACCESS_COOKIE_MAXAGE === 'string' ? parseInt(ACCESS_COOKIE_MAXAGE, 10) : defaultMaxAge;