feat: send xsrf_token header
This commit is contained in:
parent
b79a6b9117
commit
1bbfa338d9
15 changed files with 151 additions and 27 deletions
|
|
@ -150,6 +150,8 @@ paths:
|
||||||
description: User not found
|
description: User not found
|
||||||
'500':
|
'500':
|
||||||
description: Unknown server error
|
description: Unknown server error
|
||||||
|
security:
|
||||||
|
- JwtAuthCookies: []
|
||||||
patch:
|
patch:
|
||||||
operationId: updateUser
|
operationId: updateUser
|
||||||
summary: Partially update a user account
|
summary: Partially update a user account
|
||||||
|
|
@ -158,8 +160,7 @@ paths:
|
||||||
Password updates must be done via the dedicated auth-service (`/auth/`).
|
Password updates must be done via the dedicated auth-service (`/auth/`).
|
||||||
Fields not provided in the request body remain unchanged.
|
Fields not provided in the request body remain unchanged.
|
||||||
parameters:
|
parameters:
|
||||||
- $ref: '#/components/parameters/accessToken'
|
- $ref: '#/components/parameters/csrfTokenHeader'
|
||||||
- $ref: '#/components/parameters/csrfToken'
|
|
||||||
- name: user_id
|
- name: user_id
|
||||||
in: path
|
in: path
|
||||||
description: User ID (primary key)
|
description: User ID (primary key)
|
||||||
|
|
@ -404,11 +405,14 @@ paths:
|
||||||
description: User or title not found
|
description: User or title not found
|
||||||
'500':
|
'500':
|
||||||
description: Unknown server error
|
description: Unknown server error
|
||||||
|
security:
|
||||||
|
- JwtAuthCookies: []
|
||||||
patch:
|
patch:
|
||||||
operationId: updateUserTitle
|
operationId: updateUserTitle
|
||||||
summary: Update a usertitle
|
summary: Update a usertitle
|
||||||
description: User updating title list of watched
|
description: User updating title list of watched
|
||||||
parameters:
|
parameters:
|
||||||
|
- $ref: '#/components/parameters/csrfTokenHeader'
|
||||||
- name: user_id
|
- name: user_id
|
||||||
in: path
|
in: path
|
||||||
required: true
|
required: true
|
||||||
|
|
@ -450,11 +454,14 @@ paths:
|
||||||
description: User or Title not found
|
description: User or Title not found
|
||||||
'500':
|
'500':
|
||||||
description: Internal server error
|
description: Internal server error
|
||||||
|
security:
|
||||||
|
- JwtAuthCookies: []
|
||||||
delete:
|
delete:
|
||||||
operationId: deleteUserTitle
|
operationId: deleteUserTitle
|
||||||
summary: Delete a usertitle
|
summary: Delete a usertitle
|
||||||
description: User deleting title from list of watched
|
description: User deleting title from list of watched
|
||||||
parameters:
|
parameters:
|
||||||
|
- $ref: '#/components/parameters/csrfTokenHeader'
|
||||||
- name: user_id
|
- name: user_id
|
||||||
in: path
|
in: path
|
||||||
required: true
|
required: true
|
||||||
|
|
@ -478,6 +485,8 @@ paths:
|
||||||
description: User or Title not found
|
description: User or Title not found
|
||||||
'500':
|
'500':
|
||||||
description: Internal server error
|
description: Internal server error
|
||||||
|
security:
|
||||||
|
- JwtAuthCookies: []
|
||||||
components:
|
components:
|
||||||
parameters:
|
parameters:
|
||||||
accessToken:
|
accessToken:
|
||||||
|
|
@ -491,7 +500,7 @@ components:
|
||||||
description: |
|
description: |
|
||||||
JWT access token.
|
JWT access token.
|
||||||
csrfToken:
|
csrfToken:
|
||||||
name: XSRF-TOKEN
|
name: xsrf_token
|
||||||
in: cookie
|
in: cookie
|
||||||
required: true
|
required: true
|
||||||
schema:
|
schema:
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
name: XSRF-TOKEN
|
name: xsrf_token
|
||||||
in: cookie
|
in: cookie
|
||||||
required: true
|
required: true
|
||||||
schema:
|
schema:
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
get:
|
get:
|
||||||
summary: Get user title
|
summary: Get user title
|
||||||
operationId: getUserTitle
|
operationId: getUserTitle
|
||||||
|
security:
|
||||||
|
- JwtAuthCookies: []
|
||||||
parameters:
|
parameters:
|
||||||
- in: path
|
- in: path
|
||||||
name: user_id
|
name: user_id
|
||||||
|
|
@ -34,7 +36,10 @@ patch:
|
||||||
summary: Update a usertitle
|
summary: Update a usertitle
|
||||||
description: User updating title list of watched
|
description: User updating title list of watched
|
||||||
operationId: updateUserTitle
|
operationId: updateUserTitle
|
||||||
|
security:
|
||||||
|
- JwtAuthCookies: []
|
||||||
parameters:
|
parameters:
|
||||||
|
- $ref: '../parameters/xsrf_token_header.yaml'
|
||||||
- in: path
|
- in: path
|
||||||
name: user_id
|
name: user_id
|
||||||
required: true
|
required: true
|
||||||
|
|
@ -81,7 +86,10 @@ delete:
|
||||||
summary: Delete a usertitle
|
summary: Delete a usertitle
|
||||||
description: User deleting title from list of watched
|
description: User deleting title from list of watched
|
||||||
operationId: deleteUserTitle
|
operationId: deleteUserTitle
|
||||||
|
security:
|
||||||
|
- JwtAuthCookies: []
|
||||||
parameters:
|
parameters:
|
||||||
|
- $ref: '../parameters/xsrf_token_header.yaml'
|
||||||
- in: path
|
- in: path
|
||||||
name: user_id
|
name: user_id
|
||||||
required: true
|
required: true
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
get:
|
get:
|
||||||
summary: Get user info
|
summary: Get user info
|
||||||
operationId: getUsersId
|
operationId: getUsersId
|
||||||
|
security:
|
||||||
|
- JwtAuthCookies: []
|
||||||
parameters:
|
parameters:
|
||||||
- in: path
|
- in: path
|
||||||
name: user_id
|
name: user_id
|
||||||
|
|
@ -36,8 +38,7 @@ patch:
|
||||||
Fields not provided in the request body remain unchanged.
|
Fields not provided in the request body remain unchanged.
|
||||||
operationId: updateUser
|
operationId: updateUser
|
||||||
parameters:
|
parameters:
|
||||||
- $ref: '../parameters/access_token.yaml' # ← для поля в UI и GoDoc
|
- $ref: '../parameters/xsrf_token_header.yaml'
|
||||||
- $ref: '../parameters/xsrf_token_cookie.yaml' # ← для CSRF
|
|
||||||
- name: user_id
|
- name: user_id
|
||||||
in: path
|
in: path
|
||||||
required: true
|
required: true
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ servers:
|
||||||
- url: /auth
|
- url: /auth
|
||||||
|
|
||||||
paths:
|
paths:
|
||||||
/auth/sign-up:
|
/sign-up:
|
||||||
post:
|
post:
|
||||||
summary: Sign up a new user
|
summary: Sign up a new user
|
||||||
tags: [Auth]
|
tags: [Auth]
|
||||||
|
|
@ -38,7 +38,7 @@ paths:
|
||||||
type: integer
|
type: integer
|
||||||
format: int64
|
format: int64
|
||||||
|
|
||||||
/auth/sign-in:
|
/sign-in:
|
||||||
post:
|
post:
|
||||||
summary: Sign in a user and return JWT
|
summary: Sign in a user and return JWT
|
||||||
tags: [Auth]
|
tags: [Auth]
|
||||||
|
|
|
||||||
53
modules/frontend/package-lock.json
generated
53
modules/frontend/package-lock.json
generated
|
|
@ -13,6 +13,7 @@
|
||||||
"@tailwindcss/vite": "^4.1.17",
|
"@tailwindcss/vite": "^4.1.17",
|
||||||
"axios": "^1.12.2",
|
"axios": "^1.12.2",
|
||||||
"react": "^19.1.1",
|
"react": "^19.1.1",
|
||||||
|
"react-cookie": "^8.0.1",
|
||||||
"react-dom": "^19.1.1",
|
"react-dom": "^19.1.1",
|
||||||
"react-router-dom": "^7.9.4",
|
"react-router-dom": "^7.9.4",
|
||||||
"tailwindcss": "^4.1.17"
|
"tailwindcss": "^4.1.17"
|
||||||
|
|
@ -1868,6 +1869,18 @@
|
||||||
"integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
|
"integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
|
||||||
"license": "MIT"
|
"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": {
|
"node_modules/@types/json-schema": {
|
||||||
"version": "7.0.15",
|
"version": "7.0.15",
|
||||||
"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
|
"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
|
||||||
|
|
@ -1890,7 +1903,6 @@
|
||||||
"version": "19.2.2",
|
"version": "19.2.2",
|
||||||
"resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.2.tgz",
|
"resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.2.tgz",
|
||||||
"integrity": "sha512-6mDvHUFSjyT2B2yeNx2nUgMxh9LtOWvkhIU3uePn2I2oyNymUAX1NIsdgviM4CH+JSrp2D2hsMvJOkxY+0wNRA==",
|
"integrity": "sha512-6mDvHUFSjyT2B2yeNx2nUgMxh9LtOWvkhIU3uePn2I2oyNymUAX1NIsdgviM4CH+JSrp2D2hsMvJOkxY+0wNRA==",
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
@ -2524,7 +2536,6 @@
|
||||||
"version": "3.1.3",
|
"version": "3.1.3",
|
||||||
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
|
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
|
||||||
"integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
|
"integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
|
||||||
"dev": true,
|
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/debug": {
|
"node_modules/debug": {
|
||||||
|
|
@ -3260,6 +3271,15 @@
|
||||||
"node": ">= 0.4"
|
"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": {
|
"node_modules/ignore": {
|
||||||
"version": "5.3.2",
|
"version": "5.3.2",
|
||||||
"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
|
"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
|
||||||
|
|
@ -4068,6 +4088,20 @@
|
||||||
"node": ">=0.10.0"
|
"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": {
|
"node_modules/react-dom": {
|
||||||
"version": "19.2.0",
|
"version": "19.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.0.tgz",
|
||||||
|
|
@ -4081,6 +4115,12 @@
|
||||||
"react": "^19.2.0"
|
"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": {
|
"node_modules/react-refresh": {
|
||||||
"version": "0.17.0",
|
"version": "0.17.0",
|
||||||
"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.17.0.tgz",
|
"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.17.0.tgz",
|
||||||
|
|
@ -4481,6 +4521,15 @@
|
||||||
"devOptional": true,
|
"devOptional": true,
|
||||||
"license": "MIT"
|
"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": {
|
"node_modules/universalify": {
|
||||||
"version": "2.0.1",
|
"version": "2.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,7 @@
|
||||||
"@tailwindcss/vite": "^4.1.17",
|
"@tailwindcss/vite": "^4.1.17",
|
||||||
"axios": "^1.12.2",
|
"axios": "^1.12.2",
|
||||||
"react": "^19.1.1",
|
"react": "^19.1.1",
|
||||||
|
"react-cookie": "^8.0.1",
|
||||||
"react-dom": "^19.1.1",
|
"react-dom": "^19.1.1",
|
||||||
"react-router-dom": "^7.9.4",
|
"react-router-dom": "^7.9.4",
|
||||||
"tailwindcss": "^4.1.17"
|
"tailwindcss": "^4.1.17"
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,9 @@ export { CancelablePromise, CancelError } from './core/CancelablePromise';
|
||||||
export { OpenAPI } from './core/OpenAPI';
|
export { OpenAPI } from './core/OpenAPI';
|
||||||
export type { OpenAPIConfig } from './core/OpenAPI';
|
export type { OpenAPIConfig } from './core/OpenAPI';
|
||||||
|
|
||||||
|
export type { accessToken } from './models/accessToken';
|
||||||
|
export type { csrfToken } from './models/csrfToken';
|
||||||
|
export type { csrfTokenHeader } from './models/csrfTokenHeader';
|
||||||
export type { cursor } from './models/cursor';
|
export type { cursor } from './models/cursor';
|
||||||
export type { CursorObj } from './models/CursorObj';
|
export type { CursorObj } from './models/CursorObj';
|
||||||
export type { Image } from './models/Image';
|
export type { Image } from './models/Image';
|
||||||
|
|
|
||||||
9
modules/frontend/src/api/models/accessToken.ts
Normal file
9
modules/frontend/src/api/models/accessToken.ts
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
/* generated using openapi-typescript-codegen -- do not edit */
|
||||||
|
/* istanbul ignore file */
|
||||||
|
/* tslint:disable */
|
||||||
|
/* eslint-disable */
|
||||||
|
/**
|
||||||
|
* JWT access token.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
export type accessToken = string;
|
||||||
11
modules/frontend/src/api/models/csrfToken.ts
Normal file
11
modules/frontend/src/api/models/csrfToken.ts
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
/* generated using openapi-typescript-codegen -- do not edit */
|
||||||
|
/* istanbul ignore file */
|
||||||
|
/* tslint:disable */
|
||||||
|
/* eslint-disable */
|
||||||
|
/**
|
||||||
|
* Anti-CSRF token (Double Submit Cookie pattern).
|
||||||
|
* Stored in non-HttpOnly cookie, readable by JavaScript.
|
||||||
|
* Must be echoed in `X-XSRF-TOKEN` header for state-changing requests (POST/PUT/PATCH/DELETE).
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
export type csrfToken = string;
|
||||||
10
modules/frontend/src/api/models/csrfTokenHeader.ts
Normal file
10
modules/frontend/src/api/models/csrfTokenHeader.ts
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
/* generated using openapi-typescript-codegen -- do not edit */
|
||||||
|
/* istanbul ignore file */
|
||||||
|
/* tslint:disable */
|
||||||
|
/* eslint-disable */
|
||||||
|
/**
|
||||||
|
* Anti-CSRF token. Must match the `XSRF-TOKEN` cookie.
|
||||||
|
* Required for all state-changing requests (POST/PUT/PATCH/DELETE).
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
export type csrfTokenHeader = string;
|
||||||
|
|
@ -135,12 +135,16 @@ export class DefaultService {
|
||||||
* Password updates must be done via the dedicated auth-service (`/auth/`).
|
* Password updates must be done via the dedicated auth-service (`/auth/`).
|
||||||
* Fields not provided in the request body remain unchanged.
|
* Fields not provided in the request body remain unchanged.
|
||||||
*
|
*
|
||||||
|
* @param xXsrfToken Anti-CSRF token. Must match the `XSRF-TOKEN` cookie.
|
||||||
|
* Required for all state-changing requests (POST/PUT/PATCH/DELETE).
|
||||||
|
*
|
||||||
* @param userId User ID (primary key)
|
* @param userId User ID (primary key)
|
||||||
* @param requestBody
|
* @param requestBody
|
||||||
* @returns User User updated successfully. Returns updated user representation (excluding sensitive fields).
|
* @returns User User updated successfully. Returns updated user representation (excluding sensitive fields).
|
||||||
* @throws ApiError
|
* @throws ApiError
|
||||||
*/
|
*/
|
||||||
public static updateUser(
|
public static updateUser(
|
||||||
|
xXsrfToken: string,
|
||||||
userId: number,
|
userId: number,
|
||||||
requestBody: {
|
requestBody: {
|
||||||
/**
|
/**
|
||||||
|
|
@ -171,6 +175,9 @@ export class DefaultService {
|
||||||
path: {
|
path: {
|
||||||
'user_id': userId,
|
'user_id': userId,
|
||||||
},
|
},
|
||||||
|
headers: {
|
||||||
|
'X-XSRF-TOKEN': xXsrfToken,
|
||||||
|
},
|
||||||
body: requestBody,
|
body: requestBody,
|
||||||
mediaType: 'application/json',
|
mediaType: 'application/json',
|
||||||
errors: {
|
errors: {
|
||||||
|
|
@ -309,6 +316,9 @@ export class DefaultService {
|
||||||
/**
|
/**
|
||||||
* Update a usertitle
|
* Update a usertitle
|
||||||
* User updating title list of watched
|
* User updating title list of watched
|
||||||
|
* @param xXsrfToken Anti-CSRF token. Must match the `XSRF-TOKEN` cookie.
|
||||||
|
* Required for all state-changing requests (POST/PUT/PATCH/DELETE).
|
||||||
|
*
|
||||||
* @param userId
|
* @param userId
|
||||||
* @param titleId
|
* @param titleId
|
||||||
* @param requestBody
|
* @param requestBody
|
||||||
|
|
@ -316,6 +326,7 @@ export class DefaultService {
|
||||||
* @throws ApiError
|
* @throws ApiError
|
||||||
*/
|
*/
|
||||||
public static updateUserTitle(
|
public static updateUserTitle(
|
||||||
|
xXsrfToken: string,
|
||||||
userId: number,
|
userId: number,
|
||||||
titleId: number,
|
titleId: number,
|
||||||
requestBody: {
|
requestBody: {
|
||||||
|
|
@ -330,6 +341,9 @@ export class DefaultService {
|
||||||
'user_id': userId,
|
'user_id': userId,
|
||||||
'title_id': titleId,
|
'title_id': titleId,
|
||||||
},
|
},
|
||||||
|
headers: {
|
||||||
|
'X-XSRF-TOKEN': xXsrfToken,
|
||||||
|
},
|
||||||
body: requestBody,
|
body: requestBody,
|
||||||
mediaType: 'application/json',
|
mediaType: 'application/json',
|
||||||
errors: {
|
errors: {
|
||||||
|
|
@ -344,12 +358,16 @@ export class DefaultService {
|
||||||
/**
|
/**
|
||||||
* Delete a usertitle
|
* Delete a usertitle
|
||||||
* User deleting title from list of watched
|
* User deleting title from list of watched
|
||||||
|
* @param xXsrfToken Anti-CSRF token. Must match the `XSRF-TOKEN` cookie.
|
||||||
|
* Required for all state-changing requests (POST/PUT/PATCH/DELETE).
|
||||||
|
*
|
||||||
* @param userId
|
* @param userId
|
||||||
* @param titleId
|
* @param titleId
|
||||||
* @returns any Title successfully deleted
|
* @returns any Title successfully deleted
|
||||||
* @throws ApiError
|
* @throws ApiError
|
||||||
*/
|
*/
|
||||||
public static deleteUserTitle(
|
public static deleteUserTitle(
|
||||||
|
xXsrfToken: string,
|
||||||
userId: number,
|
userId: number,
|
||||||
titleId: number,
|
titleId: number,
|
||||||
): CancelablePromise<any> {
|
): CancelablePromise<any> {
|
||||||
|
|
@ -360,6 +378,9 @@ export class DefaultService {
|
||||||
'user_id': userId,
|
'user_id': userId,
|
||||||
'title_id': titleId,
|
'title_id': titleId,
|
||||||
},
|
},
|
||||||
|
headers: {
|
||||||
|
'X-XSRF-TOKEN': xXsrfToken,
|
||||||
|
},
|
||||||
errors: {
|
errors: {
|
||||||
401: `Unauthorized — missing or invalid auth token`,
|
401: `Unauthorized — missing or invalid auth token`,
|
||||||
403: `Forbidden — user not allowed to delete title`,
|
403: `Forbidden — user not allowed to delete title`,
|
||||||
|
|
|
||||||
|
|
@ -12,19 +12,17 @@ export class AuthService {
|
||||||
* @returns any Sign-up result
|
* @returns any Sign-up result
|
||||||
* @throws ApiError
|
* @throws ApiError
|
||||||
*/
|
*/
|
||||||
public static postAuthSignUp(
|
public static postSignUp(
|
||||||
requestBody: {
|
requestBody: {
|
||||||
nickname: string;
|
nickname: string;
|
||||||
pass: string;
|
pass: string;
|
||||||
},
|
},
|
||||||
): CancelablePromise<{
|
): CancelablePromise<{
|
||||||
success?: boolean;
|
user_id: number;
|
||||||
error?: string | null;
|
|
||||||
user_id?: string | null;
|
|
||||||
}> {
|
}> {
|
||||||
return __request(OpenAPI, {
|
return __request(OpenAPI, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
url: '/auth/sign-up',
|
url: '/sign-up',
|
||||||
body: requestBody,
|
body: requestBody,
|
||||||
mediaType: 'application/json',
|
mediaType: 'application/json',
|
||||||
});
|
});
|
||||||
|
|
@ -35,19 +33,18 @@ export class AuthService {
|
||||||
* @returns any Sign-in result with JWT
|
* @returns any Sign-in result with JWT
|
||||||
* @throws ApiError
|
* @throws ApiError
|
||||||
*/
|
*/
|
||||||
public static postAuthSignIn(
|
public static postSignIn(
|
||||||
requestBody: {
|
requestBody: {
|
||||||
nickname: string;
|
nickname: string;
|
||||||
pass: string;
|
pass: string;
|
||||||
},
|
},
|
||||||
): CancelablePromise<{
|
): CancelablePromise<{
|
||||||
error?: string | null;
|
user_id: number;
|
||||||
user_id?: string | null;
|
user_name: string;
|
||||||
user_name?: string | null;
|
|
||||||
}> {
|
}> {
|
||||||
return __request(OpenAPI, {
|
return __request(OpenAPI, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
url: '/auth/sign-in',
|
url: '/sign-in',
|
||||||
body: requestBody,
|
body: requestBody,
|
||||||
mediaType: 'application/json',
|
mediaType: 'application/json',
|
||||||
errors: {
|
errors: {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import { DefaultService } from "../../api";
|
import { DefaultService } from "../../api";
|
||||||
import type { UserTitleStatus } from "../../api";
|
import type { UserTitleStatus } from "../../api";
|
||||||
|
import { useCookies } from 'react-cookie';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
ClockIcon,
|
ClockIcon,
|
||||||
CheckCircleIcon,
|
CheckCircleIcon,
|
||||||
|
|
@ -17,6 +19,9 @@ const STATUS_BUTTONS: { status: UserTitleStatus; icon: React.ReactNode; label: s
|
||||||
];
|
];
|
||||||
|
|
||||||
export function TitleStatusControls({ titleId }: { titleId: number }) {
|
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 [currentStatus, setCurrentStatus] = useState<UserTitleStatus | null>(null);
|
||||||
const [loading, setLoading] = useState(false);
|
const [loading, setLoading] = useState(false);
|
||||||
|
|
||||||
|
|
@ -41,7 +46,7 @@ export function TitleStatusControls({ titleId }: { titleId: number }) {
|
||||||
try {
|
try {
|
||||||
// 1) Если кликнули на текущий статус — DELETE
|
// 1) Если кликнули на текущий статус — DELETE
|
||||||
if (currentStatus === status) {
|
if (currentStatus === status) {
|
||||||
await DefaultService.deleteUserTitle(userId, titleId);
|
await DefaultService.deleteUserTitle(xsrfToken, userId, titleId);
|
||||||
setCurrentStatus(null);
|
setCurrentStatus(null);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -56,7 +61,7 @@ export function TitleStatusControls({ titleId }: { titleId: number }) {
|
||||||
setCurrentStatus(added.status);
|
setCurrentStatus(added.status);
|
||||||
} else {
|
} else {
|
||||||
// уже есть запись — PATCH
|
// уже есть запись — PATCH
|
||||||
const updated = await DefaultService.updateUserTitle(userId, titleId, { status });
|
const updated = await DefaultService.updateUserTitle(xsrfToken, userId, titleId, { status });
|
||||||
setCurrentStatus(updated.status);
|
setCurrentStatus(updated.status);
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
|
|
|
||||||
|
|
@ -17,23 +17,23 @@ export const LoginPage: React.FC = () => {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (isLogin) {
|
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) {
|
if (res.user_id && res.user_name) {
|
||||||
// Сохраняем user_id и username в localStorage
|
// Сохраняем user_id и username в localStorage
|
||||||
localStorage.setItem("userId", res.user_id);
|
localStorage.setItem("userId", res.user_id.toString());
|
||||||
localStorage.setItem("username", res.user_name);
|
localStorage.setItem("username", res.user_name);
|
||||||
|
|
||||||
navigate("/profile"); // редирект на профиль
|
navigate("/profile"); // редирект на профиль
|
||||||
} else {
|
} else {
|
||||||
setError(res.error || "Login failed");
|
setError("Login failed");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// SignUp оставляем без сохранения данных
|
// SignUp оставляем без сохранения данных
|
||||||
const res = await AuthService.postAuthSignUp({ nickname, pass: password });
|
const res = await AuthService.postSignUp({ nickname, pass: password });
|
||||||
if (res.user_id) {
|
if (res.user_id) {
|
||||||
setIsLogin(true); // переключаемся на login после регистрации
|
setIsLogin(true); // переключаемся на login после регистрации
|
||||||
} else {
|
} else {
|
||||||
setError(res.error || "Sign up failed");
|
setError("Sign up failed");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (err: any) {
|
} catch (err: any) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue