fix review

secs-dev · Nov 14, 2024 · 03b229c · 03b229c
1 parent 752f3c0
commit 03b229c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 4 deletions.
diff --git a/backend/.gitignore b/backend/.gitignore
@@ -18,6 +18,7 @@
 *.zip
 *.tar.gz
 *.rar
+*.pem
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*

diff --git a/backend/authik/build.gradle.kts b/backend/authik/build.gradle.kts
@@ -8,7 +8,6 @@ dependencies {
     implementation(libs.commons.codec.commons.codec)
     implementation(project(":foundation"))
     testImplementation(project(":foundation-test"))
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.18.+")
 }
 
 val serviceName = "authik"

diff --git a/backend/foundation/build.gradle.kts b/backend/foundation/build.gradle.kts
@@ -24,6 +24,7 @@ dependencies {
 
     api(libs.jakarta.validation.jakarta.validation.api)
     api(libs.com.fasterxml.jackson.core.jackson.databind)
+    api(libs.com.fasterxml.jackson.module.jackson.module.kotlin)
 
     api(libs.org.jetbrains.kotlinx.kotlinx.coroutines.reactor)
     api(libs.io.projectreactor.kotlin.reactor.kotlin.extensions)

diff --git a/backend/foundation/src/main/kotlin/ru/ifmo/se/dating/spring/CorsFilter.kt b/backend/foundation/src/main/kotlin/ru/ifmo/se/dating/spring/CorsFilter.kt
@@ -10,6 +10,7 @@ import reactor.core.publisher.Mono
 
 @Component
 class CorsFilter : WebFilter {
+    // FIXME
     override fun filter(ctx: ServerWebExchange, chain: WebFilterChain): Mono<Void> {
         ctx.response.headers.add("Access-Control-Allow-Origin", "*")
         ctx.response.headers.add("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE, OPTIONS")

diff --git a/backend/gradle/libs.versions.toml b/backend/gradle/libs.versions.toml
@@ -13,7 +13,8 @@ org-liquibase-liquibase-core = "4.29.2"
 org-postgresql-postgresql = "42.7.4"
 org-postgresql-r2dbc-postgresql = "1.0.7.RELEASE"
 
-com-fasterxml-jackson-core-jackson-databind = "2.18.1"
+com-fasterxml-jackson = "2.18.1"
+
 jakarta-validation-jakarta-validation-api = "3.1.0"
 commons-codec-commons-codec = "1.17.1"
 
@@ -44,7 +45,8 @@ io-jsonwebtoken-jjwt-impl = { module = "io.jsonwebtoken:jjwt-impl", version.ref
 io-jsonwebtoken-jjwt-jackson = { module = "io.jsonwebtoken:jjwt-jackson", version.ref = "io-jsonwebtoken" }
 
 jakarta-validation-jakarta-validation-api = { module = "jakarta.validation:jakarta.validation-api", version.ref = "jakarta-validation-jakarta-validation-api" }
-com-fasterxml-jackson-core-jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "com-fasterxml-jackson-core-jackson-databind" }
+com-fasterxml-jackson-core-jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "com-fasterxml-jackson" }
+com-fasterxml-jackson-module-jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "com-fasterxml-jackson" }
 commons-codec-commons-codec = { module = "commons-codec:commons-codec", version.ref = "commons-codec-commons-codec" }
 
 org-jetbrains-kotlinx-kotlinx-coroutines-reactor = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-reactor", version.ref = "org-jetbrains-kotlinx-kotlinx-coroutines" }

diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -12,7 +12,6 @@ COPY dist ./dist
 
 COPY vite.config.ts .
 
-
 EXPOSE 443
 
 CMD ["npm", "run", "preview"]
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ @@
     *.zip
     *.tar.gz
     *.rar
+    *.pem
     # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
     hs_err_pid*
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,7 +12,6 @@ COPY dist ./dist

		COPY vite.config.ts .


		EXPOSE 443

		CMD ["npm", "run", "preview"]