Changeset 3727852

Timestamp:

01/26/26 17:59:16 (6 months ago)

Author:

Filip Gavrilovski <filipgavrilovski28@…>

Branches:

main

Children:

484dc3f

Parents:

4022db1

Message:

modify user response dto to store other relevant user data

Files:

• finkwave/src/main/java/com/ukim/finki/develop/finkwave/dto/UserResponseDto.java (modified) (1 diff)
• finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/AuthService.java (modified) (3 diffs)
• frontend/src/Login.tsx (modified) (3 diffs)
• frontend/src/Register.tsx (modified) (4 diffs)
• frontend/src/types.ts (modified) (1 diff)

finkwave/src/main/java/com/ukim/finki/develop/finkwave/dto/UserResponseDto.java

@@ -2 +2 @@
 
 import com.ukim.finki.develop.finkwave.model.Role;
+import jakarta.annotation.Nullable;
+import lombok.Builder;
 
+@Builder
 public record UserResponseDto(
+        String fullname,
         String username,
+        @Nullable String profilePhoto,
         Role role){
 }

finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/AuthService.java

@@ -65 +65 @@
         User user = userRepository.findByUsername(username)
                 .orElseThrow(() -> new RuntimeException("Invalid credentials"));
-        return new UserResponseDto(user.getUsername(), user.getRole());
+
+        return userResponseFromUser(user);
     }
 
@@ -110 +111 @@
         RefreshToken refreshToken = refreshTokenService.createRefreshToken(user);
 
-        UserResponseDto userResponseDto = new UserResponseDto(user.getUsername(), user.getRole());
+        UserResponseDto userResponseDto = userResponseFromUser(user);
+
         addTokensToResponse(response, refreshToken, accessToken);
         return userResponseDto;
@@ -135 +137 @@
         addAccessCookieToResponse(response, accessToken);
     }
+
+    private UserResponseDto userResponseFromUser(User user){
+        return UserResponseDto.builder()
+                .fullname(user.getFullName())
+                .username(user.getUsername())
+                .profilePhoto(user.getProfilePhoto())
+                .role(user.getRole())
+                .build();
+    }
 }

frontend/src/Login.tsx

@@ -3 +3 @@
 import axiosInstance, { scheduleTokenRefresh } from "./api/axiosInstance";
 import { useAuth } from "./context/authContext";
-import type { UserResponse } from "./types";
+import type { User } from "./types";
 
 const Login = () => {
@@ -16 +16 @@
                 try {
                         const response = await axiosInstance.post<{
-                                user: UserResponse;
+                                user: User;
                                 tokenExpiresIn: number;
                         }>("/auth/login", { username, password });
@@ -65 +65 @@
                                 <button
                                         type="submit"
-                                        className="bg-blue-500 hover:bg-blue-600 text-white px-4 py-2 rounded-lg text-sm font-medium transition-colors duration-200 w-full"
+                                        className="bg-blue-500 hover:bg-blue-600 text-white px-4 py-2 rounded-lg text-sm font-medium transition-colors duration-200 w-full cursor-pointer"
                                 >
                                         Login

frontend/src/Register.tsx

@@ -3 +3 @@
 import axiosInstance, { scheduleTokenRefresh } from "./api/axiosInstance";
 import { useAuth } from "./context/authContext";
-import type { User, UserResponse } from "./types";
+import type { User } from "./types";
 
 const Register = () => {
@@ -17 +17 @@
         const handleRegister = async (e: React.FormEvent) => {
                 e.preventDefault();
-                const newUser: User = {
-                        username,
-                        fullName: fullname,
-                        email: email,
-                        profilePhoto: profilePhoto,
-                };
                 try {
                         const response = await axiosInstance.post<{
-                                user: UserResponse;
+                                user: User;
                                 tokenExpiresIn: number;
                         }>("/auth/register", {
@@ -35 +29 @@
                         });
                         scheduleTokenRefresh(response.data.tokenExpiresIn);
-                        setUser(newUser);
-                        // todo
-                        // setUser(response.data.user);
+                        setUser(response.data.user);
                         navigate("/");
                 } catch (error) {
@@ -111 +103 @@
                                 <button
                                         type="submit"
-                                        className="w-full bg-blue-500 text-white p-2 rounded hover:bg-blue-600"
+                                        className="w-full bg-blue-500 text-white p-2 rounded hover:bg-blue-600 cursor-pointer"
                                         onClick={(e: React.MouseEvent<HTMLButtonElement>) =>
                                                 handleRegister(e)

frontend/src/types.ts

@@ -1 @@
-export interface UserResponse {
-        username: string;
-        role: "ADMIN" | "NONADMIN";
-}
-
 export interface User {
         username: string;
         fullName: string;
-        email: string;
+        email?: string;
         profilePhoto?: string | null;
         role?: "ADMIN" | "NONADMIN";