Merge branch 'refs/heads/backend'

backend/dist/app.js

@@ -42,6 +42,7 @@ app.use((0, cors_1.default)({
     credentials: true,
 }));
 app.use(express_1.default.json());
+app.use(express_1.default.urlencoded({ extended: true }));
 app.use((0, cookie_parser_1.default)());
 app.use((0, helmet_1.default)());
 app.use((0, express_session_1.default)({

backend/src/app.ts

@@ -33,6 +33,7 @@ app.use(
   })
 );
 app.use(express.json());
+app.use(express.urlencoded({ extended: true }));
 app.use(cookieParser());
 app.use(helmet());
 app.use(

backend/src/controllers/user.controller.ts

@@ -1,3 +1,4 @@
+import { config } from "@/configurations/envConfig";
 import { UserService } from "@/services/user.service";
 import RootController from "@/shared/rootController";
 import { Request, Response } from "express";

backend/src/middlewares/auth.ts

@@ -5,7 +5,6 @@ import jwt from "jsonwebtoken";
 const verifyJwt = (req: Request, res: Response, next: NextFunction) => {
   try {
     const token = req.cookies.tmAccessToken;
-
     if (!token) {
       return res.json({
         statusCode: httpStatus.BAD_REQUEST,

frontend/src/components/pages/login/Login.tsx

@@ -1,12 +1,12 @@
 /* eslint-disable @next/next/no-img-element */
 import { SubmitHandler, useForm } from "react-hook-form";
 import Swal from "sweetalert2";
-import Cookies from "js-cookie";
 import { useLoginUserMutation } from "@/features/user";
 import Link from "next/link";
 import GoogleLogin from "@/components/shared/GoogleLogin";
 import { IoMdEye, IoMdEyeOff } from "react-icons/io";
 import { useState } from "react";
+import { useRouter } from "next/router";
 
 type FormData = {
   email: string;
@@ -20,23 +20,22 @@ const Login = () => {
     formState: { errors },
   } = useForm<FormData>({ mode: "onChange" });
   const [togglePassword, setTogglePassword] = useState(false);
+  const router = useRouter();
 
   const [loginUser] = useLoginUserMutation();
 
   const onSubmit: SubmitHandler<FormData> = async (data) => {
     const result: any = await loginUser(data);
-    if (result?.data?.success) {
-      // Cookies.set("tmAccessToken", result?.data?.data, { expires: 6 });
+    if (result?.data?.statusCode === 200) {
       Swal.fire({
         position: "center",
         icon: "success",
         title: result?.data?.message,
         showConfirmButton: false,
         timer: 1500,
       });
-      window.location.replace("/dashboard");
-    }
-    if (!result?.error?.data?.success) {
+      router.push("/dashboard");
+    } else {
       Swal.fire({
         position: "center",
         icon: "error",

frontend/src/components/shared/GoogleLogin.tsx

@@ -2,7 +2,7 @@ import React from "react";
 
 const GoogleLogin = () => {
   const handleGoogleLogin = async () => {
-    window.open("https://api-team-manager.onrender.com/google/login", "_self");
+    window.open("http://api-team-manager.onrender.com/google/login", "_self");
   };
   return (
     <div className="my-3 text-center font-semibold">

frontend/src/features/api/apiSlice.tsx

@@ -1,14 +1,10 @@
 import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query/react";
-import Cookies from "js-cookie";
 
 const apiSlice = createApi({
   reducerPath: "api",
   baseQuery: fetchBaseQuery({
     baseUrl: "https://api-team-manager.onrender.com",
-    headers: {
-      "Content-type": "application/json",
-      authorization: Cookies.get("tmAccessToken") as string,
-    },
+    credentials: "include",
   }),
   tagTypes: [
     "user",

frontend/src/features/user/index.ts

@@ -12,8 +12,9 @@ const userApi = apiSlice.injectEndpoints({
     loginUser: builder.mutation({
       query: (data) => ({
         method: "POST",
-        url: "/user/login",
+        url: "https://api-team-manager.onrender.com/user/login",
         body: data,
+        credentials: "include",
       }),
       invalidatesTags: ["user"] as any,
     }),
@@ -25,7 +26,8 @@ const userApi = apiSlice.injectEndpoints({
     }),
     loggedInUser: builder.query({
       query: () => ({
-        url: "/user/auth",
+        url: "https://api-team-manager.onrender.com/user/auth",
+        credentials: "include",
       }),
       providesTags: ["user"] as any,
     }),

frontend/src/hooks/useGetLoggedInUser.ts

@@ -7,19 +7,15 @@ const useGetLoggedInUser = () => {
   useEffect(() => {
     const fetchUser = async () => {
       try {
-        const token = Cookies.get("tmAccessToken") as string;
-        if (token !== "undefined") {
-          const res = await fetch(
-            "https://api-team-manager.onrender.com/user/auth",
-            {
-              headers: {
-                authorization: token,
-              },
-            }
-          );
-          const data = await res.json();
-          setUser(data?.data);
-        }
+        const res = await fetch(
+          "https://api-team-manager.onrender.com/user/auth",
+          {
+            method: "GET",
+            credentials: "include",
+          }
+        );
+        const data = await res.json();
+        setUser(data?.data);
       } catch (error) {
         console.log("Failed to fetch user");
       }