Merge branch 'dev' of ssh://meowgit.nekoea.red:22222/nihonium/nyanimedb into dev-kama

.forgejo/workflows/build-and-deploy.yml

@@ -18,14 +18,10 @@ jobs:
       - uses: actions/setup-go@v6
         with:
           go-version: '^1.25'
-          check-latest: false
-          cache-dependency-path: |
-            modules/backend/go.sum
       
-      - name: Build Go app
+      - name: Build backend
         run: |
           cd modules/backend
-          go mod tidy
           go build -o nyanimedb .
           tar -czvf nyanimedb-backend.tar.gz nyanimedb
 
@@ -35,6 +31,18 @@ jobs:
           name: nyanimedb-backend.tar.gz
           path: modules/backend/nyanimedb-backend.tar.gz
 
+      - name: Build auth
+        run: |
+          cd modules/auth
+          go build -o auth .
+          tar -czvf nyanimedb-auth.tar.gz auth
+
+      - name: Upload built auth to artifactory
+        uses: actions/upload-artifact@v3
+        with:
+          name: nyanimedb-auth.tar.gz
+          path: modules/auth/nyanimedb-auth.tar.gz
+
       # Build frontend
       - uses: actions/setup-node@v5
         with:
@@ -76,6 +84,14 @@ jobs:
           push: true
           tags: meowgit.nekoea.red/nihonium/nyanimedb-backend:latest
 
+      - name: Build and push auth image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: Dockerfiles/Dockerfile_auth
+          push: true
+          tags: meowgit.nekoea.red/nihonium/nyanimedb-auth:latest
+
       - name: Build and push frontend image
         uses: docker/build-push-action@v6
         with:
@@ -85,7 +101,7 @@ jobs:
           tags: meowgit.nekoea.red/nihonium/nyanimedb-frontend:latest
 
   deploy:
-    runs-on: self-hosted
+    runs-on: debian-test
     needs: build
     env:
       POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
@@ -95,6 +111,12 @@ jobs:
       POSTGRES_VERSION: 18
       LOG_LEVEL: ${{ vars.LOG_LEVEL }}
       DATABASE_URL: ${{ secrets.DATABASE_URL }}
+      SERVICE_ADDRESS: ${{ vars.SERVICE_ADDRESS }}
+      RABBITMQ_URL: ${{ secrets.RABBITMQ_URL }}
+      JWT_PRIVATE_KEY: ${{ secrets.JWT_PRIVATE_KEY }}
+      RABBITMQ_DEFAULT_USER: ${{ secrets.RABBITMQ_USER }}
+      RABBITMQ_DEFAULT_PASS: ${{ secrets.RABBITMQ_PASSWORD }}
+      AUTH_ENABLED: ${{ vars.AUTH_ENABLED }}
 
     steps:
       - name: Checkout code

api/_build/openapi.yaml

@@ -11,52 +11,57 @@ paths:
       parameters:
         - $ref: '#/components/parameters/cursor'
         - $ref: '#/components/parameters/title_sort'
-        - in: query
-          name: sort_forward
+        - name: sort_forward
+          in: query
           schema:
             type: boolean
             default: true
-        - in: query
-          name: word
+        - name: ext_search
+          in: query
+          schema:
+            type: boolean
+            default: false
+        - name: word
+          in: query
           schema:
             type: string
-        - in: query
-          name: status
+        - name: status
+          in: query
+          description: List of title statuses to filter
           schema:
             type: array
             items:
               $ref: '#/components/schemas/TitleStatus'
-          description: List of title statuses to filter
-          style: form
           explode: false
-        - in: query
-          name: rating
+          style: form
+        - name: rating
+          in: query
           schema:
             type: number
             format: double
-        - in: query
-          name: release_year
+        - name: release_year
+          in: query
           schema:
             type: integer
             format: int32
-        - in: query
-          name: release_season
+        - name: release_season
+          in: query
           schema:
             $ref: '#/components/schemas/ReleaseSeason'
-        - in: query
-          name: limit
+        - name: limit
+          in: query
           schema:
             type: integer
             format: int32
             default: 10
-        - in: query
-          name: offset
+        - name: offset
+          in: query
           schema:
             type: integer
             format: int32
             default: 0
-        - in: query
-          name: fields
+        - name: fields
+          in: query
           schema:
             type: string
             default: all
@@ -69,10 +74,10 @@ paths:
                 type: object
                 properties:
                   data:
+                    description: List of titles
                     type: array
                     items:
                       $ref: '#/components/schemas/Title'
-                    description: List of titles
                   cursor:
                     $ref: '#/components/schemas/CursorObj'
                 required:
@@ -86,16 +91,17 @@ paths:
           description: Unknown server error
   '/titles/{title_id}':
     get:
+      operationId: getTitle
       summary: Get title description
       parameters:
-        - in: path
-          name: title_id
+        - name: title_id
+          in: path
           required: true
           schema:
             type: integer
             format: int64
-        - in: query
-          name: fields
+        - name: fields
+          in: query
           schema:
             type: string
             default: all
@@ -114,17 +120,67 @@ paths:
           description: Title not found
         '500':
           description: Unknown server error
+      security:
+        - JwtAuthCookies: []
+  /users/:
+    get:
+      summary: 'Search user by nickname or dispname (both in one param), response is always sorted by id'
+      parameters:
+        - name: word
+          in: query
+          schema:
+            type: string
+        - name: limit
+          in: query
+          schema:
+            type: integer
+            format: int32
+            default: 10
+        - name: cursor_id
+          in: query
+          description: pass cursor naked
+          schema:
+            type: integer
+            format: int32
+            default: 1
+      responses:
+        '200':
+          description: List of users with cursor
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  data:
+                    description: List of users
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/User'
+                  cursor:
+                    type: integer
+                    format: int64
+                    default: 1
+                required:
+                  - data
+                  - cursor
+        '204':
+          description: No users found
+        '400':
+          description: Request params are not correct
+        '500':
+          description: Unknown server error
   '/users/{user_id}':
     get:
+      operationId: getUsersId
       summary: Get user info
       parameters:
-        - in: path
-          name: user_id
+        - name: user_id
+          in: path
           required: true
           schema:
             type: string
-        - in: query
-          name: fields
+        - name: fields
+          in: query
           schema:
             type: string
             default: all
@@ -142,59 +198,59 @@ paths:
         '500':
           description: Unknown server error
     patch:
+      operationId: updateUser
       summary: Partially update a user account
       description: |
         Update selected user profile fields (excluding password). 
         Password updates must be done via the dedicated auth-service (`/auth/`).
         Fields not provided in the request body remain unchanged.
-      operationId: updateUser
       parameters:
         - name: user_id
           in: path
+          description: User ID (primary key)
           required: true
           schema:
             type: integer
             format: int64
-          description: User ID (primary key)
           example: 123
       requestBody:
         required: true
         content:
           application/json:
             schema:
+              description: Only provided fields are updated. Omitted fields remain unchanged.
               type: object
               properties:
                 avatar_id:
+                  description: ID of the user avatar (references `images.id`); set to `null` to remove avatar
                   type: integer
                   format: int64
-                  nullable: true
-                  description: ID of the user avatar (references `images.id`); set to `null` to remove avatar
                   example: 42
+                  nullable: true
                 mail:
+                  description: User email (must be unique and valid)
                   type: string
                   format: email
-                  pattern: '^[a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+\\.[a-zA-Z0-9_-]+$'
-                  description: User email (must be unique and valid)
                   example: john.doe.updated@example.com
+                  pattern: '^[a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+\\.[a-zA-Z0-9_-]+$'
                 nickname:
-                  type: string
-                  pattern: '^[a-zA-Z0-9_-]{3,16}$'
                   description: 'Username (alphanumeric + `_` or `-`, 3–16 chars)'
+                  type: string
+                  example: john_doe_43
                   maxLength: 16
                   minLength: 3
-                  example: john_doe_43
+                  pattern: '^[a-zA-Z0-9_-]{3,16}$'
                 disp_name:
-                  type: string
                   description: Display name
-                  maxLength: 32
-                  example: John Smith
-                user_desc:
                   type: string
+                  example: John Smith
+                  maxLength: 32
+                user_desc:
                   description: User description / bio
-                  maxLength: 512
+                  type: string
                   example: Just a curious developer.
+                  maxLength: 512
               additionalProperties: false
-              description: Only provided fields are updated. Omitted fields remain unchanged.
       responses:
         '200':
           description: User updated successfully. Returns updated user representation (excluding sensitive fields).
@@ -216,70 +272,73 @@ paths:
           description: 'Unprocessable Entity — semantic errors not caught by schema (e.g., invalid `avatar_id`)'
         '500':
           description: Unknown server error
+      security:
+        - XsrfAuthHeader: []
   '/users/{user_id}/titles':
     get:
+      operationId: getUserTitles
       summary: Get user titles
       parameters:
         - $ref: '#/components/parameters/cursor'
         - $ref: '#/components/parameters/title_sort'
-        - in: path
-          name: user_id
+        - name: user_id
+          in: path
           required: true
           schema:
             type: string
-        - in: query
-          name: sort_forward
+        - name: sort_forward
+          in: query
           schema:
             type: boolean
             default: true
-        - in: query
-          name: word
+        - name: word
+          in: query
           schema:
             type: string
-        - in: query
-          name: status
+        - name: status
+          in: query
+          description: List of title statuses to filter
           schema:
             type: array
             items:
               $ref: '#/components/schemas/TitleStatus'
-          description: List of title statuses to filter
-          style: form
           explode: false
-        - in: query
-          name: watch_status
+          style: form
+        - name: watch_status
+          in: query
           schema:
             type: array
             items:
               $ref: '#/components/schemas/UserTitleStatus'
-          style: form
           explode: false
-        - in: query
-          name: rating
+          style: form
+        - name: rating
+          in: query
           schema:
             type: number
             format: double
-        - in: query
-          name: my_rate
+        - name: my_rate
+          in: query
           schema:
             type: integer
             format: int32
-        - in: query
-          name: release_year
+        - name: release_year
+          in: query
           schema:
             type: integer
             format: int32
-        - in: query
-          name: release_season
+        - name: release_season
+          in: query
           schema:
             $ref: '#/components/schemas/ReleaseSeason'
-        - in: query
-          name: limit
+        - name: limit
+          in: query
           schema:
             type: integer
             format: int32
             default: 10
-        - in: query
-          name: fields
+        - name: fields
+          in: query
           schema:
             type: string
             default: all
@@ -309,57 +368,43 @@ paths:
         '500':
           description: Unknown server error
     post:
+      operationId: addUserTitle
       summary: Add a title to a user
       description: 'User adding title to list af watched, status required'
-      operationId: addUserTitle
       parameters:
         - name: user_id
           in: path
+          description: ID of the user to assign the title to
           required: true
           schema:
             type: integer
             format: int64
-          description: ID of the user to assign the title to
           example: 123
       requestBody:
         required: true
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/UserTitle'
+              type: object
+              properties:
+                title_id:
+                  type: integer
+                  format: int64
+                status:
+                  $ref: '#/components/schemas/UserTitleStatus'
+                rate:
+                  type: integer
+                  format: int32
+              required:
+                - title_id
+                - status
       responses:
         '200':
           description: Title successfully added to user
           content:
             application/json:
               schema:
-                type: object
-                properties:
-                  data:
-                    type: object
-                    required:
-                      - user_id
-                      - title_id
-                      - status
-                    properties:
-                      user_id:
-                        type: integer
-                        format: int64
-                      title_id:
-                        type: integer
-                        format: int64
-                      status:
-                        $ref: '#/components/schemas/UserTitleStatus'
-                      rate:
-                        type: integer
-                        format: int32
-                      review_id:
-                        type: integer
-                        format: int64
-                      ctime:
-                        type: string
-                        format: date-time
-                    additionalProperties: false
+                $ref: '#/components/schemas/UserTitleMini'
         '400':
           description: 'Invalid request body (missing fields, invalid types, etc.)'
         '401':
@@ -372,6 +417,116 @@ paths:
           description: Conflict — title already assigned to user (if applicable)
         '500':
           description: Internal server error
+  '/users/{user_id}/titles/{title_id}':
+    get:
+      operationId: getUserTitle
+      summary: Get user title
+      parameters:
+        - name: user_id
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+        - name: title_id
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+      responses:
+        '200':
+          description: User titles
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UserTitleMini'
+        '204':
+          description: No user title found
+        '400':
+          description: Request params are not correct
+        '404':
+          description: User or title not found
+        '500':
+          description: Unknown server error
+    patch:
+      operationId: updateUserTitle
+      summary: Update a usertitle
+      description: User updating title list of watched
+      parameters:
+        - name: user_id
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+        - name: title_id
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                status:
+                  $ref: '#/components/schemas/UserTitleStatus'
+                rate:
+                  type: integer
+                  format: int32
+      responses:
+        '200':
+          description: Title successfully updated
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UserTitleMini'
+        '400':
+          description: 'Invalid request body (missing fields, invalid types, etc.)'
+        '401':
+          description: Unauthorized — missing or invalid auth token
+        '403':
+          description: Forbidden — user not allowed to update title
+        '404':
+          description: User or Title not found
+        '500':
+          description: Internal server error
+      security:
+        - XsrfAuthHeader: []
+    delete:
+      operationId: deleteUserTitle
+      summary: Delete a usertitle
+      description: User deleting title from list of watched
+      parameters:
+        - name: user_id
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+        - name: title_id
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+      responses:
+        '200':
+          description: Title successfully deleted
+        '401':
+          description: Unauthorized — missing or invalid auth token
+        '403':
+          description: Forbidden — user not allowed to delete title
+        '404':
+          description: User or Title not found
+        '500':
+          description: Internal server error
+      security:
+        - XsrfAuthHeader: []
 components:
   parameters:
     cursor:
@@ -387,25 +542,36 @@ components:
       schema:
         $ref: '#/components/schemas/TitleSort'
   schemas:
-    CursorObj:
-      type: object
-      required:
-        - id
-      properties:
-        id:
-          type: integer
-          format: int64
-        param:
-          type: string
     TitleSort:
-      type: string
       description: Title sort order
+      type: string
       default: id
       enum:
         - id
         - year
         - rating
         - views
+    TitleStatus:
+      description: Title status
+      type: string
+      enum:
+        - finished
+        - ongoing
+        - planned
+    ReleaseSeason:
+      description: Title release season
+      type: string
+      enum:
+        - winter
+        - spring
+        - summer
+        - fall
+    StorageType:
+      description: Image storage type
+      type: string
+      enum:
+        - s3
+        - local
     Image:
       type: object
       properties:
@@ -413,65 +579,11 @@ components:
           type: integer
           format: int64
         storage_type:
-          type: string
-          description: Image storage type
-          enum:
-            - s3
-            - local
+          $ref: '#/components/schemas/StorageType'
         image_path:
           type: string
-    TitleStatus:
-      type: string
-      description: Title status
-      enum:
-        - finished
-        - ongoing
-        - planned
-    ReleaseSeason:
-      type: string
-      description: Title release season
-      enum:
-        - winter
-        - spring
-        - summer
-        - fall
-    UserTitleStatus:
-      type: string
-      description: User's title status
-      enum:
-        - finished
-        - planned
-        - dropped
-        - in-progress
-    Review:
-      type: object
-      additionalProperties: true
-    Tag:
-      type: object
-      description: 'A localized tag: keys are language codes (ISO 639-1), values are tag names'
-      additionalProperties:
-        type: string
-      example:
-        en: Shojo
-        ru: Сёдзё
-        ja: 少女
-    Tags:
-      type: array
-      description: Array of localized tags
-      items:
-        $ref: '#/components/schemas/Tag'
-      example:
-        - en: Shojo
-          ru: Сёдзё
-          ja: 少女
-        - en: Shounen
-          ru: Сёнен
-          ja: 少年
     Studio:
       type: object
-      required:
-        - id
-        - name
       properties:
         id:
           type: integer
@@ -482,30 +594,41 @@ components:
           $ref: '#/components/schemas/Image'
         description:
           type: string
-    Title:
-      type: object
       required:
         - id
-        - title_names
-        - tags
+        - name
+    Tag:
+      description: 'A localized tag: keys are language codes (ISO 639-1), values are tag names'
+      type: object
+      example:
+        en: Shojo
+        ru: Сёдзё
+        ja: 少女
+      additionalProperties:
+        type: string
+    Tags:
+      description: Array of localized tags
+      type: array
+      items:
+        $ref: '#/components/schemas/Tag'
+      example:
+        - en: Shojo
+          ru: Сёдзё
+          ja: 少女
+        - en: Shounen
+          ru: Сёнен
+          ja: 少年
+    Title:
+      type: object
       properties:
         id:
+          description: Unique title ID (primary key)
           type: integer
           format: int64
-          description: Unique title ID (primary key)
           example: 1
         title_names:
-          type: object
           description: 'Localized titles. Key = language (ISO 639-1), value = list of names'
-          additionalProperties:
-            type: array
-            items:
-              type: string
-              example: Attack on Titan
-            minItems: 1
-            example:
-              - Attack on Titan
-              - AoT
+          type: object
           example:
             en:
               - Attack on Titan
@@ -515,6 +638,15 @@ components:
               - Титаны
             ja:
               - 進撃の巨人
+          additionalProperties:
+            type: array
+            items:
+              type: string
+              example: Attack on Titan
+            minItems: 1
+            example:
+              - Attack on Titan
+              - AoT
         studio:
           $ref: '#/components/schemas/Studio'
         tags:
@@ -545,51 +677,68 @@ components:
           additionalProperties:
             type: number
             format: double
-      additionalProperties: true
-    User:
+      required:
+        - id
+        - title_names
+        - tags
+    CursorObj:
       type: object
       properties:
         id:
           type: integer
           format: int64
+        param:
+          type: string
+      required:
+        - id
+    User:
+      type: object
+      properties:
+        id:
           description: Unique user ID (primary key)
+          type: integer
+          format: int64
           example: 1
         image:
           $ref: '#/components/schemas/Image'
         mail:
+          description: User email
           type: string
           format: email
-          description: User email
           example: john.doe@example.com
         nickname:
-          type: string
           description: Username (alphanumeric + _ or -)
-          maxLength: 16
+          type: string
           example: john_doe_42
+          maxLength: 16
         disp_name:
-          type: string
           description: Display name
-          maxLength: 32
-          example: John Doe
-        user_desc:
           type: string
+          example: John Doe
+          maxLength: 32
+        user_desc:
           description: User description
-          maxLength: 512
+          type: string
           example: Just a regular user.
+          maxLength: 512
         creation_date:
+          description: Timestamp when the user was created
           type: string
           format: date-time
-          description: Timestamp when the user was created
           example: '2025-10-10T23:45:47.908073Z'
       required:
         - user_id
         - nickname
+    UserTitleStatus:
+      description: User's title status
+      type: string
+      enum:
+        - finished
+        - planned
+        - dropped
+        - in-progress
     UserTitle:
       type: object
-      required:
-        - user_id
-        - title_id
-        - status
       properties:
         user_id:
           type: integer
@@ -607,4 +756,42 @@ components:
         ctime:
           type: string
           format: date-time
+      required:
+        - user_id
+        - title_id
+        - status
+    UserTitleMini:
+      type: object
+      properties:
+        user_id:
+          type: integer
+          format: int64
+        title_id:
+          type: integer
+          format: int64
+        status:
+          $ref: '#/components/schemas/UserTitleStatus'
+        rate:
+          type: integer
+          format: int32
+        review_id:
+          type: integer
+          format: int64
+        ctime:
+          type: string
+          format: date-time
+      required:
+        - user_id
+        - title_id
+        - status
+    Review:
+      type: object
       additionalProperties: true
+  securitySchemes:
+    XsrfAuthHeader:
+      type: apiKey
+      in: header
+      name: X-XSRF-TOKEN
+      description: |
+        Anti-CSRF token. Must match the `XSRF-TOKEN` cookie.
+        Required for all state-changing requests (POST/PUT/PATCH/DELETE).

api/openapi.yaml

@@ -11,14 +11,19 @@ paths:
     $ref: "./paths/titles.yaml"
   /titles/{title_id}:
     $ref: "./paths/titles-id.yaml"
+  /users/:
+    $ref: "./paths/users.yaml"
   /users/{user_id}:
     $ref: "./paths/users-id.yaml"
   /users/{user_id}/titles:
     $ref: "./paths/users-id-titles.yaml"
+  /users/{user_id}/titles/{title_id}:
+    $ref: "./paths/users-id-titles-id.yaml"
 
 components:
   parameters:
     $ref: "./parameters/_index.yaml"
   schemas:
     $ref: "./schemas/_index.yaml"
-  
+  securitySchemes:
+    $ref: "./securitySchemes/_index.yaml"

api/paths/titles-id.yaml

@@ -1,5 +1,8 @@
 get:
   summary: Get title description
+  security:
+  - JwtAuthCookies: []
+  operationId: getTitle
   parameters:
     - in: path
       name: title_id

api/paths/titles.yaml

@@ -8,6 +8,11 @@ get:
       schema:
         type: boolean
         default: true
+    - in: query
+      name: ext_search
+      schema:
+        type: boolean
+        default: false
     - in: query
       name: word
       schema:
@@ -21,7 +26,6 @@ get:
       description: List of title statuses to filter
       style: form
       explode: false
-
     - in: query
       name: rating
       schema:

api/paths/users-id-titles-id.yaml

@@ -0,0 +1,111 @@
+get:
+  summary: Get user title
+  operationId: getUserTitle
+  parameters:
+  - in: path
+    name: user_id
+    required: true
+    schema:
+      type: integer
+      format: int64
+  - in: path
+    name: title_id
+    required: true
+    schema:
+      type: integer
+      format: int64
+  responses:
+    '200':
+      description: User titles
+      content:
+        application/json:
+          schema:
+            $ref: '../schemas/UserTitleMini.yaml'
+    '204':
+      description: No user title found
+    '400':
+      description: Request params are not correct
+    '404':
+      description: User or title not found
+    '500':
+      description: Unknown server error
+
+patch:
+  summary: Update a usertitle
+  description: User updating title list of watched
+  operationId: updateUserTitle
+  security:
+    - XsrfAuthHeader: []
+  parameters:
+  - in: path
+    name: user_id
+    required: true
+    schema:
+      type: integer
+      format: int64
+  - in: path
+    name: title_id
+    required: true
+    schema:
+      type: integer
+      format: int64
+  requestBody:
+    required: true
+    content:
+      application/json:
+        schema:
+          type: object
+          properties:
+            status:
+              $ref: '../schemas/enums/UserTitleStatus.yaml'
+            rate:
+              type: integer
+              format: int32
+  responses:
+    '200':
+      description: Title successfully updated
+      content:
+        application/json:
+          schema:
+            $ref: '../schemas/UserTitleMini.yaml'
+    '400':
+      description: Invalid request body (missing fields, invalid types, etc.)
+    '401':
+      description: Unauthorized — missing or invalid auth token
+    '403':
+      description: Forbidden — user not allowed to update title
+    '404':
+      description: User or Title not found
+    '500':
+      description: Internal server error
+
+delete:
+  summary: Delete a usertitle
+  description: User deleting title from list of watched
+  operationId: deleteUserTitle
+  security:
+    - XsrfAuthHeader: []
+  parameters:
+  - in: path
+    name: user_id
+    required: true
+    schema:
+      type: integer
+      format: int64
+  - in: path
+    name: title_id
+    required: true
+    schema:
+      type: integer
+      format: int64
+  responses:
+    '200':
+      description: Title successfully deleted
+    '401':
+      description: Unauthorized — missing or invalid auth token
+    '403':
+      description: Forbidden — user not allowed to delete title
+    '404':
+      description: User or Title not found
+    '500':
+      description: Internal server error

api/paths/users-id-titles.yaml

@@ -1,5 +1,6 @@
 get:
   summary: Get user titles
+  operationId: getUserTitles
   parameters:
   - $ref: '../parameters/cursor.yaml'
   - $ref: "../parameters/title_sort.yaml"
@@ -108,27 +109,26 @@ post:
     content:
       application/json:
         schema:
-          $ref: '../schemas/UserTitle.yaml'
+          type: object
+          required:
+            - title_id
+            - status
+          properties:
+            title_id:
+              type: integer
+              format: int64
+            status:
+              $ref: '../schemas/enums/UserTitleStatus.yaml'
+            rate:
+              type: integer
+              format: int32
   responses:
     '200':
       description: Title successfully added to user
       content:
         application/json:
           schema:
-            type: object
-            properties:
-              # success:
-              #   type: boolean
-              #   example: true
-              # error:
-              #   type: string
-              #   nullable: true
-              #   example: null
-              data:
-                  $ref: '../schemas/UserTitleMini.yaml'
-            # required:
-            #   - success
-            #   - error
+            $ref: '../schemas/UserTitleMini.yaml'
     '400':
       description: Invalid request body (missing fields, invalid types, etc.)
     '401':

api/paths/users-id.yaml

@@ -1,5 +1,6 @@
 get:
   summary: Get user info
+  operationId: getUsersId
   parameters:
   - in: path
     name: user_id
@@ -32,7 +33,10 @@ patch:
     Password updates must be done via the dedicated auth-service (`/auth/`).
     Fields not provided in the request body remain unchanged.
   operationId: updateUser
+  security:
+    - XsrfAuthHeader: []
   parameters:
+    # - $ref: '../parameters/xsrf_token_header.yaml'
     - name: user_id
       in: path
       required: true

api/paths/users.yaml

@@ -0,0 +1,46 @@
+get:
+  summary: Search user by nickname or dispname (both in one param), response is always sorted by id
+  parameters:
+  - in: query
+    name: word
+    schema:
+      type: string
+  - in: query
+    name: limit
+    schema:
+      type: integer
+      format: int32
+      default: 10
+  - in: query
+    name: cursor_id
+    description: pass cursor naked
+    schema:
+      type: integer
+      format: int32
+      default: 1
+  responses:
+    '200':
+      description: List of users with cursor
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              data:
+                type: array
+                items:
+                  $ref: '../schemas/User.yaml'
+                description: List of users
+              cursor:
+                type: integer
+                format: int64
+                default: 1
+            required:
+            - data
+            - cursor
+    '204':
+      description: No users found
+    '400':
+      description: Request params are not correct
+    '500':
+      description: Unknown server error

api/schemas/JWTAuth.yaml

@@ -0,0 +1,7 @@
+# type: apiKey
+# in: cookie
+# name: access_token
+# scheme: bearer
+# bearerFormat: JWT
+# description: |
+#   JWT access token sent in `Cookie: access_token=...`.

api/schemas/Title.yaml

@@ -60,4 +60,3 @@ properties:
     additionalProperties:
       type: number
       format: double
-additionalProperties: true

api/schemas/UserTitleMini.yaml

@@ -21,4 +21,3 @@ properties:
   ctime:
     type: string
     format: date-time
-additionalProperties: false

api/schemas/_index.yaml

@@ -24,3 +24,5 @@ User:
   $ref: "./User.yaml"
 UserTitle:
   $ref: "./UserTitle.yaml"
+# JwtAuth:
+#   $ref: "./JWTAuth.yaml"

api/securitySchemes/_index.yaml

@@ -0,0 +1,11 @@
+# accessToken:
+#   $ref: "./access_token.yaml"
+# csrfToken:
+#   $ref: "./xsrf_token_cookie.yaml"
+XsrfAuthHeader:
+  type: apiKey
+  in: header
+  name: X-XSRF-TOKEN
+  description: |
+    Anti-CSRF token. Must match the `XSRF-TOKEN` cookie.
+    Required for all state-changing requests (POST/PUT/PATCH/DELETE).

auth/auth.gen.go

@@ -13,32 +13,32 @@ import (
 	strictgin "github.com/oapi-codegen/runtime/strictmiddleware/gin"
 )
 
