Added GetProfileInfo

Author: whysosaket

auth-service/package-lock.json

@@ -22,12 +22,14 @@
  "express": "^4.18.2",
  "jsdom": "^22.1.0",
  "jsonwebtoken": "^9.0.1",
+ "lodash": "^4.17.21",
  "mongoose": "^7.3.2",
  "node-fetch": "^3.3.1",
  "nodemailer": "^6.9.4"
  },
  "devDependencies": {
  "@types/express": "^4.17.17",
- "@types/jsdom": "^21.1.1"
+ "@types/jsdom": "^21.1.1",
+ "@types/lodash": "^4.14.196"
  }
 }

auth-service/package.json

@@ -82,7 +82,7 @@ const login = async (req: Request, res: Response) => {
  }
 
  const payload = {
- donor: {
+ user: {
  id: user.id,
  },
  };

auth-service/src/controllers/authController.ts

@@ -0,0 +1,23 @@
+import { Request, Response } from 'express';
+import UserModel from '../models/User';
+
+const getUserInfo = async (req: Request, res: Response) => {
+ try{
+ const user = req.user;
+ if(!user){
+ return res.status(400).json({error: "User Not Found!"});
+ }
+
+ let userInfo = await UserModel.findById(user.id).select("name email batch program batch sectionCode registrationNumber gender");
+ if(!userInfo){
+ return res.status(400).json({error: "User Not Found!"});
+ }
+
+ return res.json({success: true, userInfo});
+ }catch(error){
+ console.log(error);
+ return res.json({error: "Something Went Wrong!"});
+ }
+}
+
+export { getUserInfo };

auth-service/src/controllers/userController.ts

@@ -1,30 +1,31 @@
-require('dotenv').config();
-
-import { NextFunction, Response, Request } from 'express';
+import { Request, Response, NextFunction } from 'express';
+import dotenv from 'dotenv';
+dotenv.config();
 import jwt from 'jsonwebtoken';
+import { merge } from 'lodash';
 
-const JWT_SECRET = process.env.JWT_SECRET;
+const JWT_SECRET = process.env.JWT_SECRET as string;
 
 interface UserPayload {
- user: any;
+ user: string;
 }
 
-const fetchUser = (req: Request, res: Response, next: NextFunction)=>{
+const fetchuser = (req: Request, res: Response, next: NextFunction)=>{
 
- // Get the user from auth tokein and extract id and then add it to the req object
- const token = req.header('auth-token');
-
+ const token:any = req.header('auth-token');
  if(!token){
  res.status(401).send({error: "Token Validation Error!"})
  }
 
  try{
- const data = jwt.verify(token!, JWT_SECRET!) as UserPayload;
- req.user = data.user;
- next();
+ 
+ const data = jwt.verify(token, JWT_SECRET) as UserPayload;
+ merge(req, {user: data.user});
+ 
+ return next();
  }catch(error){
  res.status(401).send({error: "Token Validation Error!"})
  }
 }
 
-export default fetchUser;
+export default fetchuser;

auth-service/src/middleware/fetchuser.ts

@@ -1,9 +1,11 @@
 import {Router} from 'express';
 import auth from './auth';
+import user from './user';
 
 const router = Router();
 
 export default (): Router => {
  auth(router);
+ user(router);
  return router;
 };

auth-service/src/routes/index.ts

@@ -0,0 +1,7 @@
+import {Router} from 'express';
+import { getUserInfo } from '../controllers/userController';
+import fetchuser from '../middleware/fetchuser';
+
+export default (router: Router) => {
+ router.route('/api/getprofileinfo').get(fetchuser, getUserInfo);
+}

auth-service/src/routes/user.ts

@@ -1,10 +1,12 @@
 import { Link } from "react-router-dom";
 import Logo from "../assets/logo";
 import { useAppSelector, useAppDispatch } from "@/app/hooks";
-import { selectUser ,logout} from "@/features/user/UserSlice";
+import { selectUser, logout } from "@/features/user/UserSlice";
 import { useEffect } from "react";
+import { useNavigate } from "react-router-dom";
 
 const Navbar = () => {
+ const navigate = useNavigate();
  const user = useAppSelector(selectUser);
  const dispatch = useAppDispatch();
  useEffect(() => {
@@ -14,14 +16,17 @@ const Navbar = () => {
  <>
  <header className="header z-10 sticky top-0 bg-slate-100 dark:bg-dark1 dark:text-white shadow-md flex items-center justify-between px-8 py-02">
  {/* logo */}
- <Link to="/" className="md:w-3/12 w-6/12 p-2 flex justify-start my-auto">
+ <Link
+ to="/"
+ className="md:w-3/12 w-6/12 p-2 flex justify-start my-auto"
+ >
  {/* <img className="fill-blue-400" height={50} width={30} src="/logo.svg" /> */}
  <Logo />
- <span
- className={`my-auto font-bold`}
- >
+ <span className={`my-auto font-bold`}>
  <span className="text-blue-500">CODE</span>
- <span className="text-white bg-blue-500 dark:bg-transparent dark:text-white">berg</span>
+ <span className="text-white bg-blue-500 dark:bg-transparent dark:text-white">
+ berg
+ </span>
  </span>
  </Link>
  {/* navigation */}
@@ -41,11 +46,20 @@ const Navbar = () => {
  {/* buttons -*/}
  <div className="w-6/12 md:w-3/12 flex justify-end">
  {!user.isLogged ? (
- <Link to="/login" className="dark:bg-dark3 dark:hover:bg-dark4 bg-slate-200 hover:bg-slate-300 dark:text-white rounded-lg shadow-md px-4 py-2 font-semibold">
- Login
- </Link>
+ <Link
+ to="/login"
+ className="dark:bg-dark3 dark:hover:bg-dark4 bg-slate-200 hover:bg-slate-300 dark:text-white rounded-lg shadow-md px-4 py-2 font-semibold"
+ >
+ Login
+ </Link>
  ) : (
- <button onClick={()=> dispatch(logout())} className="dark:bg-dark3 dark:hover:bg-dark4 bg-slate-200 hover:bg-slate-300 dark:text-white rounded-lg shadow-md px-4 py-2 font-semibold">
+ <button
+ onClick={() => {
+ dispatch(logout());
+ navigate("/");
+ }}
+ className="dark:bg-dark3 dark:hover:bg-dark4 bg-slate-200 hover:bg-slate-300 dark:text-white rounded-lg shadow-md px-4 py-2 font-semibold"
+ >
  Logout
  </button>
  )}

web/src/components/Navbar.tsx

@@ -1,6 +1,30 @@
-import React from "react";
+import {useEffect} from "react";
+import { setUser } from "@/features/user/UserSlice";
+import { useAppDispatch, useAppSelector } from "@/app/hooks";
+import { fetchUser } from "@/features/user/UserAPI";
+import { selectUser } from "@/features/user/UserSlice";
+import { useNavigate } from "react-router-dom";
 
 const ProfileCard = () => {
+
+ const navigate = useNavigate();
+ const user = useAppSelector(selectUser);
+
+ const dispatch = useAppDispatch();
+ const handleFetchUser = async () => {
+ const user = await fetchUser();
+ dispatch(setUser(user));
+ };
+
+ useEffect(() => {
+ if(!user.isLogged) {
+ navigate("/login");
+ return;
+ }
+ handleFetchUser();
+ }, []);
+
+
  return (
  <div>
  <div className="md:px-16">
@@ -58,13 +82,13 @@ const ProfileCard = () => {
  <div className="md:mt-20 mt-5 text-center border-b pb-12">
  {" "}
  <h1 className="text-4xl font-medium text-gray-700 dark:text-white">
- Saket Aryan{" "}
+ {user.name}{" "}
  </h1>{" "}
- <p className="font-light text-gray-600 mt-3 dark:text-white">CSE - Z, 2025</p>{" "}
+ <p className="font-light text-gray-600 mt-3 dark:text-white">{user.registrationNumber}</p>{" "}
  <p className="mt-8 text-gray-500">
- Solution Manager - Creative Tim Officer
+ {user.sectionCode}, {user.batch}
  </p>{" "}
- <p className="mt-2 text-gray-500">University of Computer Science</p>
+ <p className="mt-2 text-gray-500">{user.program}</p>
  </div>{" "}
  <div className="mt-12 flex flex-col justify-center">
  {" "}

web/src/components/Profile/ProfileCard.tsx

@@ -1,5 +1,19 @@
 const fetchUser = async () => {
  const authToken = localStorage.getItem("auth-token");
+ if (authToken) {
+ const response = await fetch("http://localhost:9000/api/getprofileinfo", {
+ method: "GET",
+ headers: {
+ "Content-Type": "application/json",
+ "auth-token": authToken,
+ },
+ });
+ const data = await response.json();
+ if(data.success){
+ return data.userInfo;
+ }
+ }
+ return null;
 };
 
 const isLoggedin = () => {