Skip to content

refactor: simplify AuthResponse #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
devcavin merged 1 commit into from
Jul 8, 2026
Merged

refactor: simplify AuthResponse #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 3 additions & 18 deletions backend/src/main/kotlin/io/github/devcavin/backend/service/AuthService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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
)
}

Expand Down Expand Up @@ -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
)
}

Expand Down
3 changes: 1 addition & 2 deletions backend/src/main/kotlin/io/github/devcavin/backend/web/dto/auth/AuthDTOs.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,5 @@ data class AuthenticatedUser(

data class AuthResponse(
val accessToken: String,
val refreshToken: String,
val user: AuthenticatedUser
val refreshToken: String
)
Loading