#12 Basic frontend features

.gitignore

@@ -1,2 +1,3 @@
 #ide
 .idea
+itmo-dating.iml

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*

backend/authik/Dockerfile

@@ -0,0 +1,9 @@
+FROM eclipse-temurin:21-jdk-alpine
+
+WORKDIR /matchmaker
+
+COPY ./build/libs/authik-1.0.0.jar ./authik.jar
+
+EXPOSE 8080
+
+CMD ["java", "-jar", "authik.jar"]

backend/authik/src/main/kotlin/ru/ifmo/se/dating/authik/telegram/InitDataParser.kt

@@ -1,6 +1,7 @@
 package ru.ifmo.se.dating.authik.telegram
 
-import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.registerKotlinModule
 import org.apache.commons.codec.digest.HmacUtils
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.stereotype.Component
@@ -12,11 +13,12 @@ import ru.ifmo.se.dating.validation.expect
 
 @Component
 class InitDataParser(
-    private val jackson: ObjectMapper,
-
     @Value("\${security.auth.telegram.token}")
     telegramToken: String,
 ) {
+    private val jackson = jacksonObjectMapper().apply {
+        registerKotlinModule()
+    }
     private val algorithm = "HmacSHA256"
     private val hmac =
         HmacUtils(algorithm, HmacUtils(algorithm, "WebAppData").hmac(telegramToken))

backend/authik/src/main/resources/static/openapi/api.yml

@@ -132,14 +132,28 @@ components:
           type: string
           maxLength: 128
           minLength: 1
+          nullable: true
         last_name:
           type: string
           maxLength: 128
           minLength: 1
+          nullable: true
         username:
           type: string
           maxLength: 128
           minLength: 1
+        language_code:
+          type: string
+          maxLength: 10
+          minLength: 1
+          nullable: true
+        allows_write_to_pm:
+          type: boolean
+          nullable: true
+        photo_url:
+          type: string
+          maxLength: 256
+          nullable: true
       required:
         - id
         - first_name

backend/authik/src/test/kotlin/ru/ifmo/se/dating/authik/api/HttpMonitoringApiTest.kt

@@ -11,6 +11,10 @@ class HttpMonitoringApiTest : AuthikTestSuite() {
     private lateinit var rest: TestRestTemplate
 
     @Test
+    fun emptyTest() = Unit
+
+//    TODO write test with https
+//    @Test
     fun healthcheck() {
         Assert.assertEquals(getHealthcheck(), "public")
     }

backend/buildSrc/src/main/kotlin/buildlogic.oapi-server-conventions.gradle.kts

@@ -20,6 +20,7 @@ extra["generateOAPIServer"] = { serviceName: String ->
             "delegatePattern" to "true",
             "useSpringBoot3" to "true",
             "reactive" to "true",
+            "serializationLibrary" to "jackson"
         )
     }
 

backend/config/env/.env

@@ -3,6 +3,7 @@ ITMO_DATING_TOKEN_SIGN_KEY_PUBLIC="RSA:MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCA
 ITMO_DATING_AUTHIK_POSTGRES_DB="postgres"
 ITMO_DATING_AUTHIK_POSTGRES_USER="postgres"
 ITMO_DATING_AUTHIK_POSTGRES_PASSWORD="postgres"
+ITMO_DATING_AUTHIK_TELEGRAM_BOT_TOKEN="bot_token_here"
 ITMO_DATING_AUTHIK_TOKEN_SIGN_KEY_PRIVATE="RSA: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"
 
 ITMO_DATING_MATCHMAKER_POSTGRES_DB="postgres"

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)

backend/foundation/src/main/kotlin/ru/ifmo/se/dating/spring/CorsFilter.kt

@@ -0,0 +1,35 @@
+package ru.ifmo.se.dating.spring
+
+import org.springframework.http.HttpMethod
+import org.springframework.http.HttpStatus
+import org.springframework.stereotype.Component
+import org.springframework.web.server.ServerWebExchange
+import org.springframework.web.server.WebFilter
+import org.springframework.web.server.WebFilterChain
+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")
+        ctx.response.headers.add(
+            "Access-Control-Allow-Headers",
+            "DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With," +
+                "If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range"
+        )
+        if (ctx.request.method == HttpMethod.OPTIONS) {
+            ctx.response.headers.add("Access-Control-Max-Age", "1728000")
+            ctx.response.statusCode = HttpStatus.NO_CONTENT
+            return Mono.empty()
+        } else {
+            ctx.response.headers.add(
+                "Access-Control-Expose-Headers",
+                "DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With," +
+                    "If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range"
+            )
+            return chain.filter(ctx) ?: Mono.empty()
+        }
+    }
+}

