diff --git a/backend/src/main/kotlin/io/github/devcavin/backend/service/AuthService.kt b/backend/src/main/kotlin/io/github/devcavin/backend/service/AuthService.kt index 8c6e9fd..7b1876c 100644 --- a/backend/src/main/kotlin/io/github/devcavin/backend/service/AuthService.kt +++ b/backend/src/main/kotlin/io/github/devcavin/backend/service/AuthService.kt @@ -9,13 +9,12 @@ import io.github.devcavin.backend.domain.repository.UserRepository import io.github.devcavin.backend.security.JwtProperties import io.github.devcavin.backend.security.JwtTokenProvider import io.github.devcavin.backend.web.dto.auth.AuthResponse -import io.github.devcavin.backend.web.dto.auth.AuthenticatedUser import io.github.devcavin.backend.web.dto.auth.LoginRequest import org.springframework.security.crypto.password.PasswordEncoder import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional import java.time.OffsetDateTime -import java.util.UUID +import java.util.* @Service class AuthService( @@ -43,14 +42,7 @@ class AuthService( return AuthResponse( accessToken = accessToken, - refreshToken = refreshToken, - user = AuthenticatedUser( - id = user.id!!, - name = user.name, - email = user.email, - role = user.role.name, - siteId = user.site.id!! - ) + refreshToken = refreshToken ) } @@ -80,14 +72,7 @@ class AuthService( return AuthResponse( accessToken = accessToken, - refreshToken = newRefreshToken, - user = AuthenticatedUser( - id = user.id!!, - name = user.name, - email = user.email, - role = user.role.name, - siteId = user.site.id!! - ) + refreshToken = newRefreshToken ) } diff --git a/backend/src/main/kotlin/io/github/devcavin/backend/web/dto/auth/AuthDTOs.kt b/backend/src/main/kotlin/io/github/devcavin/backend/web/dto/auth/AuthDTOs.kt index efbacb9..f347bf3 100644 --- a/backend/src/main/kotlin/io/github/devcavin/backend/web/dto/auth/AuthDTOs.kt +++ b/backend/src/main/kotlin/io/github/devcavin/backend/web/dto/auth/AuthDTOs.kt @@ -28,6 +28,5 @@ data class AuthenticatedUser( data class AuthResponse( val accessToken: String, - val refreshToken: String, - val user: AuthenticatedUser + val refreshToken: String )