From b2e5d137aa2a580c6ddc8f8e72253bdf4b1d2243 Mon Sep 17 00:00:00 2001
From: Vitor Hideyoshi <vitor.h.n.batista@gmail.com>
Date: Tue, 22 Aug 2023 01:26:47 -0300
Subject: [PATCH] Fixes API Response so Fronted Doesn't Break

---
 .../base/security/model/AuthDTO.java          | 33 +++++++++++++++----
 .../user/service/UserServiceImplTest.java     |  2 --
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/hideyoshi/backendportfolio/base/security/model/AuthDTO.java b/src/main/java/com/hideyoshi/backendportfolio/base/security/model/AuthDTO.java
index 21e765f..710ae06 100644
--- a/src/main/java/com/hideyoshi/backendportfolio/base/security/model/AuthDTO.java
+++ b/src/main/java/com/hideyoshi/backendportfolio/base/security/model/AuthDTO.java
@@ -2,31 +2,52 @@ package com.hideyoshi.backendportfolio.base.security.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.hideyoshi.backendportfolio.base.user.entity.Provider;
+import com.hideyoshi.backendportfolio.base.user.entity.Role;
 import com.hideyoshi.backendportfolio.base.user.model.TokenDTO;
 import com.hideyoshi.backendportfolio.base.user.model.UserDTO;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 
+import javax.validation.constraints.Size;
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 @Builder
+@AllArgsConstructor
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class AuthDTO implements Serializable {
 
-    private UserDTO user;
+    private Long id;
+
+    private String name;
+
+    private String email;
+
+    private String username;
+
+    private String profilePictureUrl;
+
+    private List<Role> roles;
+
+    private Provider provider;
 
     private TokenDTO accessToken;
 
     private TokenDTO refreshToken;
 
-    public AuthDTO(UserDTO user) {
-        this.user = user.toResponse();
-    }
-
     public AuthDTO(UserDTO user, TokenDTO accessToken, TokenDTO refreshToken) {
-        this.user = user.toResponse();
+        this.id = user.getId();
+        this.name = user.getName();
+        this.email = user.getEmail();
+        this.username = user.getUsername();
+        this.roles = user.getRoles();
+        this.provider = user.getProvider();
+        this.profilePictureUrl = user.getProfilePictureUrl();
+
         this.accessToken = accessToken;
         this.refreshToken = refreshToken;
     }
diff --git a/src/test/java/com/hideyoshi/backendportfolio/base/user/service/UserServiceImplTest.java b/src/test/java/com/hideyoshi/backendportfolio/base/user/service/UserServiceImplTest.java
index 5d18242..03ad33c 100644
--- a/src/test/java/com/hideyoshi/backendportfolio/base/user/service/UserServiceImplTest.java
+++ b/src/test/java/com/hideyoshi/backendportfolio/base/user/service/UserServiceImplTest.java
@@ -40,8 +40,6 @@ class UserServiceImplTest {
 
     private PasswordEncoder passwordEncoder;
 
-    private AuthService authService;
-
 
     @BeforeEach
     void setUp() {