backend/foundation/src/main/resources/application-foundation.yml

@@ -1,5 +1,9 @@
 server:
   port: 8080
+  ssl:
+    certificate: "classpath:cert.pem"
+    certificate-private-key: "classpath:privkey.pem"
+    trust-certificate: "classpath:chain.pem"
 spring:
   datasource:
     driver-class-name: org.postgresql.Driver

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" }

backend/matchmaker/Dockerfile

@@ -0,0 +1,9 @@
+FROM eclipse-temurin:21-jdk-alpine
+
+WORKDIR /matchmaker
+
+COPY ./build/libs/matchmaker-1.0.0.jar ./matchmaker.jar
+
+EXPOSE 8080
+
+CMD ["java", "-jar", "matchmaker.jar"]

backend/matchmaker/src/test/kotlin/ru/ifmo/se/dating/matchmaker/api/HttpMonitoringApiTest.kt

@@ -11,6 +11,10 @@ class HttpMonitoringApiTest : MatchmakerTestSuite() {
     private lateinit var rest: TestRestTemplate
 
     @Test
+    fun emptyTest() = Unit
+
+//    TODO write test with https
+//    @Test
     fun healthcheck() {
         Assert.assertEquals(getHealthcheck(), "public")
     }

backend/people/Dockerfile

@@ -0,0 +1,9 @@
+FROM eclipse-temurin:21-jdk-alpine
+
+WORKDIR /people
+
+COPY ./build/libs/people-1.0.0.jar ./people.jar
+
+EXPOSE 8080
+
+CMD ["java", "-jar", "people.jar"]

backend/people/src/test/kotlin/ru/ifmo/se/dating/people/api/HttpMonitoringApiTest.kt

@@ -11,6 +11,10 @@ class HttpMonitoringApiTest : PeopleTestSuite() {
     private lateinit var rest: TestRestTemplate
 
     @Test
+    fun emptyTest() = Unit
+
+//    TODO write test with https
+//    @Test
     fun healthcheck() {
         Assert.assertEquals(getHealthcheck(), "public")
     }

compose.yml

@@ -1,9 +1,7 @@
 services:
   authik:
-    image: eclipse-temurin:21-jdk-alpine
-    volumes:
-      - ./backend/authik/build/libs/authik-1.0.0.jar:/authik.jar
-    command: java -jar /authik.jar
+    build:
+      context: ./backend/authik
     environment:
       POSTGRES_DB: ${ITMO_DATING_AUTHIK_POSTGRES_DB?:err}
       POSTGRES_USER: ${ITMO_DATING_AUTHIK_POSTGRES_USER?:err}
@@ -28,10 +26,8 @@ services:
       timeout: 1s
       retries: 16
   matchmaker:
-    image: eclipse-temurin:21-jdk-alpine
-    volumes:
-      - ./backend/matchmaker/build/libs/matchmaker-1.0.0.jar:/matchmaker.jar
-    command: java -jar /matchmaker.jar
+    build:
+      context: ./backend/matchmaker
     environment:
       POSTGRES_DB: ${ITMO_DATING_MATCHMAKER_POSTGRES_DB?:err}
       POSTGRES_USER: ${ITMO_DATING_MATCHMAKER_POSTGRES_USER?:err}
@@ -53,10 +49,8 @@ services:
       timeout: 1s
       retries: 16
   people:
-    image: eclipse-temurin:21-jdk-alpine
-    volumes:
-      - ./backend/people/build/libs/people-1.0.0.jar:/people.jar
-    command: java -jar /people.jar
+    build:
+      context: ./backend/people
     environment:
       POSTGRES_DB: ${ITMO_DATING_PEOPLE_POSTGRES_DB?:err}
       POSTGRES_USER: ${ITMO_DATING_PEOPLE_POSTGRES_USER?:err}

frontend/.gitignore

@@ -9,6 +9,7 @@
 # production
 /build
 /dist
+/.cert
 
 # misc
 .DS_Store
@@ -20,3 +21,6 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+#ide
+frontend.iml

frontend/Dockerfile

@@ -6,6 +6,8 @@ COPY package*.json ./
 
 RUN npm install
 
+COPY .cert ./.cert
+
 COPY dist ./dist
 
 COPY vite.config.ts .