-// PostAuthSignInJSONBody defines parameters for PostAuthSignIn.
-type PostAuthSignInJSONBody struct {
+// PostSignInJSONBody defines parameters for PostSignIn.
+type PostSignInJSONBody struct {
 	Nickname string `json:"nickname"`
 	Pass     string `json:"pass"`
 }
 
-// PostAuthSignUpJSONBody defines parameters for PostAuthSignUp.
-type PostAuthSignUpJSONBody struct {
+// PostSignUpJSONBody defines parameters for PostSignUp.
+type PostSignUpJSONBody struct {
 	Nickname string `json:"nickname"`
 	Pass     string `json:"pass"`
 }
 
-// PostAuthSignInJSONRequestBody defines body for PostAuthSignIn for application/json ContentType.
-type PostAuthSignInJSONRequestBody PostAuthSignInJSONBody
+// PostSignInJSONRequestBody defines body for PostSignIn for application/json ContentType.
+type PostSignInJSONRequestBody PostSignInJSONBody
 
-// PostAuthSignUpJSONRequestBody defines body for PostAuthSignUp for application/json ContentType.
-type PostAuthSignUpJSONRequestBody PostAuthSignUpJSONBody
+// PostSignUpJSONRequestBody defines body for PostSignUp for application/json ContentType.
+type PostSignUpJSONRequestBody PostSignUpJSONBody
 
 // ServerInterface represents all server handlers.
 type ServerInterface interface {
 	// Sign in a user and return JWT
-	// (POST /auth/sign-in)
-	PostAuthSignIn(c *gin.Context)
+	// (POST /sign-in)
+	PostSignIn(c *gin.Context)
 	// Sign up a new user
-	// (POST /auth/sign-up)
-	PostAuthSignUp(c *gin.Context)
+	// (POST /sign-up)
+	PostSignUp(c *gin.Context)
 }
 
 // ServerInterfaceWrapper converts contexts to parameters.
@@ -50,8 +50,8 @@ type ServerInterfaceWrapper struct {
 
 type MiddlewareFunc func(c *gin.Context)
 
-// PostAuthSignIn operation middleware
-func (siw *ServerInterfaceWrapper) PostAuthSignIn(c *gin.Context) {
+// PostSignIn operation middleware
+func (siw *ServerInterfaceWrapper) PostSignIn(c *gin.Context) {
 
 	for _, middleware := range siw.HandlerMiddlewares {
 		middleware(c)
@@ -60,11 +60,11 @@ func (siw *ServerInterfaceWrapper) PostAuthSignIn(c *gin.Context) {
 		}
 	}
 
-	siw.Handler.PostAuthSignIn(c)
+	siw.Handler.PostSignIn(c)
 }
 
-// PostAuthSignUp operation middleware
-func (siw *ServerInterfaceWrapper) PostAuthSignUp(c *gin.Context) {
+// PostSignUp operation middleware
+func (siw *ServerInterfaceWrapper) PostSignUp(c *gin.Context) {
 
 	for _, middleware := range siw.HandlerMiddlewares {
 		middleware(c)
@@ -73,7 +73,7 @@ func (siw *ServerInterfaceWrapper) PostAuthSignUp(c *gin.Context) {
 		}
 	}
 
-	siw.Handler.PostAuthSignUp(c)
+	siw.Handler.PostSignUp(c)
 }
 
 // GinServerOptions provides options for the Gin server.
@@ -103,57 +103,54 @@ func RegisterHandlersWithOptions(router gin.IRouter, si ServerInterface, options
 		ErrorHandler:       errorHandler,
 	}
 
-	router.POST(options.BaseURL+"/auth/sign-in", wrapper.PostAuthSignIn)
-	router.POST(options.BaseURL+"/auth/sign-up", wrapper.PostAuthSignUp)
+	router.POST(options.BaseURL+"/sign-in", wrapper.PostSignIn)
+	router.POST(options.BaseURL+"/sign-up", wrapper.PostSignUp)
 }
 
-type PostAuthSignInRequestObject struct {
-	Body *PostAuthSignInJSONRequestBody
+type PostSignInRequestObject struct {
+	Body *PostSignInJSONRequestBody
 }
 
-type PostAuthSignInResponseObject interface {
-	VisitPostAuthSignInResponse(w http.ResponseWriter) error
+type PostSignInResponseObject interface {
+	VisitPostSignInResponse(w http.ResponseWriter) error
 }
 
-type PostAuthSignIn200JSONResponse struct {
-	Error    *string `json:"error"`
-	UserId   *string `json:"user_id"`
-	UserName *string `json:"user_name"`
+type PostSignIn200JSONResponse struct {
+	UserId   int64  `json:"user_id"`
+	UserName string `json:"user_name"`
 }
 
-func (response PostAuthSignIn200JSONResponse) VisitPostAuthSignInResponse(w http.ResponseWriter) error {
+func (response PostSignIn200JSONResponse) VisitPostSignInResponse(w http.ResponseWriter) error {
 	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(200)
 
 	return json.NewEncoder(w).Encode(response)
 }
 
-type PostAuthSignIn401JSONResponse struct {
+type PostSignIn401JSONResponse struct {
 	Error *string `json:"error,omitempty"`
 }
 
-func (response PostAuthSignIn401JSONResponse) VisitPostAuthSignInResponse(w http.ResponseWriter) error {
+func (response PostSignIn401JSONResponse) VisitPostSignInResponse(w http.ResponseWriter) error {
 	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(401)
 
 	return json.NewEncoder(w).Encode(response)
 }
 
-type PostAuthSignUpRequestObject struct {
-	Body *PostAuthSignUpJSONRequestBody
+type PostSignUpRequestObject struct {
+	Body *PostSignUpJSONRequestBody
 }
 
-type PostAuthSignUpResponseObject interface {
-	VisitPostAuthSignUpResponse(w http.ResponseWriter) error
+type PostSignUpResponseObject interface {
+	VisitPostSignUpResponse(w http.ResponseWriter) error
 }
 
-type PostAuthSignUp200JSONResponse struct {
-	Error   *string `json:"error"`
-	Success *bool   `json:"success,omitempty"`
-	UserId  *string `json:"user_id"`
+type PostSignUp200JSONResponse struct {
+	UserId int64 `json:"user_id"`
 }
 
-func (response PostAuthSignUp200JSONResponse) VisitPostAuthSignUpResponse(w http.ResponseWriter) error {
+func (response PostSignUp200JSONResponse) VisitPostSignUpResponse(w http.ResponseWriter) error {
 	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(200)
 
@@ -163,11 +160,11 @@ func (response PostAuthSignUp200JSONResponse) VisitPostAuthSignUpResponse(w http
 // StrictServerInterface represents all server handlers.
 type StrictServerInterface interface {
 	// Sign in a user and return JWT
-	// (POST /auth/sign-in)
-	PostAuthSignIn(ctx context.Context, request PostAuthSignInRequestObject) (PostAuthSignInResponseObject, error)
+	// (POST /sign-in)
+	PostSignIn(ctx context.Context, request PostSignInRequestObject) (PostSignInResponseObject, error)
 	// Sign up a new user
-	// (POST /auth/sign-up)
-	PostAuthSignUp(ctx context.Context, request PostAuthSignUpRequestObject) (PostAuthSignUpResponseObject, error)
+	// (POST /sign-up)
+	PostSignUp(ctx context.Context, request PostSignUpRequestObject) (PostSignUpResponseObject, error)
 }
 
 type StrictHandlerFunc = strictgin.StrictGinHandlerFunc
@@ -182,11 +179,11 @@ type strictHandler struct {
 	middlewares []StrictMiddlewareFunc
 }
 
-// PostAuthSignIn operation middleware
-func (sh *strictHandler) PostAuthSignIn(ctx *gin.Context) {
-	var request PostAuthSignInRequestObject
+// PostSignIn operation middleware
+func (sh *strictHandler) PostSignIn(ctx *gin.Context) {
+	var request PostSignInRequestObject
 
-	var body PostAuthSignInJSONRequestBody
+	var body PostSignInJSONRequestBody
 	if err := ctx.ShouldBindJSON(&body); err != nil {
 		ctx.Status(http.StatusBadRequest)
 		ctx.Error(err)
@@ -195,10 +192,10 @@ func (sh *strictHandler) PostAuthSignIn(ctx *gin.Context) {
 	request.Body = &body
 
 	handler := func(ctx *gin.Context, request interface{}) (interface{}, error) {
-		return sh.ssi.PostAuthSignIn(ctx, request.(PostAuthSignInRequestObject))
+		return sh.ssi.PostSignIn(ctx, request.(PostSignInRequestObject))
 	}
 	for _, middleware := range sh.middlewares {
-		handler = middleware(handler, "PostAuthSignIn")
+		handler = middleware(handler, "PostSignIn")
 	}
 
 	response, err := handler(ctx, request)
@@ -206,8 +203,8 @@ func (sh *strictHandler) PostAuthSignIn(ctx *gin.Context) {
 	if err != nil {
 		ctx.Error(err)
 		ctx.Status(http.StatusInternalServerError)
-	} else if validResponse, ok := response.(PostAuthSignInResponseObject); ok {
-		if err := validResponse.VisitPostAuthSignInResponse(ctx.Writer); err != nil {
+	} else if validResponse, ok := response.(PostSignInResponseObject); ok {
+		if err := validResponse.VisitPostSignInResponse(ctx.Writer); err != nil {
 			ctx.Error(err)
 		}
 	} else if response != nil {
@@ -215,11 +212,11 @@ func (sh *strictHandler) PostAuthSignIn(ctx *gin.Context) {
 	}
 }
 
-// PostAuthSignUp operation middleware
-func (sh *strictHandler) PostAuthSignUp(ctx *gin.Context) {
-	var request PostAuthSignUpRequestObject
+// PostSignUp operation middleware
+func (sh *strictHandler) PostSignUp(ctx *gin.Context) {
+	var request PostSignUpRequestObject
 
-	var body PostAuthSignUpJSONRequestBody
+	var body PostSignUpJSONRequestBody
 	if err := ctx.ShouldBindJSON(&body); err != nil {
 		ctx.Status(http.StatusBadRequest)
 		ctx.Error(err)
@@ -228,10 +225,10 @@ func (sh *strictHandler) PostAuthSignUp(ctx *gin.Context) {
 	request.Body = &body
 
 	handler := func(ctx *gin.Context, request interface{}) (interface{}, error) {
-		return sh.ssi.PostAuthSignUp(ctx, request.(PostAuthSignUpRequestObject))
+		return sh.ssi.PostSignUp(ctx, request.(PostSignUpRequestObject))
 	}
 	for _, middleware := range sh.middlewares {
-		handler = middleware(handler, "PostAuthSignUp")
+		handler = middleware(handler, "PostSignUp")
 	}
 
 	response, err := handler(ctx, request)
@@ -239,8 +236,8 @@ func (sh *strictHandler) PostAuthSignUp(ctx *gin.Context) {
 	if err != nil {
 		ctx.Error(err)
 		ctx.Status(http.StatusInternalServerError)
-	} else if validResponse, ok := response.(PostAuthSignUpResponseObject); ok {
-		if err := validResponse.VisitPostAuthSignUpResponse(ctx.Writer); err != nil {
+	} else if validResponse, ok := response.(PostSignUpResponseObject); ok {
+		if err := validResponse.VisitPostSignUpResponse(ctx.Writer); err != nil {
 			ctx.Error(err)
 		}
 	} else if response != nil {

auth/openapi-auth.yaml

@@ -7,7 +7,7 @@ servers:
   - url: /auth
 
 paths:
-  /auth/sign-up:
+  /sign-up:
     post:
       summary: Sign up a new user
       tags: [Auth]
@@ -30,18 +30,15 @@ paths:
           content:
             application/json:
               schema:
+                required:
+                  - user_id
                 type: object
                 properties:
-                  success:
-                    type: boolean
-                  error:
-                    type: string
-                    nullable: true
                   user_id:
-                    type: string
-                    nullable: true
+                    type: integer
+                    format: int64
 
-  /auth/sign-in:
+  /sign-in:
     post:
       summary: Sign in a user and return JWT
       tags: [Auth]
@@ -65,17 +62,16 @@ paths:
           content:
             application/json:
               schema:
+                required:
+                  - user_id
+                  - user_name
                 type: object
                 properties:
-                  error:
-                    type: string
-                    nullable: true
                   user_id:
-                    type: string
-                    nullable: true
+                    type: integer
+                    format: int64
                   user_name:
                     type: string
-                    nullable: true
         "401":
           description: Access denied due to invalid credentials
           content:

deploy/api_gen.ps1

@@ -0,0 +1,4 @@
+cd ./api
+openapi-format .\openapi.yaml --output .\_build\openapi.yaml --yaml
+cd ..
+oapi-codegen --config=api\oapi-codegen.yaml api\_build\openapi.yaml

deploy/docker-compose.yml

@@ -11,20 +11,34 @@ services:
       - "${POSTGRES_PORT}:5432"
     volumes:
       - postgres_data:/var/lib/postgresql
+    networks:
+      - nyanimedb-network
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
 
-  # pgadmin:
-  #   image: dpage/pgadmin4:${PGADMIN_VERSION}
-  #   container_name: pgadmin
-  #   restart: always
-  #   environment:
-  #     PGADMIN_DEFAULT_EMAIL: ${PGADMIN_EMAIL}
-  #     PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_PASSWORD}
-  #   ports:
-  #     - "${PGADMIN_PORT}:80"
-  #   depends_on:
-  #     - postgres
-  #   volumes:
-  #     - pgadmin_data:/var/lib/pgadmin
+  rabbitmq:
+    image: rabbitmq:3-management
+    container_name: rabbitmq
+    ports:
+      - "5672:5672"
+      - "15672:15672"
+    environment:
+      RABBITMQ_DEFAULT_USER: ${RABBITMQ_USER}
+      RABBITMQ_DEFAULT_PASS: ${RABBITMQ_PASSWORD}
+    volumes:
+      - rabbitmq_data:/var/lib/rabbitmq
+    networks:
+      - nyanimedb-network
+    healthcheck:
+      test: ["CMD", "rabbitmqctl", "status"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
 
   nyanimedb-backend:
     image: meowgit.nekoea.red/nihonium/nyanimedb-backend:latest
@@ -33,10 +47,17 @@ services:
     environment:
       LOG_LEVEL: ${LOG_LEVEL}
       DATABASE_URL: ${DATABASE_URL}
+      SERVICE_ADDRESS: ${SERVICE_ADDRESS}
+      RABBITMQ_URL: ${RABBITMQ_URL}
+      JWT_PRIVATE_KEY: ${JWT_PRIVATE_KEY}
+      AUTH_ENABLED: ${AUTH_ENABLED}
     ports:
       - "8080:8080"
     depends_on:
       - postgres
+      - rabbitmq
+    networks:
+      - nyanimedb-network
 
   nyanimedb-auth:
     image: meowgit.nekoea.red/nihonium/nyanimedb-auth:latest
@@ -45,10 +66,14 @@ services:
     environment:
       LOG_LEVEL: ${LOG_LEVEL}
       DATABASE_URL: ${DATABASE_URL}
+      SERVICE_ADDRESS: ${SERVICE_ADDRESS}
+      JWT_PRIVATE_KEY: ${JWT_PRIVATE_KEY}
     ports:
       - "8082:8082"
     depends_on:
       - postgres
+    networks:
+      - nyanimedb-network
   
   nyanimedb-frontend:
     image: meowgit.nekoea.red/nihonium/nyanimedb-frontend:latest
@@ -58,7 +83,12 @@ services:
       - "8081:80"
     depends_on:
       - nyanimedb-backend
+    networks:
+      - nyanimedb-network
 
 volumes:
   postgres_data:
-  pgadmin_data:
+  rabbitmq_data:
+
+networks:
+  nyanimedb-network:

go.mod

@@ -3,6 +3,7 @@ module nyanimedb
 go 1.25.0
 
 require (
+	github.com/alexedwards/argon2id v1.0.0
 	github.com/gin-contrib/cors v1.7.6
 	github.com/gin-gonic/gin v1.11.0
 	github.com/golang-jwt/jwt/v5 v5.3.0
@@ -36,6 +37,7 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/quic-go/qpack v0.5.1 // indirect
 	github.com/quic-go/quic-go v0.54.0 // indirect
+	github.com/rabbitmq/amqp091-go v1.10.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.3.0 // indirect
 	go.uber.org/mock v0.5.0 // indirect

go.sum

@@ -1,4 +1,6 @@
 github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk=
+github.com/alexedwards/argon2id v1.0.0 h1:wJzDx66hqWX7siL/SRUmgz3F8YMrd/nfX/xHHcQQP0w=
+github.com/alexedwards/argon2id v1.0.0/go.mod h1:tYKkqIjzXvZdzPvADMWOEZ+l6+BD6CtBXMj5fnJppiw=
 github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ=
 github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk=
 github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
@@ -70,9 +72,13 @@ github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI=
 github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg=
 github.com/quic-go/quic-go v0.54.0 h1:6s1YB9QotYI6Ospeiguknbp2Znb/jZYjZLRXn9kMQBg=
 github.com/quic-go/quic-go v0.54.0/go.mod h1:e68ZEaCdyviluZmy44P6Iey98v/Wfz6HCjQEm+l8zTY=
+github.com/rabbitmq/amqp091-go v1.10.0 h1:STpn5XsHlHGcecLmMFCtg7mqq0RnD+zFr4uzukfVhBw=
+github.com/rabbitmq/amqp091-go v1.10.0/go.mod h1:Hy4jKW5kQART1u+JkDTF9YYOQUHXqMuhrgxOEeS7G4o=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0=
+github.com/streadway/amqp v1.1.0 h1:py12iX8XSyI7aN/3dUT8DFIDJazNJsVJdxNVEpnQTZM=
+github.com/streadway/amqp v1.1.0/go.mod h1:WYSrTEYHOXHd0nwFeUXAe2G2hRnQT+deZJJf88uS9Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
@@ -87,26 +93,64 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.3.0 h1:Qd2W2sQawAfG8XSvzwhBeoGq71zXOC/Q1E9y/wUcsUA=
 github.com/ugorji/go/codec v1.3.0/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU=
 go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
 golang.org/x/arch v0.20.0 h1:dx1zTU0MAE98U+TQ8BLl7XsJbgze2WnNKF/8tGp/Q6c=
 golang.org/x/arch v0.20.0/go.mod h1:bdwinDaKcfZUGpH09BB7ZmOfhalA8lQdzl62l8gGWsk=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
 golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w=
 golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
 golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
 golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
 golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
 golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
 golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.36.9 h1:w2gp2mA27hUeUzj9Ex9FBjsBm40zfaDtEWow293U7Iw=
 google.golang.org/protobuf v1.36.9/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

modules/auth/handlers/handlers.go

@@ -2,29 +2,28 @@ package handlers
 
 import (
 	"context"
+	"crypto/rand"
+	"encoding/base64"
 	"fmt"
-	"log"
 	"net/http"
 	auth "nyanimedb/auth"
 	sqlc "nyanimedb/sql"
 	"strconv"
 	"time"
 
+	"github.com/alexedwards/argon2id"
 	"github.com/gin-gonic/gin"
 	"github.com/golang-jwt/jwt/v5"
+	log "github.com/sirupsen/logrus"
 )
 
-var accessSecret = []byte("my_access_secret_key")
-var refreshSecret = []byte("my_refresh_secret_key")
-
-var UserDb = make(map[string]string) // TEMP: stores passwords
-
 type Server struct {
-	db *sqlc.Queries
+	db            *sqlc.Queries
+	JwtPrivateKey string
 }
 
-func NewServer(db *sqlc.Queries) Server {
-	return Server{db: db}
+func NewServer(db *sqlc.Queries, JwtPrivatekey string) Server {
+	return Server{db: db, JwtPrivateKey: JwtPrivatekey}
 }
 
 func parseInt64(s string) (int32, error) {
@@ -32,15 +31,31 @@ func parseInt64(s string) (int32, error) {
 	return int32(i), err
 }
 
-func generateTokens(userID string) (accessToken string, refreshToken string, err error) {
+func HashPassword(password string) (string, error) {
+	params := &argon2id.Params{
+		Memory:      64 * 1024,
+		Iterations:  3,
+		Parallelism: 2,
+		SaltLength:  16,
+		KeyLength:   32,
+	}
+
+	return argon2id.CreateHash(password, params)
+}
+
+func CheckPassword(password, hash string) (bool, error) {
+	return argon2id.ComparePasswordAndHash(password, hash)
+}
+
+func (s Server) generateTokens(userID string) (accessToken string, refreshToken string, csrfToken string, err error) {
 	accessClaims := jwt.MapClaims{
 		"user_id": userID,
 		"exp":     time.Now().Add(15 * time.Minute).Unix(),
 	}
 	at := jwt.NewWithClaims(jwt.SigningMethodHS256, accessClaims)
-	accessToken, err = at.SignedString(accessSecret)
+	accessToken, err = at.SignedString([]byte(s.JwtPrivateKey))
 	if err != nil {
-		return "", "", err
+		return "", "", "", err
 	}
 
 	refreshClaims := jwt.MapClaims{
@@ -48,56 +63,83 @@ func generateTokens(userID string) (accessToken string, refreshToken string, err
 		"exp":     time.Now().Add(7 * 24 * time.Hour).Unix(),
 	}
 	rt := jwt.NewWithClaims(jwt.SigningMethodHS256, refreshClaims)
-	refreshToken, err = rt.SignedString(refreshSecret)
+	refreshToken, err = rt.SignedString([]byte(s.JwtPrivateKey))
 	if err != nil {
-		return "", "", err
+		return "", "", "", err
 	}
 
-	return accessToken, refreshToken, nil
+	csrfBytes := make([]byte, 32)
+	_, err = rand.Read(csrfBytes)
+	if err != nil {
+		return "", "", "", err
+	}
+	csrfToken = base64.RawURLEncoding.EncodeToString(csrfBytes)
+
+	return accessToken, refreshToken, csrfToken, nil
 }
 
-func (s Server) PostAuthSignUp(ctx context.Context, req auth.PostAuthSignUpRequestObject) (auth.PostAuthSignUpResponseObject, error) {
-	err := ""
-	success := true
-	UserDb[req.Body.Nickname] = req.Body.Pass
+func (s Server) PostSignUp(ctx context.Context, req auth.PostSignUpRequestObject) (auth.PostSignUpResponseObject, error) {
+	passhash, err := HashPassword(req.Body.Pass)
+	if err != nil {
+		log.Errorf("failed to hash password: %v", err)
+		// TODO: return 500
+	}
 
-	return auth.PostAuthSignUp200JSONResponse{
-		Error:   &err,
-		Success: &success,
-		UserId:  &req.Body.Nickname,
+	user_id, err := s.db.CreateNewUser(context.Background(), sqlc.CreateNewUserParams{
+		Passhash: passhash,
+		Nickname: req.Body.Nickname,
+	})
+	if err != nil {
+		log.Errorf("failed to create user %s: %v", req.Body.Nickname, err)
+		// TODO: check err and retyrn 400/500
+	}
+
+	return auth.PostSignUp200JSONResponse{
+		UserId: user_id,
 	}, nil
 }
 
-func (s Server) PostAuthSignIn(ctx context.Context, req auth.PostAuthSignInRequestObject) (auth.PostAuthSignInResponseObject, error) {
-	// ctx.SetCookie("122")
+func (s Server) PostSignIn(ctx context.Context, req auth.PostSignInRequestObject) (auth.PostSignInResponseObject, error) {
 	ginCtx, ok := ctx.Value(gin.ContextKey).(*gin.Context)
 	if !ok {
 		log.Print("failed to get gin context")
 		// TODO: change to 500
-		return auth.PostAuthSignIn200JSONResponse{}, fmt.Errorf("failed to get gin.Context from context.Context")
+		return auth.PostSignIn200JSONResponse{}, fmt.Errorf("failed to get gin.Context from context.Context")
 	}
 
-	err := ""
+	user, err := s.db.GetUserByNickname(context.Background(), req.Body.Nickname)
+	if err != nil {
+		log.Errorf("failed to get user by nickname %s: %v", req.Body.Nickname, err)
+		// TODO: return 400/500
+	}
 
-	pass, ok := UserDb[req.Body.Nickname]
-	if !ok || pass != req.Body.Pass {
-		e := "invalid credentials"
-		return auth.PostAuthSignIn401JSONResponse{
-			Error: &e,
+	ok, err = CheckPassword(req.Body.Pass, user.Passhash)
+	if err != nil {
+		log.Errorf("failed to check password for user %s: %v", req.Body.Nickname, err)
+		// TODO: return 500
+	}
+	if !ok {
+		err_msg := "invalid credentials"
+		return auth.PostSignIn401JSONResponse{
+			Error: &err_msg,
 		}, nil
 	}
 
-	accessToken, refreshToken, _ := generateTokens(req.Body.Nickname)
+	accessToken, refreshToken, csrfToken, err := s.generateTokens(req.Body.Nickname)
+	if err != nil {
+		log.Errorf("failed to generate tokens for user %s: %v", req.Body.Nickname, err)
+		// TODO: return 500
+	}
 
+	// TODO: check cookie settings carefully
 	ginCtx.SetSameSite(http.SameSiteStrictMode)
-	ginCtx.SetCookie("access_token", accessToken, 604800, "/auth", "", true, true)
-	ginCtx.SetCookie("refresh_token", refreshToken, 604800, "/api", "", true, true)
+	ginCtx.SetCookie("access_token", accessToken, 900, "/api", "", false, true)
+	ginCtx.SetCookie("refresh_token", refreshToken, 1209600, "/auth", "", false, true)
+	ginCtx.SetCookie("xsrf_token", csrfToken, 1209600, "/", "", false, false)
 
-	// Return access token; refresh token can be returned in response or HttpOnly cookie
-	result := auth.PostAuthSignIn200JSONResponse{
-		Error:    &err,
-		UserId:   &req.Body.Nickname,
-		UserName: &req.Body.Nickname,
+	result := auth.PostSignIn200JSONResponse{
+		UserId:   user.ID,
+		UserName: user.Nickname,
 	}
 	return result, nil
 }

modules/auth/helpers.go

@@ -0,0 +1,33 @@
+package main
+
+import (
+	"fmt"
+	"reflect"
+)
+
+func setField(obj interface{}, name string, value interface{}) error {
+	v := reflect.ValueOf(obj)
+
+	if v.Kind() != reflect.Ptr || v.Elem().Kind() != reflect.Struct {
+		return fmt.Errorf("expected pointer to a struct")
+	}
+
+	v = v.Elem()
+	field := v.FieldByName(name)
+
+	if !field.IsValid() {
+		return fmt.Errorf("no such field: %s", name)
+	}
+	if !field.CanSet() {
+		return fmt.Errorf("cannot set field: %s", name)
+	}
+
+	val := reflect.ValueOf(value)
+
+	if field.Type() != val.Type() {
+		return fmt.Errorf("provided value type (%s) doesn't match field type (%s)", val.Type(), field.Type())
+	}
+
+	field.Set(val)
+	return nil
+}

modules/auth/main.go

@@ -1,6 +1,10 @@
 package main
 
 import (
+	"context"
+	"fmt"
+	"os"
+	"reflect"
 	"time"
 
 	auth "nyanimedb/auth"
@@ -9,19 +13,40 @@ import (
 
 	"github.com/gin-contrib/cors"
 	"github.com/gin-gonic/gin"
+	"github.com/jackc/pgx/v5/pgxpool"
+	"github.com/pelletier/go-toml/v2"
+	log "github.com/sirupsen/logrus"
 )
 
 var AppConfig Config
 
 func main() {
+	if len(os.Args) != 2 {
+		AppConfig.Mode = "env"
+	} else {
+		AppConfig.Mode = "argv"
+	}
+
+	err := InitConfig()
+	if err != nil {
+		log.Fatalf("Failed to init config: %v\n", err)
+	}
+
 	r := gin.Default()
 
-	var queries *sqlc.Queries = nil
+	pool, err := pgxpool.New(context.Background(), os.Getenv("DATABASE_URL"))
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Unable to connect to database: %v\n", err)
+		os.Exit(1)
+	}
 
-	server := handlers.NewServer(queries)
+	var queries *sqlc.Queries = sqlc.New(pool)
 
+	server := handlers.NewServer(queries, AppConfig.JwtPrivateKey)
+
+	log.Info("allow origins:", AppConfig.ServiceAddress)
 	r.Use(cors.New(cors.Config{
-		AllowOrigins:     []string{"*"}, // allow all origins, change to specific domains in production
+		AllowOrigins:     []string{"*"},
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE"},
 		AllowHeaders:     []string{"Origin", "Content-Type", "Accept"},
 		ExposeHeaders:    []string{"Content-Length"},
@@ -36,3 +61,41 @@ func main() {
 
 	r.Run(":8082")
 }
+
+func InitConfig() error {
+	if AppConfig.Mode == "argv" {
+		content, err := os.ReadFile(os.Args[1])
+		if err != nil {
+			return err
+		}
+
+		toml.Unmarshal(content, &AppConfig)
+
+		fmt.Printf("%+v\n", AppConfig)
+
+		return nil
+	} else if AppConfig.Mode == "env" {
+		f := reflect.ValueOf(AppConfig)
+
+		for i := 0; i < f.NumField(); i++ {
+			field := f.Type().Field(i)
+			tag := field.Tag
+			env_var := tag.Get("env")
+			fmt.Printf("Field: %v.\nEnvironment variable: %v.\n", field.Name, env_var)
+			if env_var != "" {
+				env_value, exists := os.LookupEnv(env_var)
+				if !exists {
+					return fmt.Errorf("there is no env variable %s", env_var)
+				}
+				err := setField(&AppConfig, field.Name, env_value)
+				if err != nil {
+					return fmt.Errorf("failed to set config field %s: %v", field.Name, err)
+				}
+			}
+		}
+
+		return nil
+	} else {
+		return fmt.Errorf("incorrect config mode")
+	}
+}

modules/auth/queries.sql

@@ -0,0 +1,11 @@
+-- name: GetUserByNickname :one
+SELECT *
+FROM users
+WHERE nickname = sqlc.arg('nickname');
+
+-- name: CreateNewUser :one
+INSERT 
+INTO users (passhash, nickname) 
+VALUES (sqlc.arg(passhash), sqlc.arg(nickname))
+RETURNING id;
+

modules/auth/types.go

@@ -1,6 +1,9 @@
 package main
 
 type Config struct {
-	JwtPrivateKey string
-	LogLevel      string `toml:"LogLevel" env:"LOG_LEVEL"`
+	Mode           string
+	ServiceAddress string `toml:"ServiceAddress" env:"SERVICE_ADDRESS"`
+	DdUrl          string `toml:"DbUrl" env:"DATABASE_URL"`
+	JwtPrivateKey  string `toml:"JwtPrivateKey" env:"JWT_PRIVATE_KEY"`
+	LogLevel       string `toml:"LogLevel" env:"LOG_LEVEL"`
 }

modules/backend/handlers/common.go

@@ -1,27 +1,41 @@
 package handlers
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	oapi "nyanimedb/api"
+	"nyanimedb/modules/backend/rmq"
 	sqlc "nyanimedb/sql"
 	"strconv"
 )
 
+// type Handler struct {
+// 	publisher *rmq.Publisher
+// }
+
+// func New(publisher *rmq.Publisher) *Handler {
+// 	return &Handler{publisher: publisher}
+// }
+
 type Server struct {
 	db *sqlc.Queries
+	// publisher *rmq.Publisher
+	RPCclient *rmq.RPCClient
 }
 
-func NewServer(db *sqlc.Queries) Server {
-	return Server{db: db}
+func NewServer(db *sqlc.Queries, rpcclient *rmq.RPCClient) *Server {
+	return &Server{
+		db: db,
+		// publisher: publisher,
+		RPCclient: rpcclient,
+	}
 }
 
-func sql2StorageType(s *sqlc.StorageTypeT) (*oapi.ImageStorageType, error) {
+func sql2StorageType(s *sqlc.StorageTypeT) (*oapi.StorageType, error) {
 	if s == nil {
 		return nil, nil
 	}
-	var t oapi.ImageStorageType
+	var t oapi.StorageType
 	switch *s {
 	case sqlc.StorageTypeTLocal:
 		t = oapi.Local
@@ -33,7 +47,7 @@ func sql2StorageType(s *sqlc.StorageTypeT) (*oapi.ImageStorageType, error) {
 	return &t, nil
 }
 
-func (s Server) mapTitle(ctx context.Context, title sqlc.GetTitleByIDRow) (oapi.Title, error) {
+func (s Server) mapTitle(title sqlc.GetTitleByIDRow) (oapi.Title, error) {
 
 	oapi_title := oapi.Title{
 		EpisodesAired: title.EpisodesAired,

modules/backend/handlers/titles.go

@@ -5,8 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 	oapi "nyanimedb/api"
+	"nyanimedb/modules/backend/rmq"
 	sqlc "nyanimedb/sql"
 	"strconv"
+	"time"
 
 	"github.com/jackc/pgx/v5"
 	log "github.com/sirupsen/logrus"
@@ -132,43 +134,83 @@ func (s Server) GetTagsByTitleId(ctx context.Context, id int64) (oapi.Tags, erro
 // 	return &oapi_studio, nil
 // }
 
-func (s Server) GetTitlesTitleId(ctx context.Context, request oapi.GetTitlesTitleIdRequestObject) (oapi.GetTitlesTitleIdResponseObject, error) {
+func (s Server) GetTitle(ctx context.Context, request oapi.GetTitleRequestObject) (oapi.GetTitleResponseObject, error) {
 	var oapi_title oapi.Title
 
 	sqlc_title, err := s.db.GetTitleByID(ctx, request.TitleId)
 	if err != nil {
 		if err == pgx.ErrNoRows {
-			return oapi.GetTitlesTitleId204Response{}, nil
+			return oapi.GetTitle204Response{}, nil
 		}
 		log.Errorf("%v", err)
-		return oapi.GetTitlesTitleId500Response{}, nil
+		return oapi.GetTitle500Response{}, nil
 	}
 
-	oapi_title, err = s.mapTitle(ctx, sqlc_title)
+	oapi_title, err = s.mapTitle(sqlc_title)
 	if err != nil {
 		log.Errorf("%v", err)
-		return oapi.GetTitlesTitleId500Response{}, nil
+		return oapi.GetTitle500Response{}, nil
 	}
 
-	return oapi.GetTitlesTitleId200JSONResponse(oapi_title), nil
+	return oapi.GetTitle200JSONResponse(oapi_title), nil
 }
 
 func (s Server) GetTitles(ctx context.Context, request oapi.GetTitlesRequestObject) (oapi.GetTitlesResponseObject, error) {
+
 	opai_titles := make([]oapi.Title, 0)
+	mqreq := rmq.RabbitRequest{
+		Timestamp: time.Now(),
+	}
 
 	word := Word2Sqlc(request.Params.Word)
+	if word != nil {
+		mqreq.Name = *word
+	}
 
 	season, err := ReleaseSeason2sqlc(request.Params.ReleaseSeason)
 	if err != nil {
 		log.Errorf("%v", err)
 		return oapi.GetTitles400Response{}, err
 	}
+	if season != nil {
+		mqreq.Season = *request.Params.ReleaseSeason
+	}
 
 	title_statuses, err := TitleStatus2Sqlc(request.Params.Status)
 	if err != nil {
 		log.Errorf("%v", err)
 		return oapi.GetTitles400Response{}, err
 	}
+	if title_statuses != nil {
+		mqreq.Statuses = *request.Params.Status
+	}
+
+	if request.Params.ExtSearch != nil && *request.Params.ExtSearch {
+
+		// Структура для ответа (должна совпадать с тем, что шлёт микросервис)
+		var reply struct {
+			Status  string `json:"status"`
+			Result  string `json:"result"`
+			Preview string `json:"preview_url"`
+		}
+
+		// Делаем RPC-вызов — и ЖДЁМ ответа
+		err := s.RPCclient.Call(
+			ctx,
+			mqreq,
+			&reply,
+		)
+		if err != nil {
+			log.Errorf("RabitMQ: %v", err)
+			// return oapi.GetTitles500Response{}, err
+		}
+		// // Возвращаем результат
+		// return oapi.ProcessMedia200JSONResponse{
+		// 	Status:  reply.Status,
+		// 	Result:  reply.Result,
+		// 	Preview: reply.Preview,
+		// }, nil
+	}
 
 	params := sqlc.SearchTitlesParams{
 		Word:          word,
@@ -238,7 +280,7 @@ func (s Server) GetTitles(ctx context.Context, request oapi.GetTitlesRequestObje
 		// 	_title.TitleStorageType = string(s)
 		// }
 
-		t, err := s.mapTitle(ctx, _title)
+		t, err := s.mapTitle(_title)
 		if err != nil {
 			log.Errorf("%v", err)
 			return oapi.GetTitles500Response{}, nil

modules/backend/handlers/users.go

@@ -2,6 +2,7 @@ package handlers
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	oapi "nyanimedb/api"
 	sqlc "nyanimedb/sql"
@@ -9,23 +10,15 @@ import (
 	"time"
 
 	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgconn"
 	"github.com/jackc/pgx/v5/pgtype"
 	"github.com/oapi-codegen/runtime/types"
 	log "github.com/sirupsen/logrus"
 )
 
-// type Server struct {
-// 	db *sqlc.Queries
-// }
-
-// func NewServer(db *sqlc.Queries) Server {
-// 	return Server{db: db}
-// }
-
-// func parseInt64(s string) (int32, error) {
-// 	i, err := strconv.ParseInt(s, 10, 64)
-// 	return int32(i), err
-// }
+const (
+	pgErrDuplicateKey = "23505"
+)
 
 func mapUser(u sqlc.GetUserByIDRow) (oapi.User, error) {
 	i := oapi.Image{
@@ -48,24 +41,24 @@ func mapUser(u sqlc.GetUserByIDRow) (oapi.User, error) {
 	}, nil
 }
 
-func (s Server) GetUsersUserId(ctx context.Context, req oapi.GetUsersUserIdRequestObject) (oapi.GetUsersUserIdResponseObject, error) {
+func (s Server) GetUsersId(ctx context.Context, req oapi.GetUsersIdRequestObject) (oapi.GetUsersIdResponseObject, error) {
 	userID, err := parseInt64(req.UserId)
 	if err != nil {
-		return oapi.GetUsersUserId404Response{}, nil
+		return oapi.GetUsersId404Response{}, nil
 	}
 	_user, err := s.db.GetUserByID(context.TODO(), userID)
 	if err != nil {
 		if err == pgx.ErrNoRows {
-			return oapi.GetUsersUserId404Response{}, nil
+			return oapi.GetUsersId404Response{}, nil
 		}
 		return nil, err
 	}
 	user, err := mapUser(_user)
 	if err != nil {
 		log.Errorf("%v", err)
-		return oapi.GetUsersUserId500Response{}, err
+		return oapi.GetUsersId500Response{}, err
 	}
-	return oapi.GetUsersUserId200JSONResponse(user), nil
+	return oapi.GetUsersId200JSONResponse(user), nil
 }
 
 func sqlDate2oapi(p_date pgtype.Timestamptz) *time.Time {
@@ -140,9 +133,9 @@ func UserTitleStatus2Sqlc(s *[]oapi.UserTitleStatus) ([]sqlc.UsertitleStatusT, e
 }
 
 func UserTitleStatus2Sqlc1(s *oapi.UserTitleStatus) (*sqlc.UsertitleStatusT, error) {
-	var sqlc_status sqlc.UsertitleStatusT
+	var sqlc_status sqlc.UsertitleStatusT = sqlc.UsertitleStatusTFinished
 	if s == nil {
-		return nil, nil
+		return &sqlc_status, nil
 	}
 
 	switch *s {
@@ -202,7 +195,7 @@ func (s Server) mapUsertitle(ctx context.Context, t sqlc.SearchUserTitlesRow) (o
 		// StudioImagePath:   title.StudioImagePath,
 	}
 
-	oapi_title, err := s.mapTitle(ctx, _title)
+	oapi_title, err := s.mapTitle(_title)
 	if err != nil {
 		return oapi_usertitle, fmt.Errorf("mapUsertitle: %v", err)
 	}
@@ -211,7 +204,7 @@ func (s Server) mapUsertitle(ctx context.Context, t sqlc.SearchUserTitlesRow) (o
 	return oapi_usertitle, nil
 }
 
-func (s Server) GetUsersUserIdTitles(ctx context.Context, request oapi.GetUsersUserIdTitlesRequestObject) (oapi.GetUsersUserIdTitlesResponseObject, error) {
+func (s Server) GetUserTitles(ctx context.Context, request oapi.GetUserTitlesRequestObject) (oapi.GetUserTitlesResponseObject, error) {
 
 	oapi_usertitles := make([]oapi.UserTitle, 0)
 
@@ -220,7 +213,7 @@ func (s Server) GetUsersUserIdTitles(ctx context.Context, request oapi.GetUsersU
 	season, err := ReleaseSeason2sqlc(request.Params.ReleaseSeason)
 	if err != nil {
 		log.Errorf("%v", err)
-		return oapi.GetUsersUserIdTitles400Response{}, err
+		return oapi.GetUserTitles400Response{}, err
 	}
 
 	// var statuses_sort []string
@@ -234,19 +227,19 @@ func (s Server) GetUsersUserIdTitles(ctx context.Context, request oapi.GetUsersU
 	watch_status, err := UserTitleStatus2Sqlc(request.Params.WatchStatus)
 	if err != nil {
 		log.Errorf("%v", err)
-		return oapi.GetUsersUserIdTitles400Response{}, err
+		return oapi.GetUserTitles400Response{}, err
 	}
 
 	title_statuses, err := TitleStatus2Sqlc(request.Params.Status)
 	if err != nil {
 		log.Errorf("%v", err)
-		return oapi.GetUsersUserIdTitles400Response{}, err
+		return oapi.GetUserTitles400Response{}, err
 	}
 
 	userID, err := parseInt64(request.UserId)
 	if err != nil {
 		log.Errorf("get user titles: %v", err)
-		return oapi.GetUsersUserIdTitles404Response{}, err
+		return oapi.GetUserTitles404Response{}, err
 	}
 	params := sqlc.SearchUserTitlesParams{
 		UserID:            userID,
@@ -272,7 +265,7 @@ func (s Server) GetUsersUserIdTitles(ctx context.Context, request oapi.GetUsersU
 			err := ParseCursorInto(string(*request.Params.Sort), string(*request.Params.Cursor), &params)
 			if err != nil {
 				log.Errorf("%v", err)
-				return oapi.GetUsersUserIdTitles400Response{}, nil
+				return oapi.GetUserTitles400Response{}, nil
 			}
 		}
 	}
@@ -280,10 +273,10 @@ func (s Server) GetUsersUserIdTitles(ctx context.Context, request oapi.GetUsersU
 	titles, err := s.db.SearchUserTitles(ctx, params)
 	if err != nil {
 		log.Errorf("%v", err)
-		return oapi.GetUsersUserIdTitles500Response{}, nil
+		return oapi.GetUserTitles500Response{}, nil
 	}
 	if len(titles) == 0 {
-		return oapi.GetUsersUserIdTitles204Response{}, nil
+		return oapi.GetUserTitles204Response{}, nil
 	}
 
 	var new_cursor oapi.CursorObj
@@ -293,7 +286,7 @@ func (s Server) GetUsersUserIdTitles(ctx context.Context, request oapi.GetUsersU
 		t, err := s.mapUsertitle(ctx, title)
 		if err != nil {
 			log.Errorf("%v", err)
-			return oapi.GetUsersUserIdTitles500Response{}, nil
+			return oapi.GetUserTitles500Response{}, nil
 		}
 		oapi_usertitles = append(oapi_usertitles, t)
 
@@ -304,13 +297,13 @@ func (s Server) GetUsersUserIdTitles(ctx context.Context, request oapi.GetUsersU
 				tmp := fmt.Sprint(*t.Title.ReleaseYear)
 				new_cursor.Param = &tmp
 			case "rating":
-				tmp := strconv.FormatFloat(*t.Title.Rating, 'f', -1, 64)
+				tmp := strconv.FormatFloat(*t.Title.Rating, 'f', -1, 64) // падает
 				new_cursor.Param = &tmp
 			}
 		}
 	}
 
-	return oapi.GetUsersUserIdTitles200JSONResponse{Cursor: new_cursor, Data: oapi_usertitles}, nil
+	return oapi.GetUserTitles200JSONResponse{Cursor: new_cursor, Data: oapi_usertitles}, nil
 }
 
 func EmailToStringPtr(e *types.Email) *string {
@@ -360,7 +353,7 @@ func (s Server) UpdateUser(ctx context.Context, request oapi.UpdateUserRequestOb
 }
 
 func (s Server) AddUserTitle(ctx context.Context, request oapi.AddUserTitleRequestObject) (oapi.AddUserTitleResponseObject, error) {
-
+	//TODO: add review if exists
 	status, err := UserTitleStatus2Sqlc1(&request.Body.Status)
 	if err != nil {
 		log.Errorf("%v", err)
@@ -368,34 +361,32 @@ func (s Server) AddUserTitle(ctx context.Context, request oapi.AddUserTitleReque
 	}
 
 	params := sqlc.InsertUserTitleParams{
-		UserID:   request.UserId,
-		TitleID:  request.Body.Title.Id,
-		Status:   *status,
-		Rate:     request.Body.Rate,
-		ReviewID: request.Body.ReviewId,
+		UserID:  request.UserId,
+		TitleID: request.Body.TitleId,
+		Status:  *status,
+		Rate:    request.Body.Rate,
 	}
 
 	user_title, err := s.db.InsertUserTitle(ctx, params)
 	if err != nil {
-		log.Errorf("%v", err)
-		return oapi.AddUserTitle500Response{}, nil
+		var pgErr *pgconn.PgError
+		if errors.As(err, &pgErr) {
+			// fmt.Println(pgErr.Message) // => syntax error at end of input
+			// fmt.Println(pgErr.Code)    // => 42601
+			if pgErr.Code == pgErrDuplicateKey { //duplicate key value
+				return oapi.AddUserTitle409Response{}, nil
+			}
+		} else {
+			log.Errorf("%v", err)
+			return oapi.AddUserTitle500Response{}, nil
+		}
 	}
-
 	oapi_status, err := sql2usertitlestatus(user_title.Status)
 	if err != nil {
 		log.Errorf("%v", err)
 		return oapi.AddUserTitle500Response{}, nil
 	}
-	oapi_usertitle := struct {
-		Ctime    *time.Time `json:"ctime,omitempty"`
-		Rate     *int32     `json:"rate,omitempty"`
-		ReviewId *int64     `json:"review_id,omitempty"`
-
-		// Status User's title status
-		Status  oapi.UserTitleStatus `json:"status"`
-		TitleId int64                `json:"title_id"`
-		UserId  int64                `json:"user_id"`
-	}{
+	oapi_usertitle := oapi.UserTitleMini{
 		Ctime:    &user_title.Ctime,
 		Rate:     user_title.Rate,
 		ReviewId: user_title.ReviewID,
@@ -404,5 +395,129 @@ func (s Server) AddUserTitle(ctx context.Context, request oapi.AddUserTitleReque
 		UserId:   user_title.UserID,
 	}
 
-	return oapi.AddUserTitle200JSONResponse{Data: &oapi_usertitle}, nil
+	return oapi.AddUserTitle200JSONResponse(oapi_usertitle), nil
+}
+
+// DeleteUserTitle implements oapi.StrictServerInterface.
+func (s Server) DeleteUserTitle(ctx context.Context, request oapi.DeleteUserTitleRequestObject) (oapi.DeleteUserTitleResponseObject, error) {
+	params := sqlc.DeleteUserTitleParams{
+		UserID:  request.UserId,
+		TitleID: request.TitleId,
+	}
+	_, err := s.db.DeleteUserTitle(ctx, params)
+	if err != nil {
+		if err == pgx.ErrNoRows {
+			return oapi.DeleteUserTitle404Response{}, nil
+		}
+		log.Errorf("%v", err)
+		return oapi.DeleteUserTitle500Response{}, nil
+	}
+	return oapi.DeleteUserTitle200Response{}, nil
+}
+
+// UpdateUserTitle implements oapi.StrictServerInterface.
+func (s Server) UpdateUserTitle(ctx context.Context, request oapi.UpdateUserTitleRequestObject) (oapi.UpdateUserTitleResponseObject, error) {
+
+	status, err := UserTitleStatus2Sqlc1(request.Body.Status)
+	if err != nil {
+		log.Errorf("%v", err)
+		return oapi.UpdateUserTitle400Response{}, nil
+	}
+	params := sqlc.UpdateUserTitleParams{
+		Status:  status,
+		Rate:    request.Body.Rate,
+		UserID:  request.UserId,
+		TitleID: request.TitleId,
+	}
+
+	user_title, err := s.db.UpdateUserTitle(ctx, params)
+	if err != nil {
+		if err == pgx.ErrNoRows {
+			return oapi.UpdateUserTitle404Response{}, nil
+		}
+		log.Errorf("%v", err)
+		return oapi.UpdateUserTitle500Response{}, nil
+	}
+	oapi_status, err := sql2usertitlestatus(user_title.Status)
+	if err != nil {
+		log.Errorf("%v", err)
+		return oapi.UpdateUserTitle500Response{}, nil
+	}
+
+	oapi_usertitle := oapi.UserTitleMini{
+		Ctime:    &user_title.Ctime,
+		Rate:     user_title.Rate,
+		ReviewId: user_title.ReviewID,
+		Status:   oapi_status,
+		TitleId:  user_title.TitleID,
+		UserId:   user_title.UserID,
+	}
+
+	return oapi.UpdateUserTitle200JSONResponse(oapi_usertitle), nil
+}
+
+func (s Server) GetUserTitle(ctx context.Context, request oapi.GetUserTitleRequestObject) (oapi.GetUserTitleResponseObject, error) {
+	user_title, err := s.db.GetUserTitleByID(ctx, sqlc.GetUserTitleByIDParams{
+		TitleID: request.TitleId,
+		UserID:  request.UserId,
+	})
+	if err != nil {
+		if err == pgx.ErrNoRows {
+			return oapi.GetUserTitle404Response{}, nil
+		} else {
+			log.Errorf("%v", err)
+			return oapi.GetUserTitle500Response{}, nil
+		}
+	}
+	oapi_status, err := sql2usertitlestatus(user_title.Status)
+	if err != nil {
+		log.Errorf("%v", err)
+		return oapi.GetUserTitle500Response{}, nil
+	}
+	oapi_usertitle := oapi.UserTitleMini{
+		Ctime:    &user_title.Ctime,
+		Rate:     user_title.Rate,
+		ReviewId: user_title.ReviewID,
+		Status:   oapi_status,
+		TitleId:  user_title.TitleID,
+		UserId:   user_title.UserID,
+	}
+
+	return oapi.GetUserTitle200JSONResponse(oapi_usertitle), nil
+}
+
+// GetUsers implements oapi.StrictServerInterface.
+func (s *Server) GetUsers(ctx context.Context, request oapi.GetUsersRequestObject) (oapi.GetUsersResponseObject, error) {
+	params := sqlc.SearchUserParams{
+		Word:   request.Params.Word,
+		Cursor: request.Params.CursorId,
+		Limit:  request.Params.Limit,
+	}
+	_users, err := s.db.SearchUser(ctx, params)
+	if err != nil {
+		log.Errorf("%v", err)
+		return oapi.GetUsers500Response{}, nil
+	}
+	if len(_users) == 0 {
+		return oapi.GetUsers204Response{}, nil
+	}
+
+	var users []oapi.User
+	var cursor int64
+	for _, user := range _users {
+		oapi_user := oapi.User{ // maybe its possible to make one sqlc type and use one map func iinstead of this shit
+			// add image
+			CreationDate: &user.CreationDate,
+			DispName:     user.DispName,
+			Id:           &user.ID,
+			Mail:         StringToEmail(user.Mail),
+			Nickname:     user.Nickname,
+			UserDesc:     user.UserDesc,
+		}
+		users = append(users, oapi_user)
+
+		cursor = user.ID
+	}
+
+	return oapi.GetUsers200JSONResponse{Data: users, Cursor: cursor}, nil
 }

modules/backend/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"fmt"
+	"net/http"
 	sqlc "nyanimedb/sql"
 	"os"
 	"reflect"
@@ -10,28 +11,32 @@ import (
 
 	oapi "nyanimedb/api"
 	handlers "nyanimedb/modules/backend/handlers"
+	middleware "nyanimedb/modules/backend/middlewares"
+	"nyanimedb/modules/backend/rmq"
 
 	"github.com/gin-contrib/cors"
 	"github.com/gin-gonic/gin"
 	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/pelletier/go-toml/v2"
+	"github.com/rabbitmq/amqp091-go"
+	log "github.com/sirupsen/logrus"
 )
 
 var AppConfig Config
 
 func main() {
-	// if len(os.Args) != 2 {
-	// 	AppConfig.Mode = "env"
-	// } else {
-	// 	AppConfig.Mode = "argv"
-	// }
+	if len(os.Args) != 2 {
+		AppConfig.Mode = "env"
+	} else {
+		AppConfig.Mode = "argv"
+	}
 
-	// err := InitConfig()
-	// if err != nil {
-	// 	log.Fatalf("Failed to init config: %v\n", err)
-	// }
+	err := InitConfig()
+	if err != nil {
+		log.Fatalf("Failed to init config: %v\n", err)
+	}
 
-	pool, err := pgxpool.New(context.Background(), os.Getenv("DATABASE_URL"))
+	pool, err := pgxpool.New(context.Background(), AppConfig.DdUrl)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Unable to connect to database: %v\n", err)
 		os.Exit(1)
@@ -41,15 +46,28 @@ func main() {
 
 	r := gin.Default()
 
+	if len(AppConfig.AuthEnabled) > 0 && AppConfig.AuthEnabled != "false" {
+		r.Use(middleware.CSRFMiddleware())
+		r.Use(middleware.JWTAuthMiddleware(AppConfig.JwtPrivateKey))
+	}
+
 	queries := sqlc.New(pool)
 
-	server := handlers.NewServer(queries)
-	// r.LoadHTMLGlob("templates/*")
+	rmqConn, err := amqp091.Dial(AppConfig.RmqURL)
+	if err != nil {
+		log.Fatalf("Failed to connect to RabbitMQ: %v", err)
+	}
+	defer rmqConn.Close()
+
+	rpcClient := rmq.NewRPCClient(rmqConn, 30*time.Second)
+
+	server := handlers.NewServer(queries, rpcClient)
 
 	r.Use(cors.New(cors.Config{
-		AllowOrigins:     []string{"*"}, // allow all origins, change to specific domains in production
-		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE"},
-		AllowHeaders:     []string{"Origin", "Content-Type", "Accept"},
+		AllowOrigins: []string{AppConfig.ServiceAddress},
+		// AllowOrigins:     []string{"*"},
+		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "PATCH"},
+		AllowHeaders:     []string{"Origin", "Content-Type", "Accept", "X-XSRF-TOKEN"},
 		ExposeHeaders:    []string{"Content-Length"},
 		AllowCredentials: true,
 		MaxAge:           12 * time.Hour,
@@ -57,27 +75,15 @@ func main() {
 
 	oapi.RegisterHandlers(r, oapi.NewStrictHandler(
 		server,
-		// сюда можно добавить middlewares, если нужно
+
 		[]oapi.StrictMiddlewareFunc{},
 	))
-	// r.GET("/", func(c *gin.Context) {
-	// 	c.HTML(http.StatusOK, "index.html", gin.H{
-	// 		"title":   "Welcome Page",
-	// 		"message": "Hello, Gin with HTML templates!",
-	// 	})
-	// })
 
-	// r.GET("/api", func(c *gin.Context) {
-	// 	items := []Item{
-	// 		{ID: 1, Title: "First Item", Description: "This is the description of the first item."},
-	// 		{ID: 2, Title: "Second Item", Description: "This is the description of the second item."},
-	// 		{ID: 3, Title: "Third Item", Description: "This is the description of the third item."},
-	// 	}
-
-	// 	c.JSON(http.StatusOK, items)
-	// })
-
-	r.Run(":8080")
+	// Запуск
+	log.Infof("Server starting on :8080")
+	if err := r.Run(":8080"); err != nil && err != http.ErrServerClosed {
+		log.Fatalf("server failed: %v", err)
+	}
 }
 
 func InitConfig() error {

modules/backend/middlewares/access.go

@@ -0,0 +1,109 @@
+package middleware
+
+import (
+	"context"
+	"errors"
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// ctxKey — приватный тип для ключа контекста
+type ctxKey struct{}
+
+// ginContextKey — уникальный ключ для хранения *gin.Context
+var ginContextKey = &ctxKey{}
+
+// GinContextToContext сохраняет *gin.Context в context.Context запроса
+func GinContextToContext(c *gin.Context) {
+	ctx := context.WithValue(c.Request.Context(), ginContextKey, c)
+	c.Request = c.Request.WithContext(ctx)
+}
+
+// GinContextFromContext извлекает *gin.Context из context.Context
+func GinContextFromContext(ctx context.Context) (*gin.Context, bool) {
+	ginCtx, ok := ctx.Value(ginContextKey).(*gin.Context)
+	return ginCtx, ok
+}
+
+func JWTAuthMiddleware(secret string) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		// 1. Получаем access_token из cookie
+		tokenStr, err := c.Cookie("access_token")
+		if err != nil {
+			abortWithJSON(c, http.StatusUnauthorized, "missing access_token cookie")
+			return
+		}
+
+		// 2. Парсим токен с MapClaims
+		token, err := jwt.Parse(tokenStr, func(t *jwt.Token) (interface{}, error) {
+			if t.Method != jwt.SigningMethodHS256 {
+				return nil, errors.New("unexpected signing method: " + t.Method.Alg())
+			}
+			return []byte(secret), nil // ← конвертируем string → []byte
+		})
+		if err != nil {
+			abortWithJSON(c, http.StatusUnauthorized, "invalid token: "+err.Error())
+			return
+		}
+
+		// 3. Проверяем валидность
+		if !token.Valid {
+			abortWithJSON(c, http.StatusUnauthorized, "token is invalid")
+			return
+		}
+
+		// 4. Извлекаем user_id из claims
+		claims, ok := token.Claims.(jwt.MapClaims)
+		if !ok {
+			abortWithJSON(c, http.StatusUnauthorized, "invalid claims format")
+			return
+		}
+
+		userID, ok := claims["user_id"].(string)
+		if !ok || userID == "" {
+			abortWithJSON(c, http.StatusUnauthorized, "user_id claim missing or invalid")
+			return
+		}
+
+		// 5. Сохраняем в контексте
+		c.Set("user_id", userID)
+
+		// 6. Для oapi-codegen — кладём gin.Context в request context
+		GinContextToContext(c)
+
+		c.Next()
+	}
+}
+
+// Вспомогательные функции (без изменений)
+func UserIDFromGin(c *gin.Context) (string, bool) {
+	id, exists := c.Get("user_id")
+	if !exists {
+		return "", false
+	}
+	if s, ok := id.(string); ok {
+		return s, true
+	}
+	return "", false
+}
+
+func UserIDFromContext(ctx context.Context) (string, error) {
+	ginCtx, ok := GinContextFromContext(ctx)
+	if !ok {
+		return "", errors.New("gin context not found")
+	}
+	userID, ok := UserIDFromGin(ginCtx)
+	if !ok {
+		return "", errors.New("user_id not found in context")
+	}
+	return userID, nil
+}
+
+func abortWithJSON(c *gin.Context, code int, message string) {
+	c.AbortWithStatusJSON(code, gin.H{
+		"error":   "unauthorized",
+		"message": message,
+	})
+}

modules/backend/middlewares/csrf.go

@@ -0,0 +1,70 @@
+package middleware
+
+import (
+	"crypto/subtle"
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+)
+
+// CSRFMiddleware для Gin
+func CSRFMiddleware() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		// Пропускаем безопасные методы
+		if !isStateChangingMethod(c.Request.Method) {
+			c.Next()
+			return
+		}
+
+		// 1. Получаем токен из заголовка
+		headerToken := c.GetHeader("X-XSRF-TOKEN")
+		if headerToken == "" {
+			c.AbortWithStatusJSON(http.StatusForbidden, gin.H{
+				"error": "missing X-XSRF-TOKEN header",
+			})
+			return
+		}
+
+		// 2. Получаем токен из cookie
+		cookie, err := c.Cookie("xsrf_token")
+		if err != nil {
+			c.AbortWithStatusJSON(http.StatusForbidden, gin.H{
+				"error": "missing xsrf_token cookie",
+			})
+			return
+		}
+
+		// 3. Безопасное сравнение
+		if subtle.ConstantTimeCompare([]byte(headerToken), []byte(cookie)) != 1 {
+			c.AbortWithStatusJSON(http.StatusForbidden, gin.H{
+				"error": "CSRF token mismatch",
+			})
+			return
+		}
+
+		// 4. Опционально: сохраняем токен в контексте
+		c.Set("csrf_token", headerToken)
+		c.Next()
+	}
+}
+
+func isStateChangingMethod(method string) bool {
+	switch method {
+	case http.MethodPost, http.MethodPut, http.MethodPatch, http.MethodDelete:
+		return true
+	default:
+		return false
+	}
+}
+
+// CSRFTokenFromGin извлекает токен из Gin context
+func CSRFTokenFromGin(c *gin.Context) (string, bool) {
+	token, exists := c.Get("xsrf_token")
+	if !exists {
+		return "", false
+	}
+	if s, ok := token.(string); ok {
+		return s, true
+	}
+	return "", false
+}

modules/backend/queries.sql

@@ -23,6 +23,37 @@ FROM users as t
 LEFT JOIN images as i ON (t.avatar_id = i.id)
 WHERE t.id = sqlc.arg('id')::bigint;
 
+-- name: SearchUser :many
+SELECT
+    u.id                AS id,
+    u.avatar_id         AS avatar_id,
+    u.mail              AS mail,
+    u.nickname          AS nickname,
+    u.disp_name         AS disp_name,
+    u.user_desc         AS user_desc,
+    u.creation_date     AS creation_date,
+    i.storage_type      AS storage_type,
+    i.image_path        AS image_path
+FROM users AS u
+LEFT JOIN images AS i ON u.avatar_id = i.id
+WHERE
+    (
+        sqlc.narg('word')::text IS NULL
+        OR (
+            SELECT bool_and(
+                u.nickname ILIKE ('%' || term || '%') 
+                OR u.disp_name ILIKE ('%' || term || '%')
+            )
+            FROM unnest(string_to_array(trim(sqlc.narg('word')::text), ' ')) AS term
+            WHERE term <> ''
+        )
+    )
+    AND (
+        sqlc.narg('cursor')::int IS NULL
+        OR u.id > sqlc.narg('cursor')::int
+    )
+ORDER BY u.id ASC
+LIMIT COALESCE(sqlc.narg('limit')::int, 20);
 
 -- name: GetStudioByID :one
 SELECT *
@@ -57,17 +88,6 @@ VALUES (
     sqlc.arg('tag_names')::jsonb)
 RETURNING id, tag_names;
 
--- -- name: ListUsers :many
--- SELECT user_id, avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date
--- FROM users
--- ORDER BY user_id
--- LIMIT $1 OFFSET $2;
-
--- -- name: CreateUser :one
--- INSERT INTO users (avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date)
--- VALUES ($1, $2, $3, $4, $5, $6, $7)
--- RETURNING user_id, avatar_id, nickname, disp_name, user_desc, creation_date;
-
 -- name: UpdateUser :one
 UPDATE users
 SET
@@ -78,10 +98,6 @@ SET
 WHERE id = sqlc.arg('user_id')
 RETURNING id, avatar_id, nickname, disp_name, user_desc, creation_date, mail;
 
--- -- name: DeleteUser :exec
--- DELETE FROM users
--- WHERE user_id = $1;
-
 -- name: GetTitleByID :one
 -- sqlc.struct: TitlesFull
 SELECT 
@@ -378,78 +394,11 @@ ORDER BY
 
 LIMIT COALESCE(sqlc.narg('limit')::int, 100); -- 100 is default limit
 
--- -- name: ListTitles :many
--- SELECT title_id, title_names, studio_id, poster_id, signal_ids,
---        title_status, rating, rating_count, release_year, release_season,
---        season, episodes_aired, episodes_all, episodes_len
--- FROM titles
--- ORDER BY title_id
--- LIMIT $1 OFFSET $2;
-
--- -- name: UpdateTitle :one
--- UPDATE titles
--- SET
---   title_names = COALESCE(sqlc.narg('title_names'), title_names),
---   studio_id = COALESCE(sqlc.narg('studio_id'), studio_id),
---   poster_id = COALESCE(sqlc.narg('poster_id'), poster_id),
---   signal_ids = COALESCE(sqlc.narg('signal_ids'), signal_ids),
---   title_status = COALESCE(sqlc.narg('title_status'), title_status),
---   release_year = COALESCE(sqlc.narg('release_year'), release_year),
---   release_season = COALESCE(sqlc.narg('release_season'), release_season),
---   episodes_aired = COALESCE(sqlc.narg('episodes_aired'), episodes_aired),
---   episodes_all = COALESCE(sqlc.narg('episodes_all'), episodes_all),
---   episodes_len = COALESCE(sqlc.narg('episodes_len'), episodes_len)
--- WHERE title_id = sqlc.arg('title_id')
--- RETURNING *;
-
 -- name: GetReviewByID :one
 SELECT *
 FROM reviews
 WHERE review_id = sqlc.arg('review_id')::bigint;
 
--- -- name: CreateReview :one
--- INSERT INTO reviews (user_id, title_id, image_ids, review_text, creation_date)
--- VALUES ($1, $2, $3, $4, $5)
--- RETURNING review_id, user_id, title_id, image_ids, review_text, creation_date;
-
--- -- name: UpdateReview :one
--- UPDATE reviews
--- SET
---   image_ids = COALESCE(sqlc.narg('image_ids'), image_ids),
---   review_text = COALESCE(sqlc.narg('review_text'), review_text)
--- WHERE review_id = sqlc.arg('review_id')
--- RETURNING *;
-
--- -- name: DeleteReview :exec
--- DELETE FROM reviews
--- WHERE review_id = $1;
-
---  -- name: ListReviewsByTitle :many
--- SELECT review_id, user_id, title_id, image_ids, review_text, creation_date
--- FROM reviews
--- WHERE title_id = $1
--- ORDER BY creation_date DESC
--- LIMIT $2 OFFSET $3;
-
--- -- name: ListReviewsByUser :many
--- SELECT review_id, user_id, title_id, image_ids, review_text, creation_date
--- FROM reviews
--- WHERE user_id = $1
--- ORDER BY creation_date DESC
--- LIMIT $2 OFFSET $3;
-
--- -- name: GetUserTitle :one
--- SELECT usertitle_id, user_id, title_id, status, rate, review_id
--- FROM usertitles
--- WHERE user_id = $1 AND title_id = $2;
-
--- -- name: ListUserTitles :many
--- SELECT usertitle_id, user_id, title_id, status, rate, review_id
--- FROM usertitles
--- WHERE user_id = $1
--- ORDER BY usertitle_id
--- LIMIT $2 OFFSET $3;
-
 -- name: InsertUserTitle :one
 INSERT INTO usertitles (user_id, title_id, status, rate, review_id)
 VALUES (   
@@ -461,21 +410,25 @@ VALUES (
 )
 RETURNING user_id, title_id, status, rate, review_id, ctime;
 
--- -- name: UpdateUserTitle :one
--- UPDATE usertitles
--- SET
---   status = COALESCE(sqlc.narg('status'), status),
---   rate = COALESCE(sqlc.narg('rate'), rate),
---   review_id = COALESCE(sqlc.narg('review_id'), review_id)
--- WHERE user_id = $1 AND title_id = $2
--- RETURNING *;
+-- name: UpdateUserTitle :one
+-- Fails with sql.ErrNoRows if (user_id, title_id) not found
+UPDATE usertitles
+SET
+    status = COALESCE(sqlc.narg('status')::usertitle_status_t, status),
+    rate   = COALESCE(sqlc.narg('rate')::int, rate)
+WHERE
+    user_id = sqlc.arg('user_id')
+    AND title_id = sqlc.arg('title_id')
+RETURNING *;
 
--- -- name: DeleteUserTitle :exec
--- DELETE FROM usertitles
--- WHERE user_id = $1 AND ($2::int IS NULL OR title_id = $2);
+-- name: DeleteUserTitle :one
+DELETE FROM usertitles
+WHERE user_id = sqlc.arg('user_id')
+  AND title_id = sqlc.arg('title_id')
+RETURNING *;
 
--- -- name: ListTags :many
--- SELECT tag_id, tag_names
--- FROM tags
--- ORDER BY tag_id
--- LIMIT $1 OFFSET $2;
+-- name: GetUserTitleByID :one
+SELECT 
+    ut.*
+FROM usertitles      as ut
+WHERE ut.title_id = sqlc.arg('title_id')::bigint AND ut.user_id = sqlc.arg('user_id')::bigint;

modules/backend/rmq/rabbit.go

@@ -0,0 +1,129 @@
+package rmq
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"time"
+
+	oapi "nyanimedb/api"
+
+	amqp "github.com/rabbitmq/amqp091-go"
+)
+
+const RPCQueueName = "anime_import_rpc"
+
+// RabbitRequest не меняем
+type RabbitRequest struct {
+	Name      string             `json:"name"`
+	Statuses  []oapi.TitleStatus `json:"statuses,omitempty"`
+	Rating    float64            `json:"rating,omitempty"`
+	Year      int32              `json:"year,omitempty"`
+	Season    oapi.ReleaseSeason `json:"season,omitempty"`
+	Timestamp time.Time          `json:"timestamp"`
+}
+
+type RPCClient struct {
+	conn    *amqp.Connection
+	timeout time.Duration
+}
+
+func NewRPCClient(conn *amqp.Connection, timeout time.Duration) *RPCClient {
+	return &RPCClient{conn: conn, timeout: timeout}
+}
+
+func (c *RPCClient) Call(
+	ctx context.Context,
+	request RabbitRequest,
+	replyPayload any,
+) error {
+
+	// 1. Канал для запроса и ответа
+	ch, err := c.conn.Channel()
+	if err != nil {
+		return fmt.Errorf("channel: %w", err)
+	}
+	defer ch.Close()
+
+	// 2. Декларируем фиксированную очередь RPC (идемпотентно)
+	_, err = ch.QueueDeclare(
+		RPCQueueName,
+		true,  // durable
+		false, // auto-delete
+		false, // exclusive
+		false, // no-wait
+		nil,
+	)
+	if err != nil {
+		return fmt.Errorf("declare rpc queue: %w", err)
+	}
+
+	// 3. Создаём временную очередь ДЛЯ ОТВЕТА
+	replyQueue, err := ch.QueueDeclare(
+		"",
+		false,
+		true,
+		true,
+		false,
+		nil,
+	)
+	if err != nil {
+		return fmt.Errorf("declare reply queue: %w", err)
+	}
+
+	// 4. Подписываемся на очередь ответов
+	msgs, err := ch.Consume(
+		replyQueue.Name,
+		"",
+		true, // auto-ack
+		true, // exclusive
+		false,
+		false,
+		nil,
+	)
+	if err != nil {
+		return fmt.Errorf("consume reply: %w", err)
+	}
+
+	// correlation ID
+	corrID := fmt.Sprintf("%d", time.Now().UnixNano())
+
+	// 5. сериализация запроса
+	body, err := json.Marshal(request)
+	if err != nil {
+		return fmt.Errorf("marshal request: %w", err)
+	}
+
+	// 6. Публикация RPC-запроса
+	err = ch.Publish(
+		"",
+		RPCQueueName, // ← фиксированная очередь!
+		false,
+		false,
+		amqp.Publishing{
+			ContentType:   "application/json",
+			CorrelationId: corrID,
+			ReplyTo:       replyQueue.Name,
+			Timestamp:     time.Now(),
+			Body:          body,
+		},
+	)
+	if err != nil {
+		return fmt.Errorf("publish: %w", err)
+	}
+
+	// 7. Ждём ответ с таймаутом
+	timeoutCtx, cancel := context.WithTimeout(ctx, c.timeout)
+	defer cancel()
+
+	for {
+		select {
+		case msg := <-msgs:
+			if msg.CorrelationId == corrID {
+				return json.Unmarshal(msg.Body, replyPayload)
+			}
+		case <-timeoutCtx.Done():
+			return fmt.Errorf("rpc timeout: %w", timeoutCtx.Err())
+		}
+	}
+}

modules/backend/types.go

@@ -1,12 +1,11 @@
 package main
 
 type Config struct {
-	Mode     string
-	LogLevel string `toml:"LogLevel" env:"LOG_LEVEL"`
-}
-
-type Item struct {
-	ID          int    `json:"id"`
-	Title       string `json:"title"`
-	Description string `json:"description"`
+	Mode           string
+	ServiceAddress string `toml:"ServiceAddress" env:"SERVICE_ADDRESS"`
+	DdUrl          string `toml:"DbUrl" env:"DATABASE_URL"`
+	JwtPrivateKey  string `toml:"JwtPrivateKey" env:"JWT_PRIVATE_KEY"`
+	LogLevel       string `toml:"LogLevel" env:"LOG_LEVEL"`
+	RmqURL         string `toml:"RabbitMQUrl" env:"RABBITMQ_URL"`
+	AuthEnabled    string `toml:"AuthEnabled" env:"AUTH_ENABLED"`
 }

modules/frontend/package-lock.json

@@ -13,6 +13,7 @@
         "@tailwindcss/vite": "^4.1.17",
         "axios": "^1.12.2",
         "react": "^19.1.1",
+        "react-cookie": "^8.0.1",
         "react-dom": "^19.1.1",
         "react-router-dom": "^7.9.4",
         "tailwindcss": "^4.1.17"
@@ -1868,6 +1869,18 @@
       "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
       "license": "MIT"
     },
+    "node_modules/@types/hoist-non-react-statics": {
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.7.tgz",
+      "integrity": "sha512-PQTyIulDkIDro8P+IHbKCsw7U2xxBYflVzW/FgWdCAePD9xGSidgA76/GeJ6lBKoblyhf9pBY763gbrN+1dI8g==",
+      "license": "MIT",
+      "dependencies": {
+        "hoist-non-react-statics": "^3.3.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*"
+      }
+    },
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
@@ -1890,7 +1903,6 @@
       "version": "19.2.2",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.2.tgz",
       "integrity": "sha512-6mDvHUFSjyT2B2yeNx2nUgMxh9LtOWvkhIU3uePn2I2oyNymUAX1NIsdgviM4CH+JSrp2D2hsMvJOkxY+0wNRA==",
-      "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
@@ -2524,7 +2536,6 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
       "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/debug": {
@@ -3260,6 +3271,15 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/hoist-non-react-statics": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "react-is": "^16.7.0"
+      }
+    },
     "node_modules/ignore": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
@@ -4068,6 +4088,20 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/react-cookie": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/react-cookie/-/react-cookie-8.0.1.tgz",
+      "integrity": "sha512-QNdAd0MLuAiDiLcDU/2s/eyKmmfMHtjPUKJ2dZ/5CcQ9QKUium4B3o61/haq6PQl/YWFqC5PO8GvxeHKhy3GFA==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/hoist-non-react-statics": "^3.3.6",
+        "hoist-non-react-statics": "^3.3.2",
+        "universal-cookie": "^8.0.0"
+      },
+      "peerDependencies": {
+        "react": ">= 16.3.0"
+      }
+    },
     "node_modules/react-dom": {
       "version": "19.2.0",
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.0.tgz",
@@ -4081,6 +4115,12 @@
         "react": "^19.2.0"
       }
     },
+    "node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "license": "MIT"
+    },
     "node_modules/react-refresh": {
       "version": "0.17.0",
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.17.0.tgz",
@@ -4481,6 +4521,15 @@
       "devOptional": true,
       "license": "MIT"
     },
+    "node_modules/universal-cookie": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/universal-cookie/-/universal-cookie-8.0.1.tgz",
+      "integrity": "sha512-B6ks9FLLnP1UbPPcveOidfvB9pHjP+wekP2uRYB9YDfKVpvcjKgy1W5Zj+cEXJ9KTPnqOKGfVDQBmn8/YCQfRg==",
+      "license": "MIT",
+      "dependencies": {
+        "cookie": "^1.0.2"
+      }
+    },
     "node_modules/universalify": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",

modules/frontend/package.json

@@ -15,6 +15,7 @@
     "@tailwindcss/vite": "^4.1.17",
     "axios": "^1.12.2",
     "react": "^19.1.1",
+    "react-cookie": "^8.0.1",
     "react-dom": "^19.1.1",
     "react-router-dom": "^7.9.4",
     "tailwindcss": "^4.1.17"

modules/frontend/src/App.tsx

@@ -1,12 +1,16 @@
 import React from "react";
 import { BrowserRouter as Router, Routes, Route } from "react-router-dom";
-import UsersIdPage from "./pages/UsersIdPage/UsersIdPage";
+import UserPage from "./pages/UserPage/UserPage";
 import TitlesPage from "./pages/TitlesPage/TitlesPage";
+import TitlePage from "./pages/TitlePage/TitlePage";
 import { LoginPage } from "./pages/LoginPage/LoginPage";
 import { Header } from "./components/Header/Header";
 
+// import { OpenAPI } from "./api";
+
+// OpenAPI.WITH_CREDENTIALS = true
+
 const App: React.FC = () => {
-  // Получаем username из localStorage
   const username = localStorage.getItem("username") || undefined;
   const userId = localStorage.getItem("userId");
 
@@ -14,17 +18,22 @@ const App: React.FC = () => {
     <Router>
       <Header username={username} />
       <Routes>
+        {/* auth */}
         <Route path="/login" element={<LoginPage />} />
         <Route path="/signup" element={<LoginPage />} />
-
-        {/* /profile рендерит UsersIdPage с id из localStorage */}
+        {/*<Route path="/signup" element={<LoginPage />} />*/}
+        
+        {/* users */}
+        {/*<Route path="/users" element={<UsersPage />} />*/}
+        <Route path="/users/:id" element={<UserPage />} />
         <Route
           path="/profile"
-          element={userId ? <UsersIdPage userId={userId} /> : <LoginPage />}
+          element={userId ? <UserPage userId={userId} /> : <LoginPage />}
         />
 
-        <Route path="/users/:id" element={<UsersIdPage />} />
+        {/* titles */}
         <Route path="/titles" element={<TitlesPage />} />
+        <Route path="/titles/:id" element={<TitlePage />} />
       </Routes>
     </Router>
   );

modules/frontend/src/api/client.gen.ts

@@ -0,0 +1,16 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { type ClientOptions, type Config, createClient, createConfig } from './client';
+import type { ClientOptions as ClientOptions2 } from './types.gen';
+
+/**
+ * The `createClientConfig()` function will be called on client initialization
+ * and the returned object will become the client's initial configuration.
+ *
+ * You may want to initialize your client this way instead of calling
+ * `setConfig()`. This is useful for example if you're using Next.js
+ * to ensure your client always has the correct values.
+ */
+export type CreateClientConfig<T extends ClientOptions = ClientOptions2> = (override?: Config<ClientOptions & T>) => Config<Required<ClientOptions> & T>;
+
+export const client = createClient(createConfig<ClientOptions2>({ baseUrl: 'http://10.1.0.65:8081/api/v1' }));

modules/frontend/src/api/client/client.gen.ts

@@ -0,0 +1,301 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { createSseClient } from '../core/serverSentEvents.gen';
+import type { HttpMethod } from '../core/types.gen';
+import { getValidRequestBody } from '../core/utils.gen';
+import type {
+  Client,
+  Config,
+  RequestOptions,
+  ResolvedRequestOptions,
+} from './types.gen';
+import {
+  buildUrl,
+  createConfig,
+  createInterceptors,
+  getParseAs,
+  mergeConfigs,
+  mergeHeaders,
+  setAuthParams,
+} from './utils.gen';
+
+type ReqInit = Omit<RequestInit, 'body' | 'headers'> & {
+  body?: any;
+  headers: ReturnType<typeof mergeHeaders>;
+};
+
+export const createClient = (config: Config = {}): Client => {
+  let _config = mergeConfigs(createConfig(), config);
+
+  const getConfig = (): Config => ({ ..._config });
+
+  const setConfig = (config: Config): Config => {
+    _config = mergeConfigs(_config, config);
+    return getConfig();
+  };
+
+  const interceptors = createInterceptors<
+    Request,
+    Response,
+    unknown,
+    ResolvedRequestOptions
+  >();
+
+  const beforeRequest = async (options: RequestOptions) => {
+    const opts = {
+      ..._config,
+      ...options,
+      fetch: options.fetch ?? _config.fetch ?? globalThis.fetch,
+      headers: mergeHeaders(_config.headers, options.headers),
+      serializedBody: undefined,
+    };
+
+    if (opts.security) {
+      await setAuthParams({
+        ...opts,
+        security: opts.security,
+      });
+    }
+
+    if (opts.requestValidator) {
+      await opts.requestValidator(opts);
+    }
+
+    if (opts.body !== undefined && opts.bodySerializer) {
+      opts.serializedBody = opts.bodySerializer(opts.body);
+    }
+
+    // remove Content-Type header if body is empty to avoid sending invalid requests
+    if (opts.body === undefined || opts.serializedBody === '') {
+      opts.headers.delete('Content-Type');
+    }
+
+    const url = buildUrl(opts);
+
+    return { opts, url };
+  };
+
+  const request: Client['request'] = async (options) => {
+    // @ts-expect-error
+    const { opts, url } = await beforeRequest(options);
+    const requestInit: ReqInit = {
+      redirect: 'follow',
+      ...opts,
+      body: getValidRequestBody(opts),
+    };
+
+    let request = new Request(url, requestInit);
+
+    for (const fn of interceptors.request.fns) {
+      if (fn) {
+        request = await fn(request, opts);
+      }
+    }
+
+    // fetch must be assigned here, otherwise it would throw the error:
+    // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
+    const _fetch = opts.fetch!;
+    let response: Response;
+
+    try {
+      response = await _fetch(request);
+    } catch (error) {
+      // Handle fetch exceptions (AbortError, network errors, etc.)
+      let finalError = error;
+
+      for (const fn of interceptors.error.fns) {
+        if (fn) {
+          finalError = (await fn(
+            error,
+            undefined as any,
+            request,
+            opts,
+          )) as unknown;
+        }
+      }
+
+      finalError = finalError || ({} as unknown);
+
+      if (opts.throwOnError) {
+        throw finalError;
+      }
+
+      // Return error response
+      return opts.responseStyle === 'data'
+        ? undefined
+        : {
+            error: finalError,
+            request,
+            response: undefined as any,
+          };
+    }
+
+    for (const fn of interceptors.response.fns) {
+      if (fn) {
+        response = await fn(response, request, opts);
+      }
+    }
+
+    const result = {
+      request,
+      response,
+    };
+
+    if (response.ok) {
+      const parseAs =
+        (opts.parseAs === 'auto'
+          ? getParseAs(response.headers.get('Content-Type'))
+          : opts.parseAs) ?? 'json';
+
+      if (
+        response.status === 204 ||
+        response.headers.get('Content-Length') === '0'
+      ) {
+        let emptyData: any;
+        switch (parseAs) {
+          case 'arrayBuffer':
+          case 'blob':
+          case 'text':
+            emptyData = await response[parseAs]();
+            break;
+          case 'formData':
+            emptyData = new FormData();
+            break;
+          case 'stream':
+            emptyData = response.body;
+            break;
+          case 'json':
+          default:
+            emptyData = {};
+            break;
+        }
+        return opts.responseStyle === 'data'
+          ? emptyData
+          : {
+              data: emptyData,
+              ...result,
+            };
+      }
+
+      let data: any;
+      switch (parseAs) {
+        case 'arrayBuffer':
+        case 'blob':
+        case 'formData':
+        case 'json':
+        case 'text':
+          data = await response[parseAs]();
+          break;
+        case 'stream':
+          return opts.responseStyle === 'data'
+            ? response.body
+            : {
+                data: response.body,
+                ...result,
+              };
+      }
+
+      if (parseAs === 'json') {
+        if (opts.responseValidator) {
+          await opts.responseValidator(data);
+        }
+
+        if (opts.responseTransformer) {
+          data = await opts.responseTransformer(data);
+        }
+      }
+
+      return opts.responseStyle === 'data'
+        ? data
+        : {
+            data,
+            ...result,
+          };
+    }
+
+    const textError = await response.text();
+    let jsonError: unknown;
+
+    try {
+      jsonError = JSON.parse(textError);
+    } catch {
+      // noop
+    }
+
+    const error = jsonError ?? textError;
+    let finalError = error;
+
+    for (const fn of interceptors.error.fns) {
+      if (fn) {
+        finalError = (await fn(error, response, request, opts)) as string;
+      }
+    }
+
+    finalError = finalError || ({} as string);
+
+    if (opts.throwOnError) {
+      throw finalError;
+    }
+
+    // TODO: we probably want to return error and improve types
+    return opts.responseStyle === 'data'
+      ? undefined
+      : {
+          error: finalError,
+          ...result,
+        };
+  };
+
+  const makeMethodFn =
+    (method: Uppercase<HttpMethod>) => (options: RequestOptions) =>
+      request({ ...options, method });
+
+  const makeSseFn =
+    (method: Uppercase<HttpMethod>) => async (options: RequestOptions) => {
+      const { opts, url } = await beforeRequest(options);
+      return createSseClient({
+        ...opts,
+        body: opts.body as BodyInit | null | undefined,
+        headers: opts.headers as unknown as Record<string, string>,
+        method,
+        onRequest: async (url, init) => {
+          let request = new Request(url, init);
+          for (const fn of interceptors.request.fns) {
+            if (fn) {
+              request = await fn(request, opts);
+            }
+          }
+          return request;
+        },
+        url,
+      });
+    };
+
+  return {
+    buildUrl,
+    connect: makeMethodFn('CONNECT'),
+    delete: makeMethodFn('DELETE'),
+    get: makeMethodFn('GET'),
+    getConfig,
+    head: makeMethodFn('HEAD'),
+    interceptors,
+    options: makeMethodFn('OPTIONS'),
+    patch: makeMethodFn('PATCH'),
+    post: makeMethodFn('POST'),
+    put: makeMethodFn('PUT'),
+    request,
+    setConfig,
+    sse: {
+      connect: makeSseFn('CONNECT'),
+      delete: makeSseFn('DELETE'),
+      get: makeSseFn('GET'),
+      head: makeSseFn('HEAD'),
+      options: makeSseFn('OPTIONS'),
+      patch: makeSseFn('PATCH'),
+      post: makeSseFn('POST'),
+      put: makeSseFn('PUT'),
+      trace: makeSseFn('TRACE'),
+    },
+    trace: makeMethodFn('TRACE'),
+  } as Client;
+};

modules/frontend/src/api/client/index.ts

@@ -0,0 +1,25 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type { Auth } from '../core/auth.gen';
+export type { QuerySerializerOptions } from '../core/bodySerializer.gen';
+export {
+  formDataBodySerializer,
+  jsonBodySerializer,
+  urlSearchParamsBodySerializer,
+} from '../core/bodySerializer.gen';
+export { buildClientParams } from '../core/params.gen';
+export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen';
+export { createClient } from './client.gen';
+export type {
+  Client,
+  ClientOptions,
+  Config,
+  CreateClientConfig,
+  Options,
+  RequestOptions,
+  RequestResult,
+  ResolvedRequestOptions,
+  ResponseStyle,
+  TDataShape,
+} from './types.gen';
+export { createConfig, mergeHeaders } from './utils.gen';

modules/frontend/src/api/client/types.gen.ts

@@ -0,0 +1,241 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Auth } from '../core/auth.gen';
+import type {
+  ServerSentEventsOptions,
+  ServerSentEventsResult,
+} from '../core/serverSentEvents.gen';
+import type {
+  Client as CoreClient,
+  Config as CoreConfig,
+} from '../core/types.gen';
+import type { Middleware } from './utils.gen';
+
+export type ResponseStyle = 'data' | 'fields';
+
+export interface Config<T extends ClientOptions = ClientOptions>
+  extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
+    CoreConfig {
+  /**
+   * Base URL for all requests made by this client.
+   */
+  baseUrl?: T['baseUrl'];
+  /**
+   * Fetch API implementation. You can use this option to provide a custom
+   * fetch instance.
+   *
+   * @default globalThis.fetch
+   */
+  fetch?: typeof fetch;
+  /**
+   * Please don't use the Fetch client for Next.js applications. The `next`
+   * options won't have any effect.
+   *
+   * Install {@link https://www.npmjs.com/package/@hey-api/client-next `@hey-api/client-next`} instead.
+   */
+  next?: never;
+  /**
+   * Return the response data parsed in a specified format. By default, `auto`
+   * will infer the appropriate method from the `Content-Type` response header.
+   * You can override this behavior with any of the {@link Body} methods.
+   * Select `stream` if you don't want to parse response data at all.
+   *
+   * @default 'auto'
+   */
+  parseAs?:
+    | 'arrayBuffer'
+    | 'auto'
+    | 'blob'
+    | 'formData'
+    | 'json'
+    | 'stream'
+    | 'text';
+  /**
+   * Should we return only data or multiple fields (data, error, response, etc.)?
+   *
+   * @default 'fields'
+   */
+  responseStyle?: ResponseStyle;
+  /**
+   * Throw an error instead of returning it in the response?
+   *
+   * @default false
+   */
+  throwOnError?: T['throwOnError'];
+}
+
+export interface RequestOptions<
+  TData = unknown,
+  TResponseStyle extends ResponseStyle = 'fields',
+  ThrowOnError extends boolean = boolean,
+  Url extends string = string,
+> extends Config<{
+      responseStyle: TResponseStyle;
+      throwOnError: ThrowOnError;
+    }>,
+    Pick<
+      ServerSentEventsOptions<TData>,
+      | 'onSseError'
+      | 'onSseEvent'
+      | 'sseDefaultRetryDelay'
+      | 'sseMaxRetryAttempts'
+      | 'sseMaxRetryDelay'
+    > {
+  /**
+   * Any body that you want to add to your request.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/fetch#body}
+   */
+  body?: unknown;
+  path?: Record<string, unknown>;
+  query?: Record<string, unknown>;
+  /**
+   * Security mechanism(s) to use for the request.
+   */
+  security?: ReadonlyArray<Auth>;
+  url: Url;
+}
+
+export interface ResolvedRequestOptions<
+  TResponseStyle extends ResponseStyle = 'fields',
+  ThrowOnError extends boolean = boolean,
+  Url extends string = string,
+> extends RequestOptions<unknown, TResponseStyle, ThrowOnError, Url> {
+  serializedBody?: string;
+}
+
+export type RequestResult<
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = boolean,
+  TResponseStyle extends ResponseStyle = 'fields',
+> = ThrowOnError extends true
+  ? Promise<
+      TResponseStyle extends 'data'
+        ? TData extends Record<string, unknown>
+          ? TData[keyof TData]
+          : TData
+        : {
+            data: TData extends Record<string, unknown>
+              ? TData[keyof TData]
+              : TData;
+            request: Request;
+            response: Response;
+          }
+    >
+  : Promise<
+      TResponseStyle extends 'data'
+        ?
+            | (TData extends Record<string, unknown>
+                ? TData[keyof TData]
+                : TData)
+            | undefined
+        : (
+            | {
+                data: TData extends Record<string, unknown>
+                  ? TData[keyof TData]
+                  : TData;
+                error: undefined;
+              }
+            | {
+                data: undefined;
+                error: TError extends Record<string, unknown>
+                  ? TError[keyof TError]
+                  : TError;
+              }
+          ) & {
+            request: Request;
+            response: Response;
+          }
+    >;
+
+export interface ClientOptions {
+  baseUrl?: string;
+  responseStyle?: ResponseStyle;
+  throwOnError?: boolean;
+}
+
+type MethodFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'>,
+) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
+
+type SseFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'>,
+) => Promise<ServerSentEventsResult<TData, TError>>;
+
+type RequestFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'> &
+    Pick<
+      Required<RequestOptions<TData, TResponseStyle, ThrowOnError>>,
+      'method'
+    >,
+) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
+
+type BuildUrlFn = <
+  TData extends {
+    body?: unknown;
+    path?: Record<string, unknown>;
+    query?: Record<string, unknown>;
+    url: string;
+  },
+>(
+  options: TData & Options<TData>,
+) => string;
+
+export type Client = CoreClient<
+  RequestFn,
+  Config,
+  MethodFn,
+  BuildUrlFn,
+  SseFn
+> & {
+  interceptors: Middleware<Request, Response, unknown, ResolvedRequestOptions>;
+};
+
+/**
+ * The `createClientConfig()` function will be called on client initialization
+ * and the returned object will become the client's initial configuration.
+ *
+ * You may want to initialize your client this way instead of calling
+ * `setConfig()`. This is useful for example if you're using Next.js
+ * to ensure your client always has the correct values.
+ */
+export type CreateClientConfig<T extends ClientOptions = ClientOptions> = (
+  override?: Config<ClientOptions & T>,
+) => Config<Required<ClientOptions> & T>;
+
+export interface TDataShape {
+  body?: unknown;
+  headers?: unknown;
+  path?: unknown;
+  query?: unknown;
+  url: string;
+}
+
+type OmitKeys<T, K> = Pick<T, Exclude<keyof T, K>>;
+
+export type Options<
+  TData extends TDataShape = TDataShape,
+  ThrowOnError extends boolean = boolean,
+  TResponse = unknown,
+  TResponseStyle extends ResponseStyle = 'fields',
+> = OmitKeys<
+  RequestOptions<TResponse, TResponseStyle, ThrowOnError>,
+  'body' | 'path' | 'query' | 'url'
+> &
+  ([TData] extends [never] ? unknown : Omit<TData, 'url'>);

modules/frontend/src/api/client/utils.gen.ts

@@ -0,0 +1,332 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { getAuthToken } from '../core/auth.gen';
+import type { QuerySerializerOptions } from '../core/bodySerializer.gen';
+import { jsonBodySerializer } from '../core/bodySerializer.gen';
+import {
+  serializeArrayParam,
+  serializeObjectParam,
+  serializePrimitiveParam,
+} from '../core/pathSerializer.gen';
+import { getUrl } from '../core/utils.gen';
+import type { Client, ClientOptions, Config, RequestOptions } from './types.gen';
+
+export const createQuerySerializer = <T = unknown>({
+  parameters = {},
+  ...args
+}: QuerySerializerOptions = {}) => {
+  const querySerializer = (queryParams: T) => {
+    const search: string[] = [];
+    if (queryParams && typeof queryParams === 'object') {
+      for (const name in queryParams) {
+        const value = queryParams[name];
+
+        if (value === undefined || value === null) {
+          continue;
+        }
+
+        const options = parameters[name] || args;
+
+        if (Array.isArray(value)) {
+          const serializedArray = serializeArrayParam({
+            allowReserved: options.allowReserved,
+            explode: true,
+            name,
+            style: 'form',
+            value,
+            ...options.array,
+          });
+          if (serializedArray) search.push(serializedArray);
+        } else if (typeof value === 'object') {
+          const serializedObject = serializeObjectParam({
+            allowReserved: options.allowReserved,
+            explode: true,
+            name,
+            style: 'deepObject',
+            value: value as Record<string, unknown>,
+            ...options.object,
+          });
+          if (serializedObject) search.push(serializedObject);
+        } else {
+          const serializedPrimitive = serializePrimitiveParam({
+            allowReserved: options.allowReserved,
+            name,
+            value: value as string,
+          });
+          if (serializedPrimitive) search.push(serializedPrimitive);
+        }
+      }
+    }
+    return search.join('&');
+  };
+  return querySerializer;
+};
+
+/**
+ * Infers parseAs value from provided Content-Type header.
+ */
+export const getParseAs = (
+  contentType: string | null,
+): Exclude<Config['parseAs'], 'auto'> => {
+  if (!contentType) {
+    // If no Content-Type header is provided, the best we can do is return the raw response body,
+    // which is effectively the same as the 'stream' option.
+    return 'stream';
+  }
+
+  const cleanContent = contentType.split(';')[0]?.trim();
+
+  if (!cleanContent) {
+    return;
+  }
+
+  if (
+    cleanContent.startsWith('application/json') ||
+    cleanContent.endsWith('+json')
+  ) {
+    return 'json';
+  }
+
+  if (cleanContent === 'multipart/form-data') {
+    return 'formData';
+  }
+
+  if (
+    ['application/', 'audio/', 'image/', 'video/'].some((type) =>
+      cleanContent.startsWith(type),
+    )
+  ) {
+    return 'blob';
+  }
+
+  if (cleanContent.startsWith('text/')) {
+    return 'text';
+  }
+
+  return;
+};
+
+const checkForExistence = (
+  options: Pick<RequestOptions, 'auth' | 'query'> & {
+    headers: Headers;
+  },
+  name?: string,
+): boolean => {
+  if (!name) {
+    return false;
+  }
+  if (
+    options.headers.has(name) ||
+    options.query?.[name] ||
+    options.headers.get('Cookie')?.includes(`${name}=`)
+  ) {
+    return true;
+  }
+  return false;
+};
+
+export const setAuthParams = async ({
+  security,
+  ...options
+}: Pick<Required<RequestOptions>, 'security'> &
+  Pick<RequestOptions, 'auth' | 'query'> & {
+    headers: Headers;
+  }) => {
+  for (const auth of security) {
+    if (checkForExistence(options, auth.name)) {
+      continue;
+    }
+
+    const token = await getAuthToken(auth, options.auth);
+
+    if (!token) {
+      continue;
+    }
+
+    const name = auth.name ?? 'Authorization';
+
+    switch (auth.in) {
+      case 'query':
+        if (!options.query) {
+          options.query = {};
+        }
+        options.query[name] = token;
+        break;
+      case 'cookie':
+        options.headers.append('Cookie', `${name}=${token}`);
+        break;
+      case 'header':
+      default:
+        options.headers.set(name, token);
+        break;
+    }
+  }
+};
+
+export const buildUrl: Client['buildUrl'] = (options) =>
+  getUrl({
+    baseUrl: options.baseUrl as string,
+    path: options.path,
+    query: options.query,
+    querySerializer:
+      typeof options.querySerializer === 'function'
+        ? options.querySerializer
+        : createQuerySerializer(options.querySerializer),
+    url: options.url,
+  });
+
+export const mergeConfigs = (a: Config, b: Config): Config => {
+  const config = { ...a, ...b };
+  if (config.baseUrl?.endsWith('/')) {
+    config.baseUrl = config.baseUrl.substring(0, config.baseUrl.length - 1);
+  }
+  config.headers = mergeHeaders(a.headers, b.headers);
+  return config;
+};
+
+const headersEntries = (headers: Headers): Array<[string, string]> => {
+  const entries: Array<[string, string]> = [];
+  headers.forEach((value, key) => {
+    entries.push([key, value]);
+  });
+  return entries;
+};
+
+export const mergeHeaders = (
+  ...headers: Array<Required<Config>['headers'] | undefined>
+): Headers => {
+  const mergedHeaders = new Headers();
+  for (const header of headers) {
+    if (!header) {
+      continue;
+    }
+
+    const iterator =
+      header instanceof Headers
+        ? headersEntries(header)
+        : Object.entries(header);
+
+    for (const [key, value] of iterator) {
+      if (value === null) {
+        mergedHeaders.delete(key);
+      } else if (Array.isArray(value)) {
+        for (const v of value) {
+          mergedHeaders.append(key, v as string);
+        }
+      } else if (value !== undefined) {
+        // assume object headers are meant to be JSON stringified, i.e. their
+        // content value in OpenAPI specification is 'application/json'
+        mergedHeaders.set(
+          key,
+          typeof value === 'object' ? JSON.stringify(value) : (value as string),
+        );
+      }
+    }
+  }
+  return mergedHeaders;
+};
+
+type ErrInterceptor<Err, Res, Req, Options> = (
+  error: Err,
+  response: Res,
+  request: Req,
+  options: Options,
+) => Err | Promise<Err>;
+
+type ReqInterceptor<Req, Options> = (
+  request: Req,
+  options: Options,
+) => Req | Promise<Req>;
+
+type ResInterceptor<Res, Req, Options> = (
+  response: Res,
+  request: Req,
+  options: Options,
+) => Res | Promise<Res>;
+
+class Interceptors<Interceptor> {
+  fns: Array<Interceptor | null> = [];
+
+  clear(): void {
+    this.fns = [];
+  }
+
+  eject(id: number | Interceptor): void {
+    const index = this.getInterceptorIndex(id);
+    if (this.fns[index]) {
+      this.fns[index] = null;
+    }
+  }
+
+  exists(id: number | Interceptor): boolean {
+    const index = this.getInterceptorIndex(id);
+    return Boolean(this.fns[index]);
+  }
+
+  getInterceptorIndex(id: number | Interceptor): number {
+    if (typeof id === 'number') {
+      return this.fns[id] ? id : -1;
+    }
+    return this.fns.indexOf(id);
+  }
+
+  update(
+    id: number | Interceptor,
+    fn: Interceptor,
+  ): number | Interceptor | false {
+    const index = this.getInterceptorIndex(id);
+    if (this.fns[index]) {
+      this.fns[index] = fn;
+      return id;
+    }
+    return false;
+  }
+
+  use(fn: Interceptor): number {
+    this.fns.push(fn);
+    return this.fns.length - 1;
+  }
+}
+
+export interface Middleware<Req, Res, Err, Options> {
+  error: Interceptors<ErrInterceptor<Err, Res, Req, Options>>;
+  request: Interceptors<ReqInterceptor<Req, Options>>;
+  response: Interceptors<ResInterceptor<Res, Req, Options>>;
+}
+
+export const createInterceptors = <Req, Res, Err, Options>(): Middleware<
+  Req,
+  Res,
+  Err,
+  Options
+> => ({
+  error: new Interceptors<ErrInterceptor<Err, Res, Req, Options>>(),
+  request: new Interceptors<ReqInterceptor<Req, Options>>(),
+  response: new Interceptors<ResInterceptor<Res, Req, Options>>(),
+});
+
+const defaultQuerySerializer = createQuerySerializer({
+  allowReserved: false,
+  array: {
+    explode: true,
+    style: 'form',
+  },
+  object: {
+    explode: true,
+    style: 'deepObject',
+  },
+});
+
+const defaultHeaders = {
+  'Content-Type': 'application/json',
+};
+
+export const createConfig = <T extends ClientOptions = ClientOptions>(
+  override: Config<Omit<ClientOptions, keyof T> & T> = {},
+): Config<Omit<ClientOptions, keyof T> & T> => ({
+  ...jsonBodySerializer,
+  headers: defaultHeaders,
+  parseAs: 'auto',
+  querySerializer: defaultQuerySerializer,
+  ...override,
+});

modules/frontend/src/api/core/ApiError.ts

@@ -1,25 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import type { ApiRequestOptions } from './ApiRequestOptions';
-import type { ApiResult } from './ApiResult';
-
-export class ApiError extends Error {
-    public readonly url: string;
-    public readonly status: number;
-    public readonly statusText: string;
-    public readonly body: any;
-    public readonly request: ApiRequestOptions;
-
-    constructor(request: ApiRequestOptions, response: ApiResult, message: string) {
-        super(message);
-
-        this.name = 'ApiError';
-        this.url = response.url;
-        this.status = response.status;
-        this.statusText = response.statusText;
-        this.body = response.body;
-        this.request = request;
-    }
-}

modules/frontend/src/api/core/ApiRequestOptions.ts

@@ -1,17 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export type ApiRequestOptions = {
-    readonly method: 'GET' | 'PUT' | 'POST' | 'DELETE' | 'OPTIONS' | 'HEAD' | 'PATCH';
-    readonly url: string;
-    readonly path?: Record<string, any>;
-    readonly cookies?: Record<string, any>;
-    readonly headers?: Record<string, any>;
-    readonly query?: Record<string, any>;
-    readonly formData?: Record<string, any>;
-    readonly body?: any;
-    readonly mediaType?: string;
-    readonly responseHeader?: string;
-    readonly errors?: Record<number, string>;
-};

modules/frontend/src/api/core/ApiResult.ts

@@ -1,11 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export type ApiResult = {
-    readonly url: string;
-    readonly ok: boolean;
-    readonly status: number;
-    readonly statusText: string;
-    readonly body: any;
-};

modules/frontend/src/api/core/CancelablePromise.ts

@@ -1,131 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export class CancelError extends Error {
-
-    constructor(message: string) {
-        super(message);
-        this.name = 'CancelError';
-    }
-
-    public get isCancelled(): boolean {
-        return true;
-    }
-}
-
-export interface OnCancel {
-    readonly isResolved: boolean;
-    readonly isRejected: boolean;
-    readonly isCancelled: boolean;
-
-    (cancelHandler: () => void): void;
-}
-
-export class CancelablePromise<T> implements Promise<T> {
-    #isResolved: boolean;
-    #isRejected: boolean;
-    #isCancelled: boolean;
-    readonly #cancelHandlers: (() => void)[];
-    readonly #promise: Promise<T>;
-    #resolve?: (value: T | PromiseLike<T>) => void;
-    #reject?: (reason?: any) => void;
-
-    constructor(
-        executor: (
-            resolve: (value: T | PromiseLike<T>) => void,
-            reject: (reason?: any) => void,
-            onCancel: OnCancel
-        ) => void
-    ) {
-        this.#isResolved = false;
-        this.#isRejected = false;
-        this.#isCancelled = false;
-        this.#cancelHandlers = [];
-        this.#promise = new Promise<T>((resolve, reject) => {
-            this.#resolve = resolve;
-            this.#reject = reject;
-
-            const onResolve = (value: T | PromiseLike<T>): void => {
-                if (this.#isResolved || this.#isRejected || this.#isCancelled) {
-                    return;
-                }
-                this.#isResolved = true;
-                if (this.#resolve) this.#resolve(value);
-            };
-
-            const onReject = (reason?: any): void => {
-                if (this.#isResolved || this.#isRejected || this.#isCancelled) {
-                    return;
-                }
-                this.#isRejected = true;
-                if (this.#reject) this.#reject(reason);
-            };
-
-            const onCancel = (cancelHandler: () => void): void => {
-                if (this.#isResolved || this.#isRejected || this.#isCancelled) {
-                    return;
-                }
-                this.#cancelHandlers.push(cancelHandler);
-            };
-
-            Object.defineProperty(onCancel, 'isResolved', {
-                get: (): boolean => this.#isResolved,
-            });
-
-            Object.defineProperty(onCancel, 'isRejected', {
-                get: (): boolean => this.#isRejected,
-            });
-
-            Object.defineProperty(onCancel, 'isCancelled', {
-                get: (): boolean => this.#isCancelled,
-            });
-
-            return executor(onResolve, onReject, onCancel as OnCancel);
-        });
-    }
-
-    get [Symbol.toStringTag]() {
-        return "Cancellable Promise";
-    }
-
-    public then<TResult1 = T, TResult2 = never>(
-        onFulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | null,
-        onRejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null
-    ): Promise<TResult1 | TResult2> {
-        return this.#promise.then(onFulfilled, onRejected);
-    }
-
-    public catch<TResult = never>(
-        onRejected?: ((reason: any) => TResult | PromiseLike<TResult>) | null
-    ): Promise<T | TResult> {
-        return this.#promise.catch(onRejected);
-    }
-
-    public finally(onFinally?: (() => void) | null): Promise<T> {
-        return this.#promise.finally(onFinally);
-    }
-
-    public cancel(): void {
-        if (this.#isResolved || this.#isRejected || this.#isCancelled) {
-            return;
-        }
-        this.#isCancelled = true;
-        if (this.#cancelHandlers.length) {
-            try {
-                for (const cancelHandler of this.#cancelHandlers) {
-                    cancelHandler();
-                }
-            } catch (error) {
-                console.warn('Cancellation threw an error', error);
-                return;
-            }
-        }
-        this.#cancelHandlers.length = 0;
-        if (this.#reject) this.#reject(new CancelError('Request aborted'));
-    }
-
-    public get isCancelled(): boolean {
-        return this.#isCancelled;
-    }
-}

modules/frontend/src/api/core/OpenAPI.ts

@@ -1,32 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import type { ApiRequestOptions } from './ApiRequestOptions';
-
-type Resolver<T> = (options: ApiRequestOptions) => Promise<T>;
-type Headers = Record<string, string>;
-
-export type OpenAPIConfig = {
-    BASE: string;
-    VERSION: string;
-    WITH_CREDENTIALS: boolean;
-    CREDENTIALS: 'include' | 'omit' | 'same-origin';
-    TOKEN?: string | Resolver<string> | undefined;
-    USERNAME?: string | Resolver<string> | undefined;
-    PASSWORD?: string | Resolver<string> | undefined;
-    HEADERS?: Headers | Resolver<Headers> | undefined;
-    ENCODE_PATH?: ((path: string) => string) | undefined;
-};
-
-export const OpenAPI: OpenAPIConfig = {
-    BASE: '/api/v1',
-    VERSION: '1.0.0',
-    WITH_CREDENTIALS: false,
-    CREDENTIALS: 'include',
-    TOKEN: undefined,
-    USERNAME: undefined,
-    PASSWORD: undefined,
-    HEADERS: undefined,
-    ENCODE_PATH: undefined,
-};

modules/frontend/src/api/core/auth.gen.ts

@@ -0,0 +1,42 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type AuthToken = string | undefined;
+
+export interface Auth {
+  /**
+   * Which part of the request do we use to send the auth?
+   *
+   * @default 'header'
+   */
+  in?: 'header' | 'query' | 'cookie';
+  /**
+   * Header or query parameter name.
+   *
+   * @default 'Authorization'
+   */
+  name?: string;
+  scheme?: 'basic' | 'bearer';
+  type: 'apiKey' | 'http';
+}
+
+export const getAuthToken = async (
+  auth: Auth,
+  callback: ((auth: Auth) => Promise<AuthToken> | AuthToken) | AuthToken,
+): Promise<string | undefined> => {
+  const token =
+    typeof callback === 'function' ? await callback(auth) : callback;
+
+  if (!token) {
+    return;
+  }
+
+  if (auth.scheme === 'bearer') {
+    return `Bearer ${token}`;
+  }
+
+  if (auth.scheme === 'basic') {
+    return `Basic ${btoa(token)}`;
+  }
+
+  return token;
+};

modules/frontend/src/api/core/bodySerializer.gen.ts

@@ -0,0 +1,100 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type {
+  ArrayStyle,
+  ObjectStyle,
+  SerializerOptions,
+} from './pathSerializer.gen';
+
+export type QuerySerializer = (query: Record<string, unknown>) => string;
+
+export type BodySerializer = (body: any) => any;
+
+type QuerySerializerOptionsObject = {
+  allowReserved?: boolean;
+  array?: Partial<SerializerOptions<ArrayStyle>>;
+  object?: Partial<SerializerOptions<ObjectStyle>>;
+};
+
+export type QuerySerializerOptions = QuerySerializerOptionsObject & {
+  /**
+   * Per-parameter serialization overrides. When provided, these settings
+   * override the global array/object settings for specific parameter names.
+   */
+  parameters?: Record<string, QuerySerializerOptionsObject>;
+};
+
+const serializeFormDataPair = (
+  data: FormData,
+  key: string,
+  value: unknown,
+): void => {
+  if (typeof value === 'string' || value instanceof Blob) {
+    data.append(key, value);
+  } else if (value instanceof Date) {
+    data.append(key, value.toISOString());
+  } else {
+    data.append(key, JSON.stringify(value));
+  }
+};
+
+const serializeUrlSearchParamsPair = (
+  data: URLSearchParams,
+  key: string,
+  value: unknown,
+): void => {
+  if (typeof value === 'string') {
+    data.append(key, value);
+  } else {
+    data.append(key, JSON.stringify(value));
+  }
+};
+
+export const formDataBodySerializer = {
+  bodySerializer: <T extends Record<string, any> | Array<Record<string, any>>>(
+    body: T,
+  ): FormData => {
+    const data = new FormData();
+
+    Object.entries(body).forEach(([key, value]) => {
+      if (value === undefined || value === null) {
+        return;
+      }
+      if (Array.isArray(value)) {
+        value.forEach((v) => serializeFormDataPair(data, key, v));
+      } else {
+        serializeFormDataPair(data, key, value);
+      }
+    });
+
+    return data;
+  },
+};
+
+export const jsonBodySerializer = {
+  bodySerializer: <T>(body: T): string =>
+    JSON.stringify(body, (_key, value) =>
+      typeof value === 'bigint' ? value.toString() : value,
+    ),
+};
+
+export const urlSearchParamsBodySerializer = {
+  bodySerializer: <T extends Record<string, any> | Array<Record<string, any>>>(
+    body: T,
+  ): string => {
+    const data = new URLSearchParams();
+
+    Object.entries(body).forEach(([key, value]) => {
+      if (value === undefined || value === null) {
+        return;
+      }
+      if (Array.isArray(value)) {
+        value.forEach((v) => serializeUrlSearchParamsPair(data, key, v));
+      } else {
+        serializeUrlSearchParamsPair(data, key, value);
+      }
+    });
+
+    return data.toString();
+  },
+};

modules/frontend/src/api/core/params.gen.ts

@@ -0,0 +1,176 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+type Slot = 'body' | 'headers' | 'path' | 'query';
+
+export type Field =
+  | {
+      in: Exclude<Slot, 'body'>;
+      /**
+       * Field name. This is the name we want the user to see and use.
+       */
+      key: string;
+      /**
+       * Field mapped name. This is the name we want to use in the request.
+       * If omitted, we use the same value as `key`.
+       */
+      map?: string;
+    }
+  | {
+      in: Extract<Slot, 'body'>;
+      /**
+       * Key isn't required for bodies.
+       */
+      key?: string;
+      map?: string;
+    }
+  | {
+      /**
+       * Field name. This is the name we want the user to see and use.
+       */
+      key: string;
+      /**
+       * Field mapped name. This is the name we want to use in the request.
+       * If `in` is omitted, `map` aliases `key` to the transport layer.
+       */
+      map: Slot;
+    };
+
+export interface Fields {
+  allowExtra?: Partial<Record<Slot, boolean>>;
+  args?: ReadonlyArray<Field>;
+}
+
+export type FieldsConfig = ReadonlyArray<Field | Fields>;
+
+const extraPrefixesMap: Record<string, Slot> = {
+  $body_: 'body',
+  $headers_: 'headers',
+  $path_: 'path',
+  $query_: 'query',
+};
+const extraPrefixes = Object.entries(extraPrefixesMap);
+
+type KeyMap = Map<
+  string,
+  | {
+      in: Slot;
+      map?: string;
+    }
+  | {
+      in?: never;
+      map: Slot;
+    }
+>;
+
+const buildKeyMap = (fields: FieldsConfig, map?: KeyMap): KeyMap => {
+  if (!map) {
+    map = new Map();
+  }
+
+  for (const config of fields) {
+    if ('in' in config) {
+      if (config.key) {
+        map.set(config.key, {
+          in: config.in,
+          map: config.map,
+        });
+      }
+    } else if ('key' in config) {
+      map.set(config.key, {
+        map: config.map,
+      });
+    } else if (config.args) {
+      buildKeyMap(config.args, map);
+    }
+  }
+
+  return map;
+};
+
+interface Params {
+  body: unknown;
+  headers: Record<string, unknown>;
+  path: Record<string, unknown>;
+  query: Record<string, unknown>;
+}
+
+const stripEmptySlots = (params: Params) => {
+  for (const [slot, value] of Object.entries(params)) {
+    if (value && typeof value === 'object' && !Object.keys(value).length) {
+      delete params[slot as Slot];
+    }
+  }
+};
+
+export const buildClientParams = (
+  args: ReadonlyArray<unknown>,
+  fields: FieldsConfig,
+) => {
+  const params: Params = {
+    body: {},
+    headers: {},
+    path: {},
+    query: {},
+  };
+
+  const map = buildKeyMap(fields);
+
+  let config: FieldsConfig[number] | undefined;
+
+  for (const [index, arg] of args.entries()) {
+    if (fields[index]) {
+      config = fields[index];
+    }
+
+    if (!config) {
+      continue;
+    }
+
+    if ('in' in config) {
+      if (config.key) {
+        const field = map.get(config.key)!;
+        const name = field.map || config.key;
+        if (field.in) {
+          (params[field.in] as Record<string, unknown>)[name] = arg;
+        }
+      } else {
+        params.body = arg;
+      }
+    } else {
+      for (const [key, value] of Object.entries(arg ?? {})) {
+        const field = map.get(key);
+
+        if (field) {
+          if (field.in) {
+            const name = field.map || key;
+            (params[field.in] as Record<string, unknown>)[name] = value;
+          } else {
+            params[field.map] = value;
+          }
+        } else {
+          const extra = extraPrefixes.find(([prefix]) =>
+            key.startsWith(prefix),
+          );
+
+          if (extra) {
+            const [prefix, slot] = extra;
+            (params[slot] as Record<string, unknown>)[
+              key.slice(prefix.length)
+            ] = value;
+          } else if ('allowExtra' in config && config.allowExtra) {
+            for (const [slot, allowed] of Object.entries(config.allowExtra)) {
+              if (allowed) {
+                (params[slot as Slot] as Record<string, unknown>)[key] = value;
+                break;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  stripEmptySlots(params);
+
+  return params;
+};

modules/frontend/src/api/core/pathSerializer.gen.ts

@@ -0,0 +1,181 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+interface SerializeOptions<T>
+  extends SerializePrimitiveOptions,
+    SerializerOptions<T> {}
+
+interface SerializePrimitiveOptions {
+  allowReserved?: boolean;
+  name: string;
+}
+
+export interface SerializerOptions<T> {
+  /**
+   * @default true
+   */
+  explode: boolean;
+  style: T;
+}
+
+export type ArrayStyle = 'form' | 'spaceDelimited' | 'pipeDelimited';
+export type ArraySeparatorStyle = ArrayStyle | MatrixStyle;
+type MatrixStyle = 'label' | 'matrix' | 'simple';
+export type ObjectStyle = 'form' | 'deepObject';
+type ObjectSeparatorStyle = ObjectStyle | MatrixStyle;
+
+interface SerializePrimitiveParam extends SerializePrimitiveOptions {
+  value: string;
+}
+
+export const separatorArrayExplode = (style: ArraySeparatorStyle) => {
+  switch (style) {
+    case 'label':
+      return '.';
+    case 'matrix':
+      return ';';
+    case 'simple':
+      return ',';
+    default:
+      return '&';
+  }
+};
+
+export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => {
+  switch (style) {
+    case 'form':
+      return ',';
+    case 'pipeDelimited':
+      return '|';
+    case 'spaceDelimited':
+      return '%20';
+    default:
+      return ',';
+  }
+};
+
+export const separatorObjectExplode = (style: ObjectSeparatorStyle) => {
+  switch (style) {
+    case 'label':
+      return '.';
+    case 'matrix':
+      return ';';
+    case 'simple':
+      return ',';
+    default:
+      return '&';
+  }
+};
+
+export const serializeArrayParam = ({
+  allowReserved,
+  explode,
+  name,
+  style,
+  value,
+}: SerializeOptions<ArraySeparatorStyle> & {
+  value: unknown[];
+}) => {
+  if (!explode) {
+    const joinedValues = (
+      allowReserved ? value : value.map((v) => encodeURIComponent(v as string))
+    ).join(separatorArrayNoExplode(style));
+    switch (style) {
+      case 'label':
+        return `.${joinedValues}`;
+      case 'matrix':
+        return `;${name}=${joinedValues}`;
+      case 'simple':
+        return joinedValues;
+      default:
+        return `${name}=${joinedValues}`;
+    }
+  }
+
+  const separator = separatorArrayExplode(style);
+  const joinedValues = value
+    .map((v) => {
+      if (style === 'label' || style === 'simple') {
+        return allowReserved ? v : encodeURIComponent(v as string);
+      }
+
+      return serializePrimitiveParam({
+        allowReserved,
+        name,
+        value: v as string,
+      });
+    })
+    .join(separator);
+  return style === 'label' || style === 'matrix'
+    ? separator + joinedValues
+    : joinedValues;
+};
+
+export const serializePrimitiveParam = ({
+  allowReserved,
+  name,
+  value,
+}: SerializePrimitiveParam) => {
+  if (value === undefined || value === null) {
+    return '';
+  }
+
+  if (typeof value === 'object') {
+    throw new Error(
+      'Deeply-nested arrays/objects aren’t supported. Provide your own `querySerializer()` to handle these.',
+    );
+  }
+
+  return `${name}=${allowReserved ? value : encodeURIComponent(value)}`;
+};
+
+export const serializeObjectParam = ({
+  allowReserved,
+  explode,
+  name,
+  style,
+  value,
+  valueOnly,
+}: SerializeOptions<ObjectSeparatorStyle> & {
+  value: Record<string, unknown> | Date;
+  valueOnly?: boolean;
+}) => {
+  if (value instanceof Date) {
+    return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`;
+  }
+
+  if (style !== 'deepObject' && !explode) {
+    let values: string[] = [];
+    Object.entries(value).forEach(([key, v]) => {
+      values = [
+        ...values,
+        key,
+        allowReserved ? (v as string) : encodeURIComponent(v as string),
+      ];
+    });
+    const joinedValues = values.join(',');
+    switch (style) {
+      case 'form':
+        return `${name}=${joinedValues}`;
+      case 'label':
+        return `.${joinedValues}`;
+      case 'matrix':
+        return `;${name}=${joinedValues}`;
+      default:
+        return joinedValues;
+    }
+  }
+
+  const separator = separatorObjectExplode(style);
+  const joinedValues = Object.entries(value)
+    .map(([key, v]) =>
+      serializePrimitiveParam({
+        allowReserved,
+        name: style === 'deepObject' ? `${name}[${key}]` : key,
+        value: v as string,
+      }),
+    )
+    .join(separator);
+  return style === 'label' || style === 'matrix'
+    ? separator + joinedValues
+    : joinedValues;
+};

modules/frontend/src/api/core/queryKeySerializer.gen.ts

@@ -0,0 +1,136 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+/**
+ * JSON-friendly union that mirrors what Pinia Colada can hash.
+ */
+export type JsonValue =
+  | null
+  | string
+  | number
+  | boolean
+  | JsonValue[]
+  | { [key: string]: JsonValue };
+
+/**
+ * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes.
+ */
+export const queryKeyJsonReplacer = (_key: string, value: unknown) => {
+  if (
+    value === undefined ||
+    typeof value === 'function' ||
+    typeof value === 'symbol'
+  ) {
+    return undefined;
+  }
+  if (typeof value === 'bigint') {
+    return value.toString();
+  }
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
+  return value;
+};
+
+/**
+ * Safely stringifies a value and parses it back into a JsonValue.
+ */
+export const stringifyToJsonValue = (input: unknown): JsonValue | undefined => {
+  try {
+    const json = JSON.stringify(input, queryKeyJsonReplacer);
+    if (json === undefined) {
+      return undefined;
+    }
+    return JSON.parse(json) as JsonValue;
+  } catch {
+    return undefined;
+  }
+};
+
+/**
+ * Detects plain objects (including objects with a null prototype).
+ */
+const isPlainObject = (value: unknown): value is Record<string, unknown> => {
+  if (value === null || typeof value !== 'object') {
+    return false;
+  }
+  const prototype = Object.getPrototypeOf(value as object);
+  return prototype === Object.prototype || prototype === null;
+};
+
+/**
+ * Turns URLSearchParams into a sorted JSON object for deterministic keys.
+ */
+const serializeSearchParams = (params: URLSearchParams): JsonValue => {
+  const entries = Array.from(params.entries()).sort(([a], [b]) =>
+    a.localeCompare(b),
+  );
+  const result: Record<string, JsonValue> = {};
+
+  for (const [key, value] of entries) {
+    const existing = result[key];
+    if (existing === undefined) {
+      result[key] = value;
+      continue;
+    }
+
+    if (Array.isArray(existing)) {
+      (existing as string[]).push(value);
+    } else {
+      result[key] = [existing, value];
+    }
+  }
+
+  return result;
+};
+
+/**
+ * Normalizes any accepted value into a JSON-friendly shape for query keys.
+ */
+export const serializeQueryKeyValue = (
+  value: unknown,
+): JsonValue | undefined => {
+  if (value === null) {
+    return null;
+  }
+
+  if (
+    typeof value === 'string' ||
+    typeof value === 'number' ||
+    typeof value === 'boolean'
+  ) {
+    return value;
+  }
+
+  if (
+    value === undefined ||
+    typeof value === 'function' ||
+    typeof value === 'symbol'
+  ) {
+    return undefined;
+  }
+
+  if (typeof value === 'bigint') {
+    return value.toString();
+  }
+
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
+
+  if (Array.isArray(value)) {
+    return stringifyToJsonValue(value);
+  }
+
+  if (
+    typeof URLSearchParams !== 'undefined' &&
+    value instanceof URLSearchParams
+  ) {
+    return serializeSearchParams(value);
+  }
+
+  if (isPlainObject(value)) {
+    return stringifyToJsonValue(value);
+  }
+
+  return undefined;
+};

modules/frontend/src/api/core/request.ts

@@ -1,323 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import axios from 'axios';
-import type { AxiosError, AxiosRequestConfig, AxiosResponse, AxiosInstance } from 'axios';
-import FormData from 'form-data';
-
-import { ApiError } from './ApiError';
-import type { ApiRequestOptions } from './ApiRequestOptions';
-import type { ApiResult } from './ApiResult';
-import { CancelablePromise } from './CancelablePromise';
-import type { OnCancel } from './CancelablePromise';
-import type { OpenAPIConfig } from './OpenAPI';
-
-export const isDefined = <T>(value: T | null | undefined): value is Exclude<T, null | undefined> => {
-    return value !== undefined && value !== null;
-};
-
-export const isString = (value: any): value is string => {
-    return typeof value === 'string';
-};
-
-export const isStringWithValue = (value: any): value is string => {
-    return isString(value) && value !== '';
-};
-
-export const isBlob = (value: any): value is Blob => {
-    return (
-        typeof value === 'object' &&
-        typeof value.type === 'string' &&
-        typeof value.stream === 'function' &&
-        typeof value.arrayBuffer === 'function' &&
-        typeof value.constructor === 'function' &&
-        typeof value.constructor.name === 'string' &&
-        /^(Blob|File)$/.test(value.constructor.name) &&
-        /^(Blob|File)$/.test(value[Symbol.toStringTag])
-    );
-};
-
-export const isFormData = (value: any): value is FormData => {
-    return value instanceof FormData;
-};
-
-export const isSuccess = (status: number): boolean => {
-    return status >= 200 && status < 300;
-};
-
-export const base64 = (str: string): string => {
-    try {
-        return btoa(str);
-    } catch (err) {
-        // @ts-ignore
-        return Buffer.from(str).toString('base64');
-    }
-};
-
-export const getQueryString = (params: Record<string, any>): string => {
-    const qs: string[] = [];
-
-    const append = (key: string, value: any) => {
-        qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);
-    };
-
-    const process = (key: string, value: any) => {
-        if (isDefined(value)) {
-            if (Array.isArray(value)) {
-                value.forEach(v => {
-                    process(key, v);
-                });
-            } else if (typeof value === 'object') {
-                Object.entries(value).forEach(([k, v]) => {
-                    process(`${key}[${k}]`, v);
-                });
-            } else {
-                append(key, value);
-            }
-        }
-    };
-
-    Object.entries(params).forEach(([key, value]) => {
-        process(key, value);
-    });
-
-    if (qs.length > 0) {
-        return `?${qs.join('&')}`;
-    }
-
-    return '';
-};
-
-const getUrl = (config: OpenAPIConfig, options: ApiRequestOptions): string => {
-    const encoder = config.ENCODE_PATH || encodeURI;
-
-    const path = options.url
-        .replace('{api-version}', config.VERSION)
-        .replace(/{(.*?)}/g, (substring: string, group: string) => {
-            if (options.path?.hasOwnProperty(group)) {
-                return encoder(String(options.path[group]));
-            }
-            return substring;
-        });
-
-    const url = `${config.BASE}${path}`;
-    if (options.query) {
-        return `${url}${getQueryString(options.query)}`;
-    }
-    return url;
-};
-
-export const getFormData = (options: ApiRequestOptions): FormData | undefined => {
-    if (options.formData) {
-        const formData = new FormData();
-
-        const process = (key: string, value: any) => {
-            if (isString(value) || isBlob(value)) {
-                formData.append(key, value);
-            } else {
-                formData.append(key, JSON.stringify(value));
-            }
-        };
-
-        Object.entries(options.formData)
-            .filter(([_, value]) => isDefined(value))
-            .forEach(([key, value]) => {
-                if (Array.isArray(value)) {
-                    value.forEach(v => process(key, v));
-                } else {
-                    process(key, value);
-                }
-            });
-
-        return formData;
-    }
-    return undefined;
-};
-
-type Resolver<T> = (options: ApiRequestOptions) => Promise<T>;
-
-export const resolve = async <T>(options: ApiRequestOptions, resolver?: T | Resolver<T>): Promise<T | undefined> => {
-    if (typeof resolver === 'function') {
-        return (resolver as Resolver<T>)(options);
-    }
-    return resolver;
-};
-
-export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions, formData?: FormData): Promise<Record<string, string>> => {
-    const [token, username, password, additionalHeaders] = await Promise.all([
-        resolve(options, config.TOKEN),
-        resolve(options, config.USERNAME),
-        resolve(options, config.PASSWORD),
-        resolve(options, config.HEADERS),
-    ]);
-
-    const formHeaders = typeof formData?.getHeaders === 'function' && formData?.getHeaders() || {}
-
-    const headers = Object.entries({
-        Accept: 'application/json',
-        ...additionalHeaders,
-        ...options.headers,
-        ...formHeaders,
-    })
-    .filter(([_, value]) => isDefined(value))
-    .reduce((headers, [key, value]) => ({
-        ...headers,
-        [key]: String(value),
-    }), {} as Record<string, string>);
-
-    if (isStringWithValue(token)) {
-        headers['Authorization'] = `Bearer ${token}`;
-    }
-
-    if (isStringWithValue(username) && isStringWithValue(password)) {
-        const credentials = base64(`${username}:${password}`);
-        headers['Authorization'] = `Basic ${credentials}`;
-    }
-
-    if (options.body !== undefined) {
-        if (options.mediaType) {
-            headers['Content-Type'] = options.mediaType;
-        } else if (isBlob(options.body)) {
-            headers['Content-Type'] = options.body.type || 'application/octet-stream';
-        } else if (isString(options.body)) {
-            headers['Content-Type'] = 'text/plain';
-        } else if (!isFormData(options.body)) {
-            headers['Content-Type'] = 'application/json';
-        }
-    }
-
-    return headers;
-};
-
-export const getRequestBody = (options: ApiRequestOptions): any => {
-    if (options.body) {
-        return options.body;
-    }
-    return undefined;
-};
-
-export const sendRequest = async <T>(
-    config: OpenAPIConfig,
-    options: ApiRequestOptions,
-    url: string,
-    body: any,
-    formData: FormData | undefined,
-    headers: Record<string, string>,
-    onCancel: OnCancel,
-    axiosClient: AxiosInstance
-): Promise<AxiosResponse<T>> => {
-    const source = axios.CancelToken.source();
-
-    const requestConfig: AxiosRequestConfig = {
-        url,
-        headers,
-        data: body ?? formData,
-        method: options.method,
-        withCredentials: config.WITH_CREDENTIALS,
-        withXSRFToken: config.CREDENTIALS === 'include' ? config.WITH_CREDENTIALS : false,
-        cancelToken: source.token,
-    };
-
-    onCancel(() => source.cancel('The user aborted a request.'));
-
-    try {
-        return await axiosClient.request(requestConfig);
-    } catch (error) {
-        const axiosError = error as AxiosError<T>;
-        if (axiosError.response) {
-            return axiosError.response;
-        }
-        throw error;
-    }
-};
-
-export const getResponseHeader = (response: AxiosResponse<any>, responseHeader?: string): string | undefined => {
-    if (responseHeader) {
-        const content = response.headers[responseHeader];
-        if (isString(content)) {
-            return content;
-        }
-    }
-    return undefined;
-};
-
-export const getResponseBody = (response: AxiosResponse<any>): any => {
-    if (response.status !== 204) {
-        return response.data;
-    }
-    return undefined;
-};
-
-export const catchErrorCodes = (options: ApiRequestOptions, result: ApiResult): void => {
-    const errors: Record<number, string> = {
-        400: 'Bad Request',
-        401: 'Unauthorized',
-        403: 'Forbidden',
-        404: 'Not Found',
-        500: 'Internal Server Error',
-        502: 'Bad Gateway',
-        503: 'Service Unavailable',
-        ...options.errors,
-    }
-
-    const error = errors[result.status];
-    if (error) {
-        throw new ApiError(options, result, error);
-    }
-
-    if (!result.ok) {
-        const errorStatus = result.status ?? 'unknown';
-        const errorStatusText = result.statusText ?? 'unknown';
-        const errorBody = (() => {
-            try {
-                return JSON.stringify(result.body, null, 2);
-            } catch (e) {
-                return undefined;
-            }
-        })();
-
-        throw new ApiError(options, result,
-            `Generic Error: status: ${errorStatus}; status text: ${errorStatusText}; body: ${errorBody}`
-        );
-    }
-};
-
-/**
- * Request method
- * @param config The OpenAPI configuration object
- * @param options The request options from the service
- * @param axiosClient The axios client instance to use
- * @returns CancelablePromise<T>
- * @throws ApiError
- */
-export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions, axiosClient: AxiosInstance = axios): CancelablePromise<T> => {
-    return new CancelablePromise(async (resolve, reject, onCancel) => {
-        try {
-            const url = getUrl(config, options);
-            const formData = getFormData(options);
-            const body = getRequestBody(options);
-            const headers = await getHeaders(config, options, formData);
-
-            if (!onCancel.isCancelled) {
-                const response = await sendRequest<T>(config, options, url, body, formData, headers, onCancel, axiosClient);
-                const responseBody = getResponseBody(response);
-                const responseHeader = getResponseHeader(response, options.responseHeader);
-
-                const result: ApiResult = {
-                    url,
-                    ok: isSuccess(response.status),
-                    status: response.status,
-                    statusText: response.statusText,
-                    body: responseHeader ?? responseBody,
-                };
-
-                catchErrorCodes(options, result);
-
-                resolve(result.body);
-            }
-        } catch (error) {
-            reject(error);
-        }
-    });
-};

modules/frontend/src/api/core/serverSentEvents.gen.ts

@@ -0,0 +1,264 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Config } from './types.gen';
+
+export type ServerSentEventsOptions<TData = unknown> = Omit<
+  RequestInit,
+  'method'
+> &
+  Pick<Config, 'method' | 'responseTransformer' | 'responseValidator'> & {
+    /**
+     * Fetch API implementation. You can use this option to provide a custom
+     * fetch instance.
+     *
+     * @default globalThis.fetch
+     */
+    fetch?: typeof fetch;
+    /**
+     * Implementing clients can call request interceptors inside this hook.
+     */
+    onRequest?: (url: string, init: RequestInit) => Promise<Request>;
+    /**
+     * Callback invoked when a network or parsing error occurs during streaming.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @param error The error that occurred.
+     */
+    onSseError?: (error: unknown) => void;
+    /**
+     * Callback invoked when an event is streamed from the server.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @param event Event streamed from the server.
+     * @returns Nothing (void).
+     */
+    onSseEvent?: (event: StreamEvent<TData>) => void;
+    serializedBody?: RequestInit['body'];
+    /**
+     * Default retry delay in milliseconds.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @default 3000
+     */
+    sseDefaultRetryDelay?: number;
+    /**
+     * Maximum number of retry attempts before giving up.
+     */
+    sseMaxRetryAttempts?: number;
+    /**
+     * Maximum retry delay in milliseconds.
+     *
+     * Applies only when exponential backoff is used.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @default 30000
+     */
+    sseMaxRetryDelay?: number;
+    /**
+     * Optional sleep function for retry backoff.
+     *
+     * Defaults to using `setTimeout`.
+     */
+    sseSleepFn?: (ms: number) => Promise<void>;
+    url: string;
+  };
+
+export interface StreamEvent<TData = unknown> {
+  data: TData;
+  event?: string;
+  id?: string;
+  retry?: number;
+}
+
+export type ServerSentEventsResult<
+  TData = unknown,
+  TReturn = void,
+  TNext = unknown,
+> = {
+  stream: AsyncGenerator<
+    TData extends Record<string, unknown> ? TData[keyof TData] : TData,
+    TReturn,
+    TNext
+  >;
+};
+
+export const createSseClient = <TData = unknown>({
+  onRequest,
+  onSseError,
+  onSseEvent,
+  responseTransformer,
+  responseValidator,
+  sseDefaultRetryDelay,
+  sseMaxRetryAttempts,
+  sseMaxRetryDelay,
+  sseSleepFn,
+  url,
+  ...options
+}: ServerSentEventsOptions): ServerSentEventsResult<TData> => {
+  let lastEventId: string | undefined;
+
+  const sleep =
+    sseSleepFn ??
+    ((ms: number) => new Promise((resolve) => setTimeout(resolve, ms)));
+
+  const createStream = async function* () {
+    let retryDelay: number = sseDefaultRetryDelay ?? 3000;
+    let attempt = 0;
+    const signal = options.signal ?? new AbortController().signal;
+
+    while (true) {
+      if (signal.aborted) break;
+
+      attempt++;
+
+      const headers =
+        options.headers instanceof Headers
+          ? options.headers
+          : new Headers(options.headers as Record<string, string> | undefined);
+
+      if (lastEventId !== undefined) {
+        headers.set('Last-Event-ID', lastEventId);
+      }
+
+      try {
+        const requestInit: RequestInit = {
+          redirect: 'follow',
+          ...options,
+          body: options.serializedBody,
+          headers,
+          signal,
+        };
+        let request = new Request(url, requestInit);
+        if (onRequest) {
+          request = await onRequest(url, requestInit);
+        }
+        // fetch must be assigned here, otherwise it would throw the error:
+        // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
+        const _fetch = options.fetch ?? globalThis.fetch;
+        const response = await _fetch(request);
+
+        if (!response.ok)
+          throw new Error(
+            `SSE failed: ${response.status} ${response.statusText}`,
+          );
+
+        if (!response.body) throw new Error('No body in SSE response');
+
+        const reader = response.body
+          .pipeThrough(new TextDecoderStream())
+          .getReader();
+
+        let buffer = '';
+
+        const abortHandler = () => {
+          try {
+            reader.cancel();
+          } catch {
+            // noop
+          }
+        };
+
+        signal.addEventListener('abort', abortHandler);
+
+        try {
+          while (true) {
+            const { done, value } = await reader.read();
+            if (done) break;
+            buffer += value;
+
+            const chunks = buffer.split('\n\n');
+            buffer = chunks.pop() ?? '';
+
+            for (const chunk of chunks) {
+              const lines = chunk.split('\n');
+              const dataLines: Array<string> = [];
+              let eventName: string | undefined;
+
+              for (const line of lines) {
+                if (line.startsWith('data:')) {
+                  dataLines.push(line.replace(/^data:\s*/, ''));
+                } else if (line.startsWith('event:')) {
+                  eventName = line.replace(/^event:\s*/, '');
+                } else if (line.startsWith('id:')) {
+                  lastEventId = line.replace(/^id:\s*/, '');
+                } else if (line.startsWith('retry:')) {
+                  const parsed = Number.parseInt(
+                    line.replace(/^retry:\s*/, ''),
+                    10,
+                  );
+                  if (!Number.isNaN(parsed)) {
+                    retryDelay = parsed;
+                  }
+                }
+              }
+
+              let data: unknown;
+              let parsedJson = false;
+
+              if (dataLines.length) {
+                const rawData = dataLines.join('\n');
+                try {
+                  data = JSON.parse(rawData);
+                  parsedJson = true;
+                } catch {
+                  data = rawData;
+                }
+              }
+
+              if (parsedJson) {
+                if (responseValidator) {
+                  await responseValidator(data);
+                }
+
+                if (responseTransformer) {
+                  data = await responseTransformer(data);
+                }
+              }
+
+              onSseEvent?.({
+                data,
+                event: eventName,
+                id: lastEventId,
+                retry: retryDelay,
+              });
+
+              if (dataLines.length) {
+                yield data as any;
+              }
+            }
+          }
+        } finally {
+          signal.removeEventListener('abort', abortHandler);
+          reader.releaseLock();
+        }
+
+        break; // exit loop on normal completion
+      } catch (error) {
+        // connection failed or aborted; retry after delay
+        onSseError?.(error);
+
+        if (
+          sseMaxRetryAttempts !== undefined &&
+          attempt >= sseMaxRetryAttempts
+        ) {
+          break; // stop after firing error
+        }
+
+        // exponential backoff: double retry each attempt, cap at 30s
+        const backoff = Math.min(
+          retryDelay * 2 ** (attempt - 1),
+          sseMaxRetryDelay ?? 30000,
+        );
+        await sleep(backoff);
+      }
+    }
+  };
+
+  const stream = createStream();
+
+  return { stream };
+};

modules/frontend/src/api/core/types.gen.ts

@@ -0,0 +1,118 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Auth, AuthToken } from './auth.gen';
+import type {
+  BodySerializer,
+  QuerySerializer,
+  QuerySerializerOptions,
+} from './bodySerializer.gen';
+
+export type HttpMethod =
+  | 'connect'
+  | 'delete'
+  | 'get'
+  | 'head'
+  | 'options'
+  | 'patch'
+  | 'post'
+  | 'put'
+  | 'trace';
+
+export type Client<
+  RequestFn = never,
+  Config = unknown,
+  MethodFn = never,
+  BuildUrlFn = never,
+  SseFn = never,
+> = {
+  /**
+   * Returns the final request URL.
+   */
+  buildUrl: BuildUrlFn;
+  getConfig: () => Config;
+  request: RequestFn;
+  setConfig: (config: Config) => Config;
+} & {
+  [K in HttpMethod]: MethodFn;
+} & ([SseFn] extends [never]
+    ? { sse?: never }
+    : { sse: { [K in HttpMethod]: SseFn } });
+
+export interface Config {
+  /**
+   * Auth token or a function returning auth token. The resolved value will be
+   * added to the request payload as defined by its `security` array.
+   */
+  auth?: ((auth: Auth) => Promise<AuthToken> | AuthToken) | AuthToken;
+  /**
+   * A function for serializing request body parameter. By default,
+   * {@link JSON.stringify()} will be used.
+   */
+  bodySerializer?: BodySerializer | null;
+  /**
+   * An object containing any HTTP headers that you want to pre-populate your
+   * `Headers` object with.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/Headers/Headers#init See more}
+   */
+  headers?:
+    | RequestInit['headers']
+    | Record<
+        string,
+        | string
+        | number
+        | boolean
+        | (string | number | boolean)[]
+        | null
+        | undefined
+        | unknown
+      >;
+  /**
+   * The request method.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/fetch#method See more}
+   */
+  method?: Uppercase<HttpMethod>;
+  /**
+   * A function for serializing request query parameters. By default, arrays
+   * will be exploded in form style, objects will be exploded in deepObject
+   * style, and reserved characters are percent-encoded.
+   *
+   * This method will have no effect if the native `paramsSerializer()` Axios
+   * API function is used.
+   *
+   * {@link https://swagger.io/docs/specification/serialization/#query View examples}
+   */
+  querySerializer?: QuerySerializer | QuerySerializerOptions;
+  /**
+   * A function validating request data. This is useful if you want to ensure
+   * the request conforms to the desired shape, so it can be safely sent to
+   * the server.
+   */
+  requestValidator?: (data: unknown) => Promise<unknown>;
+  /**
+   * A function transforming response data before it's returned. This is useful
+   * for post-processing data, e.g. converting ISO strings into Date objects.
+   */
+  responseTransformer?: (data: unknown) => Promise<unknown>;
+  /**
+   * A function validating response data. This is useful if you want to ensure
+   * the response conforms to the desired shape, so it can be safely passed to
+   * the transformers and returned to the user.
+   */
+  responseValidator?: (data: unknown) => Promise<unknown>;
+}
+
+type IsExactlyNeverOrNeverUndefined<T> = [T] extends [never]
+  ? true
+  : [T] extends [never | undefined]
+    ? [undefined] extends [T]
+      ? false
+      : true
+    : false;
+
+export type OmitNever<T extends Record<string, unknown>> = {
+  [K in keyof T as IsExactlyNeverOrNeverUndefined<T[K]> extends true
+    ? never
+    : K]: T[K];
+};

modules/frontend/src/api/core/utils.gen.ts

@@ -0,0 +1,143 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { BodySerializer, QuerySerializer } from './bodySerializer.gen';
+import {
+  type ArraySeparatorStyle,
+  serializeArrayParam,
+  serializeObjectParam,
+  serializePrimitiveParam,
+} from './pathSerializer.gen';
+
+export interface PathSerializer {
+  path: Record<string, unknown>;
+  url: string;
+}
+
+export const PATH_PARAM_RE = /\{[^{}]+\}/g;
+
+export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => {
+  let url = _url;
+  const matches = _url.match(PATH_PARAM_RE);
+  if (matches) {
+    for (const match of matches) {
+      let explode = false;
+      let name = match.substring(1, match.length - 1);
+      let style: ArraySeparatorStyle = 'simple';
+
+      if (name.endsWith('*')) {
+        explode = true;
+        name = name.substring(0, name.length - 1);
+      }
+
+      if (name.startsWith('.')) {
+        name = name.substring(1);
+        style = 'label';
+      } else if (name.startsWith(';')) {
+        name = name.substring(1);
+        style = 'matrix';
+      }
+
+      const value = path[name];
+
+      if (value === undefined || value === null) {
+        continue;
+      }
+
+      if (Array.isArray(value)) {
+        url = url.replace(
+          match,
+          serializeArrayParam({ explode, name, style, value }),
+        );
+        continue;
+      }
+
+      if (typeof value === 'object') {
+        url = url.replace(
+          match,
+          serializeObjectParam({
+            explode,
+            name,
+            style,
+            value: value as Record<string, unknown>,
+            valueOnly: true,
+          }),
+        );
+        continue;
+      }
+
+      if (style === 'matrix') {
+        url = url.replace(
+          match,
+          `;${serializePrimitiveParam({
+            name,
+            value: value as string,
+          })}`,
+        );
+        continue;
+      }
+
+      const replaceValue = encodeURIComponent(
+        style === 'label' ? `.${value as string}` : (value as string),
+      );
+      url = url.replace(match, replaceValue);
+    }
+  }
+  return url;
+};
+
+export const getUrl = ({
+  baseUrl,
+  path,
+  query,
+  querySerializer,
+  url: _url,
+}: {
+  baseUrl?: string;
+  path?: Record<string, unknown>;
+  query?: Record<string, unknown>;
+  querySerializer: QuerySerializer;
+  url: string;
+}) => {
+  const pathUrl = _url.startsWith('/') ? _url : `/${_url}`;
+  let url = (baseUrl ?? '') + pathUrl;
+  if (path) {
+    url = defaultPathSerializer({ path, url });
+  }
+  let search = query ? querySerializer(query) : '';
+  if (search.startsWith('?')) {
+    search = search.substring(1);
+  }
+  if (search) {
+    url += `?${search}`;
+  }
+  return url;
+};
+
+export function getValidRequestBody(options: {
+  body?: unknown;
+  bodySerializer?: BodySerializer | null;
+  serializedBody?: unknown;
+}) {
+  const hasBody = options.body !== undefined;
+  const isSerializedBody = hasBody && options.bodySerializer;
+
+  if (isSerializedBody) {
+    if ('serializedBody' in options) {
+      const hasSerializedBody =
+        options.serializedBody !== undefined && options.serializedBody !== '';
+
+      return hasSerializedBody ? options.serializedBody : null;
+    }
+
+    // not all clients implement a serializedBody property (i.e. client-axios)
+    return options.body !== '' ? options.body : null;
+  }
+
+  // plain/text body
+  if (hasBody) {
+    return options.body;
+  }
+
+  // no body was provided
+  return undefined;
+}

modules/frontend/src/api/index.ts

@@ -1,26 +1,4 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export { ApiError } from './core/ApiError';
-export { CancelablePromise, CancelError } from './core/CancelablePromise';
-export { OpenAPI } from './core/OpenAPI';
-export type { OpenAPIConfig } from './core/OpenAPI';
+// This file is auto-generated by @hey-api/openapi-ts
 
-export type { cursor } from './models/cursor';
-export type { CursorObj } from './models/CursorObj';
-export type { Image } from './models/Image';
-export type { ReleaseSeason } from './models/ReleaseSeason';
-export type { Review } from './models/Review';
-export type { Studio } from './models/Studio';
-export type { Tag } from './models/Tag';
-export type { Tags } from './models/Tags';
-export type { Title } from './models/Title';
-export type { title_sort } from './models/title_sort';
-export type { TitleSort } from './models/TitleSort';
-export type { TitleStatus } from './models/TitleStatus';
-export type { User } from './models/User';
-export type { UserTitle } from './models/UserTitle';
-export type { UserTitleStatus } from './models/UserTitleStatus';
-
-export { DefaultService } from './services/DefaultService';
+export type * from './types.gen';
+export * from './sdk.gen';

modules/frontend/src/api/models/CursorObj.ts

@@ -1,9 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export type CursorObj = {
-    id: number;
-    param?: string;
-};
-

modules/frontend/src/api/models/Image.ts

@@ -1,13 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export type Image = {
-    id?: number;
-    /**
-     * Image storage type
-     */
-    storage_type?: 's3' | 'local';
-    image_path?: string;
-};
-

modules/frontend/src/api/models/ReleaseSeason.ts

@@ -1,8 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Title release season
- */
-export type ReleaseSeason = 'winter' | 'spring' | 'summer' | 'fall';

modules/frontend/src/api/models/Review.ts

@@ -1,5 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export type Review = Record<string, any>;

modules/frontend/src/api/models/Studio.ts

@@ -1,12 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import type { Image } from './Image';
-export type Studio = {
-    id: number;
-    name: string;
-    poster?: Image;
-    description?: string;
-};
-

modules/frontend/src/api/models/Tag.ts

@@ -1,8 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-/**
- * A localized tag: keys are language codes (ISO 639-1), values are tag names
- */
-export type Tag = Record<string, string>;

modules/frontend/src/api/models/Tags.ts

@@ -1,9 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import type { Tag } from './Tag';
-/**
- * Array of localized tags
- */
-export type Tags = Array<Tag>;

modules/frontend/src/api/models/Title.ts

@@ -1,5 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export type Title = Record<string, any>;

modules/frontend/src/api/models/TitleSort.ts

@@ -1,8 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Title sort order
- */
-export type TitleSort = 'id' | 'year' | 'rating' | 'views';

modules/frontend/src/api/models/TitleStatus.ts

@@ -1,8 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Title status
- */
-export type TitleStatus = 'finished' | 'ongoing' | 'planned';

modules/frontend/src/api/models/User.ts

@@ -1,33 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import type { Image } from './Image';
-export type User = {
-    /**
-     * Unique user ID (primary key)
-     */
-    id?: number;
-    image?: Image;
-    /**
-     * User email
-     */
-    mail?: string;
-    /**
-     * Username (alphanumeric + _ or -)
-     */
-    nickname: string;
-    /**
-     * Display name
-     */
-    disp_name?: string;
-    /**
-     * User description
-     */
-    user_desc?: string;
-    /**
-     * Timestamp when the user was created
-     */
-    creation_date?: string;
-};
-

modules/frontend/src/api/models/UserTitle.ts

@@ -1,15 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import type { Title } from './Title';
-import type { UserTitleStatus } from './UserTitleStatus';
-export type UserTitle = {
-    user_id: number;
-    title?: Title;
-    status: UserTitleStatus;
-    rate?: number;
-    review_id?: number;
-    ctime?: string;
-};
-

modules/frontend/src/api/models/UserTitleStatus.ts

@@ -1,8 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-/**
- * User's title status
- */
-export type UserTitleStatus = 'finished' | 'planned' | 'dropped' | 'in-progress';

modules/frontend/src/api/models/cursor.ts

@@ -1,5 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export type cursor = string;

modules/frontend/src/api/models/title_sort.ts

@@ -1,6 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import type { TitleSort } from './TitleSort';
-export type title_sort = TitleSort;

modules/frontend/src/api/sdk.gen.ts

@@ -0,0 +1,110 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Client, Options as Options2, TDataShape } from './client';
+import { client } from './client.gen';
+import type { AddUserTitleData, AddUserTitleErrors, AddUserTitleResponses, DeleteUserTitleData, DeleteUserTitleErrors, DeleteUserTitleResponses, GetTitleData, GetTitleErrors, GetTitleResponses, GetTitlesData, GetTitlesErrors, GetTitlesResponses, GetUsersIdData, GetUsersIdErrors, GetUsersIdResponses, GetUserTitleData, GetUserTitleErrors, GetUserTitleResponses, GetUserTitlesData, GetUserTitlesErrors, GetUserTitlesResponses, UpdateUserData, UpdateUserErrors, UpdateUserResponses, UpdateUserTitleData, UpdateUserTitleErrors, UpdateUserTitleResponses } from './types.gen';
+
+export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<TData, ThrowOnError> & {
+    /**
+     * You can provide a client instance returned by `createClient()` instead of
+     * individual options. This might be also useful if you want to implement a
+     * custom client.
+     */
+    client?: Client;
+    /**
+     * You can pass arbitrary values through the `meta` object. This can be
+     * used to access values that aren't defined as part of the SDK function.
+     */
+    meta?: Record<string, unknown>;
+};
+
+/**
+ * Get titles
+ */
+export const getTitles = <ThrowOnError extends boolean = false>(options?: Options<GetTitlesData, ThrowOnError>) => (options?.client ?? client).get<GetTitlesResponses, GetTitlesErrors, ThrowOnError>({
+    querySerializer: { parameters: { status: { array: { explode: false } } } },
+    url: '/titles',
+    ...options
+});
+
+/**
+ * Get title description
+ */
+export const getTitle = <ThrowOnError extends boolean = false>(options: Options<GetTitleData, ThrowOnError>) => (options.client ?? client).get<GetTitleResponses, GetTitleErrors, ThrowOnError>({ url: '/titles/{title_id}', ...options });
+
+/**
+ * Get user info
+ */
+export const getUsersId = <ThrowOnError extends boolean = false>(options: Options<GetUsersIdData, ThrowOnError>) => (options.client ?? client).get<GetUsersIdResponses, GetUsersIdErrors, ThrowOnError>({ url: '/users/{user_id}', ...options });
+
+/**
+ * Partially update a user account
+ *
+ * Update selected user profile fields (excluding password).
+ * Password updates must be done via the dedicated auth-service (`/auth/`).
+ * Fields not provided in the request body remain unchanged.
+ *
+ */
+export const updateUser = <ThrowOnError extends boolean = false>(options: Options<UpdateUserData, ThrowOnError>) => (options.client ?? client).patch<UpdateUserResponses, UpdateUserErrors, ThrowOnError>({
+    security: [{ name: 'X-XSRF-TOKEN', type: 'apiKey' }],
+    url: '/users/{user_id}',
+    ...options,
+    headers: {
+        'Content-Type': 'application/json',
+        ...options.headers
+    }
+});
+
+/**
+ * Get user titles
+ */
+export const getUserTitles = <ThrowOnError extends boolean = false>(options: Options<GetUserTitlesData, ThrowOnError>) => (options.client ?? client).get<GetUserTitlesResponses, GetUserTitlesErrors, ThrowOnError>({
+    querySerializer: { parameters: { status: { array: { explode: false } }, watch_status: { array: { explode: false } } } },
+    url: '/users/{user_id}/titles',
+    ...options
+});
+
+/**
+ * Add a title to a user
+ *
+ * User adding title to list af watched, status required
+ */
+export const addUserTitle = <ThrowOnError extends boolean = false>(options: Options<AddUserTitleData, ThrowOnError>) => (options.client ?? client).post<AddUserTitleResponses, AddUserTitleErrors, ThrowOnError>({
+    url: '/users/{user_id}/titles',
+    ...options,
+    headers: {
+        'Content-Type': 'application/json',
+        ...options.headers
+    }
+});
+
+/**
+ * Delete a usertitle
+ *
+ * User deleting title from list of watched
+ */
+export const deleteUserTitle = <ThrowOnError extends boolean = false>(options: Options<DeleteUserTitleData, ThrowOnError>) => (options.client ?? client).delete<DeleteUserTitleResponses, DeleteUserTitleErrors, ThrowOnError>({
+    security: [{ name: 'X-XSRF-TOKEN', type: 'apiKey' }],
+    url: '/users/{user_id}/titles/{title_id}',
+    ...options
+});
+
+/**
+ * Get user title
+ */
+export const getUserTitle = <ThrowOnError extends boolean = false>(options: Options<GetUserTitleData, ThrowOnError>) => (options.client ?? client).get<GetUserTitleResponses, GetUserTitleErrors, ThrowOnError>({ url: '/users/{user_id}/titles/{title_id}', ...options });
+
+/**
+ * Update a usertitle
+ *
+ * User updating title list of watched
+ */
+export const updateUserTitle = <ThrowOnError extends boolean = false>(options: Options<UpdateUserTitleData, ThrowOnError>) => (options.client ?? client).patch<UpdateUserTitleResponses, UpdateUserTitleErrors, ThrowOnError>({
+    security: [{ name: 'X-XSRF-TOKEN', type: 'apiKey' }],
+    url: '/users/{user_id}/titles/{title_id}',
+    ...options,
+    headers: {
+        'Content-Type': 'application/json',
+        ...options.headers
+    }
+});

modules/frontend/src/api/services/DefaultService.ts

@@ -1,285 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import type { CursorObj } from '../models/CursorObj';
-import type { ReleaseSeason } from '../models/ReleaseSeason';
-import type { Title } from '../models/Title';
-import type { TitleSort } from '../models/TitleSort';
-import type { TitleStatus } from '../models/TitleStatus';
-import type { User } from '../models/User';
-import type { UserTitle } from '../models/UserTitle';
-import type { UserTitleStatus } from '../models/UserTitleStatus';
-import type { CancelablePromise } from '../core/CancelablePromise';
-import { OpenAPI } from '../core/OpenAPI';
-import { request as __request } from '../core/request';
-export class DefaultService {
-    /**
-     * Get titles
-     * @param cursor
-     * @param sort
-     * @param sortForward
-     * @param word
-     * @param status List of title statuses to filter
-     * @param rating
-     * @param releaseYear
-     * @param releaseSeason
-     * @param limit
-     * @param offset
-     * @param fields
-     * @returns any List of titles with cursor
-     * @throws ApiError
-     */
-    public static getTitles(
-        cursor?: string,
-        sort?: TitleSort,
-        sortForward: boolean = true,
-        word?: string,
-        status?: Array<TitleStatus>,
-        rating?: number,
-        releaseYear?: number,
-        releaseSeason?: ReleaseSeason,
-        limit: number = 10,
-        offset?: number,
-        fields: string = 'all',
-    ): CancelablePromise<{
-        /**
-         * List of titles
-         */
-        data: Array<Title>;
-        cursor: CursorObj;
-    }> {
-        return __request(OpenAPI, {
-            method: 'GET',
-            url: '/titles',
-            query: {
-                'cursor': cursor,
-                'sort': sort,
-                'sort_forward': sortForward,
-                'word': word,
-                'status': status,
-                'rating': rating,
-                'release_year': releaseYear,
-                'release_season': releaseSeason,
-                'limit': limit,
-                'offset': offset,
-                'fields': fields,
-            },
-            errors: {
-                400: `Request params are not correct`,
-                500: `Unknown server error`,
-            },
-        });
-    }
-    /**
-     * Get title description
-     * @param titleId
-     * @param fields
-     * @returns Title Title description
-     * @throws ApiError
-     */
-    public static getTitles1(
-        titleId: number,
-        fields: string = 'all',
-    ): CancelablePromise<Title> {
-        return __request(OpenAPI, {
-            method: 'GET',
-            url: '/titles/{title_id}',
-            path: {
-                'title_id': titleId,
-            },
-            query: {
-                'fields': fields,
-            },
-            errors: {
-                400: `Request params are not correct`,
-                404: `Title not found`,
-                500: `Unknown server error`,
-            },
-        });
-    }
-    /**
-     * Get user info
-     * @param userId
-     * @param fields
-     * @returns User User info
-     * @throws ApiError
-     */
-    public static getUsers(
-        userId: string,
-        fields: string = 'all',
-    ): CancelablePromise<User> {
-        return __request(OpenAPI, {
-            method: 'GET',
-            url: '/users/{user_id}',
-            path: {
-                'user_id': userId,
-            },
-            query: {
-                'fields': fields,
-            },
-            errors: {
-                400: `Request params are not correct`,
-                404: `User not found`,
-                500: `Unknown server error`,
-            },
-        });
-    }
-    /**
-     * Partially update a user account
-     * Update selected user profile fields (excluding password).
-     * Password updates must be done via the dedicated auth-service (`/auth/`).
-     * Fields not provided in the request body remain unchanged.
-     *
-     * @param userId User ID (primary key)
-     * @param requestBody
-     * @returns User User updated successfully. Returns updated user representation (excluding sensitive fields).
-     * @throws ApiError
-     */
-    public static updateUser(
-        userId: number,
-        requestBody: {
-            /**
-             * ID of the user avatar (references `images.id`); set to `null` to remove avatar
-             */
-            avatar_id?: number | null;
-            /**
-             * User email (must be unique and valid)
-             */
-            mail?: string;
-            /**
-             * Username (alphanumeric + `_` or `-`, 3–16 chars)
-             */
-            nickname?: string;
-            /**
-             * Display name
-             */
-            disp_name?: string;
-            /**
-             * User description / bio
-             */
-            user_desc?: string;
-        },
-    ): CancelablePromise<User> {
-        return __request(OpenAPI, {
-            method: 'PATCH',
-            url: '/users/{user_id}',
-            path: {
-                'user_id': userId,
-            },
-            body: requestBody,
-            mediaType: 'application/json',
-            errors: {
-                400: `Invalid input (e.g., validation failed, nickname/email conflict, malformed JSON)`,
-                401: `Unauthorized — missing or invalid authentication token`,
-                403: `Forbidden — user is not allowed to modify this resource (e.g., not own profile & no admin rights)`,
-                404: `User not found`,
-                409: `Conflict — e.g., requested \`nickname\` or \`mail\` already taken by another user`,
-                422: `Unprocessable Entity — semantic errors not caught by schema (e.g., invalid \`avatar_id\`)`,
-                500: `Unknown server error`,
-            },
-        });
-    }
-    /**
-     * Get user titles
-     * @param userId
-     * @param cursor
-     * @param sort
-     * @param sortForward
-     * @param word
-     * @param status List of title statuses to filter
-     * @param watchStatus
-     * @param rating
-     * @param myRate
-     * @param releaseYear
-     * @param releaseSeason
-     * @param limit
-     * @param fields
-     * @returns any List of user titles
-     * @throws ApiError
-     */
-    public static getUsersTitles(
-        userId: string,
-        cursor?: string,
-        sort?: TitleSort,
-        sortForward: boolean = true,
-        word?: string,
-        status?: Array<TitleStatus>,
-        watchStatus?: Array<UserTitleStatus>,
-        rating?: number,
-        myRate?: number,
-        releaseYear?: number,
-        releaseSeason?: ReleaseSeason,
-        limit: number = 10,
-        fields: string = 'all',
-    ): CancelablePromise<{
-        data: Array<UserTitle>;
-        cursor: CursorObj;
-    }> {
-        return __request(OpenAPI, {
-            method: 'GET',
-            url: '/users/{user_id}/titles',
-            path: {
-                'user_id': userId,
-            },
-            query: {
-                'cursor': cursor,
-                'sort': sort,
-                'sort_forward': sortForward,
-                'word': word,
-                'status': status,
-                'watch_status': watchStatus,
-                'rating': rating,
-                'my_rate': myRate,
-                'release_year': releaseYear,
-                'release_season': releaseSeason,
-                'limit': limit,
-                'fields': fields,
-            },
-            errors: {
-                400: `Request params are not correct`,
-                404: `User not found`,
-                500: `Unknown server error`,
-            },
-        });
-    }
-    /**
-     * Add a title to a user
-     * User adding title to list af watched, status required
-     * @param userId ID of the user to assign the title to
-     * @param requestBody
-     * @returns any Title successfully added to user
-     * @throws ApiError
-     */
-    public static addUserTitle(
-        userId: number,
-        requestBody: UserTitle,
-    ): CancelablePromise<{
-        data?: {
-            user_id: number;
-            title_id: number;
-            status: UserTitleStatus;
-            rate?: number;
-            review_id?: number;
-            ctime?: string;
-        };
-    }> {
-        return __request(OpenAPI, {
-            method: 'POST',
-            url: '/users/{user_id}/titles',
-            path: {
-                'user_id': userId,
-            },
-            body: requestBody,
-            mediaType: 'application/json',
-            errors: {
-                400: `Invalid request body (missing fields, invalid types, etc.)`,
-                401: `Unauthorized — missing or invalid auth token`,
-                403: `Forbidden — user not allowed to assign titles to this user`,
-                404: `User or Title not found`,
-                409: `Conflict — title already assigned to user (if applicable)`,
-                500: `Internal server error`,
-            },
-        });
-    }
-}

modules/frontend/src/api/types.gen.ts

@@ -0,0 +1,570 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type ClientOptions = {
+    baseUrl: `${string}://${string}/api/v1` | (string & {});
+};
+
+/**
+ * Title sort order
+ */
+export type TitleSort = 'id' | 'year' | 'rating' | 'views';
+
+/**
+ * Title status
+ */
+export type TitleStatus = 'finished' | 'ongoing' | 'planned';
+
+/**
+ * Title release season
+ */
+export type ReleaseSeason = 'winter' | 'spring' | 'summer' | 'fall';
+
+/**
+ * Image storage type
+ */
+export type StorageType = 's3' | 'local';
+
+export type Image = {
+    id?: number;
+    storage_type?: StorageType;
+    image_path?: string;
+};
+
+export type Studio = {
+    id: number;
+    name: string;
+    poster?: Image;
+    description?: string;
+};
+
+/**
+ * A localized tag: keys are language codes (ISO 639-1), values are tag names
+ */
+export type Tag = {
+    [key: string]: string;
+};
+
+/**
+ * Array of localized tags
+ */
+export type Tags = Array<Tag>;
+
+export type Title = {
+    /**
+     * Unique title ID (primary key)
+     */
+    id: number;
+    /**
+     * Localized titles. Key = language (ISO 639-1), value = list of names
+     */
+    title_names: {
+        [key: string]: Array<string>;
+    };
+    studio?: Studio;
+    tags: Tags;
+    poster?: Image;
+    title_status?: TitleStatus;
+    rating?: number;
+    rating_count?: number;
+    release_year?: number;
+    release_season?: ReleaseSeason;
+    episodes_aired?: number;
+    episodes_all?: number;
+    episodes_len?: {
+        [key: string]: number;
+    };
+};
+
+export type CursorObj = {
+    id: number;
+    param?: string;
+};
+
+export type User = {
+    /**
+     * Unique user ID (primary key)
+     */
+    id?: number;
+    image?: Image;
+    /**
+     * User email
+     */
+    mail?: string;
+    /**
+     * Username (alphanumeric + _ or -)
+     */
+    nickname: string;
+    /**
+     * Display name
+     */
+    disp_name?: string;
+    /**
+     * User description
+     */
+    user_desc?: string;
+    /**
+     * Timestamp when the user was created
+     */
+    creation_date?: string;
+};
+
+/**
+ * User's title status
+ */
+export type UserTitleStatus = 'finished' | 'planned' | 'dropped' | 'in-progress';
+
+export type UserTitle = {
+    user_id: number;
+    title?: Title;
+    status: UserTitleStatus;
+    rate?: number;
+    review_id?: number;
+    ctime?: string;
+};
+
+export type UserTitleMini = {
+    user_id: number;
+    title_id: number;
+    status: UserTitleStatus;
+    rate?: number;
+    review_id?: number;
+    ctime?: string;
+};
+
+export type Review = {
+    [key: string]: unknown;
+};
+
+export type Cursor = string;
+
+export type TitleSort2 = TitleSort;
+
+export type GetTitlesData = {
+    body?: never;
+    path?: never;
+    query?: {
+        cursor?: string;
+        sort?: TitleSort;
+        sort_forward?: boolean;
+        ext_search?: boolean;
+        word?: string;
+        /**
+         * List of title statuses to filter
+         */
+        status?: Array<TitleStatus>;
+        rating?: number;
+        release_year?: number;
+        release_season?: ReleaseSeason;
+        limit?: number;
+        offset?: number;
+        fields?: string;
+    };
+    url: '/titles';
+};
+
+export type GetTitlesErrors = {
+    /**
+     * Request params are not correct
+     */
+    400: unknown;
+    /**
+     * Unknown server error
+     */
+    500: unknown;
+};
+
+export type GetTitlesResponses = {
+    /**
+     * List of titles with cursor
+     */
+    200: {
+        /**
+         * List of titles
+         */
+        data: Array<Title>;
+        cursor: CursorObj;
+    };
+    /**
+     * No titles found
+     */
+    204: void;
+};
+
+export type GetTitlesResponse = GetTitlesResponses[keyof GetTitlesResponses];
+
+export type GetTitleData = {
+    body?: never;
+    path: {
+        title_id: number;
+    };
+    query?: {
+        fields?: string;
+    };
+    url: '/titles/{title_id}';
+};
+
+export type GetTitleErrors = {
+    /**
+     * Request params are not correct
+     */
+    400: unknown;
+    /**
+     * Title not found
+     */
+    404: unknown;
+    /**
+     * Unknown server error
+     */
+    500: unknown;
+};
+
+export type GetTitleResponses = {
+    /**
+     * Title description
+     */
+    200: Title;
+    /**
+     * No title found
+     */
+    204: void;
+};
+
+export type GetTitleResponse = GetTitleResponses[keyof GetTitleResponses];
+
+export type GetUsersIdData = {
+    body?: never;
+    path: {
+        user_id: string;
+    };
+    query?: {
+        fields?: string;
+    };
+    url: '/users/{user_id}';
+};
+
+export type GetUsersIdErrors = {
+    /**
+     * Request params are not correct
+     */
+    400: unknown;
+    /**
+     * User not found
+     */
+    404: unknown;
+    /**
+     * Unknown server error
+     */
+    500: unknown;
+};
+
+export type GetUsersIdResponses = {
+    /**
+     * User info
+     */
+    200: User;
+};
+
+export type GetUsersIdResponse = GetUsersIdResponses[keyof GetUsersIdResponses];
+
+export type UpdateUserData = {
+    /**
+     * Only provided fields are updated. Omitted fields remain unchanged.
+     */
+    body: {
+        /**
+         * ID of the user avatar (references `images.id`); set to `null` to remove avatar
+         */
+        avatar_id?: number | null;
+        /**
+         * User email (must be unique and valid)
+         */
+        mail?: string;
+        /**
+         * Username (alphanumeric + `_` or `-`, 3–16 chars)
+         */
+        nickname?: string;
+        /**
+         * Display name
+         */
+        disp_name?: string;
+        /**
+         * User description / bio
+         */
+        user_desc?: string;
+    };
+    path: {
+        /**
+         * User ID (primary key)
+         */
+        user_id: number;
+    };
+    query?: never;
+    url: '/users/{user_id}';
+};
+
+export type UpdateUserErrors = {
+    /**
+     * Invalid input (e.g., validation failed, nickname/email conflict, malformed JSON)
+     */
+    400: unknown;
+    /**
+     * Unauthorized — missing or invalid authentication token
+     */
+    401: unknown;
+    /**
+     * Forbidden — user is not allowed to modify this resource (e.g., not own profile & no admin rights)
+     */
+    403: unknown;
+    /**
+     * User not found
+     */
+    404: unknown;
+    /**
+     * Conflict — e.g., requested `nickname` or `mail` already taken by another user
+     */
+    409: unknown;
+    /**
+     * Unprocessable Entity — semantic errors not caught by schema (e.g., invalid `avatar_id`)
+     */
+    422: unknown;
+    /**
+     * Unknown server error
+     */
+    500: unknown;
+};
+
+export type UpdateUserResponses = {
+    /**
+     * User updated successfully. Returns updated user representation (excluding sensitive fields).
+     */
+    200: User;
+};
+
+export type UpdateUserResponse = UpdateUserResponses[keyof UpdateUserResponses];
+
+export type GetUserTitlesData = {
+    body?: never;
+    path: {
+        user_id: string;
+    };
+    query?: {
+        cursor?: string;
+        sort?: TitleSort;
+        sort_forward?: boolean;
+        word?: string;
+        /**
+         * List of title statuses to filter
+         */
+        status?: Array<TitleStatus>;
+        watch_status?: Array<UserTitleStatus>;
+        rating?: number;
+        my_rate?: number;
+        release_year?: number;
+        release_season?: ReleaseSeason;
+        limit?: number;
+        fields?: string;
+    };
+    url: '/users/{user_id}/titles';
+};
+
+export type GetUserTitlesErrors = {
+    /**
+     * Request params are not correct
+     */
+    400: unknown;
+    /**
+     * User not found
+     */
+    404: unknown;
+    /**
+     * Unknown server error
+     */
+    500: unknown;
+};
+
+export type GetUserTitlesResponses = {
+    /**
+     * List of user titles
+     */
+    200: {
+        data: Array<UserTitle>;
+        cursor: CursorObj;
+    };
+    /**
+     * No titles found
+     */
+    204: void;
+};
+
+export type GetUserTitlesResponse = GetUserTitlesResponses[keyof GetUserTitlesResponses];
+
+export type AddUserTitleData = {
+    body: {
+        title_id: number;
+        status: UserTitleStatus;
+        rate?: number;
+    };
+    path: {
+        /**
+         * ID of the user to assign the title to
+         */
+        user_id: number;
+    };
+    query?: never;
+    url: '/users/{user_id}/titles';
+};
+
+export type AddUserTitleErrors = {
+    /**
+     * Invalid request body (missing fields, invalid types, etc.)
+     */
+    400: unknown;
+    /**
+     * Unauthorized — missing or invalid auth token
+     */
+    401: unknown;
+    /**
+     * Forbidden — user not allowed to assign titles to this user
+     */
+    403: unknown;
+    /**
+     * User or Title not found
+     */
+    404: unknown;
+    /**
+     * Conflict — title already assigned to user (if applicable)
+     */
+    409: unknown;
+    /**
+     * Internal server error
+     */
+    500: unknown;
+};
+
+export type AddUserTitleResponses = {
+    /**
+     * Title successfully added to user
+     */
+    200: UserTitleMini;
+};
+
+export type AddUserTitleResponse = AddUserTitleResponses[keyof AddUserTitleResponses];
+
+export type DeleteUserTitleData = {
+    body?: never;
+    path: {
+        user_id: number;
+        title_id: number;
+    };
+    query?: never;
+    url: '/users/{user_id}/titles/{title_id}';
+};
+
+export type DeleteUserTitleErrors = {
+    /**
+     * Unauthorized — missing or invalid auth token
+     */
+    401: unknown;
+    /**
+     * Forbidden — user not allowed to delete title
+     */
+    403: unknown;
+    /**
+     * User or Title not found
+     */
+    404: unknown;
+    /**
+     * Internal server error
+     */
+    500: unknown;
+};
+
+export type DeleteUserTitleResponses = {
+    /**
+     * Title successfully deleted
+     */
+    200: unknown;
+};
+
+export type GetUserTitleData = {
+    body?: never;
+    path: {
+        user_id: number;
+        title_id: number;
+    };
+    query?: never;
+    url: '/users/{user_id}/titles/{title_id}';
+};
+
+export type GetUserTitleErrors = {
+    /**
+     * Request params are not correct
+     */
+    400: unknown;
+    /**
+     * User or title not found
+     */
+    404: unknown;
+    /**
+     * Unknown server error
+     */
+    500: unknown;
+};
+
+export type GetUserTitleResponses = {
+    /**
+     * User titles
+     */
+    200: UserTitleMini;
+    /**
+     * No user title found
+     */
+    204: void;
+};
+
+export type GetUserTitleResponse = GetUserTitleResponses[keyof GetUserTitleResponses];
+
+export type UpdateUserTitleData = {
+    body: {
+        status?: UserTitleStatus;
+        rate?: number;
+    };
+    path: {
+        user_id: number;
+        title_id: number;
+    };
+    query?: never;
+    url: '/users/{user_id}/titles/{title_id}';
+};
+
+export type UpdateUserTitleErrors = {
+    /**
+     * Invalid request body (missing fields, invalid types, etc.)
+     */
+    400: unknown;
+    /**
+     * Unauthorized — missing or invalid auth token
+     */
+    401: unknown;
+    /**
+     * Forbidden — user not allowed to update title
+     */
+    403: unknown;
+    /**
+     * User or Title not found
+     */
+    404: unknown;
+    /**
+     * Internal server error
+     */
+    500: unknown;
+};
+
+export type UpdateUserTitleResponses = {
+    /**
+     * Title successfully updated
+     */
+    200: UserTitleMini;
+};
+
+export type UpdateUserTitleResponse = UpdateUserTitleResponses[keyof UpdateUserTitleResponses];

modules/frontend/src/auth/core/OpenAPI.ts

@@ -20,7 +20,7 @@ export type OpenAPIConfig = {
 };
 
 export const OpenAPI: OpenAPIConfig = {
-    BASE: '/auth',
+    BASE: 'http://10.1.0.65:8081/auth',
     VERSION: '1.0.0',
     WITH_CREDENTIALS: false,
     CREDENTIALS: 'include',

modules/frontend/src/auth/services/AuthService.ts

@@ -12,19 +12,17 @@ export class AuthService {
      * @returns any Sign-up result
      * @throws ApiError
      */
-    public static postAuthSignUp(
+    public static postSignUp(
         requestBody: {
             nickname: string;
             pass: string;
         },
     ): CancelablePromise<{
-        success?: boolean;
-        error?: string | null;
-        user_id?: string | null;
+        user_id: number;
     }> {
         return __request(OpenAPI, {
             method: 'POST',
-            url: '/auth/sign-up',
+            url: '/sign-up',
             body: requestBody,
             mediaType: 'application/json',
         });
@@ -35,19 +33,18 @@ export class AuthService {
      * @returns any Sign-in result with JWT
      * @throws ApiError
      */
-    public static postAuthSignIn(
+    public static postSignIn(
         requestBody: {
             nickname: string;
             pass: string;
         },
     ): CancelablePromise<{
-        error?: string | null;
-        user_id?: string | null;
-        user_name?: string | null;
+        user_id: number;
+        user_name: string;
     }> {
         return __request(OpenAPI, {
             method: 'POST',
-            url: '/auth/sign-in',
+            url: '/sign-in',
             body: requestBody,
             mediaType: 'application/json',
             errors: {

modules/frontend/src/components/TitleStatusControls/TitleStatusControls.tsx

@@ -0,0 +1,118 @@
+import { useEffect, useState } from "react";
+// import { DefaultService } from "../../api";
+import { addUserTitle, deleteUserTitle, getUserTitle, updateUserTitle } from "../../api";
+import type { UserTitleStatus } from "../../api";
+import { useCookies } from 'react-cookie';
+
+import {
+  ClockIcon,
+  CheckCircleIcon,
+  PlayCircleIcon,
+  XCircleIcon,
+} from "@heroicons/react/24/solid";
+// import { stat } from "fs";
+
+// Статусы с иконками и подписью
+const STATUS_BUTTONS: { status: UserTitleStatus; icon: React.ReactNode; label: string }[] = [
+  { status: "planned", icon: <ClockIcon className="w-5 h-5" />, label: "Planned" },
+  { status: "finished", icon: <CheckCircleIcon className="w-5 h-5" />, label: "Finished" },
+  { status: "in-progress", icon: <PlayCircleIcon className="w-5 h-5" />, label: "In Progress" },
+  { status: "dropped", icon: <XCircleIcon className="w-5 h-5" />, label: "Dropped" },
+];
+
+export function TitleStatusControls({ titleId }: { titleId: number }) {
+    const [cookies] = useCookies(['xsrf_token']);
+    const xsrfToken = cookies['xsrf_token'] || null;
+
+    const [currentStatus, setCurrentStatus] = useState<UserTitleStatus | null>(null);
+    const [loading, setLoading] = useState(false);
+
+    const userIdStr = localStorage.getItem("userId");
+    const userId = userIdStr ? Number(userIdStr) : null;
+
+    // --- Load initial status ---
+    useEffect(() => {
+        if (!userId) return;
+        getUserTitle({ path: { user_id: userId, title_id: titleId } })
+            .then(res => setCurrentStatus(res.data?.status ?? null))
+            .catch(() => setCurrentStatus(null)); // 404 = not assigned
+
+        // DefaultService.getUserTitle(userId, titleId)
+        //     .then((res) => setCurrentStatus(res.status))
+        //     .catch(() => setCurrentStatus(null)); // 404 = user title does not exist
+    }, [titleId, userId]);
+
+    // --- Handle click ---
+    const handleStatusClick = async (status: UserTitleStatus) => {
+        if (!userId || loading) return;
+
+        setLoading(true);
+
+        try {
+            // 1) Если кликнули на текущий статус — DELETE
+            if (currentStatus === status) {
+                // await DefaultService.deleteUserTitle(userId, titleId);
+                await deleteUserTitle({path: {
+                    user_id: userId,
+                    title_id: titleId,
+                },
+                headers: { "X-XSRF-TOKEN": xsrfToken },
+                })
+                setCurrentStatus(null);
+                return;
+            }
+
+            // 2) Если другой статус — POST или PATCH
+            if (!currentStatus) {
+                // ещё нет записи — POST
+                // const added = await DefaultService.addUserTitle(userId, {
+                //     title_id: titleId,
+                //     status,
+                // });
+                const added = await addUserTitle({
+                body: {
+                    title_id: titleId,
+                    status: status,
+                    },
+                path: {user_id: userId},
+                headers: { "X-XSRF-TOKEN": xsrfToken },
+                });
+
+                setCurrentStatus(added.data?.status ?? null);
+            } else {
+                // уже есть запись — PATCH
+                //const updated = await DefaultService.updateUserTitle(userId, titleId, { status });
+                const updated = await updateUserTitle({
+                    path: { user_id: userId, title_id: titleId },
+                    body: { status },
+                    headers: { "X-XSRF-TOKEN": xsrfToken },
+            });
+                setCurrentStatus(updated.data?.status ?? null);
+            }
+        } finally {
+            setLoading(false);
+        }
+    };
+
+    return (
+        <div className="flex gap-2 flex-wrap justify-center mt-2">
+            {STATUS_BUTTONS.map(btn => (
+                <button
+                    key={btn.status}
+                    onClick={() => handleStatusClick(btn.status)}
+                    disabled={loading}
+                    className={`
+                        px-3 py-1 rounded-md border flex items-center gap-1 transition
+                        ${currentStatus === btn.status
+                            ? "bg-blue-600 text-white border-blue-700"
+                            : "bg-gray-200 text-black border-gray-300 hover:bg-gray-300"}
+                    `}
+                    title={btn.label}
+                >
+                    {btn.icon}
+                    <span>{btn.label}</span>
+                </button>
+            ))}
+        </div>
+    );
+}

modules/frontend/src/components/TitlesFilterPanel/TitlesFilterPanel.tsx

@@ -0,0 +1,122 @@
+import { useState } from "react";
+import type { TitleStatus, ReleaseSeason } from "../../api";
+import { ChevronDownIcon, ChevronUpIcon } from "@heroicons/react/24/solid";
+
+export type TitlesFilter = {
+  extSearch: boolean;
+  status: TitleStatus | "";
+  rating: number | "";
+  releaseYear: number | "";
+  releaseSeason: ReleaseSeason | "";
+};
+
+type TitlesFilterPanelProps = {
+  filters: TitlesFilter;
+  setFilters: (filters: TitlesFilter) => void;
+};
+
+const STATUS_OPTIONS: (TitleStatus | "")[] = ["", "planned", "finished", "ongoing"];
+const SEASON_OPTIONS: (ReleaseSeason | "")[] = ["", "winter", "spring", "summer", "fall"];
+const RATING_OPTIONS = ["", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+
+export function TitlesFilterPanel({ filters, setFilters }: TitlesFilterPanelProps) {
+  const [open, setOpen] = useState(false);
+
+  const handleChange = (field: keyof TitlesFilter, value: any) => {
+    setFilters({ ...filters, [field]: value });
+  };
+
+  return (
+    <div className="w-full flex justify-center my-4">
+      <div className="bg-white shadow rounded-lg w-full max-w-3xl p-4">
+        {/* Заголовок панели */}
+        <div
+          className="flex justify-between items-center cursor-pointer"
+          onClick={() => setOpen((prev) => !prev)}
+        >
+          <h3 className="text-lg font-medium">Filters</h3>
+          {open ? <ChevronUpIcon className="w-5 h-5" /> : <ChevronDownIcon className="w-5 h-5" />}
+        </div>
+
+        {/* Контент панели */}
+        {open && (
+          <div className="mt-4 grid grid-cols-2 sm:grid-cols-3 gap-4">
+            {/* Extended Search */}
+            <div className="flex items-center gap-2">
+              <input
+                type="checkbox"
+                id="extSearch"
+                checked={filters.extSearch}
+                onChange={(e) => handleChange("extSearch", e.target.checked)}
+                className="w-4 h-4"
+              />
+              <label htmlFor="extSearch" className="text-sm">
+                Extended Search
+              </label>
+            </div>
+
+            {/* Status */}
+            <div className="flex flex-col">
+              <label htmlFor="status" className="text-sm mb-1">Status</label>
+              <select
+                id="status"
+                value={filters.status}
+                onChange={(e) => handleChange("status", e.target.value || "")}
+                className="border rounded px-2 py-1"
+              >
+                {STATUS_OPTIONS.map((s) => (
+                  <option key={s || "all"} value={s}>{s || "All"}</option>
+                ))}
+              </select>
+            </div>
+
+            {/* Rating */}
+            <div className="flex flex-col">
+              <label htmlFor="rating" className="text-sm mb-1">Rating</label>
+              <select
+                id="rating"
+                value={filters.rating}
+                onChange={(e) => handleChange("rating", e.target.value ? Number(e.target.value) : "")}
+                className="border rounded px-2 py-1"
+              >
+                {RATING_OPTIONS.map((r) => (
+                  <option key={r} value={r}>{r || "All"}</option>
+                ))}
+              </select>
+            </div>
+
+            {/* Release Year */}
+            <div className="flex flex-col">
+              <label htmlFor="releaseYear" className="text-sm mb-1">Release Year</label>
+              <input
+                type="number"
+                id="releaseYear"
+                value={filters.releaseYear || ""}
+                onChange={(e) =>
+                  handleChange("releaseYear", e.target.value ? Number(e.target.value) : "")
+                }
+                className="border rounded px-2 py-1"
+                placeholder="Any"
+              />
+            </div>
+
+            {/* Release Season */}
+            <div className="flex flex-col">
+              <label htmlFor="releaseSeason" className="text-sm mb-1">Release Season</label>
+              <select
+                id="releaseSeason"
+                value={filters.releaseSeason}
+                onChange={(e) => handleChange("releaseSeason", e.target.value || "")}
+                className="border rounded px-2 py-1"
+              >
+                {SEASON_OPTIONS.map((s) => (
+                  <option key={s || "all"} value={s}>{s || "All"}</option>
+                ))}
+              </select>
+            </div>
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}

modules/frontend/src/components/cards/TitleCardHorizontal.tsx

@@ -1,4 +1,4 @@
-import type { Title } from "../../api/models/Title";
+import type { Title } from "../../api";
 
 export function TitleCardHorizontal({ title }: { title: Title }) {
   return (

modules/frontend/src/components/cards/TitleCardSquare.tsx

@@ -1,5 +1,4 @@
-// TitleCardSquare.tsx
-import type { Title } from "../../api/models/Title";
+import type { Title } from "../../api";
 
 export function TitleCardSquare({ title }: { title: Title }) {
   return (

modules/frontend/src/main.tsx

@@ -1,10 +1,13 @@
 import { StrictMode } from 'react'
 import { createRoot } from 'react-dom/client'
+import { CookiesProvider } from 'react-cookie'
 import './index.css'
 import App from './App.tsx'
 
 createRoot(document.getElementById('root')!).render(
   <StrictMode>
-    <App />
+    <CookiesProvider>
+      <App />
+    </CookiesProvider>
   </StrictMode>,
 )

modules/frontend/src/pages/LoginPage/LoginPage.tsx

@@ -17,23 +17,23 @@ export const LoginPage: React.FC = () => {
 
     try {
       if (isLogin) {
-        const res = await AuthService.postAuthSignIn({ nickname, pass: password });
+        const res = await AuthService.postSignIn({ nickname, pass: password });
         if (res.user_id && res.user_name) {
           // Сохраняем user_id и username в localStorage
-          localStorage.setItem("userId", res.user_id);
+          localStorage.setItem("userId", res.user_id.toString());
           localStorage.setItem("username", res.user_name);
 
           navigate("/profile"); // редирект на профиль
         } else {
-          setError(res.error || "Login failed");
+          setError("Login failed");
         }
       } else {
         // SignUp оставляем без сохранения данных
-        const res = await AuthService.postAuthSignUp({ nickname, pass: password });
+        const res = await AuthService.postSignUp({ nickname, pass: password });
         if (res.user_id) {
           setIsLogin(true); // переключаемся на login после регистрации
         } else {
-          setError(res.error || "Sign up failed");
+          setError("Sign up failed");
         }
       }
     } catch (err: any) {

modules/frontend/src/pages/TitlePage/TitlePage.tsx

@@ -1,64 +1,109 @@
-// import React, { useEffect, useState } from "react";
-// import { useParams } from "react-router-dom";
+import { useEffect, useState } from "react";
+import { useParams, Link } from "react-router-dom";
 // import { DefaultService } from "../../api/services/DefaultService";
-// import type { User } from "../../api/models/User";
-// import styles from "./UserPage.module.css";
+import { getTitle, type Title } from "../../api";
+import { TitleStatusControls } from "../../components/TitleStatusControls/TitleStatusControls";
 
-// const UserPage: React.FC = () => {
-//   const { id } = useParams<{ id: string }>();
-//   const [user, setUser] = useState<User | null>(null);
-//   const [loading, setLoading] = useState(true);
-//   const [error, setError] = useState<string | null>(null);
+export default function TitlePage() {
+  const params = useParams();
+  const titleId = Number(params.id);
 
-//   useEffect(() => {
-//     if (!id) return;
+  const [title, setTitle] = useState<Title | null>(null);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
 
-//     const getTitleInfo = async () => {
-//       try {
-//         const userInfo = await DefaultService.getTitle(id, "all");
-//         setUser(userInfo);
-//       } catch (err) {
-//         console.error(err);
-//         setError("Failed to fetch user info.");
-//       } finally {
-//         setLoading(false);
-//       }
-//     };
-//     getTitleInfo();
-//   }, [id]);
+  // ---------------------------
+  //       LOAD TITLE INFO
+  // ---------------------------
+  useEffect(() => {
+    const fetchTitle = async () => {
+      setLoading(true);
+      try {
+        // const data = await DefaultService.getTitle(titleId, "all");
+        const data = await getTitle({path: {title_id: titleId}})
+        setTitle(data?.data ?? null);
+        setError(null);
+      } catch (err: any) {
+        console.error(err);
+        setError(err?.message || "Failed to fetch title");
+      } finally {
+        setLoading(false);
+      }
+    };
+    fetchTitle();
+  }, [titleId]);
 
-//   if (loading) return <div className={styles.loader}>Loading...</div>;
-//   if (error) return <div className={styles.error}>{error}</div>;
-//   if (!user) return <div className={styles.error}>User not found.</div>;
+  const getTagsString = () =>
+    title?.tags?.map(tag => tag.en).filter(Boolean).join(", ");
 
-//   return (
-//     <div className={styles.container}>
-//       <div className={styles.card}>
-//         <div className={styles.avatar}>
-//           {user.avatar_id ? (
-//             <img
-//               src={`/images/${user.avatar_id}.png`}
-//               alt="User Avatar"
-//               className={styles.avatarImg}
-//             />
-//           ) : (
-//             <div className={styles.avatarPlaceholder}>
-//               {user.disp_name?.[0] || "U"}
-//             </div>
-//           )}
-//         </div>
+  if (loading) return <div className="mt-20 font-medium text-black">Loading title...</div>;
+  if (error) return <div className="mt-20 text-red-600 font-medium">{error}</div>;
+  if (!title) return null;
 
-//         <div className={styles.info}>
-//           <h1 className={styles.name}>{user.disp_name || user.nickname}</h1>
-//           <p className={styles.nickname}>@{user.nickname}</p>
-//           {user.user_desc && <p className={styles.desc}>{user.user_desc}</p>}
-//           <p className={styles.created}>
-//             Joined: {new Date(user.creation_date).toLocaleDateString()}
-//           </p>
-//         </div>
-//       </div>
-//     </div>
-//   );
-// };
+  return (
+    <div className="w-full min-h-screen bg-gray-50 p-6 flex justify-center">
+      <div className="flex flex-col md:flex-row bg-white shadow-lg rounded-xl max-w-4xl w-full p-6 gap-6">
+        {/* Poster + status buttons */}
+        <div className="flex flex-col items-center">
+          <img
+            src={title.poster?.image_path || "/default-poster.png"}
+            alt={title.title_names?.en?.[0] || "Title poster"}
+            className="w-48 h-72 object-cover rounded-lg mb-4"
+          />
 
-// export default UserPage;
+          {/* Status buttons */}
+          <TitleStatusControls titleId={titleId} />
+        </div>
+
+        {/* Title info */}
+        <div className="flex-1 flex flex-col">
+          <h1 className="text-3xl font-bold mb-2">
+            {title.title_names?.en?.[0] || "Untitled"}
+          </h1>
+
+          {title.studio && (
+            <p className="text-gray-700 mb-1">
+              Studio:{" "}
+              {title.studio.id ? (
+                <Link
+                  to={`/studios/${title.studio.id}`}
+                  className="text-blue-600 hover:underline"
+                >
+                  {title.studio.name}
+                </Link>
+              ) : (
+                title.studio.name
+              )}
+            </p>
+          )}
+
+          {title.title_status && <p className="text-gray-700 mb-1">Status: {title.title_status}</p>}
+
+          {title.rating !== undefined && (
+            <p className="text-gray-700 mb-1">
+              Rating: {title.rating} ({title.rating_count} votes)
+            </p>
+          )}
+
+          {title.release_year && (
+            <p className="text-gray-700 mb-1">
+              Released: {title.release_year} {title.release_season || ""}
+            </p>
+          )}
+
+          {title.episodes_aired !== undefined && (
+            <p className="text-gray-700 mb-1">
+              Episodes: {title.episodes_aired}/{title.episodes_all}
+            </p>
+          )}
+
+          {title.tags && title.tags.length > 0 && (
+            <p className="text-gray-700 mb-1">
+              Tags: {getTagsString()}
+            </p>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+}

modules/frontend/src/pages/TitlesPage/TitlesPage.module.css

@@ -1 +0,0 @@
-@import "tailwindcss";

modules/frontend/src/pages/TitlesPage/TitlesPage.tsx

@@ -2,11 +2,13 @@ import { useEffect, useState } from "react";
 import { ListView } from "../../components/ListView/ListView";
 import { SearchBar } from "../../components/SearchBar/SearchBar";
 import { TitlesSortBox } from "../../components/TitlesSortBox/TitlesSortBox";
-import { DefaultService } from "../../api/services/DefaultService";
+// import { DefaultService } from "../../api/services/DefaultService";
 import { TitleCardSquare } from "../../components/cards/TitleCardSquare";
 import { TitleCardHorizontal } from "../../components/cards/TitleCardHorizontal";
-import type { CursorObj, Title, TitleSort } from "../../api";
+import { getTitles, type CursorObj, type Title, type TitleSort } from "../../api";
 import { LayoutSwitch } from "../../components/LayoutSwitch/LayoutSwitch";
+import { Link } from "react-router-dom";
+import { type TitlesFilter, TitlesFilterPanel } from "../../components/TitlesFilterPanel/TitlesFilterPanel";
 
 const PAGE_SIZE = 10;
 
@@ -21,37 +23,40 @@ export default function TitlesPage() {
   const [sortForward, setSortForward] = useState(true);
   const [layout, setLayout] = useState<"square" | "horizontal">("square");
 
+  const [filters, setFilters] = useState<TitlesFilter>({
+    extSearch: false,
+    status: "",
+    rating: "",
+    releaseYear: "",
+    releaseSeason: "",
+  });
+
   const fetchPage = async (cursorObj: CursorObj | null) => {
-    const cursorStr = cursorObj ? btoa(JSON.stringify(cursorObj)).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '') : "";
+    const cursorStr = cursorObj
+      ? btoa(JSON.stringify(cursorObj)).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "")
+      : undefined;
 
-    try {
-      const result = await DefaultService.getTitles(
-        cursorStr,
-        sort,
-        sortForward,
-        search.trim() || undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        PAGE_SIZE,
-        undefined,
-        "all"
-      );
+    const response = await getTitles({
+      query: {
+        cursor: cursorStr,
+        sort: sort,
+        sort_forward: sortForward,
+        ext_search: filters.extSearch,
+        word: search.trim() || undefined,
+        status: filters.status ? [filters.status] : undefined,
+        rating: filters.rating || undefined,
+        release_year: filters.releaseYear || undefined,
+        release_season: filters.releaseSeason || undefined,
+        limit: PAGE_SIZE,
+        offset: PAGE_SIZE,
+        fields: "all",
+      },
+    });
 
-      if ((result === undefined) || !result.data?.length) {
-        return { items: [], nextCursor: null };
-      }
-      return {
-        items: result.data ?? [],
-        nextCursor: result.cursor ?? null
-      };
-    } catch (err: any) {
-      if (err.status === 204) {
-        return { items: [], nextCursor: null };
-      }
-      throw err;
-    }
+    return {
+      items: response.data?.data ?? [],
+      nextCursor: response.data?.cursor ?? null,
+    };
   };
 
   // Инициализация: загружаем сразу две страницы
@@ -72,7 +77,7 @@ export default function TitlesPage() {
     };
 
     initLoad();
-  }, [search, sort, sortForward]);
+  }, [search, sort, sortForward, filters]);
 
 
 const handleLoadMore = async () => {
@@ -120,6 +125,7 @@ const handleLoadMore = async () => {
           setSortForward={setSortForward}
         />
       </div>
+       <TitlesFilterPanel filters={filters} setFilters={setFilters} />
 
       {loading && <div className="mt-20 font-medium text-black">Loading...</div>}
 
@@ -135,11 +141,11 @@ const handleLoadMore = async () => {
             hasMore={!!cursor || nextPage.length > 1}
             loadingMore={loadingMore}
             onLoadMore={handleLoadMore}
-            renderItem={(title, layout) =>
-              layout === "square"
-                ? <TitleCardSquare title={title} />
-                : <TitleCardHorizontal title={title} />
-            }
+            renderItem={(title, layout) => (
+              <Link to={`/titles/${title.id}`} key={title.id} className="block">
+                {layout === "square" ? <TitleCardSquare title={title} /> : <TitleCardHorizontal title={title} />}
+              </Link>
+            )}
           />
 
           {!cursor && nextPage.length == 0 && (

modules/frontend/src/pages/UserPage/UserPage.module.css

@@ -1,103 +0,0 @@
-body,
-html {
-  width: 100%;
-  margin: 0;
-  background-color: #777;
-  color: #fff;
-}
-
-html,
-body,
-#root {
-  height: 100%;
-}
-
-.header {
-  width: 100vw;
-  padding: 30px 40px;
-  background: #f7f7f7;
-  display: flex;
-  align-items: center;
-  gap: 25px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
-  border-bottom: 1px solid #e5e5e5;
-  color: #000000;
-}
-
-.avatarWrapper {
-  width: 120px;
-  height: 120px;
-  min-width: 120px;
-  border-radius: 50%;
-  overflow: hidden;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  background: #ddd;
-}
-
-.avatarImg {
-  width: 100%;
-  height: 100%;
-  object-fit: cover;
-}
-
-.avatarPlaceholder {
-  width: 100%;
-  height: 100%;
-  border-radius: 50%;
-  background: #ccc;
-  font-size: 42px;
-  font-weight: bold;
-  color: #555;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.userInfo {
-  display: flex;
-  flex-direction: column;
-}
-
-.name {
-  font-size: 32px;
-  font-weight: 700;
-  margin: 0;
-}
-
-.nickname {
-  font-size: 18px;
-  color: #666;
-  margin-top: 6px;
-}
-
-.container {
-  max-width: 100vw;
-  width: 100%;
-  position: absolute;
-  top: 0%;
-  /* margin: 25px auto; */
-  /* padding: 0 20px; */
-}
-
-.content {
-  margin-top: 20px;
-}
-
-.desc {
-  font-size: 18px;
-  margin-bottom: 10px;
-}
-
-.created {
-  font-size: 16px;
-  color: #888;
-}
-
-.loader,
-.error {
-  text-align: center;
-  margin-top: 40px;
-  font-size: 18px;
-}

modules/frontend/src/pages/UserPage/UserPage.tsx

@@ -1,67 +1,201 @@
-import React, { useEffect, useState } from "react";
-import { useParams } from "react-router-dom"; // <-- import
-import { DefaultService } from "../../api/services/DefaultService";
-import type { User } from "../../api/models/User";
-import styles from "./UserPage.module.css";
+// pages/UserPage/UserPage.tsx
+import { useEffect, useState } from "react";
+import { useParams } from "react-router-dom";
+// import { DefaultService } from "../../api/services/DefaultService";
+import { SearchBar } from "../../components/SearchBar/SearchBar";
+import { TitlesSortBox } from "../../components/TitlesSortBox/TitlesSortBox";
+import { LayoutSwitch } from "../../components/LayoutSwitch/LayoutSwitch";
+import { ListView } from "../../components/ListView/ListView";
+import { UserTitleCardSquare } from "../../components/cards/UserTitleCardSquare";
+import { UserTitleCardHorizontal } from "../../components/cards/UserTitleCardHorizontal";
+import { type User, type UserTitle, type CursorObj, type TitleSort, getUsersId, getUserTitles } from "../../api";
+import { Link } from "react-router-dom";
 
-const UserPage: React.FC = () => {
-  const { id } = useParams<{ id: string }>(); // <-- get user id from URL
-  const [user, setUser] = useState<User | null>(null);
-  const [loading, setLoading] = useState(true);
-  const [error, setError] = useState<string | null>(null);
+const PAGE_SIZE = 10;
 
-  useEffect(() => {
-    if (!id) return;
-
-    const getUserInfo = async () => {
-      try {
-        const userInfo = await DefaultService.getUsers(id, "all"); // <-- use dynamic id
-        setUser(userInfo);
-      } catch (err) {
-        console.error(err);
-        setError("Failed to fetch user info.");
-      } finally {
-        setLoading(false);
-      }
-    };
-    getUserInfo();
-  }, [id]);
-
-  if (loading) return <div className={styles.loader}>Loading...</div>;
-  if (error) return <div className={styles.error}>{error}</div>;
-  if (!user) return <div className={styles.error}>User not found.</div>;
-
-  return (
-    <div className={styles.container}>
-      <div className={styles.header}>
-        <div className={styles.avatarWrapper}>
-          {user.image?.image_path ? (
-            <img
-              src={`/images/${user.image.image_path}.png`}
-              alt="User Avatar"
-              className={styles.avatarImg}
-            />
-          ) : (
-            <div className={styles.avatarPlaceholder}>
-              {user.disp_name?.[0] || "U"}
-            </div>
-          )}
-        </div>
-
-        <div className={styles.userInfo}>
-          <h1 className={styles.name}>{user.disp_name || user.nickname}</h1>
-          <p className={styles.nickname}>@{user.nickname}</p>
-          {/* <p className={styles.created}>
-            Joined: {new Date(user.creation_date).toLocaleDateString()}
-          </p> */}
-        </div>
-
-        <div className={styles.content}>
-          {user.user_desc && <p className={styles.desc}>{user.user_desc}</p>}
-        </div>
-      </div>
-    </div>
-  );
+type UserPageProps = {
+  userId?: string;
 };
 
-export default UserPage;
+export default function UserPage({ userId }: UserPageProps) {
+  const params = useParams();
+  const id = userId || params?.id;
+
+  const [user, setUser] = useState<User | null>(null);
+  const [loadingUser, setLoadingUser] = useState(true);
+  const [errorUser, setErrorUser] = useState<string | null>(null);
+
+  // Для списка тайтлов
+  const [titles, setTitles] = useState<UserTitle[]>([]);
+  const [nextPage, setNextPage] = useState<UserTitle[]>([]);
+  const [cursor, setCursor] = useState<CursorObj | null>(null);
+  const [loadingTitles, setLoadingTitles] = useState(true);
+  const [loadingMore, setLoadingMore] = useState(false);
+  const [search, setSearch] = useState("");
+  const [sort, setSort] = useState<TitleSort>("id");
+  const [sortForward, setSortForward] = useState(true);
+  const [layout, setLayout] = useState<"square" | "horizontal">("square");
+
+  // --- Получение данных пользователя ---
+  useEffect(() => {
+    const fetchUser = async () => {
+      if (!id) return;
+      setLoadingUser(true);
+      try {
+        // const result = await DefaultService.getUsersId(id, "all");
+        const result = await getUsersId({path: {user_id: id}})
+        setUser(result?.data ?? null);
+        setErrorUser(null);
+      } catch (err: any) {
+        console.error(err);
+        setErrorUser(err?.message || "Failed to fetch user data");
+      } finally {
+        setLoadingUser(false);
+      }
+    };
+    fetchUser();
+  }, [id]);
+
+  // --- Получение списка тайтлов пользователя ---
+  const fetchPage = async (cursorObj: CursorObj | null) => {
+    if (!id) return { items: [], nextCursor: null };
+    const cursorStr = cursorObj
+      ? btoa(JSON.stringify(cursorObj)).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "")
+      : "";
+
+    try {
+      const result = await getUserTitles({
+          path: {
+              user_id: id,
+          },
+          query: {
+              cursor: cursorStr,
+              sort: sort,
+              sort_forward: sortForward,
+              word: search.trim() || undefined,
+              status: undefined,
+              watch_status: undefined,
+              rating: undefined,
+              my_rate: undefined,
+              release_year: undefined,
+              release_season: undefined,
+              limit: PAGE_SIZE}})
+      // const result = await DefaultService.getUserTitles(
+      //   id,
+      //   cursorStr,
+      //   sort,
+      //   sortForward,
+      //   search.trim() || undefined,
+      //   undefined, // status фильтр, можно добавить
+      //   undefined, // watchStatus
+      //   undefined, // rating
+      //   undefined, // myRate
+      //   undefined, // releaseYear
+      //   undefined, // releaseSeason
+      //   PAGE_SIZE,
+      //   "all"
+      // );
+
+      if (!result?.data?.data?.length) return { items: [], nextCursor: null };
+
+      return { items: result.data?.data, nextCursor: result.data?.cursor ?? null };
+    } catch (err: any) {
+      if (err.status === 204) return { items: [], nextCursor: null };
+      throw err;
+    }
+  };
+
+  // Инициализация: загружаем сразу две страницы
+  useEffect(() => {
+    const initLoad = async () => {
+      setLoadingTitles(true);
+      setTitles([]);
+      setNextPage([]);
+      setCursor(null);
+
+      const firstPage = await fetchPage(null);
+      const secondPage = firstPage.nextCursor ? await fetchPage(firstPage.nextCursor) : { items: [], nextCursor: null };
+
+      setTitles(firstPage.items);
+      setNextPage(secondPage.items);
+      setCursor(secondPage.nextCursor);
+      setLoadingTitles(false);
+    };
+    initLoad();
+  }, [id, search, sort, sortForward]);
+
+  const handleLoadMore = async () => {
+    if (nextPage.length === 0) {
+      setLoadingMore(false);
+      return;
+    }
+    setLoadingMore(true);
+
+    setTitles(prev => [...prev, ...nextPage]);
+    setNextPage([]);
+
+    if (cursor) {
+      try {
+        const next = await fetchPage(cursor);
+        if (next.items.length > 0) setNextPage(next.items);
+        setCursor(next.nextCursor);
+      } catch (err) {
+        console.error(err);
+      }
+    }
+
+    setLoadingMore(false);
+  };
+
+  return (
+    <div className="w-full min-h-screen bg-gray-50 p-6 flex flex-col items-center">
+
+      {/* --- Карточка пользователя --- */}
+      {loadingUser && <div className="mt-10 text-xl font-medium">Loading user...</div>}
+      {errorUser && <div className="mt-10 text-red-600 font-medium">{errorUser}</div>}
+      {user && (
+        <div className="bg-white shadow-lg rounded-xl p-6 w-full max-w-sm flex flex-col items-center mb-8">
+          <img src={user.image?.image_path} alt={user.nickname} className="w-32 h-32 rounded-full object-cover mb-4" />
+          <h2 className="text-2xl font-bold mb-2">{user.disp_name || user.nickname}</h2>
+          {user.mail && <p className="text-gray-600 mb-2">{user.mail}</p>}
+          {user.user_desc && <p className="text-gray-700 text-center">{user.user_desc}</p>}
+          {user.creation_date && <p className="text-gray-400 mt-4 text-sm">Registered: {new Date(user.creation_date).toLocaleDateString()}</p>}
+        </div>
+      )}
+
+      {/* --- Панель поиска, сортировки и лейаута --- */}
+      <div className="w-full sm:w-4/5 flex flex-col sm:flex-row gap-4 mb-6 items-center">
+        <SearchBar placeholder="Search titles..." search={search} setSearch={setSearch} />
+        <LayoutSwitch layout={layout} setLayout={setLayout} />
+        <TitlesSortBox sort={sort} setSort={setSort} sortForward={sortForward} setSortForward={setSortForward} />
+      </div>
+
+      {/* --- Список тайтлов --- */}
+      {loadingTitles && <div className="mt-6 font-medium text-black">Loading titles...</div>}
+      {!loadingTitles && titles.length === 0 && <div className="mt-6 font-medium text-black">No titles found.</div>}
+
+      {titles.length > 0 && (
+        <>
+          <ListView<UserTitle>
+            items={titles}
+            layout={layout}
+            hasMore={!!cursor || nextPage.length > 1}
+            loadingMore={loadingMore}
+            onLoadMore={handleLoadMore}
+            renderItem={(title, layout) => (
+              <Link to={`/titles/${title.title?.id}`} key={title.title?.id} className="block">
+                {layout === "square" ? <UserTitleCardSquare title={title} /> : <UserTitleCardHorizontal title={title} />}
+              </Link>
+            )}
+          />
+
+          {!cursor && nextPage.length === 0 && (
+            <div className="mt-6 font-medium text-black">
+              Результатов больше нет, было найдено {titles.length} тайтлов.
+            </div>
+          )}
+        </>
+      )}
+    </div>
+  );
+}

modules/frontend/src/pages/UsersIdPage/UsersIdPage.tsx

@@ -1,183 +0,0 @@
-// pages/UserPage/UserPage.tsx
-import { useEffect, useState } from "react";
-import { useParams } from "react-router-dom";
-import { DefaultService } from "../../api/services/DefaultService";
-import { SearchBar } from "../../components/SearchBar/SearchBar";
-import { TitlesSortBox } from "../../components/TitlesSortBox/TitlesSortBox";
-import { LayoutSwitch } from "../../components/LayoutSwitch/LayoutSwitch";
-import { ListView } from "../../components/ListView/ListView";
-import { UserTitleCardSquare } from "../../components/cards/UserTitleCardSquare";
-import { UserTitleCardHorizontal } from "../../components/cards/UserTitleCardHorizontal";
-import type { User, UserTitle, CursorObj, TitleSort } from "../../api";
-
-const PAGE_SIZE = 10;
-
-type UsersIdPageProps = {
-  userId?: string;
-};
-
-export default function UsersIdPage({ userId }: UsersIdPageProps) {
-  const params = useParams();
-  const id = userId || params?.id;
-
-  const [user, setUser] = useState<User | null>(null);
-  const [loadingUser, setLoadingUser] = useState(true);
-  const [errorUser, setErrorUser] = useState<string | null>(null);
-
-  // Для списка тайтлов
-  const [titles, setTitles] = useState<UserTitle[]>([]);
-  const [nextPage, setNextPage] = useState<UserTitle[]>([]);
-  const [cursor, setCursor] = useState<CursorObj | null>(null);
-  const [loadingTitles, setLoadingTitles] = useState(true);
-  const [loadingMore, setLoadingMore] = useState(false);
-  const [search, setSearch] = useState("");
-  const [sort, setSort] = useState<TitleSort>("id");
-  const [sortForward, setSortForward] = useState(true);
-  const [layout, setLayout] = useState<"square" | "horizontal">("square");
-
-  // --- Получение данных пользователя ---
-  useEffect(() => {
-    const fetchUser = async () => {
-      if (!id) return;
-      setLoadingUser(true);
-      try {
-        const result = await DefaultService.getUsers(id, "all");
-        setUser(result);
-        setErrorUser(null);
-      } catch (err: any) {
-        console.error(err);
-        setErrorUser(err?.message || "Failed to fetch user data");
-      } finally {
-        setLoadingUser(false);
-      }
-    };
-    fetchUser();
-  }, [id]);
-
-  // --- Получение списка тайтлов пользователя ---
-  const fetchPage = async (cursorObj: CursorObj | null) => {
-    if (!id) return { items: [], nextCursor: null };
-    const cursorStr = cursorObj
-      ? btoa(JSON.stringify(cursorObj)).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "")
-      : "";
-
-    try {
-      const result = await DefaultService.getUsersTitles(
-        id,
-        cursorStr,
-        sort,
-        sortForward,
-        search.trim() || undefined,
-        undefined, // status фильтр, можно добавить
-        undefined, // watchStatus
-        undefined, // rating
-        undefined, // myRate
-        undefined, // releaseYear
-        undefined, // releaseSeason
-        PAGE_SIZE,
-        "all"
-      );
-
-      if (!result?.data?.length) return { items: [], nextCursor: null };
-
-      return { items: result.data, nextCursor: result.cursor ?? null };
-    } catch (err: any) {
-      if (err.status === 204) return { items: [], nextCursor: null };
-      throw err;
-    }
-  };
-
-  // Инициализация: загружаем сразу две страницы
-  useEffect(() => {
-    const initLoad = async () => {
-      setLoadingTitles(true);
-      setTitles([]);
-      setNextPage([]);
-      setCursor(null);
-
-      const firstPage = await fetchPage(null);
-      const secondPage = firstPage.nextCursor ? await fetchPage(firstPage.nextCursor) : { items: [], nextCursor: null };
-
-      setTitles(firstPage.items);
-      setNextPage(secondPage.items);
-      setCursor(secondPage.nextCursor);
-      setLoadingTitles(false);
-    };
-    initLoad();
-  }, [id, search, sort, sortForward]);
-
-  const handleLoadMore = async () => {
-    if (nextPage.length === 0) {
-      setLoadingMore(false);
-      return;
-    }
-    setLoadingMore(true);
-
-    setTitles(prev => [...prev, ...nextPage]);
-    setNextPage([]);
-
-    if (cursor) {
-      try {
-        const next = await fetchPage(cursor);
-        if (next.items.length > 0) setNextPage(next.items);
-        setCursor(next.nextCursor);
-      } catch (err) {
-        console.error(err);
-      }
-    }
-
-    setLoadingMore(false);
-  };
-
-  // const getAvatarUrl = (avatarId?: number) => (avatarId ? `/api/images/${avatarId}` : "/default-avatar.png");
-
-  return (
-    <div className="w-full min-h-screen bg-gray-50 p-6 flex flex-col items-center">
-
-      {/* --- Карточка пользователя --- */}
-      {loadingUser && <div className="mt-10 text-xl font-medium">Loading user...</div>}
-      {errorUser && <div className="mt-10 text-red-600 font-medium">{errorUser}</div>}
-      {user && (
-        <div className="bg-white shadow-lg rounded-xl p-6 w-full max-w-sm flex flex-col items-center mb-8">
-          <img src={user.image?.image_path} alt={user.nickname} className="w-32 h-32 rounded-full object-cover mb-4" />
-          <h2 className="text-2xl font-bold mb-2">{user.disp_name || user.nickname}</h2>
-          {user.mail && <p className="text-gray-600 mb-2">{user.mail}</p>}
-          {user.user_desc && <p className="text-gray-700 text-center">{user.user_desc}</p>}
-          {user.creation_date && <p className="text-gray-400 mt-4 text-sm">Registered: {new Date(user.creation_date).toLocaleDateString()}</p>}
-        </div>
-      )}
-
-      {/* --- Панель поиска, сортировки и лейаута --- */}
-      <div className="w-full sm:w-4/5 flex flex-col sm:flex-row gap-4 mb-6 items-center">
-        <SearchBar placeholder="Search titles..." search={search} setSearch={setSearch} />
-        <LayoutSwitch layout={layout} setLayout={setLayout} />
-        <TitlesSortBox sort={sort} setSort={setSort} sortForward={sortForward} setSortForward={setSortForward} />
-      </div>
-
-      {/* --- Список тайтлов --- */}
-      {loadingTitles && <div className="mt-6 font-medium text-black">Loading titles...</div>}
-      {!loadingTitles && titles.length === 0 && <div className="mt-6 font-medium text-black">No titles found.</div>}
-
-      {titles.length > 0 && (
-        <>
-          <ListView<UserTitle>
-            items={titles}
-            layout={layout}
-            hasMore={!!cursor || nextPage.length > 1}
-            loadingMore={loadingMore}
-            onLoadMore={handleLoadMore}
-            renderItem={(title, layout) =>
-              layout === "square" ? <UserTitleCardSquare title={title} /> : <UserTitleCardHorizontal title={title} />
-            }
-          />
-
-          {!cursor && nextPage.length === 0 && (
-            <div className="mt-6 font-medium text-black">
-              Результатов больше нет, было найдено {titles.length} тайтлов.
-            </div>
-          )}
-        </>
-      )}
-    </div>
-  );
-}

sql/migrations/000001_init.up.sql

@@ -47,6 +47,8 @@ CREATE TABLE titles (
     id                  bigint              GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
     -- example {"ru": ["Атака титанов", "Атака Титанов"],"en": ["Attack on Titan", "AoT"],"ja": ["進撃の巨人", "しんげきのきょじん"]}
     title_names         jsonb               NOT NULL,
+    -- example {"ru": "Кулинарное аниме как правильно приготовить людей.","en": "A culinary anime about how to cook people properly."}
+    title_desc          jsonb,
     studio_id           bigint              NOT NULL REFERENCES studios (id),
     poster_id           bigint              REFERENCES images (id) ON DELETE SET NULL,
     title_status        title_status_t      NOT NULL,                          
@@ -179,6 +181,6 @@ END;
 $$ LANGUAGE plpgsql;
 
 CREATE TRIGGER set_ctime_on_update
-AFTER UPDATE ON usertitles
+BEFORE UPDATE ON usertitles
 FOR EACH ROW
 EXECUTE FUNCTION set_ctime();

sql/models.go

@@ -246,6 +246,7 @@ type Tag struct {
 type Title struct {
 	ID            int64           `json:"id"`
 	TitleNames    json.RawMessage `json:"title_names"`
+	TitleDesc     []byte          `json:"title_desc"`
 	StudioID      int64           `json:"studio_id"`
 	PosterID      *int64          `json:"poster_id"`
 	TitleStatus   TitleStatusT    `json:"title_status"`

sql/queries.sql.go

@@ -29,6 +29,51 @@ func (q *Queries) CreateImage(ctx context.Context, arg CreateImageParams) (Image
 	return i, err
 }
 
+const createNewUser = `-- name: CreateNewUser :one
+INSERT 
+INTO users (passhash, nickname) 
+VALUES ($1, $2)
+RETURNING id
+`
+
+type CreateNewUserParams struct {
+	Passhash string `json:"passhash"`
+	Nickname string `json:"nickname"`
+}
+
+func (q *Queries) CreateNewUser(ctx context.Context, arg CreateNewUserParams) (int64, error) {
+	row := q.db.QueryRow(ctx, createNewUser, arg.Passhash, arg.Nickname)
+	var id int64
+	err := row.Scan(&id)
+	return id, err
+}
+
+const deleteUserTitle = `-- name: DeleteUserTitle :one
+DELETE FROM usertitles
+WHERE user_id = $1
+  AND title_id = $2
+RETURNING user_id, title_id, status, rate, review_id, ctime
+`
+
+type DeleteUserTitleParams struct {
+	UserID  int64 `json:"user_id"`
+	TitleID int64 `json:"title_id"`
+}
+
+func (q *Queries) DeleteUserTitle(ctx context.Context, arg DeleteUserTitleParams) (Usertitle, error) {
+	row := q.db.QueryRow(ctx, deleteUserTitle, arg.UserID, arg.TitleID)
+	var i Usertitle
+	err := row.Scan(
+		&i.UserID,
+		&i.TitleID,
+		&i.Status,
+		&i.Rate,
+		&i.ReviewID,
+		&i.Ctime,
+	)
+	return i, err
+}
+
 const getImageByID = `-- name: GetImageByID :one
 SELECT id, storage_type, image_path
 FROM images
@@ -44,40 +89,12 @@ func (q *Queries) GetImageByID(ctx context.Context, illustID int64) (Image, erro
 
 const getReviewByID = `-- name: GetReviewByID :one
 
-
-
 SELECT id, data, rating, user_id, title_id, created_at
 FROM reviews
 WHERE review_id = $1::bigint
 `
 
 // 100 is default limit
-// -- name: ListTitles :many
-// SELECT title_id, title_names, studio_id, poster_id, signal_ids,
-//
-//	title_status, rating, rating_count, release_year, release_season,
-//	season, episodes_aired, episodes_all, episodes_len
-//
-// FROM titles
-// ORDER BY title_id
-// LIMIT $1 OFFSET $2;
-// -- name: UpdateTitle :one
-// UPDATE titles
-// SET
-//
-//	title_names = COALESCE(sqlc.narg('title_names'), title_names),
-//	studio_id = COALESCE(sqlc.narg('studio_id'), studio_id),
-//	poster_id = COALESCE(sqlc.narg('poster_id'), poster_id),
-//	signal_ids = COALESCE(sqlc.narg('signal_ids'), signal_ids),
-//	title_status = COALESCE(sqlc.narg('title_status'), title_status),
-//	release_year = COALESCE(sqlc.narg('release_year'), release_year),
-//	release_season = COALESCE(sqlc.narg('release_season'), release_season),
-//	episodes_aired = COALESCE(sqlc.narg('episodes_aired'), episodes_aired),
-//	episodes_all = COALESCE(sqlc.narg('episodes_all'), episodes_all),
-//	episodes_len = COALESCE(sqlc.narg('episodes_len'), episodes_len)
-//
-// WHERE title_id = sqlc.arg('title_id')
-// RETURNING *;
 func (q *Queries) GetReviewByID(ctx context.Context, reviewID int64) (Review, error) {
 	row := q.db.QueryRow(ctx, getReviewByID, reviewID)
 	var i Review
@@ -111,9 +128,8 @@ func (q *Queries) GetStudioByID(ctx context.Context, studioID int64) (Studio, er
 }
 
 const getTitleByID = `-- name: GetTitleByID :one
-
 SELECT 
-    t.id, t.title_names, t.studio_id, t.poster_id, t.title_status, t.rating, t.rating_count, t.release_year, t.release_season, t.season, t.episodes_aired, t.episodes_all, t.episodes_len,
+    t.id, t.title_names, t.title_desc, t.studio_id, t.poster_id, t.title_status, t.rating, t.rating_count, t.release_year, t.release_season, t.season, t.episodes_aired, t.episodes_all, t.episodes_len,
     i.storage_type                          as title_storage_type,
     i.image_path                            as title_image_path,
     COALESCE(
@@ -141,6 +157,7 @@ GROUP BY
 type GetTitleByIDRow struct {
 	ID                int64           `json:"id"`
 	TitleNames        json.RawMessage `json:"title_names"`
+	TitleDesc         []byte          `json:"title_desc"`
 	StudioID          int64           `json:"studio_id"`
 	PosterID          *int64          `json:"poster_id"`
 	TitleStatus       TitleStatusT    `json:"title_status"`
@@ -162,9 +179,6 @@ type GetTitleByIDRow struct {
 	StudioImagePath   *string         `json:"studio_image_path"`
 }
 
-// -- name: DeleteUser :exec
-// DELETE FROM users
-// WHERE user_id = $1;
 // sqlc.struct: TitlesFull
 func (q *Queries) GetTitleByID(ctx context.Context, titleID int64) (GetTitleByIDRow, error) {
 	row := q.db.QueryRow(ctx, getTitleByID, titleID)
@@ -172,6 +186,7 @@ func (q *Queries) GetTitleByID(ctx context.Context, titleID int64) (GetTitleByID
 	err := row.Scan(
 		&i.ID,
 		&i.TitleNames,
+		&i.TitleDesc,
 		&i.StudioID,
 		&i.PosterID,
 		&i.TitleStatus,
@@ -268,6 +283,55 @@ func (q *Queries) GetUserByID(ctx context.Context, id int64) (GetUserByIDRow, er
 	return i, err
 }
 
+const getUserByNickname = `-- name: GetUserByNickname :one
+SELECT id, avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date, last_login
+FROM users
+WHERE nickname = $1
+`
+
+func (q *Queries) GetUserByNickname(ctx context.Context, nickname string) (User, error) {
+	row := q.db.QueryRow(ctx, getUserByNickname, nickname)
+	var i User
+	err := row.Scan(
+		&i.ID,
+		&i.AvatarID,
+		&i.Passhash,
+		&i.Mail,
+		&i.Nickname,
+		&i.DispName,
+		&i.UserDesc,
+		&i.CreationDate,
+		&i.LastLogin,
+	)
+	return i, err
+}
+
+const getUserTitleByID = `-- name: GetUserTitleByID :one
+SELECT 
+    ut.user_id, ut.title_id, ut.status, ut.rate, ut.review_id, ut.ctime
+FROM usertitles      as ut
+WHERE ut.title_id = $1::bigint AND ut.user_id = $2::bigint
+`
+
+type GetUserTitleByIDParams struct {
+	TitleID int64 `json:"title_id"`
+	UserID  int64 `json:"user_id"`
+}
+
+func (q *Queries) GetUserTitleByID(ctx context.Context, arg GetUserTitleByIDParams) (Usertitle, error) {
+	row := q.db.QueryRow(ctx, getUserTitleByID, arg.TitleID, arg.UserID)
+	var i Usertitle
+	err := row.Scan(
+		&i.UserID,
+		&i.TitleID,
+		&i.Status,
+		&i.Rate,
+		&i.ReviewID,
+		&i.Ctime,
+	)
+	return i, err
+}
+
 const insertStudio = `-- name: InsertStudio :one
 INSERT INTO studios (studio_name, illust_id, studio_desc)
 VALUES (
@@ -330,13 +394,6 @@ func (q *Queries) InsertTitleTags(ctx context.Context, arg InsertTitleTagsParams
 }
 
 const insertUserTitle = `-- name: InsertUserTitle :one
-
-
-
-
-
-
-
 INSERT INTO usertitles (user_id, title_id, status, rate, review_id)
 VALUES (   
     $1::bigint,
@@ -356,46 +413,6 @@ type InsertUserTitleParams struct {
 	ReviewID *int64           `json:"review_id"`
 }
 
-// -- name: CreateReview :one
-// INSERT INTO reviews (user_id, title_id, image_ids, review_text, creation_date)
-// VALUES ($1, $2, $3, $4, $5)
-// RETURNING review_id, user_id, title_id, image_ids, review_text, creation_date;
-// -- name: UpdateReview :one
-// UPDATE reviews
-// SET
-//
-//	image_ids = COALESCE(sqlc.narg('image_ids'), image_ids),
-//	review_text = COALESCE(sqlc.narg('review_text'), review_text)
-//
-// WHERE review_id = sqlc.arg('review_id')
-// RETURNING *;
-// -- name: DeleteReview :exec
-// DELETE FROM reviews
-// WHERE review_id = $1;
-//
-//	-- name: ListReviewsByTitle :many
-//
-// SELECT review_id, user_id, title_id, image_ids, review_text, creation_date
-// FROM reviews
-// WHERE title_id = $1
-// ORDER BY creation_date DESC
-// LIMIT $2 OFFSET $3;
-// -- name: ListReviewsByUser :many
-// SELECT review_id, user_id, title_id, image_ids, review_text, creation_date
-// FROM reviews
-// WHERE user_id = $1
-// ORDER BY creation_date DESC
-// LIMIT $2 OFFSET $3;
-// -- name: GetUserTitle :one
-// SELECT usertitle_id, user_id, title_id, status, rate, review_id
-// FROM usertitles
-// WHERE user_id = $1 AND title_id = $2;
-// -- name: ListUserTitles :many
-// SELECT usertitle_id, user_id, title_id, status, rate, review_id
-// FROM usertitles
-// WHERE user_id = $1
-// ORDER BY usertitle_id
-// LIMIT $2 OFFSET $3;
 func (q *Queries) InsertUserTitle(ctx context.Context, arg InsertUserTitleParams) (Usertitle, error) {
 	row := q.db.QueryRow(ctx, insertUserTitle,
 		arg.UserID,
@@ -623,6 +640,87 @@ func (q *Queries) SearchTitles(ctx context.Context, arg SearchTitlesParams) ([]S
 	return items, nil
 }
 
+const searchUser = `-- name: SearchUser :many
+SELECT
+    u.id                AS id,
+    u.avatar_id         AS avatar_id,
+    u.mail              AS mail,
+    u.nickname          AS nickname,
+    u.disp_name         AS disp_name,
+    u.user_desc         AS user_desc,
+    u.creation_date     AS creation_date,
+    i.storage_type      AS storage_type,
+    i.image_path        AS image_path
+FROM users AS u
+LEFT JOIN images AS i ON u.avatar_id = i.id
+WHERE
+    (
+        $1::text IS NULL
+        OR (
+            SELECT bool_and(
+                u.nickname ILIKE ('%' || term || '%') 
+                OR u.disp_name ILIKE ('%' || term || '%')
+            )
+            FROM unnest(string_to_array(trim($1::text), ' ')) AS term
+            WHERE term <> ''
+        )
+    )
+    AND (
+        $2::int IS NULL
+        OR u.id > $2::int
+    )
+ORDER BY u.id ASC
+LIMIT COALESCE($3::int, 20)
+`
+
+type SearchUserParams struct {
+	Word   *string `json:"word"`
+	Cursor *int32  `json:"cursor"`
+	Limit  *int32  `json:"limit"`
+}
+
+type SearchUserRow struct {
+	ID           int64         `json:"id"`
+	AvatarID     *int64        `json:"avatar_id"`
+	Mail         *string       `json:"mail"`
+	Nickname     string        `json:"nickname"`
+	DispName     *string       `json:"disp_name"`
+	UserDesc     *string       `json:"user_desc"`
+	CreationDate time.Time     `json:"creation_date"`
+	StorageType  *StorageTypeT `json:"storage_type"`
+	ImagePath    *string       `json:"image_path"`
+}
+
+func (q *Queries) SearchUser(ctx context.Context, arg SearchUserParams) ([]SearchUserRow, error) {
+	rows, err := q.db.Query(ctx, searchUser, arg.Word, arg.Cursor, arg.Limit)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	items := []SearchUserRow{}
+	for rows.Next() {
+		var i SearchUserRow
+		if err := rows.Scan(
+			&i.ID,
+			&i.AvatarID,
+			&i.Mail,
+			&i.Nickname,
+			&i.DispName,
+			&i.UserDesc,
+			&i.CreationDate,
+			&i.StorageType,
+			&i.ImagePath,
+		); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
 const searchUserTitles = `-- name: SearchUserTitles :many
 
 SELECT
@@ -866,8 +964,6 @@ func (q *Queries) SearchUserTitles(ctx context.Context, arg SearchUserTitlesPara
 }
 
 const updateUser = `-- name: UpdateUser :one
-
-
 UPDATE users
 SET
   avatar_id = COALESCE($1, avatar_id),
@@ -896,15 +992,6 @@ type UpdateUserRow struct {
 	Mail         *string   `json:"mail"`
 }
 
-// -- name: ListUsers :many
-// SELECT user_id, avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date
-// FROM users
-// ORDER BY user_id
-// LIMIT $1 OFFSET $2;
-// -- name: CreateUser :one
-// INSERT INTO users (avatar_id, passhash, mail, nickname, disp_name, user_desc, creation_date)
-// VALUES ($1, $2, $3, $4, $5, $6, $7)
-// RETURNING user_id, avatar_id, nickname, disp_name, user_desc, creation_date;
 func (q *Queries) UpdateUser(ctx context.Context, arg UpdateUserParams) (UpdateUserRow, error) {
 	row := q.db.QueryRow(ctx, updateUser,
 		arg.AvatarID,
@@ -925,3 +1012,41 @@ func (q *Queries) UpdateUser(ctx context.Context, arg UpdateUserParams) (UpdateU
 	)
 	return i, err
 }
+
+const updateUserTitle = `-- name: UpdateUserTitle :one
+UPDATE usertitles
+SET
+    status = COALESCE($1::usertitle_status_t, status),
+    rate   = COALESCE($2::int, rate)
+WHERE
+    user_id = $3
+    AND title_id = $4
+RETURNING user_id, title_id, status, rate, review_id, ctime
+`
+
+type UpdateUserTitleParams struct {
+	Status  *UsertitleStatusT `json:"status"`
+	Rate    *int32            `json:"rate"`
+	UserID  int64             `json:"user_id"`
+	TitleID int64             `json:"title_id"`
+}
+
+// Fails with sql.ErrNoRows if (user_id, title_id) not found
+func (q *Queries) UpdateUserTitle(ctx context.Context, arg UpdateUserTitleParams) (Usertitle, error) {
+	row := q.db.QueryRow(ctx, updateUserTitle,
+		arg.Status,
+		arg.Rate,
+		arg.UserID,
+		arg.TitleID,
+	)
+	var i Usertitle
+	err := row.Scan(
+		&i.UserID,
+		&i.TitleID,
+		&i.Status,
+		&i.Rate,
+		&i.ReviewID,
+		&i.Ctime,
+	)
+	return i, err
+}

sql/sqlc.yaml

@@ -3,6 +3,7 @@ sql:
   - engine: "postgresql"
     queries: 
       - "../modules/backend/queries.sql"
+      - "../modules/auth/queries.sql"
     schema: "migrations"
     gen:
       go:
@@ -14,6 +15,11 @@ sql:
         emit_pointers_for_null_types: true
         emit_empty_slices: true #slices returned by :many queries will be empty instead of nil
         overrides:
+          - db_type: "usertitle_status_t"
+            nullable: true
+            go_type: 
+              type: "UsertitleStatusT"
+              pointer: true
           - db_type: "storage_type_t"
             nullable: true
             go_type: