Fourth frontend features and some backend fixes (#74)

Author: Kimiega

backend/config/crypto/ca.cnf

@@ -19,3 +19,18 @@ authorityKeyIdentifier = keyid:always,issuer
 basicConstraints = critical, CA:true
 keyUsage = critical, digitalSignature, cRLSign, keyCertSign
 
+[req_ext]
+subjectAltName = @alt_names
+
+[alt_names]
+DNS.1 = localhost
+DNS.2 = authik-0.dating.se.ifmo.ru
+DNS.3 = authik-1.dating.se.ifmo.ru
+DNS.4 = authik-2.dating.se.ifmo.ru
+DNS.5 = matchmaker-0.dating.se.ifmo.ru
+DNS.6 = matchmaker-1.dating.se.ifmo.ru
+DNS.7 = matchmaker-2.dating.se.ifmo.ru
+DNS.8 = people-0.dating.se.ifmo.ru
+DNS.9 = people-1.dating.se.ifmo.ru
+DNS.10 = people-2.dating.se.ifmo.ru
+DNS.11 = server.dc1.consul

backend/config/crypto/keys.bash

@@ -7,6 +7,7 @@ ENV="$2"
 
 ALIAS="itmo-dating"
 ALIAS_BACKEND="$ALIAS-backend"
+ALIAS_EXTERNAL="$ALIAS-external"
 
 VALIDITY=1
 PASSWORD="$ITMO_DATING_KEY_STORE_PASSWORD"
@@ -71,6 +72,9 @@ function generate() {
     -deststoretype JKS \
     -destkeystore "$ALIAS_BACKEND.jks" \
     -deststorepass "$PASSWORD"
+
+  echo "Copying PKCS12 as external certificate"
+  cp "$ALIAS_BACKEND.p12" "$ALIAS_EXTERNAL.p12"
 }
 
 function copy() {
@@ -92,6 +96,7 @@ function distribute() {
 
   echo "Copying package to the gateway..."
   copy "$GATEWAY_INSTALL_PATH" "$ALIAS_BACKEND.p12"
+  copy "$GATEWAY_INSTALL_PATH" "$ALIAS_EXTERNAL.p12"
 
   echo "Copying keys to the consul..."
   copy "$CONSUL_INSTALL_PATH" "$ALIAS_BACKEND.key"

backend/consul/Dockerfile

@@ -12,3 +12,5 @@ RUN chmod -R 755 /consul/config && \
     chmod 644 /consul/config/itmo-dating-backend.crt && \
     chmod 644 /consul/config/itmo-dating-backend-ca.crt && \
     chmod 644 /consul/config/consul.hcl
+
+CMD ["sh", "./consul/run.sh"]

backend/consul/config/consul.hcl

@@ -14,6 +14,10 @@ acl {
   enable_token_persistence = true
 }
 
+limits {
+  http_max_conns_per_client = 400
+}
+
 data_dir = "/opt/consul/data"
 
 ui = true

backend/consul/run.sh

@@ -1,4 +1,3 @@
 #!/bin/sh
 
-consul agent -config-file=/consul/config/consul.hcl -bootstrap-expect=1 \
-  | grep -v "This request used the token query parameter which is deprecated and will be removed"
+consul agent -config-file=/consul/config/consul.hcl -bootstrap-expect=1 | grep -v "This request used the token query parameter which is deprecated and will be removed"

backend/gateway/build.gradle.kts

@@ -7,7 +7,7 @@ dependencies {
 
     implementation(libs.org.springframework.boot.spring.boot)
     implementation(libs.org.springframework.cloud.spring.cloud.starter.gateway)
-
+    implementation(libs.org.springframework.spring.web)
     implementation(libs.org.springdoc.springdoc.openapi.starter.webflux.ui)
 
     testImplementation(libs.org.springframework.boot.spring.boot.starter.test)

backend/gateway/src/main/kotlin/ru/ifmo/se/dating/gateway/SSLContextConfig.kt backend/gateway/src/main/kotlin/ru/ifmo/se/dating/gateway/ClientSSLContextConfig.kt

@@ -12,17 +12,17 @@ import javax.net.ssl.KeyManagerFactory
 import javax.net.ssl.TrustManagerFactory
 
 @Configuration
-class SSLContextConfig(
-    @Value("\${server.ssl.key-store-type}")
+class ClientSSLContextConfig(
+    @Value("\${client.ssl.key-store-type}")
     private val keyStoreType: String,
 
-    @Value("\${server.ssl.key-store}")
+    @Value("\${client.ssl.key-store}")
     private val keyStore: Resource,
 
-    @Value("\${server.ssl.key-store-password}")
+    @Value("\${client.ssl.key-store-password}")
     private val keyStorePassword: String,
 
-    @Value("\${server.ssl.protocol}")
+    @Value("\${client.ssl.protocol}")
     private val sslProtocol: String,
 ) {
     @Bean

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

@@ -1,4 +1,4 @@
-package ru.ifmo.se.dating.spring.api
+package ru.ifmo.se.dating.gateway
 
 import org.springframework.http.HttpMethod
 import org.springframework.http.HttpStatus
@@ -13,11 +13,15 @@ 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-Methods",
+            "GET, PUT, POST, PATCH, 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"
+//        "DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With," +
+//        "If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range,Authorization"
+            "*"
         )
         if (ctx.request.method == HttpMethod.OPTIONS) {
             ctx.response.headers.add("Access-Control-Max-Age", "1728000")

backend/gateway/src/main/resources/application.yml

@@ -95,10 +95,16 @@ server:
   ssl:
     enabled: true
     key-store-type: PKCS12
-    key-store: classpath:keystore/itmo-dating-backend.p12
+    key-store: classpath:keystore/itmo-dating-external.p12
     key-store-password: ${KEY_STORE_PASSWORD}
     protocol: TLSv1.3
     enabled-protocols: TLSv1.3
+client:
+  ssl:
+    key-store-type: PKCS12
+    key-store: classpath:keystore/itmo-dating-backend.p12
+    key-store-password: ${KEY_STORE_PASSWORD}
+    protocol: TLSv1.3
 springdoc:
   swagger-ui:
     path: /swagger-ui.html

backend/gateway/src/test/kotlin/ru/ifmo/se/dating/gateway/SecurityInitializer.kt

@@ -12,6 +12,7 @@ class SecurityInitializer :
     override fun initialize(ctx: ConfigurableApplicationContext) {
         TestPropertyValues.of(
             "server.ssl.key-store-password=$keyStorePassword",
+            "client.ssl.key-store-password=$keyStorePassword",
         ).applyTo(ctx.environment)
     }
 }

backend/matchmaker/src/main/kotlin/ru/ifmo/se/dating/matchmaker/security/MatchmakerSecuredPaths.kt

@@ -14,5 +14,6 @@ class MatchmakerSecuredPaths : SpringSecuredPaths {
         Path("/api/**"),
         Not(Path("/api/people/{person_id}", HttpMethod.PUT)),
         Not(Path("/api/monitoring/healthcheck", HttpMethod.GET)),
+        Not(Path("/api/suggestions", HttpMethod.OPTIONS)),
     )
 }

backend/starter-service-discovery/src/main/resources/application-service-discovery.yml

@@ -16,6 +16,8 @@ spring:
         instance-id: instance-${HOSTNAME}
         heartbeat:
           enabled: true
+          ttl: 30
+        catalog-services-watch-delay: 5000
 management:
   health:
     consul:

compose.yml

@@ -85,7 +85,6 @@ services:
     image: ghcr.io/secs-dev/itmo-dating-consul:latest
     build:
       context: ./backend/consul
-    command: sh ./consul/run.sh
     hostname: server.dc1.consul
     ports:
       - "127.0.0.1:8500:8500/tcp"

frontend/.eslintrc.cjs

@@ -27,5 +27,14 @@ module.exports = {
   plugins: ['@typescript-eslint', 'react'],
   rules: {
     'react/react-in-jsx-scope': 0,
+    'no-unused-vars': 'off',
+    '@typescript-eslint/no-unused-vars': [
+      'warn', // or "error"
+      {
+        argsIgnorePattern: '^_',
+        varsIgnorePattern: '^_',
+        caughtErrorsIgnorePattern: '^_',
+      },
+    ],
   },
 }

frontend/Dockerfile

@@ -6,7 +6,7 @@ COPY package*.json ./
 
 RUN npm install
 
-# COPY .cert ./.cert
+COPY .cert ./.cert
 
 COPY dist ./dist
 

frontend/src/app/routes/ui/index.tsx

@@ -1,10 +1,11 @@
 import { Route } from 'atomic-router-react'
 import { routes } from '../api'
-import { Registration, Home, Main } from '@/pages'
+import { Registration, Main } from '@/pages'
+import { Welcome } from '@/pages/welcome/ui/Welcome.tsx'
 
 export const Routes = () => (
   <>
-    <Route route={routes.home} view={Home} />
+    <Route route={routes.home} view={Welcome} />
     <Route route={routes.registration} view={Registration} />
     <Route route={routes.main} view={Main} />
   </>

frontend/src/entities/person-patch/model/PersonPatch.ts

@@ -1,12 +1,12 @@
 export interface PersonPatch {
-  status: string
-  firstName: string
-  lastName: string
-  interests: Topic[]
-  height: number
-  birthday: string
-  facultyId: number
-  locationId: number
+  status: string | null
+  firstName: string | null
+  lastName: string | null
+  interests: Topic[] | null
+  height: number | null
+  birthday: string | null
+  facultyId: number | null
+  locationId: number | null
 }
 
 export interface Topic {

frontend/src/entities/person/model/Person.ts

@@ -15,3 +15,16 @@ export interface Person {
   faculty: string
   location: Location
 }
+
+export interface PersonLegacy {
+  status: string
+  userId: number
+  firstName: string
+  zodiac: string
+  lastName: string
+  interests: Interest[]
+  height: number
+  birthday: Date
+  facultyId: number
+  locationId: number
+}

frontend/src/entities/registration-data/model/Coordinates.ts

@@ -0,0 +1,4 @@
+export interface Coordinates {
+  latitude: number
+  longitude: number
+}

frontend/src/entities/registration-data/model/Location.ts

@@ -0,0 +1,7 @@
+import { Coordinates } from './Coordinates.ts'
+
+export interface Location {
+  id: number
+  name: string
+  coordinates: Coordinates
+}

frontend/src/entities/registration-data/model/RegistartionData.ts

@@ -2,12 +2,13 @@ import { Interest } from './interest.ts'
 import { Picture } from './picture.ts'
 
 export type RegistrationData = {
-  tgId: string
-  name: string
-  surname: string
-  height: number
-  faculty: string
-  birthday: Date
-  pictures: Picture[]
-  interests: Interest[]
+  tgId: string | null
+  name: string | null
+  surname: string | null
+  height: number | null
+  facultyId: number | null
+  birthday: Date | null
+  pictures: Picture[] | null
+  interests: Interest[] | null
+  locationId: number | null
 }

frontend/src/entities/registration-data/model/faculty.ts

@@ -0,0 +1,4 @@
+export interface Faculty {
+  id: number
+  longName: string
+}

frontend/src/features/authentication/api/authFx.ts

@@ -7,8 +7,13 @@ import { AuthState, initialAuthState } from '@/entities'
 import { backendAuthikUrl } from '@/shared/api'
 
 export const $authStore = createStore<AuthState>(initialAuthState)
+export const $userIdStore = createStore<number | null>(null)
+
+export const $userRegisteredStore = createStore<boolean>(false)
 
 persist({ store: $authStore, key: 'authStore' })
+persist({ store: $userIdStore, key: 'userIdStore' })
+persist({ store: $userRegisteredStore, key: 'userRegisteredStore' })
 
 export const authFx = createEffect<AuthRequest, AuthState, Error>({
   handler: async (authReq) => {
@@ -49,3 +54,26 @@ $authStore.on(authFx.failData, (_, error) => ({
   loading: false,
   error: error.message,
 }))
+
+export const userIdFx = createEffect<number | null, number | null, Error>({
+  handler: async (x) => {
+    if (x == null) throw Error('x is null')
+    return x
+  },
+})
+
+export const userRegisteredFx = createEffect<boolean, boolean, Error>({
+  handler: async (x) => {
+    if (!x) throw Error('user not registered')
+    return x
+  },
+})
+
+$userIdStore.on(userIdFx.doneData, (_, result) => result)
+$userIdStore.on(userIdFx.failData, (_, __) => {
+  return null
+})
+$userRegisteredStore.on(userRegisteredFx.doneData, (_, result) => result)
+$userRegisteredStore.on(userRegisteredFx.failData, (_, __) => {
+  return false
+})

frontend/src/features/get-faculties/api/getFaculties.ts

@@ -0,0 +1,23 @@
+import axios from 'axios'
+import React from 'react'
+import { backendPeopleUrl } from '@/shared/api'
+import { Faculty } from '@/entities/registration-data/model/faculty.ts'
+
+export function getFaculties(
+  setFaculties: React.Dispatch<React.SetStateAction<Array<Faculty>>>,
+) {
+  const url = `${backendPeopleUrl}/api/faculties`
+
+  axios
+    .get(url)
+    .then((response) => {
+      console.log(response.data)
+      //FIXME after integration with backend
+      setFaculties(response.data)
+    })
+    .catch((error) => {
+      console.error('Error getting faculties: ', error)
+      //TODO remove after integration with backend
+      setFaculties([{ id: 1, longName: 'piict' }])
+    })
+}

frontend/src/features/get-locations/api/getLocations.ts

@@ -0,0 +1,32 @@
+import axios from 'axios'
+import React from 'react'
+import { backendPeopleUrl } from '@/shared/api'
+import { Location } from '@/entities/registration-data/model/Location.ts'
+
+export function getLocations(
+  setLocations: React.Dispatch<React.SetStateAction<Array<Location>>>,
+) {
+  const url = `${backendPeopleUrl}/api/locations`
+
+  axios
+    .get(url)
+    .then((response) => {
+      console.log(response.data)
+      //FIXME after integration with backend
+      setLocations(response.data)
+    })
+    .catch((error) => {
+      console.error('Error getting locations: ', error)
+      //TODO remove after integration with backend
+      setLocations([
+        {
+          id: 1,
+          name: 'ITMO University, Kronverkskiy Avenue',
+          coordinates: {
+            latitude: 59.957478,
+            longitude: 30.308014,
+          },
+        },
+      ])
+    })
+}