Skip to content

Refactor token response #211

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

Open
ericksgmes wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Refactor token response #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa49e68
fix: add a try catch so when a token is expired it doesnt return 500
ericksgmes Nov 18, 2025
9b35c67
refactor: change response text
ericksgmes Nov 19, 2025
b810ffd
refactor: remove redundant code
ericksgmes Nov 19, 2025
a3eec1f
fix: searchSession was being generated with random id
ericksgmes Nov 19, 2025
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
11 changes: 0 additions & 11 deletions ...in/kotlin/br/all/application/study/find/service/FindAllStudyReviewsBySourceServiceImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import br.all.domain.model.review.SystematicStudy
class FindAllStudyReviewsBySourceServiceImpl(
private val systematicStudyRepository: SystematicStudyRepository,
private val studyReviewRepository: StudyReviewRepository,
// private val protocolRepository: ProtocolRepository,
private val credentialsService: CredentialsService,
) : FindAllStudyReviewsBySourceService {

Expand All @@ -26,18 +25,8 @@ class FindAllStudyReviewsBySourceServiceImpl(

presenter.prepareIfFailsPreconditions(user, systematicStudy)

if(presenter.isDone()) return

val searchSource = SearchSource(request.searchSource)

// val protocolDto = protocolRepository.findBySystematicStudy(systematicStudyId.value)
// val hasSource = protocolDto?.informationSources?.contains(searchSource.id) ?: false
//
// if (!hasSource) {
// val message = "Protocol ID $systematicStudyId does not contain ${searchSource.id} as a search source"
// presenter.prepareFailView(NoSuchElementException(message))
// }

if (presenter.isDone()) return

val studyReviews = studyReviewRepository.findAllBySource(request.systematicStudyId, searchSource.toString())
Expand Down
3 changes: 1 addition & 2 deletions web/src/main/kotlin/br/all/search/controller/SearchSessionController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ class SearchSessionController(
description = "Success updating an existing search session of a systematic study",
content = [Content(
mediaType = "application/json",
schema = Schema(implementation = UpdateSearchSessionService.ResponseModel::class)
schema = Schema(implementation = PatchSearchSessionService.ResponseModel::class)
)]
),
ApiResponse(
Expand All @@ -289,7 +289,6 @@ class SearchSessionController(
),
]
)
// CHANGE API RESPONSE TEXT
@PatchMapping("/patch-search-session/{sessionId}")
fun patchSearchSession(
@PathVariable systematicStudyId: UUID,
Expand Down
11 changes: 10 additions & 1 deletion web/src/main/kotlin/br/all/security/service/TokenService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,16 @@ class TokenService(jwtProperties: JwtProperties) {

fun extractUsername(token: String): String? = getAllClaims(token).subject

fun isExpired(token: String) = getAllClaims(token).expiration.before(Date(System.currentTimeMillis()))
fun isExpired(token: String): Boolean =
try {
val claims = getAllClaims(token)
val exp = claims.expiration
exp.before(Date())
} catch (e: io.jsonwebtoken.ExpiredJwtException) {
true
} catch (e: Exception) {
true
}

fun isValid(token: String, userDetails: UserDetails) =
extractUsername(token) == userDetails.username && !isExpired(token)
Expand Down
2 changes: 1 addition & 1 deletion web/src/main/kotlin/br/all/utils/example/CreateSearchSessionExampleService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class CreateSearchSessionExampleService (
)

val searchSession = SearchSessionDto(
id = uuidGeneratorService.next(),
id = studyReviews[0].searchSessionId.value,
systematicStudyId = systematicStudyId.value(),
userId = userId,
searchString = searchString,
Expand Down
Loading