Skip to content
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

Jump to bottom

refactor(build.gradle): remove unused deps #298

Merged
merged 2 commits into from
Oct 16, 2024
Merged

refactor(build.gradle): remove unused deps #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3c80ec
refactor(build.gradle): remove unused deps
ybelMekk Oct 14, 2024
6b9b723
Merge branch 'master' into remove_apache_httpclient5
ybelMekk Oct 14, 2024
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
2 changes: 0 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ val springSecurity = "6.3.3"
val snakeYaml = "2.3"
val mockk = "1.13.13"
val kotest = "5.9.1"
val apacheHttp = "5.3.1"
val gradleVersion = "8.4"
val json = "20240303"
val kotlinLoggin = "3.0.5"
Expand Down Expand Up @@ -64,7 +63,6 @@ dependencies {
implementation("javax.inject:javax.inject:1")
implementation("jakarta.validation:jakarta.validation-api")
implementation("net.logstash.logback:logstash-logback-encoder:$logbackStash")
implementation("org.apache.httpcomponents.client5:httpclient5:$apacheHttp")
implementation("jakarta.persistence:jakarta.persistence-api")
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
Expand Down
3 changes: 1 addition & 2 deletions src/main/kotlin/no/nav/gandalf/ldap/RestAuthenticationEntryPoint.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import jakarta.servlet.http.HttpServletRequest
import jakarta.servlet.http.HttpServletResponse
import no.nav.gandalf.api.INVALID_CLIENT
import no.nav.gandalf.model.ErrorDescriptiveResponse
import org.apache.hc.core5.http.ContentType
import org.springframework.http.HttpStatus
import org.springframework.security.core.AuthenticationException
import org.springframework.security.web.AuthenticationEntryPoint
Expand All @@ -24,7 +23,7 @@ class RestAuthenticationEntryPoint : AuthenticationEntryPoint {
) {
val response = ErrorDescriptiveResponse(INVALID_CLIENT, "Unauthorised: ${e?.message ?: ""}")
httpServletResponse.status = HttpStatus.UNAUTHORIZED.value()
httpServletResponse.contentType = ContentType.APPLICATION_JSON.mimeType
httpServletResponse.contentType = "application/json"
val out: OutputStream = httpServletResponse.outputStream
val mapper = ObjectMapper()
mapper.writeValue(out, response)
Expand Down