Vorkout/connect
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

base: Vorkout:master
Branches Tags
Vorkout:master
Vorkout:VORKOUT-16
Vorkout:VORKOUT-14
Vorkout:VORKOUT-8
Vorkout:VORKOUT-15
Vorkout:VORKOUT-6
Vorkout:VORKOUT-6-test
Vorkout:VORKOUT-7fix
Vorkout:VORKOUT-7
Vorkout:VORKOUT-13
Vorkout:VORKOUT-12
Vorkout:VORKOUT-4
Vorkout:VORKOUT-9
Vorkout:VORKOUT-10
Vorkout:VORKOUT-3
Vorkout:VORKOUT-2
..
compare: Vorkout:VORKOUT-9
Branches Tags
Vorkout:VORKOUT-16
Vorkout:VORKOUT-14
Vorkout:master
Vorkout:VORKOUT-8
Vorkout:VORKOUT-15
Vorkout:VORKOUT-6
Vorkout:VORKOUT-6-test
Vorkout:VORKOUT-7fix
Vorkout:VORKOUT-7
Vorkout:VORKOUT-13
Vorkout:VORKOUT-12
Vorkout:VORKOUT-4
Vorkout:VORKOUT-9
Vorkout:VORKOUT-10
Vorkout:VORKOUT-3
Vorkout:VORKOUT-2

No commits in common. "master" and "VORKOUT-9" have entirely different histories.
master ... VORKOUT-9

76 changed files with 15998 additions and 6078 deletions
Show Stats Expand all files Collapse all files

34
Makefile
View File

@ -12,53 +12,39 @@ services:
start-api: start-api:
cd api && \ cd api && \
poetry run python -m ${API_APPLICATION_NAME} source .venv/bin/activate && \
python -m ${API_APPLICATION_NAME}
start-client: start-client:
cd client && \ cd client && \
npm run dev npm start
migrate: migrate:
cd api && \ cd api && \
source .venv/bin/activate && \
cd $(API_APPLICATION_NAME)/db && \ cd $(API_APPLICATION_NAME)/db && \
PYTHONPATH='../..' ALEMBIC_MIGRATIONS=True poetry run alembic upgrade $(args) PYTHONPATH='../..' ALEMBIC_MIGRATIONS=True alembic upgrade $(args)
downgrade: downgrade:
cd api && \ cd api && \
source .venv/bin/activate && \
cd $(API_APPLICATION_NAME)/db && \ cd $(API_APPLICATION_NAME)/db && \
PYTHONPATH='../..' poetry run alembic downgrade -1 PYTHONPATH='../..' alembic downgrade -1
revision: revision:
cd api && \ cd api && \
source .venv/bin/activate && \
cd $(API_APPLICATION_NAME)/db && \ cd $(API_APPLICATION_NAME)/db && \
PYTHONPATH='../..' ALEMBIC_MIGRATIONS=True poetry run alembic revision --autogenerate PYTHONPATH='../..' ALEMBIC_MIGRATIONS=True alembic revision --autogenerate
venv-api: venv-api:
cd api && \ cd api && \
poetry install poetry install
venv-client:
cd client && \
npm install
install: install:
make migrate head && \ make migrate head && \
cd api && \ cd api && \
poetry run python3 -m api.utils.init poetry run python3 api/utils/init.py
%:: %::
echo $(MESSAGE) echo $(MESSAGE)
format-api:
cd api && \
poetry run ruff format .
check-api:
cd api && \
poetry run ruff format . --check
regenerate-openapi-local:
cd client \
rm src/types/openapi-types.ts \
npx openapi-typescript http://localhost:8000/openapi -o src/types/openapi-types.ts

50
README.md
View File

@ -1,49 +1 @@
# Vorkout/connect Vorkout/connect
### Makefile cheat sheet
```Makefile
Dev:
venv-api create python virtual environment
venv-client install node modules
install Migrate database and initialize project
Application Api:
start-api Run api server
Application Client:
start-client Run client server
Prod:
...
Code:
check-api Check api code with ruff
format-api Reformat api code with ruff
Help:
...
Testing:
...
```
### Запуск в режиме разработки
Для запуска в режиме разработки нужно
1. Устрановить среду для clint и api
2. Запустить в докере или локально необходимые сервисы (базуб брокер и redis) `make services`
3. Для миграции и создания первого пользователя необходимо запустить `make install`
3. Запустить api `make start-api`
4. Запустить client `make start-client`
### Миграции алембик
1. Стоит внимательно учитывать, адрес какой базы стоит в настройках alembic - локальной или продакшн. Посмотреть это можно в файле [env.py](connect/api/api/db/alembic/env.py). Конфиг для локальной базы
```python
config.set_main_option(
"sqlalchemy.url",
f"mysql+pymysql://root:hackme@localhost:3306/connect_test",
)
```

7
api/api/__main__.py
View File

@ -9,10 +9,9 @@ from uvicorn import run
from api.config import get_settings, DefaultSettings from api.config import get_settings, DefaultSettings
from api.endpoints import list_of_routes from api.endpoints import list_of_routes
from api.utils.common import get_hostname from api.utils.common import get_hostname
from api.services.middleware import MiddlewareAccessTokenValidadtion
logger = logging.getLogger() logger = logging.getLogger()
logger.setLevel(logging.DEBUG) logger.setLevel(logging.INFO)
def bind_routes(application: FastAPI, setting: DefaultSettings) -> None: def bind_routes(application: FastAPI, setting: DefaultSettings) -> None:
@ -33,7 +32,7 @@ def get_app() -> FastAPI:
description=description, description=description,
docs_url="/swagger", docs_url="/swagger",
openapi_url="/openapi", openapi_url="/openapi",
version="0.0.2", version="0.1.0",
) )
settings = get_settings() settings = get_settings()
bind_routes(application, settings) bind_routes(application, settings)
@ -45,7 +44,6 @@ app = get_app()
dev_origins = [ dev_origins = [
"http://localhost:3000", "http://localhost:3000",
"http://127.0.0.1:64775",
] ]
prod_origins = [""] prod_origins = [""]
@ -73,7 +71,6 @@ if __name__ == "__main__":
log_level="info", log_level="info",
) )
app.add_middleware(MiddlewareAccessTokenValidadtion)
app.add_middleware( app.add_middleware(
CORSMiddleware, CORSMiddleware,
allow_origins=origins, allow_origins=origins,

6
api/api/config/default.py
View File

@ -44,12 +44,6 @@ class DefaultSettings(BaseSettings):
REDIS_DB: int = int(environ.get("REDIS_DB", "0")) REDIS_DB: int = int(environ.get("REDIS_DB", "0"))
REDIS_PASSWORD: str = environ.get("REDIS_PASSWORD", "hackme") REDIS_PASSWORD: str = environ.get("REDIS_PASSWORD", "hackme")
SECRET_KEY: str = environ.get("SECRET_KEY", "secret")
ALGORITHM: str = environ.get("ALGORITHM", "HS256")
ACCESS_TOKEN_EXPIRE_MINUTES: int = int(environ.get("ACCESS_TOKEN_EXPIRE_MINUTES", 600))
REFRESH_TOKEN_EXPIRE_DAYS: int = int(environ.get("REFRESH_TOKEN_EXPIRE_DAYS_LONG", 365))
@cached_property @cached_property
def database_settings(self) -> dict: def database_settings(self) -> dict:
"""Get all settings for connection with database.""" """Get all settings for connection with database."""

38
api/api/db/alembic/versions/93106fbe7d83_.py
View File

@ -1,38 +0,0 @@
"""empty message
Revision ID: 93106fbe7d83
Revises: f1b06efacec0
Create Date: 2025-06-26 16:36:02.270706
"""
from typing import Sequence, Union
from alembic import op
import sqlalchemy as sa
from sqlalchemy.dialects import mysql
# revision identifiers, used by Alembic.
revision: str = '93106fbe7d83'
down_revision: Union[str, None] = 'f1b06efacec0'
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None
def upgrade() -> None:
"""Upgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
op.alter_column('account_keyring', 'key_value',
existing_type=mysql.VARCHAR(length=255),
type_=sa.String(length=512),
existing_nullable=False)
# ### end Alembic commands ###
def downgrade() -> None:
"""Downgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
op.alter_column('account_keyring', 'key_value',
existing_type=sa.String(length=512),
type_=mysql.VARCHAR(length=255),
existing_nullable=False)
# ### end Alembic commands ###

138
api/api/db/alembic/versions/f1b06efacec0_.py
View File

@ -1,138 +0,0 @@
"""empty message
Revision ID: f1b06efacec0
Revises:
Create Date: 2025-04-23 15:09:14.833213
"""
from typing import Sequence, Union
from alembic import op
import sqlalchemy as sa
from sqlalchemy.dialects import mysql
# revision identifiers, used by Alembic.
revision: str = 'f1b06efacec0'
down_revision: Union[str, None] = None
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None
def upgrade() -> None:
"""Upgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('account',
sa.Column('id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), autoincrement=True, nullable=False),
sa.Column('name', sa.String(length=100), nullable=False),
sa.Column('login', sa.String(length=100), nullable=False),
sa.Column('email', sa.String(length=100), nullable=True),
sa.Column('bind_tenant_id', sa.String(length=40), nullable=True),
sa.Column('role', sa.Enum('OWNER', 'ADMIN', 'EDITOR', 'VIEWER', name='accountrole'), nullable=False),
sa.Column('meta', sa.JSON(), nullable=True),
sa.Column('creator_id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=True),
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
sa.Column('status', sa.Enum('ACTIVE', 'DISABLED', 'BLOCKED', 'DELETED', name='accountstatus'), nullable=False),
sa.ForeignKeyConstraint(['creator_id'], ['account.id'], ),
sa.PrimaryKeyConstraint('id')
)
op.create_index('idx_login', 'account', ['login'], unique=False)
op.create_index('idx_name', 'account', ['name'], unique=False)
op.create_table('account_keyring',
sa.Column('owner_id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=False),
sa.Column('key_type', sa.Enum('PASSWORD', 'ACCESS_TOKEN', 'REFRESH_TOKEN', 'API_KEY', name='keytype'), nullable=False),
sa.Column('key_id', sa.String(length=40), nullable=False),
sa.Column('key_value', sa.String(length=255), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
sa.Column('expiry', sa.DateTime(timezone=True), nullable=True),
sa.Column('status', sa.Enum('ACTIVE', 'EXPIRED', 'DELETED', name='keystatus'), nullable=False),
sa.ForeignKeyConstraint(['owner_id'], ['account.id'], ),
sa.PrimaryKeyConstraint('owner_id', 'key_type', 'key_id')
)
op.create_table('list_events',
sa.Column('id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), autoincrement=True, nullable=False),
sa.Column('name', sa.String(length=40, collation='latin1_bin'), nullable=False),
sa.Column('title', sa.String(length=64), nullable=False),
sa.Column('creator_id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
sa.Column('schema', sa.JSON(), nullable=True),
sa.Column('state', sa.Enum('AUTO', 'DESCRIPTED', name='eventstate'), nullable=False),
sa.Column('status', sa.Enum('ACTIVE', 'DISABLED', 'DELETED', name='eventstatus'), nullable=False),
sa.ForeignKeyConstraint(['creator_id'], ['account.id'], ),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('name')
)
op.create_table('process_schema',
sa.Column('id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), autoincrement=True, nullable=False),
sa.Column('title', sa.String(length=100), nullable=False),
sa.Column('description', sa.Text(), nullable=False),
sa.Column('owner_id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=False),
sa.Column('creator_id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
sa.Column('settings', sa.JSON(), nullable=True),
sa.Column('status', sa.Enum('ACTIVE', 'STOPPING', 'STOPPED', 'DELETED', name='processstatus'), nullable=False),
sa.ForeignKeyConstraint(['creator_id'], ['account.id'], ),
sa.ForeignKeyConstraint(['owner_id'], ['account.id'], ),
sa.PrimaryKeyConstraint('id')
)
op.create_index('idx_owner_id', 'process_schema', ['owner_id'], unique=False)
op.create_table('process_version_archive',
sa.Column('id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), autoincrement=True, nullable=False),
sa.Column('ps_id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=False),
sa.Column('version', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=False),
sa.Column('snapshot', sa.JSON(), nullable=True),
sa.Column('owner_id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
sa.Column('is_last', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=True),
sa.ForeignKeyConstraint(['owner_id'], ['account.id'], ),
sa.ForeignKeyConstraint(['ps_id'], ['process_schema.id'], ),
sa.PrimaryKeyConstraint('id', 'version')
)
op.create_table('ps_node',
sa.Column('id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), autoincrement=True, nullable=False),
sa.Column('ps_id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=False),
sa.Column('node_type', sa.Enum('TYPE1', 'TYPE2', 'TYPE3', name='nodetype'), nullable=False),
sa.Column('settings', sa.JSON(), nullable=True),
sa.Column('creator_id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
sa.Column('status', sa.Enum('ACTIVE', 'DISABLED', 'DELETED', name='nodestatus'), nullable=False),
sa.ForeignKeyConstraint(['creator_id'], ['account.id'], ),
sa.ForeignKeyConstraint(['ps_id'], ['process_schema.id'], ),
sa.PrimaryKeyConstraint('id')
)
op.create_index('idx_ps_id', 'ps_node', ['ps_id'], unique=False)
op.create_table('node_link',
sa.Column('id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), autoincrement=True, nullable=False),
sa.Column('link_name', sa.String(length=20), nullable=False),
sa.Column('node_id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=False),
sa.Column('next_node_id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=False),
sa.Column('settings', sa.JSON(), nullable=True),
sa.Column('creator_id', sa.Integer().with_variant(mysql.INTEGER(unsigned=True), 'mysql'), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
sa.Column('status', sa.Enum('ACTIVE', 'STOPPING', 'STOPPED', 'DELETED', name='nodelinkstatus'), nullable=False),
sa.ForeignKeyConstraint(['creator_id'], ['account.id'], ),
sa.ForeignKeyConstraint(['next_node_id'], ['ps_node.id'], ),
sa.ForeignKeyConstraint(['node_id'], ['ps_node.id'], ),
sa.PrimaryKeyConstraint('id')
)
op.create_index('idx_next_node_id', 'node_link', ['next_node_id'], unique=False)
op.create_index('idx_node_id', 'node_link', ['node_id'], unique=False)
# ### end Alembic commands ###
def downgrade() -> None:
"""Downgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
op.drop_index('idx_node_id', table_name='node_link')
op.drop_index('idx_next_node_id', table_name='node_link')
op.drop_table('node_link')
op.drop_index('idx_ps_id', table_name='ps_node')
op.drop_table('ps_node')
op.drop_table('process_version_archive')
op.drop_index('idx_owner_id', table_name='process_schema')
op.drop_table('process_schema')
op.drop_table('list_events')
op.drop_table('account_keyring')
op.drop_index('idx_name', table_name='account')
op.drop_index('idx_login', table_name='account')
op.drop_table('account')
# ### end Alembic commands ###

5
api/api/db/connection/session.py
View File

@ -15,9 +15,11 @@ from api.config import get_settings
from api.config.default import DbCredentialsSchema from api.config.default import DbCredentialsSchema
class SessionManager: class SessionManager:
engines: Any engines: Any
def __init__(self, database_uri=get_settings().database_uri) -> None: def __init__(self, database_uri=get_settings().database_uri) -> None:
self.database_uri = database_uri self.database_uri = database_uri
self.refresh(database_uri) self.refresh(database_uri)
@ -42,11 +44,9 @@ class SessionManager:
pool_size=get_settings().CONNECTION_POOL_SIZE, pool_size=get_settings().CONNECTION_POOL_SIZE,
max_overflow=get_settings().CONNECTION_OVERFLOW, max_overflow=get_settings().CONNECTION_OVERFLOW,
) )
def get_engine_by_db_uri(self, database_uri) -> AsyncEngine: def get_engine_by_db_uri(self, database_uri) -> AsyncEngine:
return self.engines[database_uri] return self.engines[database_uri]
@contextlib.asynccontextmanager @contextlib.asynccontextmanager
async def get_connection( async def get_connection(
database_uri=None, database_uri=None,
@ -58,7 +58,6 @@ async def get_connection(
async with engine.connect() as conn: async with engine.connect() as conn:
yield conn yield conn
async def get_connection_dep() -> AsyncConnection: async def get_connection_dep() -> AsyncConnection:
async with get_connection() as conn: async with get_connection() as conn:
yield conn yield conn

126
api/api/db/logic/account.py
View File

@ -1,126 +0,0 @@
import math
from datetime import datetime, timezone
from enum import Enum
from typing import Optional
from sqlalchemy import func, insert, select
from sqlalchemy.ext.asyncio import AsyncConnection
from api.db.tables.account import account_table
from api.schemas.account.account import User
from api.schemas.endpoints.account import all_user_adapter, AllUser, AllUserResponse, UserCreate
async def get_user_accaunt_page(connection: AsyncConnection, page, limit) -> Optional[AllUserResponse]:
"""
Получает список ползовелей заданных значениями page, limit.
"""
first_user = page * limit - (limit)
query = (
select(
account_table.c.id,
account_table.c.name,
account_table.c.login,
account_table.c.email,
account_table.c.bind_tenant_id,
account_table.c.role,
account_table.c.created_at,
account_table.c.status,
)
.order_by(account_table.c.id)
.offset(first_user)
.limit(limit)
)
count_query = select(func.count()).select_from(account_table)
result = await connection.execute(query)
count_result = await connection.execute(count_query)
users_data = result.mappings().all()
total_count = count_result.scalar()
total_pages = math.ceil(total_count / limit)
validated_users = all_user_adapter.validate_python(users_data)
return AllUserResponse(
users=validated_users,
amount_count=total_count,
amount_pages=total_pages,
current_page=page,
limit=limit,
)
async def get_user_by_id(connection: AsyncConnection, user_id: int) -> Optional[AllUser]:
"""
Получает юзера по id.
"""
query = select(account_table).where(account_table.c.id == user_id)
user_db_cursor = await connection.execute(query)
user = user_db_cursor.mappings().one_or_none()
if not user:
return None
return AllUser.model_validate(user)
async def get_user_by_login(connection: AsyncConnection, login: str) -> Optional[User]:
"""
Получает юзера по login.
"""
query = select(account_table).where(account_table.c.login == login)
user_db_cursor = await connection.execute(query)
user_db = user_db_cursor.one_or_none()
if not user_db:
return None
user_data = {
column.name: (
getattr(user_db, column.name).name
if isinstance(getattr(user_db, column.name), Enum)
else getattr(user_db, column.name)
)
for column in account_table.columns
}
return User.model_validate(user_data)
async def update_user_by_id(connection: AsyncConnection, update_values, user) -> Optional[User]:
"""
Вносит изменеия в нужное поле таблицы account_table.
"""
await connection.execute(account_table.update().where(account_table.c.id == user.id).values(**update_values))
await connection.commit()
async def create_user(connection: AsyncConnection, user: UserCreate, creator_id: int) -> Optional[AllUser]:
"""
Создает нове поле в таблице account_table.
"""
query = insert(account_table).values(
name=user.name,
login=user.login,
email=user.email,
bind_tenant_id=user.bind_tenant_id,
role=user.role.value,
meta=user.meta or {},
creator_id=creator_id,
created_at=datetime.now(timezone.utc),
status=user.status.value,
)
res = await connection.execute(query)
await connection.commit()
new_user = await get_user_by_id(connection, res.lastrowid)
return new_user

87
api/api/db/logic/auth.py
View File

@ -1,87 +0,0 @@
from typing import Optional
from sqlalchemy import select, update
from sqlalchemy.ext.asyncio import AsyncConnection
from enum import Enum
from api.db.tables.account import account_table, account_keyring_table, KeyType, KeyStatus
from api.schemas.account.account import User
from api.schemas.account.account_keyring import AccountKeyring
from api.schemas.endpoints.account import AllUser
from api.utils.key_id_gen import KeyIdGenerator
from datetime import datetime, timezone
async def get_user(connection: AsyncConnection, login: str) -> tuple[Optional[AllUser], Optional[AccountKeyring]]:
query = (
select(account_table, account_keyring_table)
.join(account_keyring_table, account_table.c.id == account_keyring_table.c.owner_id)
.where(account_table.c.login == login, account_keyring_table.c.key_type == KeyType.PASSWORD)
)
user_db_cursor = await connection.execute(query)
user_db = user_db_cursor.one_or_none()
if not user_db:
return None, None
user_data = {
column.name: (
getattr(user_db, column.name).name
if isinstance(getattr(user_db, column.name), Enum)
else getattr(user_db, column.name)
)
for column in account_table.columns
}
password_data = {
column.name: (
getattr(user_db, column.name).name
if isinstance(getattr(user_db, column.name), Enum)
else getattr(user_db, column.name)
)
for column in account_keyring_table.columns
}
user = AllUser.model_validate(user_data)
password = AccountKeyring.model_validate(password_data)
return user, password
async def upgrade_old_refresh_token(connection: AsyncConnection, refresh_token) -> Optional[User]:
new_status = KeyStatus.EXPIRED
update_query = (
update(account_keyring_table)
.where(
account_keyring_table.c.status == KeyStatus.ACTIVE,
account_keyring_table.c.key_type == KeyType.REFRESH_TOKEN,
account_keyring_table.c.key_value == refresh_token,
)
.values(status=new_status)
)
await connection.execute(update_query)
await connection.commit()
async def add_new_refresh_token(
connection: AsyncConnection, new_refresh_token, new_refresh_token_expires_time, user
) -> Optional[User]:
new_refresh_token = account_keyring_table.insert().values(
owner_id=user.id,
key_type=KeyType.REFRESH_TOKEN,
key_id=KeyIdGenerator(),
key_value=new_refresh_token,
created_at=datetime.now(timezone.utc),
expiry=new_refresh_token_expires_time,
status=KeyStatus.ACTIVE,
)
await connection.execute(new_refresh_token)
await connection.commit()

104
api/api/db/logic/keyring.py
View File

@ -1,104 +0,0 @@
from datetime import datetime, timedelta, timezone
from enum import Enum
from typing import Optional
from sqlalchemy import insert, select, update
from sqlalchemy.dialects.mysql import insert as mysql_insert
from sqlalchemy.ext.asyncio import AsyncConnection
from api.db.tables.account import account_keyring_table, KeyStatus, KeyType
from api.schemas.account.account_keyring import AccountKeyring
from api.utils.hasher import hasher
async def get_key_by_id(connection: AsyncConnection, key_id: str) -> Optional[AccountKeyring]:
"""
Получает key по key_id.
"""
query = select(account_keyring_table).where(account_keyring_table.c.key_id == key_id)
user_db_cursor = await connection.execute(query)
user_db = user_db_cursor.one_or_none()
if not user_db:
return None
user_data = {
column.name: (
getattr(user_db, column.name).name
if isinstance(getattr(user_db, column.name), Enum)
else getattr(user_db, column.name)
)
for column in account_keyring_table.columns
}
return AccountKeyring.model_validate(user_data)
async def update_key_by_id(connection: AsyncConnection, update_values, key) -> Optional[AccountKeyring]:
"""
Вносит изменеия в нужное поле таблицы account_keyring_table.
"""
await connection.execute(
account_keyring_table.update().where(account_keyring_table.c.key_id == key.key_id).values(**update_values)
)
await connection.commit()
async def create_key(connection: AsyncConnection, key: AccountKeyring, key_id: int) -> Optional[AccountKeyring]:
"""
Создает нове поле в таблице account_keyring_table).
"""
query = insert(account_keyring_table).values(
owner_id=key.owner_id,
key_type=key.key_type.value,
key_id=key_id,
key_value=key.key_value,
created_at=datetime.now(timezone.utc),
expiry=key.expiry,
status=key.status.value,
)
key.created_at = datetime.now(timezone.utc)
key.key_id = key_id
await connection.execute(query)
await connection.commit()
return key
async def create_password_key(connection: AsyncConnection, password: str | None, owner_id: int):
if password is None:
password = hasher.generate_password()
hashed_password = hasher.hash_data(password)
stmt = mysql_insert(account_keyring_table).values(
owner_id=owner_id,
key_type=KeyType.PASSWORD.value,
key_id="PASSWORD",
key_value=hashed_password,
created_at=datetime.now(timezone.utc),
expiry=datetime.now(timezone.utc) + timedelta(days=365),
status=KeyStatus.ACTIVE,
)
stmt.on_duplicate_key_update(key_value=hashed_password)
await connection.execute(stmt)
await connection.commit()
async def update_password_key(connection: AsyncConnection, owner_id: int, password: str):
stmt = select(account_keyring_table).where(account_keyring_table.c.owner_id == owner_id)
result = await connection.execute(stmt)
keyring = result.one_or_none()
if not keyring:
await create_password_key(connection, password, owner_id)
else:
stmt = (
update(account_keyring_table)
.values(key_value=hasher.hash_data(password), expiry=datetime.now(timezone.utc) + timedelta(days=365))
.where(account_keyring_table.c.owner_id == owner_id)
)
await connection.execute(stmt)
await connection.commit()

106
api/api/db/tables/account.py
View File

@ -1,67 +1,73 @@
import enum from sqlalchemy import Table, Column, Integer, String, Enum as SQLAEnum, JSON, ForeignKey, DateTime, Index
from sqlalchemy import Table, Column, String, Enum as SQLAEnum, JSON, ForeignKey, DateTime, Index
from sqlalchemy.sql import func from sqlalchemy.sql import func
from enum import Enum from datetime import datetime, timedelta
from enum import Enum, auto
from api.db.sql_types import UnsignedInt from api.db.sql_types import UnsignedInt
from api.db import metadata from api.db import metadata
class AccountRole(enum.StrEnum): class AccountRole(str,Enum):
OWNER = "OWNER" OWNER = auto()
ADMIN = "ADMIN" ADMIN = auto()
EDITOR = "EDITOR" EDITOR = auto()
VIEWER = "VIEWER" VIEWER = auto()
class AccountStatus(str,Enum):
ACTIVE = auto()
DISABLED = auto()
BLOCKED = auto()
DELETED = auto()
class AccountStatus(enum.StrEnum):
ACTIVE = "ACTIVE"
DISABLED = "DISABLED"
BLOCKED = "BLOCKED"
DELETED = "DELETED"
account_table = Table( account_table = Table(
"account", 'account', metadata,
metadata, Column('id', UnsignedInt, primary_key=True, autoincrement=True),
Column("id", UnsignedInt, primary_key=True, autoincrement=True), Column('name', String(100), nullable=False),
Column("name", String(100), nullable=False), Column('login', String(100), nullable=False),
Column("login", String(100), nullable=False), Column('email', String(100), nullable=True),
Column("email", String(100), nullable=True), Column('bind_tenant_id', String(40), nullable=True),
Column("bind_tenant_id", String(40), nullable=True), Column('role', SQLAEnum(AccountRole), nullable=False),
Column("role", SQLAEnum(AccountRole), nullable=False), Column('meta', JSON, default={}),
Column("meta", JSON, default={}), Column('creator_id', UnsignedInt, ForeignKey('account.id'), nullable=True),
Column("creator_id", UnsignedInt, ForeignKey("account.id"), nullable=True), Column('created_at', DateTime(timezone=True), server_default=func.now()),
Column("created_at", DateTime(timezone=True), server_default=func.now()), Column('status', SQLAEnum(AccountStatus), nullable=False),
Column("status", SQLAEnum(AccountStatus), nullable=False),
Index("idx_login", "login"), Index('idx_login', 'login'),
Index("idx_name", "name"), Index('idx_name', 'name'),
) )
class KeyType(str,Enum):
PASSWORD = auto()
ACCESS_TOKEN = auto()
REFRESH_TOKEN = auto()
API_KEY = auto()
class KeyType(enum.StrEnum): class KeyStatus(str,Enum):
PASSWORD = "PASSWORD" ACTIVE = auto()
ACCESS_TOKEN = "ACCESS_TOKEN" EXPIRED = auto()
REFRESH_TOKEN = "REFRESH_TOKEN" DELETED = auto()
API_KEY = "API_KEY"
class KeyStatus(enum.StrEnum):
ACTIVE = "ACTIVE"
EXPIRED = "EXPIRED"
DELETED = "DELETED"
account_keyring_table = Table( account_keyring_table = Table(
"account_keyring", 'account_keyring', metadata,
metadata, Column('owner_id', UnsignedInt, ForeignKey('account.id'), primary_key=True, nullable=False),
Column("owner_id", UnsignedInt, ForeignKey("account.id"), primary_key=True, nullable=False), Column('key_type', SQLAEnum(KeyType), primary_key=True, nullable=False),
Column("key_type", SQLAEnum(KeyType), primary_key=True, nullable=False), Column('key_id', String(40), default=None),
Column("key_id", String(40), primary_key=True, default=None), Column('key_value', String(64), nullable=False),
Column("key_value", String(512), nullable=False), Column('created_at', DateTime(timezone=True), server_default=func.now()),
Column("created_at", DateTime(timezone=True), server_default=func.now()), Column('expiry', DateTime(timezone=True), nullable=True),
Column("expiry", DateTime(timezone=True), nullable=True), Column('status', SQLAEnum(KeyStatus), nullable=False), )
Column("status", SQLAEnum(KeyStatus), nullable=False),
)
def set_expiry_for_key_type(key_type: KeyType) -> datetime:
match key_type:
case KeyType.ACCESS_TOKEN:
return datetime.now() + timedelta(hours=1) # 1 hour
case KeyType.REFRESH_TOKEN:
return datetime.now() + timedelta(days=365) # 1 year
case KeyType.API_KEY:
return datetime.max # max datetime

37
api/api/db/tables/events.py
View File

@ -1,5 +1,3 @@
import enum
from sqlalchemy import Table, Column, Integer, String, Enum as SQLAEnum, JSON, ForeignKey, DateTime, Index from sqlalchemy import Table, Column, Integer, String, Enum as SQLAEnum, JSON, ForeignKey, DateTime, Index
from sqlalchemy.sql import func from sqlalchemy.sql import func
from enum import Enum, auto from enum import Enum, auto
@ -8,27 +6,24 @@ from api.db.sql_types import UnsignedInt
from api.db import metadata from api.db import metadata
class EventState(str, Enum):
AUTO = auto()
DESCRIPTED = auto()
class EventState(enum.StrEnum): class EventStatus(str, Enum):
AUTO = "AUTO" ACTIVE = auto()
DESCRIPTED = "DESCRIPTED" DISABLED = auto()
DELETED = auto()
class EventStatus(enum.StrEnum):
ACTIVE = "ACTIVE"
DISABLED = "DISABLED"
DELETED = "DELETED"
list_events_table = Table( list_events_table = Table(
"list_events", 'list_events', metadata,
metadata, Column('id', UnsignedInt, primary_key=True, autoincrement=True),
Column("id", UnsignedInt, primary_key=True, autoincrement=True), Column('name', String(40, collation='latin1_bin'), nullable=False,unique=True),
Column("name", String(40, collation="latin1_bin"), nullable=False, unique=True), Column('title', String(64), nullable=False),
Column("title", String(64), nullable=False), Column('creator_id', UnsignedInt, ForeignKey('account.id'), nullable=False),
Column("creator_id", UnsignedInt, ForeignKey("account.id"), nullable=False), Column('created_at', DateTime(timezone=True), server_default=func.now()),
Column("created_at", DateTime(timezone=True), server_default=func.now()), Column('schema', JSON, default={}),
Column("schema", JSON, default={}), Column('state', SQLAEnum(EventState), nullable=False),
Column("state", SQLAEnum(EventState), nullable=False), Column('status', SQLAEnum(EventStatus), nullable=False),
Column("status", SQLAEnum(EventStatus), nullable=False),
) )

148
api/api/db/tables/process.py
View File

@ -1,18 +1,4 @@
import enum from sqlalchemy import Table, Column, Integer, String, Text, Enum as SQLAEnum, JSON, ForeignKey, DateTime, Index, PrimaryKeyConstraint
from sqlalchemy import (
Table,
Column,
Integer,
String,
Text,
Enum as SQLAEnum,
JSON,
ForeignKey,
DateTime,
Index,
PrimaryKeyConstraint,
)
from sqlalchemy.sql import func from sqlalchemy.sql import func
from enum import Enum, auto from enum import Enum, auto
@ -21,88 +7,78 @@ from api.db.sql_types import UnsignedInt
from api.db import metadata from api.db import metadata
class ProcessStatus(enum.StrEnum): # Определение перечислений для статуса процесса
ACTIVE = "ACTIVE" class ProcessStatus(str, Enum):
STOPPING = "STOPPING" ACTIVE = auto()
STOPPED = "STOPPED" STOPPING = auto()
DELETED = "DELETED" STOPPED = auto()
DELETED = auto()
# Определение таблицы process_schema
process_schema_table = Table( process_schema_table = Table(
"process_schema", 'process_schema', metadata,
metadata, Column('id', UnsignedInt, primary_key=True, autoincrement=True),
Column("id", UnsignedInt, primary_key=True, autoincrement=True), Column('title', String(100), nullable=False),
Column("title", String(100), nullable=False), Column('description', Text, nullable=False),
Column("description", Text, nullable=False), Column('owner_id', UnsignedInt, ForeignKey('account.id'), nullable=False),
Column("owner_id", UnsignedInt, ForeignKey("account.id"), nullable=False), Column('creator_id', UnsignedInt, ForeignKey('account.id'), nullable=False),
Column("creator_id", UnsignedInt, ForeignKey("account.id"), nullable=False), Column('created_at', DateTime(timezone=True), server_default=func.now()),
Column("created_at", DateTime(timezone=True), server_default=func.now()), Column('settings', JSON, default={}),
Column("settings", JSON, default={}), Column('status', SQLAEnum(ProcessStatus), nullable=False),
Column("status", SQLAEnum(ProcessStatus), nullable=False),
Index( Index('idx_owner_id', 'owner_id',)
"idx_owner_id",
"owner_id",
),
) )
process_version_archive_table = Table( process_version_archive_table = Table(
"process_version_archive", 'process_version_archive', metadata,
metadata, Column('id', UnsignedInt, autoincrement=True, nullable=False),
Column("id", UnsignedInt, autoincrement=True, nullable=False), Column('ps_id', UnsignedInt, ForeignKey('process_schema.id'), nullable=False),
Column("ps_id", UnsignedInt, ForeignKey("process_schema.id"), nullable=False), Column('version', UnsignedInt, default=1, nullable=False),
Column("version", UnsignedInt, default=1, nullable=False), Column('snapshot', JSON, default={}),
Column("snapshot", JSON, default={}), Column('owner_id', UnsignedInt, ForeignKey('account.id'), nullable=False),
Column("owner_id", UnsignedInt, ForeignKey("account.id"), nullable=False), Column('created_at', DateTime(timezone=True), server_default=func.now()),
Column("created_at", DateTime(timezone=True), server_default=func.now()), Column('is_last', UnsignedInt, default=0),
Column("is_last", UnsignedInt, default=0), PrimaryKeyConstraint('id', 'version') )
PrimaryKeyConstraint("id", "version"),
)
class NodeStatus(enum.StrEnum):
ACTIVE = "ACTIVE"
DISABLED = "DISABLED"
DELETED = "DELETED"
class NodeStatus(str, Enum):
ACTIVE = auto()
DISABLED = auto()
DELETED = auto()
class NodeType(Enum): class NodeType(Enum):
TYPE1 = "Type1" TYPE1 = 'Type1'
TYPE2 = "Type2" TYPE2 = 'Type2'
TYPE3 = "Type3" TYPE3 = 'Type3'
ps_node_table = Table( ps_node_table = Table(
"ps_node", 'ps_node', metadata,
metadata, Column('id', UnsignedInt, autoincrement=True, primary_key=True, nullable=False),
Column("id", UnsignedInt, autoincrement=True, primary_key=True, nullable=False), Column('ps_id', UnsignedInt, ForeignKey('process_schema.id'), nullable=False),
Column("ps_id", UnsignedInt, ForeignKey("process_schema.id"), nullable=False), Column('node_type', SQLAEnum(NodeType), nullable=False),
Column("node_type", SQLAEnum(NodeType), nullable=False), Column('settings', JSON, default={}),
Column("settings", JSON, default={}), Column('creator_id', UnsignedInt, ForeignKey('account.id'), nullable=False),
Column("creator_id", UnsignedInt, ForeignKey("account.id"), nullable=False), Column('created_at', DateTime(timezone=True), server_default=func.now()),
Column("created_at", DateTime(timezone=True), server_default=func.now()), Column('status', SQLAEnum(NodeStatus), nullable=False),
Column("status", SQLAEnum(NodeStatus), nullable=False),
Index("idx_ps_id", "ps_id"), Index('idx_ps_id', 'ps_id')
) )
class NodeLinkStatus(str, Enum):
class NodeLinkStatus(enum.StrEnum): ACTIVE = auto()
ACTIVE = "ACTIVE" STOPPING = auto()
STOPPING = "STOPPING" STOPPED = auto()
STOPPED = "STOPPED" DELETED = auto()
DELETED = "DELETED"
node_link_table = Table( node_link_table = Table(
"node_link", 'node_link', metadata,
metadata, Column('id', UnsignedInt, autoincrement=True, primary_key=True, nullable=False),
Column("id", UnsignedInt, autoincrement=True, primary_key=True, nullable=False), Column('link_name', String(20), nullable=False),
Column("link_name", String(20), nullable=False), Column('node_id', UnsignedInt, ForeignKey('ps_node.id'), nullable=False),
Column("node_id", UnsignedInt, ForeignKey("ps_node.id"), nullable=False), Column('next_node_id', UnsignedInt, ForeignKey('ps_node.id'), nullable=False),
Column("next_node_id", UnsignedInt, ForeignKey("ps_node.id"), nullable=False), Column('settings', JSON, default={}),
Column("settings", JSON, default={}), Column('creator_id', UnsignedInt, ForeignKey('account.id'), nullable=False),
Column("creator_id", UnsignedInt, ForeignKey("account.id"), nullable=False), Column('created_at', DateTime(timezone=True), server_default=func.now()),
Column("created_at", DateTime(timezone=True), server_default=func.now()), Column('status', SQLAEnum(NodeLinkStatus),nullable=False),
Column("status", SQLAEnum(NodeLinkStatus), nullable=False),
Index("idx_node_id", "node_id"), Index('idx_node_id', 'node_id'),
Index("idx_next_node_id", "next_node_id"), Index('idx_next_node_id', 'next_node_id'))
)

7
api/api/endpoints/__init__.py
View File

@ -1,9 +1,4 @@
from api.endpoints.auth import api_router as auth_router list_of_routes = []
from api.endpoints.profile import api_router as profile_router
from api.endpoints.account import api_router as account_router
from api.endpoints.keyring import api_router as keyring_router
list_of_routes = [auth_router, profile_router, account_router, keyring_router]
__all__ = [ __all__ = [
"list_of_routes", "list_of_routes",

138
api/api/endpoints/account.py
View File

@ -1,138 +0,0 @@
from fastapi import (
APIRouter,
Depends,
HTTPException,
status,
)
from sqlalchemy.ext.asyncio import AsyncConnection
from api.db.connection.session import get_connection_dep
from api.db.logic.account import (
create_user,
get_user_accaunt_page,
get_user_by_id,
get_user_by_login,
update_user_by_id,
)
from api.db.logic.keyring import create_password_key, update_password_key
from api.db.tables.account import AccountStatus
from api.schemas.account.account import User
from api.schemas.base import bearer_schema
from api.schemas.endpoints.account import AllUser, AllUserResponse, UserCreate, UserUpdate
from api.services.auth import get_current_user
from api.services.update_data_validation import update_user_data_changes
from api.services.user_role_validation import db_user_role_validation
api_router = APIRouter(
prefix="/account",
tags=["User accountModel"],
)
@api_router.get("", dependencies=[Depends(bearer_schema)], response_model=AllUserResponse)
async def get_all_account(
page: int = 1,
limit: int = 10,
connection: AsyncConnection = Depends(get_connection_dep),
current_user=Depends(get_current_user),
):
authorize_user = await db_user_role_validation(connection, current_user)
user_list = await get_user_accaunt_page(connection, page, limit)
if user_list is None:
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Accounts not found")
return user_list
@api_router.get("/{user_id}", dependencies=[Depends(bearer_schema)], response_model=UserUpdate)
async def get_account(
user_id: int,
connection: AsyncConnection = Depends(get_connection_dep),
current_user=Depends(get_current_user),
):
authorize_user = await db_user_role_validation(connection, current_user)
user = await get_user_by_id(connection, user_id)
if user is None:
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Account not found")
return user
@api_router.post("", dependencies=[Depends(bearer_schema)], response_model=AllUser)
async def create_account(
user: UserCreate,
connection: AsyncConnection = Depends(get_connection_dep),
current_user=Depends(get_current_user),
):
authorize_user = await db_user_role_validation(connection, current_user)
user_validation = await get_user_by_login(connection, user.login)
if user_validation is None:
new_user = await create_user(connection, user, authorize_user.id)
await create_password_key(connection, user.password, new_user.id)
return new_user
else:
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST, detail="An account with this information already exists."
)
@api_router.put("/{user_id}", dependencies=[Depends(bearer_schema)], response_model=UserUpdate)
async def update_account(
user_id: int,
user_update: UserUpdate,
connection: AsyncConnection = Depends(get_connection_dep),
current_user=Depends(get_current_user),
):
authorize_user = await db_user_role_validation(connection, current_user)
user = await get_user_by_id(connection, user_id)
if user is None:
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Account not found")
if user_update.password is not None:
await update_password_key(connection, user.id, user_update.password)
update_values = update_user_data_changes(user_update, user)
if update_values is None:
return user
user_update_data = UserUpdate.model_validate({**user.model_dump(), **update_values})
await update_user_by_id(connection, update_values, user)
user = await get_user_by_id(connection, user_id)
return user
@api_router.delete("/{user_id}", dependencies=[Depends(bearer_schema)], response_model=User)
async def delete_account(
user_id: int,
connection: AsyncConnection = Depends(get_connection_dep),
current_user=Depends(get_current_user),
):
authorize_user = await db_user_role_validation(connection, current_user)
user = await get_user_by_id(connection, user_id)
if user is None:
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Account not found")
user_update = UserUpdate(status=AccountStatus.DELETED.value)
update_values = update_user_data_changes(user_update, user)
if update_values is None:
return user
await update_user_by_id(connection, update_values, user)
user = await get_user_by_id(connection, user_id)
return user

106
api/api/endpoints/auth.py
View File

@ -1,106 +0,0 @@
from datetime import datetime, timedelta, timezone
from fastapi import (
APIRouter,
Depends,
HTTPException,
Response,
status,
Request,
)
from loguru import logger
from fastapi_jwt_auth import AuthJWT
from pydantic import BaseModel
from sqlalchemy.ext.asyncio import AsyncConnection
from api.config import get_settings
from api.db.connection.session import get_connection_dep
from api.services.auth import authenticate_user
from api.db.logic.auth import add_new_refresh_token, upgrade_old_refresh_token
from api.schemas.endpoints.auth import Auth, Tokens
api_router = APIRouter(
prefix="/auth",
tags=["User auth"],
)
class Settings(BaseModel):
authjwt_secret_key: str = get_settings().SECRET_KEY
# Configure application to store and get JWT from cookies
authjwt_token_location: set = {"headers"}
authjwt_cookie_domain: str = get_settings().DOMAIN
# Only allow JWT cookies to be sent over https
authjwt_cookie_secure: bool = get_settings().ENV == "prod"
# Enable csrf double submit protection. default is True
authjwt_cookie_csrf_protect: bool = False
authjwt_cookie_samesite: str = "lax"
@AuthJWT.load_config
def get_config():
return Settings()
@api_router.post("", response_model=Tokens)
async def login_for_access_token(
user: Auth,
response: Response,
connection: AsyncConnection = Depends(get_connection_dep),
Authorize: AuthJWT = Depends(),
):
"""Авторизирует, выставляет токены в куки."""
user = await authenticate_user(connection, user.login, user.password)
# print("login_for_access_token", user)
if not user:
raise HTTPException(
status_code=status.HTTP_401_UNAUTHORIZED,
detail="Incorrect username or password",
# headers={"WWW-Authenticate": "Bearer"},
)
access_token_expires = timedelta(minutes=get_settings().ACCESS_TOKEN_EXPIRE_MINUTES)
refresh_token_expires = timedelta(days=get_settings().REFRESH_TOKEN_EXPIRE_DAYS)
logger.debug(f"refresh_token_expires {refresh_token_expires}")
access_token = Authorize.create_access_token(subject=user.login, expires_time=access_token_expires)
refresh_token = Authorize.create_refresh_token(subject=user.login, expires_time=refresh_token_expires)
refresh_token_expires_time = datetime.now(timezone.utc) + refresh_token_expires
await add_new_refresh_token(connection, refresh_token, refresh_token_expires_time, user)
return Tokens(access_token=access_token, refresh_token=refresh_token)
@api_router.post("/refresh", response_model=Tokens)
async def refresh(
request: Request,
connection: AsyncConnection = Depends(get_connection_dep),
Authorize: AuthJWT = Depends(),
) -> Tokens:
try:
Authorize.jwt_refresh_token_required()
current_user = Authorize.get_jwt_subject()
except Exception:
refresh_token = request.headers.get("Authorization").split(" ")[1]
await upgrade_old_refresh_token(connection, refresh_token)
raise HTTPException(
status_code=status.HTTP_401_UNAUTHORIZED,
detail="Invalid refresh token",
)
access_token_expires = timedelta(minutes=get_settings().ACCESS_TOKEN_EXPIRE_MINUTES)
new_access_token = Authorize.create_access_token(subject=current_user, expires_time=access_token_expires)
return Tokens(access_token=new_access_token)

128
api/api/endpoints/keyring.py
View File

@ -1,128 +0,0 @@
from fastapi import (
APIRouter,
Body,
Depends,
Form,
HTTPException,
Response,
status,
)
from sqlalchemy.ext.asyncio import AsyncConnection
from api.db.connection.session import get_connection_dep
from api.db.logic.keyring import get_key_by_id, create_key, update_key_by_id
from api.db.tables.account import KeyStatus
from api.schemas.base import bearer_schema
from api.schemas.endpoints.account_keyring import AccountKeyringUpdate
from api.schemas.account.account_keyring import AccountKeyring
from api.services.auth import get_current_user
from api.services.user_role_validation import db_user_role_validation
from api.services.update_data_validation import update_key_data_changes
api_router = APIRouter(
prefix="/keyring",
tags=["User KeyringModel"],
)
@api_router.get("/{user_id}/{key_id}", dependencies=[Depends(bearer_schema)], response_model=AccountKeyring)
async def get_keyring(
key_id: str, connection: AsyncConnection = Depends(get_connection_dep), current_user=Depends(get_current_user)
):
authorize_user = await db_user_role_validation(connection, current_user)
keyring = await get_key_by_id(connection, key_id)
if keyring is None:
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Key not found")
return keyring
@api_router.post("/{user_id}/{key_id}", dependencies=[Depends(bearer_schema)], response_model=AccountKeyring)
async def create_keyring(
user_id: int,
key_id: str,
key: AccountKeyringUpdate,
connection: AsyncConnection = Depends(get_connection_dep),
current_user=Depends(get_current_user),
):
authorize_user = await db_user_role_validation(connection, current_user)
keyring = await get_key_by_id(connection, key_id)
if keyring is None:
keyring_new = await create_key(
connection,
key,
key_id,
)
return keyring_new
else:
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST, detail="An keyring with this information already exists."
)
@api_router.put("/{user_id}/{key_id}", dependencies=[Depends(bearer_schema)], response_model=AccountKeyring)
async def update_keyring(
user_id: int,
key_id: str,
keyring_update: AccountKeyringUpdate,
connection: AsyncConnection = Depends(get_connection_dep),
current_user=Depends(get_current_user),
):
authorize_user = await db_user_role_validation(connection, current_user)
keyring = await get_key_by_id(connection, key_id)
if keyring is None:
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="keyring not found")
update_values = update_key_data_changes(keyring_update, keyring)
if update_values is None:
return keyring
keyring_update_data = AccountKeyring.model_validate({**keyring.model_dump(), **update_values})
await update_key_by_id(connection, update_values, keyring)
keyring = await get_key_by_id(connection, key_id)
return keyring
@api_router.delete("/{user_id}/{key_id}", dependencies=[Depends(bearer_schema)], response_model=AccountKeyring)
async def delete_keyring(
user_id: int,
key_id: str,
connection: AsyncConnection = Depends(get_connection_dep),
current_user=Depends(get_current_user),
):
authorize_user = await db_user_role_validation(connection, current_user)
keyring = await get_key_by_id(connection, key_id)
if keyring is None:
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="keyring not found")
keyring_update = AccountKeyringUpdate(status=KeyStatus.DELETED.value)
update_values = update_key_data_changes(keyring_update, keyring)
if update_values is None:
return keyring
await update_key_by_id(connection, update_values, keyring)
keyring = await get_key_by_id(connection, key_id)
return keyring

65
api/api/endpoints/profile.py
View File

@ -1,65 +0,0 @@
from fastapi import (
APIRouter,
Body,
Depends,
Form,
HTTPException,
Request,
Response,
status,
)
from sqlalchemy.ext.asyncio import AsyncConnection
from api.db.connection.session import get_connection_dep
from api.db.logic.account import get_user_by_id, update_user_by_id, get_user_by_login
from api.schemas.base import bearer_schema
from api.services.auth import get_current_user
from api.services.update_data_validation import update_user_data_changes
from api.schemas.endpoints.account import UserUpdate
from api.schemas.account.account import User
api_router = APIRouter(
prefix="/profile",
tags=["User accountModel"],
)
@api_router.get("", dependencies=[Depends(bearer_schema)], response_model=User)
async def get_profile(
connection: AsyncConnection = Depends(get_connection_dep), current_user=Depends(get_current_user)
):
user = await get_user_by_login(connection, current_user)
if user is None:
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Account not found")
return user
@api_router.put("", dependencies=[Depends(bearer_schema)], response_model=User)
async def update_profile(
user_updata: UserUpdate,
connection: AsyncConnection = Depends(get_connection_dep),
current_user=Depends(get_current_user),
):
user = await get_user_by_login(connection, current_user)
if user is None:
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Account not found")
if user_updata.role == None and user_updata.login == None:
update_values = update_user_data_changes(user_updata, user)
if update_values is None:
return user
await update_user_by_id(connection, update_values, user)
user = await get_user_by_id(connection, user.id)
return user
else:
raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail="Bad body")

34
api/api/schemas/account/account.py
View File

@ -1,20 +1,30 @@
import datetime import datetime
from datetime import datetime from enum import Enum
from typing import Optional
from pydantic import EmailStr, Field
from api.db.tables.account import AccountRole, AccountStatus
from api.schemas.base import Base from pydantic import BaseModel, EmailStr, Field
class User(Base): class Role(Enum):
id: Optional[int] = None OWNER = "Owner"
ADMIN = "Admin"
EDITOR = "Editor"
VIEWER = "Viewer"
class Status(Enum):
ACTIVE = "Active"
DISABLED = "Disabled"
BLOCKED = "Blocked"
DELETED = "Deleted"
class User(BaseModel):
id: int
name: str = Field(..., max_length=100) name: str = Field(..., max_length=100)
login: str = Field(..., max_length=100) login: str = Field(..., max_length=100)
email: Optional[EmailStr] = Field(None, max_length=100) # Электронная почта (может быть None) email: EmailStr = Field(..., max_length=100)
bind_tenant_id: Optional[str] = Field(None, max_length=40) bind_tenant_id: str = Field(..., max_length=40)
role: AccountRole role: Role
meta: dict meta: dict
creator_id: Optional[int] = None creator_id: int
is_active: bool
created_at: datetime created_at: datetime
status: AccountStatus status: Status

32
api/api/schemas/account/account_keyring.py
View File

@ -1,17 +1,27 @@
import datetime import datetime
from typing import Optional
from pydantic import Field from enum import Enum
from pydantic import BaseModel, Field
from datetime import datetime from datetime import datetime
from api.db.tables.account import KeyType, KeyStatus
from api.schemas.base import Base
class AccountKeyring(Base): class Type(Enum):
PASSWORD = "password"
ACCESS_TOKEN = "access_token"
REFRESH_TOKEN = "refresh_token"
API_KEY = "api_key"
class Status(Enum):
ACTIVE = "Active"
EXPIRED = "Expired"
DELETED = "Deleted"
class AccountKeyring(BaseModel):
owner_id: int owner_id: int
key_type: KeyType key_type: Type
key_id: Optional[str] = Field(None, max_length=40) key_id: str = Field(..., max_length=40)
key_value: str = Field(..., max_length=255) key_value: str = Field(..., max_length=64)
created_at: datetime created_at: datetime
expiry: Optional[datetime] = None expiry: datetime
status: KeyStatus status: Status

14
api/api/schemas/base.py
View File

@ -1,14 +0,0 @@
from fastapi.security import HTTPBearer
from pydantic import BaseModel, ConfigDict
from pydantic.alias_generators import to_camel
bearer_schema = HTTPBearer() # схема для авторизации в swagger
class Base(BaseModel):
model_config = ConfigDict(
from_attributes=True,
alias_generator=to_camel,
populate_by_name=True,
)

0
api/api/schemas/endpoints/__init__.py
View File

54
api/api/schemas/endpoints/account.py
View File

@ -1,54 +0,0 @@
from datetime import datetime
from typing import List, Optional
from pydantic import EmailStr, Field, TypeAdapter
from api.db.tables.account import AccountRole, AccountStatus
from api.schemas.base import Base
class UserUpdate(Base):
id: Optional[int] = None
name: Optional[str] = Field(None, max_length=100)
login: Optional[str] = Field(None, max_length=100)
email: Optional[EmailStr] = None
password: Optional[str] = None
bind_tenant_id: Optional[str] = Field(None, max_length=40)
role: Optional[AccountRole] = None
meta: Optional[dict] = None
creator_id: Optional[int] = None
created_at: Optional[datetime] = None
status: Optional[AccountStatus] = None
class UserCreate(Base):
name: str = Field(max_length=100)
login: str = Field(max_length=100)
email: Optional[EmailStr] = None
password: Optional[str] = None
bind_tenant_id: Optional[str] = Field(None, max_length=40)
role: AccountRole
meta: Optional[dict] = None
status: AccountStatus
class AllUser(Base):
id: int
name: str
login: str
email: Optional[EmailStr] = None
bind_tenant_id: Optional[str] = None
role: AccountRole
created_at: datetime
status: AccountStatus
class AllUserResponse(Base):
users: List[AllUser]
amount_count: int
amount_pages: int
current_page: int
limit: int
all_user_adapter = TypeAdapter(List[AllUser])

17
api/api/schemas/endpoints/account_keyring.py
View File

@ -1,17 +0,0 @@
import datetime
from typing import Optional
from pydantic import Field
from datetime import datetime
from api.db.tables.account import KeyType, KeyStatus
from api.schemas.base import Base
class AccountKeyringUpdate(Base):
owner_id: Optional[int] = None
key_type: Optional[KeyType] = None
key_id: Optional[str] = Field(None, max_length=40)
key_value: Optional[str] = Field(None, max_length=255)
created_at: Optional[datetime] = None
expiry: Optional[datetime] = None
status: Optional[KeyStatus] = None

13
api/api/schemas/endpoints/auth.py
View File

@ -1,13 +0,0 @@
from api.schemas.base import Base
# Таблица для получения информации из запроса
class Auth(Base):
login: str
password: str
class Tokens(Base):
access_token: str
refresh_token: str | None = None

7
api/api/schemas/events/list_events.py
View File

@ -1,10 +1,8 @@
from pydantic import Field from pydantic import BaseModel, Field
from typing import Dict, Any from typing import Dict, Any
from datetime import datetime from datetime import datetime
from enum import Enum from enum import Enum
from api.schemas.base import Base
class State(Enum): class State(Enum):
AUTO = "Auto" AUTO = "Auto"
@ -16,8 +14,7 @@ class Status(Enum):
DISABLED = "Disabled" DISABLED = "Disabled"
DELETED = "Deleted" DELETED = "Deleted"
class ListEvent(BaseModel):
class ListEvent(Base):
id: int id: int
name: str = Field(..., max_length=40) name: str = Field(..., max_length=40)
title: str = Field(..., max_length=64) title: str = Field(..., max_length=64)

8
api/api/schemas/process/node_link.py
View File

@ -1,19 +1,15 @@
from pydantic import Field from pydantic import BaseModel, Field, conint
from typing import Dict, Any from typing import Dict, Any
from datetime import datetime from datetime import datetime
from enum import Enum from enum import Enum
from api.schemas.base import Base
class Status(Enum): class Status(Enum):
ACTIVE = "Active" ACTIVE = "Active"
STOPPING = "Stopping" STOPPING = "Stopping"
STOPPED = "Stopped" STOPPED = "Stopped"
DELETED = "Deleted" DELETED = "Deleted"
class MyModel(BaseModel):
class MyModel(Base):
id: int id: int
link_name: str = Field(..., max_length=20) link_name: str = Field(..., max_length=20)
node_id: int node_id: int

8
api/api/schemas/process/process_schema.py
View File

@ -1,19 +1,15 @@
from pydantic import Field from pydantic import BaseModel, Field
from typing import Dict, Any from typing import Dict, Any
from datetime import datetime from datetime import datetime
from enum import Enum from enum import Enum
from api.schemas.base import Base
class Status(Enum): class Status(Enum):
ACTIVE = "Active" ACTIVE = "Active"
STOPPING = "Stopping" STOPPING = "Stopping"
STOPPED = "Stopped" STOPPED = "Stopped"
DELETED = "Deleted" DELETED = "Deleted"
class ProcessSchema(BaseModel):
class ProcessSchema(Base):
id: int id: int
title: str = Field(..., max_length=100) title: str = Field(..., max_length=100)
description: str description: str

6
api/api/schemas/process/process_version_archive.py
View File

@ -1,10 +1,8 @@
from pydantic import BaseModel, Field
from typing import Dict, Any from typing import Dict, Any
from datetime import datetime from datetime import datetime
from api.schemas.base import Base class ProcessStatusSchema(BaseModel):
class ProcessStatusSchema(Base):
id: int id: int
version: int version: int
snapshot: Dict[str, Any] snapshot: Dict[str, Any]

8
api/api/schemas/process/ps_node.py
View File

@ -1,21 +1,19 @@
from pydantic import BaseModel
from datetime import datetime from datetime import datetime
from typing import Dict, Any from typing import Dict, Any
from enum import Enum from enum import Enum
from api.schemas.base import Base
class NodeType(Enum): class NodeType(Enum):
pass
pass
class Status(Enum): class Status(Enum):
ACTIVE = "Active" ACTIVE = "Active"
DISABLED = "Disabled" DISABLED = "Disabled"
DELETED = "Deleted" DELETED = "Deleted"
class Ps_Node(BaseModel):
class Ps_Node(Base):
id: int id: int
ps_id: int ps_id: int
node_type: NodeType node_type: NodeType

25
api/api/services/auth.py
View File

@ -1,25 +0,0 @@
from typing import Optional
from fastapi import HTTPException, Request
from sqlalchemy.ext.asyncio import AsyncConnection
from api.db.logic.auth import get_user
from api.db.tables.account import AccountStatus
from api.schemas.endpoints.account import AllUser
from api.utils.hasher import hasher
async def get_current_user(request: Request) -> str | HTTPException:
if not hasattr(request.state, "current_user"):
return HTTPException(status_code=401, detail="Unauthorized")
return request.state.current_user
async def authenticate_user(connection: AsyncConnection, username: str, password: str) -> Optional[AllUser]:
sql_user, sql_password = await get_user(connection, username)
if not sql_user or sql_user.status != AccountStatus.ACTIVE:
return None
if not hasher.verify_data(password, sql_password.key_value):
return None
return sql_user

53
api/api/services/middleware.py
View File

@ -1,53 +0,0 @@
from fastapi_jwt_auth import AuthJWT
from starlette.middleware.base import BaseHTTPMiddleware
from fastapi import (
Request,
status,
)
from fastapi.responses import JSONResponse
from api.config import get_settings
import re
from re import escape
class MiddlewareAccessTokenValidadtion(BaseHTTPMiddleware):
def __init__(self, app):
super().__init__(app)
self.prefix = escape(get_settings().PATH_PREFIX)
self.excluded_routes = [
re.compile(r"^" + re.escape(self.prefix) + r"/auth/refresh/?$"),
re.compile(r"^" + re.escape(self.prefix) + r"/auth/?$"),
re.compile(r"^" + r"/swagger"),
re.compile(r"^" + r"/openapi"),
]
async def dispatch(self, request: Request, call_next):
if request.method not in ["GET", "POST", "PUT", "DELETE"]:
return JSONResponse(
status_code=status.HTTP_405_METHOD_NOT_ALLOWED,
content={"detail": "Method not allowed"},
)
if any(pattern.match(request.url.path) for pattern in self.excluded_routes):
return await call_next(request)
auth_header = request.headers.get("Authorization")
if not auth_header:
return JSONResponse(
status_code=status.HTTP_401_UNAUTHORIZED,
content={"detail": "Missing authorization header."},
headers={"WWW-Authenticate": "Bearer"},
)
try:
token = auth_header.split(" ")[1]
Authorize = AuthJWT(request)
current_user = Authorize.get_jwt_subject()
request.state.current_user = current_user
except Exception:
return JSONResponse(
status_code=status.HTTP_401_UNAUTHORIZED,
content={"detail": "The access token is invalid or expired."},
headers={"WWW-Authenticate": "Bearer"},
)
return await call_next(request)

74
api/api/services/update_data_validation.py
View File

@ -1,74 +0,0 @@
from enum import Enum
from typing import Optional
from api.schemas.endpoints.account import UserUpdate
from api.db.tables.account import KeyType, KeyStatus
from api.schemas.endpoints.account_keyring import AccountKeyringUpdate
from api.db.tables.account import AccountRole, AccountStatus
def update_user_data_changes(update_data: UserUpdate, user) -> Optional[dict]:
"""
Сравнивает данные для обновления с текущими значениями пользователя.
Возвращает:
- None, если нет изменений
- Словарь {поле: новое_значение} для измененных полей
"""
update_values = {}
changes = {}
for field, value in update_data.model_dump(exclude_unset=True).items():
if value is None:
continue
if isinstance(value, (AccountRole, AccountStatus)):
update_values[field] = value.value
else:
update_values[field] = value
for field, new_value in update_values.items():
if not hasattr(user, field):
continue
current_value = getattr(user, field)
if isinstance(current_value, Enum):
current_value = current_value.value
if current_value != new_value:
changes[field] = new_value
return changes if changes else None
def update_key_data_changes(update_data: AccountKeyringUpdate, key) -> Optional[dict]:
"""
Сравнивает данные для обновления с текущими значениями пользователя.
Возвращает:
- None, если нет изменений
- Словарь {поле: новое_значение} для измененных полей
"""
update_values = {}
changes = {}
for field, value in update_data.model_dump(exclude_unset=True).items():
if value is None:
continue
if isinstance(value, (KeyType, KeyStatus)):
update_values[field] = value.value
else:
update_values[field] = value
for field, new_value in update_values.items():
if not hasattr(key, field):
continue
current_value = getattr(key, field)
if isinstance(current_value, Enum):
current_value = current_value.value
if current_value != new_value:
changes[field] = new_value
return changes if changes else None

13
api/api/services/user_role_validation.py
View File

@ -1,13 +0,0 @@
from fastapi import (
HTTPException,
status,
)
from api.db.logic.account import get_user_by_login
from api.db.tables.account import AccountRole
async def db_user_role_validation(connection, current_user):
authorize_user = await get_user_by_login(connection, current_user)
if authorize_user.role not in {AccountRole.OWNER, AccountRole.ADMIN}:
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="You do not have enough permissions")
return authorize_user

25
api/api/utils/hasher.py
View File

@ -1,25 +0,0 @@
import hashlib
import secrets
# Хешер для работы с паролем.
class Hasher:
def __init__(self):
pass
def hash_data(self, password: str) -> str:
# Хеширует пароль с использованием SHA-256.
return hashlib.sha256(password.encode()).hexdigest()
def verify_data(self, password: str, hashed: str) -> bool:
# Проверяет пароль путем сравнения его хеша с сохраненным хешем.
return self.hash_data(password) == hashed
@staticmethod
def generate_password() -> str:
return secrets.token_urlsafe(20)
hasher = Hasher()

21
api/api/utils/init.py
View File

@ -1,23 +1,31 @@
import asyncio
import os import os
import asyncio
import hashlib
import secrets
from api.db.connection.session import get_connection from api.db.connection.session import get_connection
from api.db.tables.account import account_keyring_table, account_table, AccountRole, KeyStatus, KeyType from api.db.tables.account import account_table, account_keyring_table, AccountRole, KeyType, KeyStatus
from api.utils.hasher import hasher
from api.utils.key_id_gen import KeyIdGenerator
INIT_LOCK_FILE = "../init.lock" INIT_LOCK_FILE = "../init.lock"
DEFAULT_LOGIN = "vorkout" DEFAULT_LOGIN = "vorkout"
def hash_password(password: str) -> str:
return hashlib.sha256(password.encode()).hexdigest()
def generate_password() -> str:
return secrets.token_urlsafe(20)
async def init(): async def init():
if os.path.exists(INIT_LOCK_FILE): if os.path.exists(INIT_LOCK_FILE):
print("Sorry, service is already initialized") print("Sorry, service is already initialized")
return return
async with get_connection() as conn: async with get_connection() as conn:
password = hasher.generate_password() password = generate_password()
hashed_password = hasher.hash_data(password) hashed_password = hash_password(password)
create_user_query = account_table.insert().values( create_user_query = account_table.insert().values(
name=DEFAULT_LOGIN, name=DEFAULT_LOGIN,
@ -31,7 +39,6 @@ async def init():
create_key_query = account_keyring_table.insert().values( create_key_query = account_keyring_table.insert().values(
owner_id=user_id, owner_id=user_id,
key_type=KeyType.PASSWORD, key_type=KeyType.PASSWORD,
key_id=KeyIdGenerator(),
key_value=hashed_password, key_value=hashed_password,
status=KeyStatus.ACTIVE, status=KeyStatus.ACTIVE,
) )

10
api/api/utils/key_id_gen.py
View File

@ -1,10 +0,0 @@
import random
from datetime import datetime
# Генератор key_id для таблицы account_keyring
def KeyIdGenerator():
random_number = random.randint(1000, 9999)
result = f"{datetime.now().strftime('%Y-%m-%d')}-{random_number}"
return result

917
api/poetry.lock generated
View File

File diff suppressed because it is too large Load Diff

18
api/pyproject.toml
View File

@ -1,32 +1,24 @@
[project] [project]
name = "api" name = "api"
version = "0.0.5" version = "0.0.2"
description = "" description = ""
authors = [{ name = "Vladislav", email = "vlad.dev@heado.ru" }] authors = [
{name = "Vladislav",email = "vlad.dev@heado.ru"}
]
readme = "README.md" readme = "README.md"
requires-python = ">=3.11,<4.0" requires-python = ">=3.11,<4.0"
dependencies = [ dependencies = [
"sqlalchemy[pymysql,aiomysql] (>=2.0.39,<3.0.0)", "sqlalchemy[pymysql,aiomysql] (>=2.0.39,<3.0.0)",
"alembic (>=1.15.1,<2.0.0)", "alembic (>=1.15.1,<2.0.0)",
"aio-pika (>=9.5.5,<10.0.0)", "aio-pika (>=9.5.5,<10.0.0)",
"fastapi[standard] (>=0.115.11,<0.116.0)", "fastapi[standart] (>=0.115.11,<0.116.0)",
"uvicorn (>=0.34.0,<0.35.0)", "uvicorn (>=0.34.0,<0.35.0)",
"loguru (>=0.7.3,<0.8.0)", "loguru (>=0.7.3,<0.8.0)",
"pydantic-settings (>=2.8.1,<3.0.0)", "pydantic-settings (>=2.8.1,<3.0.0)",
"cryptography (>=44.0.2,<45.0.0)", "cryptography (>=44.0.2,<45.0.0)",
"pydantic[email] (>=2.11.3,<3.0.0)",
"python-multipart (>=0.0.20,<0.0.21)",
"fastapi-jwt-auth @ git+https://github.com/vvpreo/fastapi-jwt-auth",
] ]
[build-system] [build-system]
requires = ["poetry-core>=2.0.0,<3.0.0"] requires = ["poetry-core>=2.0.0,<3.0.0"]
build-backend = "poetry.core.masonry.api" build-backend = "poetry.core.masonry.api"
[tool.poetry.group.dev.dependencies]
ruff = "^0.11.10"
[tool.ruff]
line-length = 120
extend-exclude = ["alembic"]

9
client/.env.local
View File

@ -1,4 +1,5 @@
VITE_APP_WEBSOCKET_PROTOCOL=ws REACT_APP_WEBSOCKET_PROTOCOL=ws
VITE_APP_HTTP_PROTOCOL=http REACT_APP_HTTP_PROTOCOL=http
VITE_APP_API_URL=localhost:8000 REACT_APP_API_URL=localhost:8000
VITE_APP_URL=localhost:3000 REACT_APP_URL=localhost:3000
BROWSER=none

17
client/index.html
View File

@ -1,17 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="Web site created using Vite" />
<link rel="icon" href="/favicon.ico" />
<link rel="apple-touch-icon" href="/logo192.png" />
<link rel="manifest" href="/manifest.json" />
<title>VORKOUT</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
</html>

17443
client/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

25
client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "client", "name": "client",
"version": "0.0.5", "version": "0.0.1",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@ant-design/icons": "^5.6.1", "@ant-design/icons": "^5.6.1",
@ -9,24 +9,25 @@
"@testing-library/react": "^16.2.0", "@testing-library/react": "^16.2.0",
"@testing-library/user-event": "^13.5.0", "@testing-library/user-event": "^13.5.0",
"@types/jest": "^27.5.2", "@types/jest": "^27.5.2",
"@types/node": "^16.18.126",
"@types/react": "^19.0.11", "@types/react": "^19.0.11",
"@types/react-dom": "^19.0.4", "@types/react-dom": "^19.0.4",
"antd": "^5.24.7", "antd": "^5.24.7",
"axios": "^1.9.0",
"axios-retry": "^4.5.0",
"i18next": "^25.0.1", "i18next": "^25.0.1",
"i18next-browser-languagedetector": "^8.0.5", "i18next-browser-languagedetector": "^8.0.5",
"react": "^18.3.1", "react": "^18.3.1",
"react-dom": "^18.3.1", "react-dom": "^18.3.1",
"react-i18next": "^15.5.1", "react-i18next": "^15.5.1",
"react-router-dom": "^7.5.0", "react-router-dom": "^7.5.0",
"web-vitals": "^2.1.4", "react-scripts": "5.0.1",
"zustand": "^5.0.5" "typescript": "^4.9.5",
"web-vitals": "^2.1.4"
}, },
"scripts": { "scripts": {
"dev": "vite", "start": "react-scripts start",
"build": "vite build", "build": "react-scripts build",
"preview": "vite preview" "test": "react-scripts test",
"eject": "react-scripts eject"
}, },
"eslintConfig": { "eslintConfig": {
"extends": [ "extends": [
@ -45,13 +46,5 @@
"last 1 firefox version", "last 1 firefox version",
"last 1 safari version" "last 1 safari version"
] ]
},
"devDependencies": {
"@esbuild-plugins/node-globals-polyfill": "^0.2.3",
"@types/node": "^20.19.1",
"@vitejs/plugin-react": "^4.5.2",
"typescript": "^5.8.3",
"vite": "^6.3.5",
"vite-plugin-node-polyfills": "^0.23.0"
} }
} }

BIN
client/public/favicon.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 15 KiB

3
client/public/icons/logo.svg
View File

@ -1,3 +0,0 @@
<svg width="128" height="128" viewBox="0 0 128 128" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M52.0626 73.9965L52.0348 76.7513C51.9791 79.687 49.6 82.0452 46.6644 82.0452C43.8957 82.0452 41.6139 79.9444 41.3357 77.2383L41.3217 77.1965C41.3217 76.953 41.1269 76.7583 40.8835 76.7513C40.8835 76.7513 36.7235 76.1391 35.5548 75.8052C34.7757 75.5826 34.7061 73.9965 35.9722 73.9965H52.0696H52.0626ZM76.0904 73.9965L76.1183 76.7513C76.1739 79.687 78.5531 82.0452 81.4887 82.0452C84.2574 82.0452 86.5391 79.9444 86.8174 77.2383L86.8313 77.1965C86.8313 76.953 87.0261 76.7583 87.2696 76.7513C87.2696 76.7513 91.4296 76.1391 92.5983 75.8052C93.3774 75.5826 93.447 73.9965 92.1809 73.9965H76.0835H76.0904ZM58.233 127.979V103.123C54.6643 105.468 51.0957 105.085 50.4557 105.023V126.804C53.0157 127.353 55.6104 127.75 58.233 127.979ZM69.8157 103.123V128C72.4383 127.777 75.0331 127.388 77.593 126.845V105.023C76.953 105.085 73.3774 105.468 69.8157 103.123ZM127.993 64.1183C127.993 109.913 86.88 124.139 85.3704 124.668V96.2157H79.5339C72.6957 96.2157 67.1583 90.5809 67.1583 83.6313V73.9965H60.9948V83.6313C60.9948 90.5809 55.4574 96.2157 48.6191 96.2157H42.6783V124.591C26.6435 118.908 0 99.9861 0 64.1183C0 24.9252 32.4244 0 64 0C103.847 0 128 32.487 128 64.1183H127.993ZM56.5774 70.5948C56.5774 65.5443 52.5565 61.4539 47.5896 61.4539H35.4504C30.4835 61.4539 26.4626 65.5443 26.4626 70.5948V81.5652C26.4626 86.6226 30.4835 90.7061 35.4504 90.7061H47.5896C52.5565 90.7061 56.5774 86.6157 56.5774 81.5652V70.5948ZM79.5339 55.9444C79.5339 55.9444 87.8609 55.9652 93.1687 55.9861V43.4713C93.1687 33.6765 85.2452 25.7391 75.4644 25.7391H52.6539C42.88 25.7391 34.9496 33.6765 34.9496 43.4713V55.9861C40.2504 55.9722 48.6122 55.9444 48.6122 55.9444C55.2417 55.9444 60.633 61.2383 60.96 67.8957H67.1861C67.5131 61.2383 72.9044 55.9444 79.5339 55.9444ZM92.7026 90.6991C97.6696 90.6991 101.69 86.6087 101.69 81.5583V70.5878C101.69 65.5374 97.6696 61.447 92.7026 61.447H80.5635C75.5965 61.447 71.5757 65.5374 71.5757 70.5878V81.5583C71.5757 86.6087 75.5965 90.6991 80.5635 90.6991H92.7026ZM120.188 64.1113C120.188 33.0713 95.7009 7.81914 64 7.81914C32.2991 7.81914 7.81218 33.0713 7.81218 64.1113C7.81218 84.487 18.6783 102.372 34.9078 112.257V96.2087H31.9165C25.0852 96.2087 19.5409 90.5739 19.5409 83.6244V74.087H18.3165C17.5931 74.087 17.0017 73.5374 17.0017 72.8626V69.1478C17.0017 68.473 17.5931 67.9235 18.3165 67.9235H19.5617C19.7565 62.8035 22.8522 58.5461 27.2765 56.8V41.2313C27.2765 28.8348 37.3078 18.7896 49.6765 18.7896H78.4696C90.8383 18.7896 100.87 28.8348 100.87 41.2313V56.793C105.301 58.5322 108.41 62.7965 108.605 67.9235H109.85C110.574 67.9235 111.165 68.473 111.165 69.1478V72.8626C111.165 73.5374 110.574 74.087 109.85 74.087H108.626V83.6244C108.626 90.5739 103.089 96.2087 96.2505 96.2087H93.1548V112.383C109.503 102.525 120.188 84.5774 120.188 64.1113Z" fill="#333333"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

43
client/public/index.html Normal file
View File

@ -0,0 +1,43 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>VORKOUT</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>

18
client/src/App.tsx
View File

@ -1,25 +1,13 @@
/* eslint-disable react-hooks/exhaustive-deps */ import React from 'react';
import React, { useEffect } from 'react';
import { Route, Routes } from 'react-router-dom'; import { Route, Routes } from 'react-router-dom';
import { useSetUserSelector } from './store/userStore';
import LoginPage from './pages/LoginPage';
import ProtectedRoute from './pages/ProtectedRoute';
import MainLayout from './pages/MainLayout'; import MainLayout from './pages/MainLayout';
import ProtectedRoute from './pages/ProtectedRoute';
function App() { function App() {
const setUser = useSetUserSelector();
useEffect(() => {
const storedUser = localStorage.getItem('user');
if (storedUser) {
setUser(JSON.parse(storedUser));
}
}, []);
return ( return (
<div className="App"> <div className="App">
<Routes> <Routes>
<Route path="/login" element={<LoginPage />} /> <Route path="/login" element={<div>login</div>} />
<Route element={<ProtectedRoute />}> <Route element={<ProtectedRoute />}>
<Route path="*" element={<MainLayout />}></Route> <Route path="*" element={<MainLayout />}></Route>
</Route> </Route>

130
client/src/api/api.ts
View File

@ -1,130 +0,0 @@
import axios from 'axios';
import axiosRetry from 'axios-retry';
import { Auth, Tokens } from '@/types/auth';
import { useAuthStore } from '@/store/authStore';
import { AuthService } from '@/services/authService';
import { User, UserCreate, UserUpdate } from '@/types/user';
const baseURL = `${import.meta.env.VITE_APP_HTTP_PROTOCOL}://${
import.meta.env.VITE_APP_API_URL
}/api/v1`;
const base = axios.create({
baseURL,
withCredentials: true,
headers: {
accepts: 'application/json',
},
});
base.interceptors.request.use((config) => {
if (config.url === '/auth/refresh') {
return config;
}
const token = useAuthStore.getState().accessToken;
if (token) {
config.headers.Authorization = `Bearer ${token}`;
}
return config;
});
axiosRetry(base, {
retries: 3,
retryDelay: (retryCount: number) => {
console.log(`retry attempt: ${retryCount}`);
return retryCount * 2000;
},
retryCondition: async (error: any) => {
if (error.code === 'ERR_CANCELED') {
return true;
}
return false;
},
});
base.interceptors.response.use(
(response) => {
return response;
},
async function (error) {
if (!error.response) {
return Promise.reject(error);
}
console.log('error', error);
const originalRequest = error.response.config;
const urlTokens = error?.request?.responseURL.split('/');
const url = urlTokens[urlTokens.length - 1];
console.log('url', url);
if (
error.response.status === 401 &&
!(originalRequest?._retry != null) &&
url !== 'login' &&
url !== 'refresh' &&
url !== 'logout'
) {
originalRequest._retry = true;
try {
await AuthService.refresh();
return base(originalRequest);
} catch (error) {
await AuthService.logout();
return new Promise(() => {});
}
}
return await Promise.reject(error);
}
);
const api = {
// auth
async login(auth: Auth): Promise<Tokens> {
const response = await base.post<Tokens>('/auth', auth);
return response.data;
},
async refreshToken(): Promise<Tokens> {
const token = localStorage.getItem('refreshToken');
const response = await base.post<Tokens>(
'/auth/refresh',
{},
{
headers: {
Authorization: `Bearer ${token}`,
},
}
);
return response.data;
},
// user
async getProfile(): Promise<User> {
const response = await base.get<User>('/profile');
return response.data;
},
async getUsers(page: number, limit: number): Promise<any> {
const response = await base.get<User[]>(
`/account?page=${page}&limit=${limit}`
);
return response.data;
},
async getUserById(userId: number): Promise<User> {
const response = await base.get<User>(`/account/${userId}`);
return response.data;
},
async createUser(user: UserCreate): Promise<User> {
const response = await base.post<User>('/account', user);
return response.data;
},
async updateUser(userId: number, user: UserUpdate): Promise<User> {
const response = await base.put<User>(`/account/${userId}`, user);
return response.data;
},
// keyrings
};
export default api;

24
client/src/components/ContentDrawer.tsx
View File

@ -2,16 +2,12 @@ import { Drawer } from 'antd';
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { Avatar, Typography } from 'antd'; import { Avatar, Typography } from 'antd';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { useUserSelector } from '@/store/userStore';
interface ContentDrawerProps { interface ContentDrawerProps {
open: boolean; open: boolean;
closeDrawer: () => void; closeDrawer: () => void;
children: React.ReactNode; children: React.ReactNode;
type: 'create' | 'edit'; type: 'create' | 'edit';
login?: string;
name?: string;
email?: string | null;
} }
export default function ContentDrawer({ export default function ContentDrawer({
@ -19,11 +15,7 @@ export default function ContentDrawer({
closeDrawer, closeDrawer,
children, children,
type, type,
login,
name,
email,
}: ContentDrawerProps) { }: ContentDrawerProps) {
const user = useUserSelector();
const { t } = useTranslation(); const { t } = useTranslation();
const [width, setWidth] = useState<number | string>('30%'); const [width, setWidth] = useState<number | string>('30%');
@ -38,7 +30,6 @@ export default function ContentDrawer({
window.addEventListener('resize', calculateWidths); window.addEventListener('resize', calculateWidths);
return () => window.removeEventListener('resize', calculateWidths); return () => window.removeEventListener('resize', calculateWidths);
}, []); }, []);
console.log(login, user?.login, login === user?.login);
const editDrawerTitle = ( const editDrawerTitle = (
<div <div
@ -68,21 +59,16 @@ export default function ContentDrawer({
<div style={{ display: 'flex', alignItems: 'center', gap: 12, flex: 1 }}> <div style={{ display: 'flex', alignItems: 'center', gap: 12, flex: 1 }}>
<Avatar <Avatar
src={ src="https://cdn-icons-png.flaticon.com/512/219/219986.png"
login ? `https://gamma.heado.ru/go/ava?name=${login}` : undefined
}
size={40} size={40}
style={{ flexShrink: 0 }} style={{ flexShrink: 0 }}
/> />
<div> <div>
<Typography.Text <Typography.Text strong style={{ display: 'block' }}>
strong Александр Александров
style={{ display: 'block', fontSize: '20px' }}
>
{name} {login === user?.login ? t('you') : ''}
</Typography.Text> </Typography.Text>
<Typography.Text type="secondary" style={{ fontSize: 14 }}> <Typography.Text type="secondary" style={{ fontSize: 14 }}>
{email} alexandralex@vorkout.ru
</Typography.Text> </Typography.Text>
</div> </div>
</div> </div>
@ -166,7 +152,7 @@ export default function ContentDrawer({
placement="right" placement="right"
open={open} open={open}
width={width} width={width}
destroyOnHidden={true} destroyOnClose={true}
closable={false} closable={false}
> >
{children} {children}

24
client/src/components/Header.tsx
View File

@ -1,9 +1,5 @@
import { useUserSelector } from '@/store/userStore';
import { Avatar } from 'antd'; import { Avatar } from 'antd';
import Title from 'antd/es/typography/Title'; import Title from 'antd/es/typography/Title';
import { useState } from 'react';
import ContentDrawer from './ContentDrawer';
import UserEdit from './UserEdit';
interface HeaderProps { interface HeaderProps {
title: string; title: string;
@ -11,13 +7,6 @@ interface HeaderProps {
} }
export default function Header({ title, additionalContent }: HeaderProps) { export default function Header({ title, additionalContent }: HeaderProps) {
const [openEdit, setOpenEdit] = useState(false);
const showEditDrawer = () => setOpenEdit(true);
const closeEditDrawer = () => {
setOpenEdit(false);
};
const user = useUserSelector();
return ( return (
<div <div
style={{ style={{
@ -54,24 +43,13 @@ export default function Header({ title, additionalContent }: HeaderProps) {
alignItems: 'center', alignItems: 'center',
justifyContent: 'center', justifyContent: 'center',
}} }}
onClick={showEditDrawer}
> >
<Avatar <Avatar
size={25.77} size={25.77}
src={`https://gamma.heado.ru/go/ava?name=${user?.login}`} src={`https://cdn-icons-png.flaticon.com/512/219/219986.png`}
/> />
</div> </div>
</div> </div>
<ContentDrawer
login={user?.login}
name={user?.name}
email={user?.email}
open={openEdit}
closeDrawer={closeEditDrawer}
type="edit"
>
{user?.id && <UserEdit closeDrawer={closeEditDrawer} userId={user?.id} />}
</ContentDrawer>
</div> </div>
); );
} }

8
client/src/components/SiderMenu.tsx
View File

@ -1,4 +1,3 @@
import { useUserSelector } from '@/store/userStore';
import { Divider, Menu, Tooltip } from 'antd'; import { Divider, Menu, Tooltip } from 'antd';
import React from 'react'; import React from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
@ -14,7 +13,6 @@ export default function SiderMenu({
selectedKey, selectedKey,
hangleMenuClick, hangleMenuClick,
}: SiderMenuProps) { }: SiderMenuProps) {
const user = useUserSelector();
const { t } = useTranslation(); const { t } = useTranslation();
const collapseStyle = collapsed const collapseStyle = collapsed
? { fontSize: '12px' } ? { fontSize: '12px' }
@ -76,8 +74,7 @@ export default function SiderMenu({
label: t('settings'), label: t('settings'),
className: 'no-expand-icon', className: 'no-expand-icon',
children: [ children: [
user && (user.role === 'OWNER' || user.role === 'ADMIN') {
? {
key: '/accounts', key: '/accounts',
label: !collapsed ? ( label: !collapsed ? (
<Tooltip title={t('accounts')}>{t('accounts')}</Tooltip> <Tooltip title={t('accounts')}>{t('accounts')}</Tooltip>
@ -85,8 +82,7 @@ export default function SiderMenu({
t('accounts') t('accounts')
), ),
style: collapseStyle, style: collapseStyle,
} },
: undefined,
{ {
key: '/events-list', key: '/events-list',
label: !collapsed ? ( label: !collapsed ? (

171
client/src/components/UserCreate.tsx
View File

@ -8,19 +8,13 @@ import {
UploadFile, UploadFile,
GetProp, GetProp,
UploadProps, UploadProps,
message, } from 'antd';
Spin, import { useState } from 'react';
} from "antd"; import { useTranslation } from 'react-i18next';
import { useState } from "react";
import { useTranslation } from "react-i18next";
import { useUserSelector } from "@/store/userStore";
import { UserCreate as NewUserCreate } from "@/types/user";
import { UserService } from "@/services/userService";
import { LoadingOutlined } from "@ant-design/icons";
const { Option } = Select; const { Option } = Select;
type FileType = Parameters<GetProp<UploadProps, "beforeUpload">>[0]; type FileType = Parameters<GetProp<UploadProps, 'beforeUpload'>>[0];
const getBase64 = (file: FileType): Promise<string> => const getBase64 = (file: FileType): Promise<string> =>
new Promise((resolve, reject) => { new Promise((resolve, reject) => {
@ -30,17 +24,10 @@ const getBase64 = (file: FileType): Promise<string> =>
reader.onerror = (error) => reject(error); reader.onerror = (error) => reject(error);
}); });
interface UserCreateProps { export default function UserCreate() {
closeDrawer: () => void;
getUsers: () => Promise<void>;
}
export default function UserCreate({ closeDrawer, getUsers }: UserCreateProps) {
const user = useUserSelector();
const { t } = useTranslation(); const { t } = useTranslation();
const [previewOpen, setPreviewOpen] = useState(false); const [previewOpen, setPreviewOpen] = useState(false);
const [previewImage, setPreviewImage] = useState(""); const [previewImage, setPreviewImage] = useState('');
const [loading, setLoading] = useState(false);
const [fileList, setFileList] = useState<UploadFile[]>([]); const [fileList, setFileList] = useState<UploadFile[]>([]);
@ -53,49 +40,40 @@ export default function UserCreate({ closeDrawer, getUsers }: UserCreateProps) {
setPreviewOpen(true); setPreviewOpen(true);
}; };
const handleChange: UploadProps["onChange"] = ({ fileList: newFileList }) => const handleChange: UploadProps['onChange'] = ({ fileList: newFileList }) =>
setFileList(newFileList); setFileList(newFileList);
const onFinish = async (values: NewUserCreate) => {
setLoading(true);
await UserService.createUser(values);
await getUsers();
closeDrawer();
setLoading(false);
message.info(t("createdAccountMessage"), 4);
};
const customUploadButton = ( const customUploadButton = (
<div> <div>
<div <div
style={{ style={{
height: "102px", height: '102px',
width: "102px", width: '102px',
backgroundColor: "#E2E2E2", backgroundColor: '#E2E2E2',
borderRadius: "50%", borderRadius: '50%',
display: "flex", display: 'flex',
alignItems: "center", alignItems: 'center',
justifyContent: "center", justifyContent: 'center',
marginBottom: 8, marginBottom: 8,
marginTop: 30, marginTop: 30,
cursor: "pointer", cursor: 'pointer',
}} }}
> >
<img <img
src="./icons/drawer/add_photo_alternate.svg" src="./icons/drawer/add_photo_alternate.svg"
alt="add_photo_alternate" alt="add_photo_alternate"
style={{ height: "18px", width: "18px" }} style={{ height: '18px', width: '18px' }}
/> />
</div> </div>
<span style={{ fontSize: "14px", color: "#8c8c8c" }}> <span style={{ fontSize: '14px', color: '#8c8c8c' }}>
{t("selectPhoto")} {t('selectPhoto')}
</span> </span>
</div> </div>
); );
const photoToUpload = ( const photoToUpload = (
<div style={{ height: "102px" }}> <div style={{ height: '102px' }}>
<Upload <Upload
listType="picture-circle" listType="picture-circle"
fileList={fileList} fileList={fileList}
@ -107,11 +85,11 @@ export default function UserCreate({ closeDrawer, getUsers }: UserCreateProps) {
</Upload> </Upload>
{previewImage && ( {previewImage && (
<Image <Image
wrapperStyle={{ display: "none" }} wrapperStyle={{ display: 'none' }}
preview={{ preview={{
visible: previewOpen, visible: previewOpen,
onVisibleChange: (visible) => setPreviewOpen(visible), onVisibleChange: (visible) => setPreviewOpen(visible),
afterOpenChange: (visible) => !visible && setPreviewImage(""), afterOpenChange: (visible) => !visible && setPreviewImage(''),
}} }}
src={previewImage} src={previewImage}
/> />
@ -122,24 +100,24 @@ export default function UserCreate({ closeDrawer, getUsers }: UserCreateProps) {
return ( return (
<div <div
style={{ style={{
display: "flex", display: 'flex',
flexDirection: "column", flexDirection: 'column',
height: "100%", height: '100%',
}} }}
> >
<div <div
style={{ style={{
display: "flex", display: 'flex',
alignItems: "center", alignItems: 'center',
justifyContent: "center", justifyContent: 'center',
marginBottom: "36px", marginBottom: '36px',
}} }}
> >
<div <div
style={{ style={{
display: "flex", display: 'flex',
flexDirection: "column", flexDirection: 'column',
alignItems: "center", alignItems: 'center',
}} }}
> >
{photoToUpload} {photoToUpload}
@ -148,85 +126,83 @@ export default function UserCreate({ closeDrawer, getUsers }: UserCreateProps) {
<Form <Form
name="user-edit-form" name="user-edit-form"
layout="vertical" layout="vertical"
onFinish={onFinish} // onFinish={onFinish}
initialValues={{ initialValues={{
name: "", name: '',
login: "", login: '',
password: "", password: '',
email: "", email: '',
bindTenantId: "", tenant: '',
role: "", role: '',
status: "", status: '',
}} }}
style={{ flex: 1, display: "flex", flexDirection: "column" }} style={{ flex: 1, display: 'flex', flexDirection: 'column' }}
> >
<Form.Item <Form.Item
label={t("name")} label={t('name')}
name="name" name="name"
rules={[{ required: true, message: t("nameMessage") }]} rules={[{ required: true, message: t('nameMessage') }]}
> >
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("login")} label={t('login')}
name="login" name="login"
rules={[{ required: true, message: t("loginMessage") }]} rules={[{ required: true, message: t('loginMessage') }]}
> >
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("password")} label={t('password')}
name="password" name="password"
rules={[{ message: t("passwordMessage") }]} rules={[{ required: true, message: t('passwordMessage') }]}
> >
<Input.Password /> <Input.Password />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("email")} label={t('email')}
name="email" name="email"
rules={[ rules={[
{ message: t("emailMessage") }, { required: true, message: t('emailMessage') },
{ type: "email", message: t("emailErrorMessage") }, { type: 'email', message: t('emailErrorMessage') },
]} ]}
> >
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("tenant")} label={t('tenant')}
name="bindTenantId" name="tenant"
rules={[{ message: t("tenantMessage") }]} rules={[{ required: true, message: t('tenantMessage') }]}
> >
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("role")} label={t('role')}
name="role" name="role"
rules={[{ required: true, message: t("roleMessage") }]} rules={[{ required: true, message: t('roleMessage') }]}
> >
<Select placeholder={t("roleMessage")}> <Select placeholder={t('roleMessage')}>
{user && user.role === "OWNER" ? ( <Option value="Директор магазина">Директор магазина</Option>
<Option value="ADMIN">{t("ADMIN")}</Option> <Option value="Менеджер">Менеджер</Option>
) : undefined} <Option value="Кассир">Кассир</Option>
<Option value="EDITOR">{t("EDITOR")}</Option>
<Option value="VIEWER">{t("VIEWER")}</Option>
</Select> </Select>
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("status")} label={t('status')}
name="status" name="status"
rules={[{ required: true, message: t("statusMessage") }]} rules={[{ required: true, message: t('statusMessage') }]}
> >
<Select placeholder={t("statusMessage")}> <Select placeholder={t('statusMessage')}>
<Option value="ACTIVE">{t("ACTIVE")}</Option> <Option value="ACTIVE">Активен</Option>
<Option value="DISABLED">{t("DISABLED")}</Option> <Option value="DISABLED">Неактивен</Option>
<Option value="BLOCKED">{t("BLOCKED")}</Option> <Option value="BLOCKED">Заблокирован</Option>
<Option value="DELETED">{t("DELETED")}</Option> <Option value="DELETED">Удален</Option>
</Select> </Select>
</Form.Item> </Form.Item>
@ -237,23 +213,14 @@ export default function UserCreate({ closeDrawer, getUsers }: UserCreateProps) {
type="primary" type="primary"
htmlType="submit" htmlType="submit"
block block
style={{ color: "#000" }} style={{ color: '#000' }}
> >
{loading ? (
<>
<Spin indicator={<LoadingOutlined spin />} size="small"></Spin>{" "}
{t("saving")}
</>
) : (
<>
<img <img
src="/icons/drawer/reg.svg" src="/icons/drawer/reg.svg"
alt="save" alt="save"
style={{ height: "18px", width: "18px" }} style={{ height: '18px', width: '18px' }}
/>{" "} />{' '}
{t("addAccount")} {t('addAccount')}
</>
)}
</Button> </Button>
</Form.Item> </Form.Item>
</Form> </Form>

113
client/src/components/UserEdit.tsx
View File

@ -1,101 +1,47 @@
import { UserService } from '@/services/userService'; import { Button, Form, Input, Select } from 'antd';
import { useUserSelector } from '@/store/userStore';
import { UserUpdate } from '@/types/user';
import { LoadingOutlined } from '@ant-design/icons';
import { Button, Form, Input, message, Select, Spin } from 'antd';
import { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
const { Option } = Select; const { Option } = Select;
interface UserEditProps { export default function UserEdit() {
userId?: number;
closeDrawer: () => void;
}
export default function UserEdit({ userId, closeDrawer }: UserEditProps) {
const currentUser = useUserSelector();
const [form] = Form.useForm();
const { t } = useTranslation(); const { t } = useTranslation();
const [user, setUser] = useState<UserUpdate>({
id: 0,
name: '',
login: '',
email: '',
password: '',
bindTenantId: '',
role: 'VIEWER',
meta: {},
createdAt: '',
status: 'ACTIVE',
});
const [loading, setLoading] = useState(false);
useEffect(() => {
async function getUser() {
if (typeof userId === 'undefined') {
return;
}
const user = await UserService.getUserById(userId);
setUser(user);
form.setFieldsValue({ ...user });
}
getUser();
}, []);
const onFinish = async (values: UserUpdate) => {
setLoading(true);
let updatedUser: Partial<UserUpdate> = {};
(Object.keys(values) as Array<keyof UserUpdate>).forEach((key) => {
if (values[key] !== user[key]) {
updatedUser = { ...updatedUser, [key]: values[key] };
}
});
if (Object.keys(updatedUser).length > 0) {
console.log('updateUser', userId, updatedUser);
await UserService.updateUser(userId!, updatedUser);
}
setLoading(false);
message.info(t('editAccountMessage'), 4);
closeDrawer();
};
return ( return (
<div style={{ display: 'flex', flexDirection: 'column', height: '100%' }}> <div style={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
<Form <Form
form={form}
name="user-edit-form" name="user-edit-form"
layout="vertical" layout="vertical"
onFinish={onFinish} // onFinish={onFinish}
initialValues={{ ...user }} initialValues={{
name: 'Александр Александров',
login: 'alexandralex@vorkout.ru',
password: 'jKUUl776GHd',
email: 'alexandralex@vorkout.ru',
tenant: 'text',
role: 'Директор магазина',
status: 'Активен',
}}
style={{ flex: 1, display: 'flex', flexDirection: 'column' }} style={{ flex: 1, display: 'flex', flexDirection: 'column' }}
> >
<Form.Item <Form.Item
label={t('name')} label={t('name')}
name="name" name="name"
rules={[{ message: t('nameMessage') }]} rules={[{ required: true, message: t('nameMessage') }]}
> >
<Input /> <Input />
</Form.Item> </Form.Item>
{user?.id === currentUser?.id ? undefined : (
<Form.Item <Form.Item
label={t('login')} label={t('login')}
name="login" name="login"
rules={[{ message: t('loginMessage') }]} rules={[{ required: true, message: t('loginMessage') }]}
> >
<Input /> <Input />
</Form.Item> </Form.Item>
)}
<Form.Item <Form.Item
label={t('password')} label={t('password')}
name="password" name="password"
rules={[{ message: t('passwordMessage') }]} rules={[{ required: true, message: t('passwordMessage') }]}
> >
<Input.Password /> <Input.Password />
</Form.Item> </Form.Item>
@ -113,27 +59,23 @@ export default function UserEdit({ userId, closeDrawer }: UserEditProps) {
<Form.Item <Form.Item
label={t('tenant')} label={t('tenant')}
name="bindTenantId" name="tenant"
rules={[{ required: true, message: t('tenantMessage') }]} rules={[{ required: true, message: t('tenantMessage') }]}
> >
<Input /> <Input />
</Form.Item> </Form.Item>
{user?.id === currentUser?.id ? undefined : (
<Form.Item <Form.Item
label={t('role')} label={t('role')}
name="role" name="role"
rules={[{ required: true, message: t('roleMessage') }]} rules={[{ required: true, message: t('roleMessage') }]}
> >
<Select placeholder={t('roleMessage')}> <Select placeholder={t('roleMessage')}>
{currentUser && currentUser.role === 'OWNER' ? ( <Option value="Директор магазина">Директор магазина</Option>
<Option value="ADMIN">{t('ADMIN')}</Option> <Option value="Менеджер">Менеджер</Option>
) : undefined} <Option value="Кассир">Кассир</Option>
<Option value="EDITOR">{t('EDITOR')}</Option>
<Option value="VIEWER">{t('VIEWER')}</Option>
</Select> </Select>
</Form.Item> </Form.Item>
)}
<Form.Item <Form.Item
label={t('status')} label={t('status')}
@ -141,10 +83,10 @@ export default function UserEdit({ userId, closeDrawer }: UserEditProps) {
rules={[{ required: true, message: t('statusMessage') }]} rules={[{ required: true, message: t('statusMessage') }]}
> >
<Select placeholder={t('statusMessage')}> <Select placeholder={t('statusMessage')}>
<Option value="ACTIVE">{t('ACTIVE')}</Option> <Option value="ACTIVE">Активен</Option>
<Option value="DISABLED">{t('DISABLED')}</Option> <Option value="DISABLED">Неактивен</Option>
<Option value="BLOCKED">{t('BLOCKED')}</Option> <Option value="BLOCKED">Заблокирован</Option>
<Option value="DELETED">{t('DELETED')}</Option> <Option value="DELETED">Удален</Option>
</Select> </Select>
</Form.Item> </Form.Item>
@ -157,21 +99,12 @@ export default function UserEdit({ userId, closeDrawer }: UserEditProps) {
block block
style={{ color: '#000' }} style={{ color: '#000' }}
> >
{loading ? (
<>
<Spin indicator={<LoadingOutlined spin />} size="small"></Spin>{' '}
{t('saving')}
</>
) : (
<>
<img <img
src="/icons/drawer/save.svg" src="/icons/drawer/save.svg"
alt="save" alt="save"
style={{ height: '18px', width: '18px' }} style={{ height: '18px', width: '18px' }}
/>{' '} />{' '}
{t('save')} {t('save')}
</>
)}
</Button> </Button>
</Form.Item> </Form.Item>
</Form> </Form>

7
client/src/config/AppWrapper.tsx
View File

@ -1,9 +1,8 @@
import '@/config/i18n'; import './i18n';
import { ConfigProvider } from 'antd'; import { ConfigProvider } from 'antd';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { BrowserRouter } from 'react-router-dom';
import { theme } from '@/config/customTheme'; import { theme } from './customTheme';
import en from 'antd/locale/en_US'; import en from 'antd/locale/en_US';
import ru from 'antd/locale/ru_RU'; import ru from 'antd/locale/ru_RU';
@ -19,7 +18,7 @@ export default function AppWrapper({ children }: any) {
return ( return (
<ConfigProvider locale={antdLocales[currentLang]} theme={theme}> <ConfigProvider locale={antdLocales[currentLang]} theme={theme}>
<BrowserRouter>{children}</BrowserRouter> {children}
</ConfigProvider> </ConfigProvider>
); );
} }

28
client/src/config/i18n.ts
View File

@ -37,20 +37,6 @@ i18n
addAccount: 'Add account', addAccount: 'Add account',
save: 'Save changes', save: 'Save changes',
newAccount: 'New account', newAccount: 'New account',
ACTIVE: 'Active',
DISABLED: 'Disabled',
BLOCKED: 'Blocked',
DELETED: 'Deleted',
OWNER: 'Owner',
ADMIN: 'Admin',
EDITOR: 'Editor',
VIEWER: 'Viewer',
nameLogin: 'Name, login',
createdAt: 'Created',
saving: 'Saving...',
createdAccountMessage: 'User successfully created!',
editAccountMessage: 'User successfully updated!',
you: '(You)',
}, },
}, },
ru: { ru: {
@ -80,20 +66,6 @@ i18n
addAccount: 'Добавить аккаунт', addAccount: 'Добавить аккаунт',
save: 'Сохранить изменения', save: 'Сохранить изменения',
newAccount: 'Новая учетная запись', newAccount: 'Новая учетная запись',
ACTIVE: 'Активен',
DISABLED: 'Выключен',
BLOCKED: 'Заблокирован',
DELETED: 'Удален',
OWNER: 'Владелец',
ADMIN: 'Админ',
EDITOR: 'Редактор',
VIEWER: 'Наблюдатель',
nameLogin: 'Имя, Логин',
createdAt: 'Создано',
saving: 'Сохранение...',
createdAccountMessage: 'Пользователь успешно создан!',
editAccountMessage: 'Пользователь успешно обновлен!',
you: '(Вы)',
}, },
}, },
}, },

12
client/src/env.d.ts vendored
View File

@ -1,12 +0,0 @@
/// <reference types="vite/client" />
interface ImportMetaEnv {
readonly VITE_APP_WEBSOCKET_PROTOCOL: string;
readonly VITE_APP_HTTP_PROTOCOL: string;
readonly VITE_APP_API_URL: string;
readonly VITE_APP_URL: string;
}
interface ImportMeta {
readonly env: ImportMetaEnv;
}

9
client/src/main.tsx → client/src/index.tsx
View File

@ -1,8 +1,9 @@
import React from 'react'; import React from 'react';
import ReactDOM from 'react-dom/client'; import ReactDOM from 'react-dom/client';
import '@/index.css'; import './index.css';
import App from '@/App'; import App from './App';
import AppWrapper from '@/config/AppWrapper'; import { BrowserRouter } from 'react-router-dom';
import AppWrapper from './config/AppWrapper';
const root = ReactDOM.createRoot( const root = ReactDOM.createRoot(
document.getElementById('root') as HTMLElement document.getElementById('root') as HTMLElement
@ -10,6 +11,8 @@ const root = ReactDOM.createRoot(
root.render( root.render(
<AppWrapper> <AppWrapper>
<BrowserRouter>
<App /> <App />
</BrowserRouter>
</AppWrapper> </AppWrapper>
); );

213
client/src/pages/AccountsPage.tsx
View File

@ -1,219 +1,36 @@
import { useEffect, useState } from "react"; import Header from '../components/Header';
import { useTranslation } from "react-i18next"; import { useState } from 'react';
import { AccountStatus, AllUser, AllUserResponse } from "@/types/user"; import ContentDrawer from '../components/ContentDrawer';
import Header from "@/components/Header"; import UserCreate from '../components/UserCreate';
import ContentDrawer from "@/components/ContentDrawer"; import { useTranslation } from 'react-i18next';
import UserCreate from "@/components/UserCreate";
import { Avatar, Table } from "antd";
import { TableProps } from "antd/lib";
import { UserService } from "@/services/userService";
import UserEdit from "@/components/UserEdit";
import { useSearchParams } from "react-router-dom";
export default function AccountsPage() { export default function AccountsPage() {
const { t } = useTranslation(); const { t } = useTranslation();
const [openCreate, setOpenCreate] = useState(false); const [open, setOpen] = useState(false);
const [searchParams, setSearchParams] = useSearchParams();
const [activeAccount, setActiveAccount] = useState< const showDrawer = () => setOpen(true);
{ login: string; id: number; name: string; email: string } | undefined const closeDrawer = () => setOpen(false);
>(undefined);
const showCreateDrawer = () => setOpenCreate(true);
const closeCreateDrawer = () => {
setActiveAccount(undefined);
setOpenCreate(false);
};
const [openEdit, setOpenEdit] = useState(false);
const showEditDrawer = () => setOpenEdit(true);
const closeEditDrawer = () => {
setActiveAccount(undefined);
setOpenEdit(false);
};
const [accounts, setAccounts] = useState<AllUserResponse>({
amountCount: 0,
amountPages: 0,
users: [],
currentPage: 1,
limit: 10,
});
async function getUsers() {
const page = Number(searchParams.get("page") || "1");
const limit = Number(searchParams.get("limit") || "10");
setSearchParams({
page: page.toString(),
limit: limit.toString(),
});
const data = await UserService.getUsers(page, limit);
console.log("searchParams", searchParams);
setAccounts(data);
}
useEffect(() => {
getUsers();
}, []);
const statusColor = {
ACTIVE: "#27AE60",
DISABLED: "#606060",
BLOCKED: "#FF0000",
DELETED: "#B30000",
};
const columns: TableProps<AllUser>["columns"] = [
{
title: "#",
dataIndex: "id",
key: "id",
},
{
title: t("nameLogin"),
dataIndex: "nameLogin",
key: "nameLogin",
render: (text, record) => (
<div
onClick={() => {
setActiveAccount({
login: record.login,
id: record.id,
name: record.name,
email: record.email || "",
});
showEditDrawer();
}}
style={{
display: "flex",
alignItems: "center",
gap: "16px",
cursor: "pointer",
}}
>
<div
style={{
height: "32px",
width: "32px",
display: "flex",
alignItems: "center",
justifyContent: "center",
}}
>
<Avatar
size={32}
src={`https://gamma.heado.ru/go/ava?name=${record.login}`}
/>
</div>
<div style={{ display: "flex", flexDirection: "column" }}>
<div>{record.name}</div>
<div style={{ color: "#606060" }}>{record.login}</div>
</div>
</div>
),
},
{
title: "E-mail",
dataIndex: "email",
key: "email",
},
{
title: t("tenant"),
dataIndex: "bindTenantId",
key: "tenant",
},
{
title: t("role"),
dataIndex: "role",
key: "role",
render: (text) => <div>{t(text)}</div>,
},
{
title: t("createdAt"),
dataIndex: "createdAt",
key: "createdAt",
render: (text) => (
<div>
{new Date(text).toLocaleString("ru", {
year: "2-digit",
month: "2-digit",
day: "2-digit",
})}
</div>
),
},
{
title: t("status"),
dataIndex: "status",
key: "status",
render: (text) => (
<div style={{ color: statusColor[text as AccountStatus] }}>
{t(text)}
</div>
),
},
];
const onTableChange: TableProps<AllUser>["onChange"] = (pagination) => {
console.log(pagination);
UserService.getUsers(
pagination.current as number,
pagination.pageSize
).then((data) => {
setAccounts(data);
setSearchParams({
page: data.currentPage.toString(),
limit: data.limit.toString(),
});
});
};
return ( return (
<> <>
<Header <Header
title={t("accounts")} title={t('accounts')}
additionalContent={ additionalContent={
<img <img
src="./icons/header/add_2.svg" src="./icons/header/add_2.svg"
alt="add" alt="add"
style={{ style={{
height: "18px", height: '18px',
width: "18px", width: '18px',
cursor: "pointer", cursor: 'pointer',
}} }}
onClick={showCreateDrawer} onClick={showDrawer}
/> />
} }
/> />
<Table
size="small"
onChange={onTableChange}
columns={columns}
dataSource={accounts.users}
pagination={{
pageSize: accounts.limit,
current: accounts.currentPage,
total: accounts.amountCount,
}}
rowKey={"id"}
/>
<ContentDrawer <ContentDrawer open={open} closeDrawer={closeDrawer} type="create">
open={openCreate} <UserCreate />
closeDrawer={closeCreateDrawer}
type="create"
>
<UserCreate getUsers={getUsers} closeDrawer={closeCreateDrawer} />
</ContentDrawer>
<ContentDrawer
login={activeAccount?.login}
name={activeAccount?.name}
email={activeAccount?.email}
open={openEdit}
closeDrawer={closeEditDrawer}
type="edit"
>
<UserEdit userId={activeAccount?.id} closeDrawer={closeEditDrawer} />
</ContentDrawer> </ContentDrawer>
</> </>
); );

2
client/src/pages/ConfigurationPage.tsx
View File

@ -1,5 +1,5 @@
import Header from '@/components/Header';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import Header from '../components/Header';
export default function ConfigurationPage() { export default function ConfigurationPage() {
const { t } = useTranslation(); const { t } = useTranslation();

2
client/src/pages/EventsListPage.tsx
View File

@ -1,5 +1,5 @@
import Header from '@/components/Header';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import Header from '../components/Header';
export default function EventsListPage() { export default function EventsListPage() {
const { t } = useTranslation(); const { t } = useTranslation();

107
client/src/pages/LoginPage.tsx
View File

@ -1,107 +0,0 @@
import React from 'react';
import { Form, Input, Button, Typography, message } from 'antd';
import {
EyeInvisibleOutlined,
EyeTwoTone,
UserOutlined,
} from '@ant-design/icons';
import { useNavigate } from 'react-router-dom';
import { AuthService } from '@/services/authService';
import { Auth } from '@/types/auth';
const { Text, Link } = Typography;
export default function LoginPage() {
const navigate = useNavigate();
const onFinish = async (values: any) => {
await AuthService.login(values as Auth);
navigate('/');
};
return (
<div
style={{
height: '100vh',
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
}}
>
<div
style={{
width: '100%',
maxWidth: 472,
padding: 24,
background: '#fff',
textAlign: 'center',
}}
>
<div style={{ marginBottom: 32 }}>
<img
src="./icons/logo.svg"
alt="logo"
style={{ width: 128, height: 128, marginBottom: 16 }}
/>
</div>
<Form
name="login"
onFinish={onFinish}
layout="vertical"
>
<Form.Item
name="login"
rules={[{ required: true, message: 'Введите login' }]}
>
<Input size="large" placeholder="Логин" prefix={<UserOutlined />} />
</Form.Item>
<Form.Item
name="password"
rules={[{ required: true, message: 'Введите пароль' }]}
>
<Input.Password
size="large"
placeholder="Пароль"
iconRender={(visible) =>
visible ? <EyeTwoTone /> : <EyeInvisibleOutlined />
}
/>
</Form.Item>
<Form.Item>
<Button
type="primary"
htmlType="submit"
block
size="large"
style={{
backgroundColor: '#C2DA3D',
borderColor: '#C2DA3D',
color: '#000',
}}
>
Войти
</Button>
</Form.Item>
<Text type="secondary" style={{ fontSize: 12 }}>
Нажимая кнопку Войти, Вы полностью принимаете{' '}
<Link href="/offer" target="_blank">
Публичную оферту
</Link>{' '}
и{' '}
<Link href="/privacy" target="_blank">
Политику обработки персональных данных
</Link>
</Text>
</Form>
<div style={{ marginTop: 256 }}>
<Link href="/forgot-password">Забыли пароль?</Link>
</div>
</div>
</div>
);
}

2
client/src/pages/MainLayout.tsx
View File

@ -2,8 +2,8 @@
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
import { Layout } from 'antd'; import { Layout } from 'antd';
import Sider from 'antd/es/layout/Sider'; import Sider from 'antd/es/layout/Sider';
import SiderMenu from '../components/SiderMenu';
import { Route, Routes, useLocation, useNavigate } from 'react-router-dom'; import { Route, Routes, useLocation, useNavigate } from 'react-router-dom';
import SiderMenu from '@/components/SiderMenu';
import ProcessDiagramPage from './ProcessDiagramPage'; import ProcessDiagramPage from './ProcessDiagramPage';
import RunningProcessesPage from './RunningProcessesPage'; import RunningProcessesPage from './RunningProcessesPage';
import AccountsPage from './AccountsPage'; import AccountsPage from './AccountsPage';

2
client/src/pages/ProcessDiagramPage.tsx
View File

@ -1,5 +1,5 @@
import Header from '@/components/Header';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import Header from '../components/Header';
export default function ProcessDiagramPage() { export default function ProcessDiagramPage() {
const { t } = useTranslation(); const { t } = useTranslation();

16
client/src/pages/ProtectedRoute.tsx
View File

@ -1,18 +1,8 @@
/* eslint-disable react-hooks/exhaustive-deps */ // ProtectedRoute.js
import { Outlet, useNavigate } from 'react-router-dom'; import { Outlet } from 'react-router-dom';
import React, { useEffect } from 'react'; import React from 'react';
import { useUserSelector } from '@/store/userStore';
const ProtectedRoute = (): React.JSX.Element => { const ProtectedRoute = (): React.JSX.Element => {
const navigate = useNavigate();
const user = useUserSelector();
useEffect(() => {
if (!user?.id) {
navigate('/login');
}
}, [user]);
return <Outlet />; return <Outlet />;
}; };
export default ProtectedRoute; export default ProtectedRoute;

2
client/src/pages/RunningProcessesPage.tsx
View File

@ -1,5 +1,5 @@
import Header from '@/components/Header';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import Header from '../components/Header';
export default function RunningProcessesPage() { export default function RunningProcessesPage() {
const { t } = useTranslation(); const { t } = useTranslation();

30
client/src/services/authService.ts
View File

@ -1,30 +0,0 @@
import api from "@/api/api";
import { useAuthStore } from "@/store/authStore";
import { Auth } from "@/types/auth";
import { UserService } from "./userService";
import { useUserStore } from "@/store/userStore";
export class AuthService {
static async login(auth: Auth) {
const token = await api.login(auth);
useAuthStore.getState().setAccessToken(token.accessToken);
localStorage.setItem('refreshToken', token.refreshToken as string);
await UserService.getProfile().then((user) => {
useUserStore.getState().setUser(user);
});
}
static async logout() {
console.log('logout');
useUserStore.getState().setUser(null);
useAuthStore.getState().setAccessToken(null);
localStorage.removeItem('userInfo');
localStorage.removeItem('refreshToken');
}
static async refresh() {
console.log('refresh');
const token = await api.refreshToken();
useAuthStore.getState().setAccessToken(token.accessToken);
}
}

38
client/src/services/userService.ts
View File

@ -1,38 +0,0 @@
import api from '@/api/api';
import { AllUserResponse, User, UserCreate, UserUpdate } from '@/types/user';
export class UserService {
static async getProfile(): Promise<User> {
console.log('getProfile');
const user = api.getProfile();
return user;
}
static async getUsers(
page: number = 1,
limit: number = 10
): Promise<AllUserResponse> {
console.log('getUsers');
const allUsers = api.getUsers(page, limit);
return allUsers;
}
static async getUserById(userId: number): Promise<User> {
console.log('getUserById');
const user = api.getUserById(userId);
return user;
}
static async createUser(user: UserCreate): Promise<User> {
console.log('createUser');
const createdUser = api.createUser(user);
return createdUser;
}
static async updateUser(userId: number, user: UserUpdate): Promise<User> {
console.log('updateUser');
const updatedUser = api.updateUser(userId, user);
return updatedUser;
}
}

18
client/src/store/authStore.ts
View File

@ -1,18 +0,0 @@
import { create } from 'zustand';
import { devtools } from 'zustand/middleware';
type AuthState = {
accessToken: string | null;
setAccessToken: (token: string | null) => void;
};
export const useAuthStore = create<AuthState>()(
devtools((set) => ({
accessToken: null,
setAccessToken: (token) => set({ accessToken: token }),
}))
);
export const useAuthSelector = () => {
return useAuthStore((state) => state.accessToken);
};

36
client/src/store/userStore.ts
View File

@ -1,36 +0,0 @@
import { User } from '@/types/user';
import { create } from 'zustand';
import { devtools, persist } from 'zustand/middleware';
const userInfo = localStorage.getItem('userInfo');
type UserStoreState = {
user: User | null;
loading: boolean;
};
type UserStoreActions = {
setUser: (user: User | null) => void;
};
type UserStore = UserStoreState & UserStoreActions;
export const useUserStore = create<UserStore>()(
devtools(
persist(
(set, get) => ({
user: userInfo != null ? JSON.parse(userInfo) : ({} as User),
loading: false,
setUser: (user: User | null) => set({ user }),
}),
{ name: 'userInfo' }
)
)
);
export const useUserSelector = () => {
return useUserStore((state) => state.user);
};
export const useSetUserSelector = () => {
return useUserStore((state) => state.setUser);
};

4
client/src/types/auth.ts
View File

@ -1,4 +0,0 @@
import { components } from './openapi-types';
export type Auth = components['schemas']['Auth'];
export type Tokens = components['schemas']['Tokens'];

719
client/src/types/openapi-types.ts
View File

@ -1,719 +0,0 @@
/**
* This file was auto-generated by openapi-typescript.
* Do not make direct changes to the file.
*/
export interface paths {
"/api/v1/auth": {
parameters: {
query?: never;
header?: never;
path?: never;
cookie?: never;
};
get?: never;
put?: never;
/**
* Login For Access Token
* @description Авторизирует, выставляет токены в куки.
*/
post: operations["login_for_access_token_api_v1_auth_post"];
delete?: never;
options?: never;
head?: never;
patch?: never;
trace?: never;
};
"/api/v1/auth/refresh": {
parameters: {
query?: never;
header?: never;
path?: never;
cookie?: never;
};
get?: never;
put?: never;
/** Refresh */
post: operations["refresh_api_v1_auth_refresh_post"];
delete?: never;
options?: never;
head?: never;
patch?: never;
trace?: never;
};
"/api/v1/profile": {
parameters: {
query?: never;
header?: never;
path?: never;
cookie?: never;
};
/** Get Profile */
get: operations["get_profile_api_v1_profile_get"];
/** Update Profile */
put: operations["update_profile_api_v1_profile_put"];
post?: never;
delete?: never;
options?: never;
head?: never;
patch?: never;
trace?: never;
};
"/api/v1/account": {
parameters: {
query?: never;
header?: never;
path?: never;
cookie?: never;
};
/** Get All Account */
get: operations["get_all_account_api_v1_account_get"];
put?: never;
/** Create Account */
post: operations["create_account_api_v1_account_post"];
delete?: never;
options?: never;
head?: never;
patch?: never;
trace?: never;
};
"/api/v1/account/{user_id}": {
parameters: {
query?: never;
header?: never;
path?: never;
cookie?: never;
};
/** Get Account */
get: operations["get_account_api_v1_account__user_id__get"];
/** Update Account */
put: operations["update_account_api_v1_account__user_id__put"];
post?: never;
/** Delete Account */
delete: operations["delete_account_api_v1_account__user_id__delete"];
options?: never;
head?: never;
patch?: never;
trace?: never;
};
"/api/v1/keyring/{user_id}/{key_id}": {
parameters: {
query?: never;
header?: never;
path?: never;
cookie?: never;
};
/** Get Keyring */
get: operations["get_keyring_api_v1_keyring__user_id___key_id__get"];
/** Update Keyring */
put: operations["update_keyring_api_v1_keyring__user_id___key_id__put"];
/** Create Keyring */
post: operations["create_keyring_api_v1_keyring__user_id___key_id__post"];
/** Delete Keyring */
delete: operations["delete_keyring_api_v1_keyring__user_id___key_id__delete"];
options?: never;
head?: never;
patch?: never;
trace?: never;
};
}
export type webhooks = Record<string, never>;
export interface components {
schemas: {
/** AccountKeyring */
AccountKeyring: {
/** Ownerid */
ownerId: number;
keyType: components["schemas"]["KeyType"];
/** Keyid */
keyId?: string | null;
/** Keyvalue */
keyValue: string;
/**
* Createdat
* Format: date-time
*/
createdAt: string;
/** Expiry */
expiry?: string | null;
status: components["schemas"]["KeyStatus"];
};
/** AccountKeyringUpdate */
AccountKeyringUpdate: {
/** Ownerid */
ownerId?: number | null;
keyType?: components["schemas"]["KeyType"] | null;
/** Keyid */
keyId?: string | null;
/** Keyvalue */
keyValue?: string | null;
/** Createdat */
createdAt?: string | null;
/** Expiry */
expiry?: string | null;
status?: components["schemas"]["KeyStatus"] | null;
};
/**
* AccountRole
* @enum {string}
*/
AccountRole: "OWNER" | "ADMIN" | "EDITOR" | "VIEWER";
/**
* AccountStatus
* @enum {string}
*/
AccountStatus: "ACTIVE" | "DISABLED" | "BLOCKED" | "DELETED";
/** AllUser */
AllUser: {
/** Id */
id: number;
/** Name */
name: string;
/** Login */
login: string;
/** Email */
email?: string | null;
/** Bindtenantid */
bindTenantId?: string | null;
role: components["schemas"]["AccountRole"];
/**
* Createdat
* Format: date-time
*/
createdAt: string;
status: components["schemas"]["AccountStatus"];
};
/** AllUserResponse */
AllUserResponse: {
/** Users */
users: components["schemas"]["AllUser"][];
/** Amountcount */
amountCount: number;
/** Amountpages */
amountPages: number;
/** Currentpage */
currentPage: number;
/** Limit */
limit: number;
};
/** Auth */
Auth: {
/** Login */
login: string;
/** Password */
password: string;
};
/** HTTPValidationError */
HTTPValidationError: {
/** Detail */
detail?: components["schemas"]["ValidationError"][];
};
/**
* KeyStatus
* @enum {string}
*/
KeyStatus: "ACTIVE" | "EXPIRED" | "DELETED";
/**
* KeyType
* @enum {string}
*/
KeyType: "PASSWORD" | "ACCESS_TOKEN" | "REFRESH_TOKEN" | "API_KEY";
/** Tokens */
Tokens: {
/** Accesstoken */
accessToken: string;
/** Refreshtoken */
refreshToken?: string | null;
};
/** User */
User: {
/** Id */
id?: number | null;
/** Name */
name: string;
/** Login */
login: string;
/** Email */
email?: string | null;
/** Bindtenantid */
bindTenantId?: string | null;
role: components["schemas"]["AccountRole"];
/** Meta */
meta: {
[key: string]: unknown;
};
/** Creatorid */
creatorId?: number | null;
/**
* Createdat
* Format: date-time
*/
createdAt: string;
status: components["schemas"]["AccountStatus"];
};
/** UserCreate */
UserCreate: {
/** Name */
name?: string | null;
/** Login */
login?: string | null;
/** Email */
email?: string | null;
/** Password */
password?: string | null;
/** Bindtenantid */
bindTenantId?: string | null;
role?: components["schemas"]["AccountRole"] | null;
/** Meta */
meta?: {
[key: string]: unknown;
} | null;
status?: components["schemas"]["AccountStatus"] | null;
};
/** UserUpdate */
UserUpdate: {
/** Id */
id?: number | null;
/** Name */
name?: string | null;
/** Login */
login?: string | null;
/** Email */
email?: string | null;
/** Password */
password?: string | null;
/** Bindtenantid */
bindTenantId?: string | null;
role?: components["schemas"]["AccountRole"] | null;
/** Meta */
meta?: {
[key: string]: unknown;
} | null;
/** Creatorid */
creatorId?: number | null;
/** Createdat */
createdAt?: string | null;
status?: components["schemas"]["AccountStatus"] | null;
};
/** ValidationError */
ValidationError: {
/** Location */
loc: (string | number)[];
/** Message */
msg: string;
/** Error Type */
type: string;
};
};
responses: never;
parameters: never;
requestBodies: never;
headers: never;
pathItems: never;
}
export type $defs = Record<string, never>;
export interface operations {
login_for_access_token_api_v1_auth_post: {
parameters: {
query?: never;
header?: never;
path?: never;
cookie?: never;
};
requestBody: {
content: {
"application/json": components["schemas"]["Auth"];
};
};
responses: {
/** @description Successful Response */
200: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["Tokens"];
};
};
/** @description Validation Error */
422: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["HTTPValidationError"];
};
};
};
};
refresh_api_v1_auth_refresh_post: {
parameters: {
query?: never;
header?: never;
path?: never;
cookie?: never;
};
requestBody?: never;
responses: {
/** @description Successful Response */
200: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["Tokens"];
};
};
};
};
get_profile_api_v1_profile_get: {
parameters: {
query?: never;
header?: never;
path?: never;
cookie?: never;
};
requestBody?: never;
responses: {
/** @description Successful Response */
200: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["User"];
};
};
};
};
update_profile_api_v1_profile_put: {
parameters: {
query?: never;
header?: never;
path?: never;
cookie?: never;
};
requestBody: {
content: {
"application/json": components["schemas"]["UserUpdate"];
};
};
responses: {
/** @description Successful Response */
200: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["User"];
};
};
/** @description Validation Error */
422: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["HTTPValidationError"];
};
};
};
};
get_all_account_api_v1_account_get: {
parameters: {
query?: {
page?: number;
limit?: number;
};
header?: never;
path?: never;
cookie?: never;
};
requestBody?: never;
responses: {
/** @description Successful Response */
200: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["AllUserResponse"];
};
};
/** @description Validation Error */
422: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["HTTPValidationError"];
};
};
};
};
create_account_api_v1_account_post: {
parameters: {
query?: never;
header?: never;
path?: never;
cookie?: never;
};
requestBody: {
content: {
"application/json": components["schemas"]["UserCreate"];
};
};
responses: {
/** @description Successful Response */
200: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["AllUser"];
};
};
/** @description Validation Error */
422: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["HTTPValidationError"];
};
};
};
};
get_account_api_v1_account__user_id__get: {
parameters: {
query?: never;
header?: never;
path: {
user_id: number;
};
cookie?: never;
};
requestBody?: never;
responses: {
/** @description Successful Response */
200: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["UserUpdate"];
};
};
/** @description Validation Error */
422: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["HTTPValidationError"];
};
};
};
};
update_account_api_v1_account__user_id__put: {
parameters: {
query?: never;
header?: never;
path: {
user_id: number;
};
cookie?: never;
};
requestBody: {
content: {
"application/json": components["schemas"]["UserUpdate"];
};
};
responses: {
/** @description Successful Response */
200: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["UserUpdate"];
};
};
/** @description Validation Error */
422: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["HTTPValidationError"];
};
};
};
};
delete_account_api_v1_account__user_id__delete: {
parameters: {
query?: never;
header?: never;
path: {
user_id: number;
};
cookie?: never;
};
requestBody?: never;
responses: {
/** @description Successful Response */
200: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["User"];
};
};
/** @description Validation Error */
422: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["HTTPValidationError"];
};
};
};
};
get_keyring_api_v1_keyring__user_id___key_id__get: {
parameters: {
query?: never;
header?: never;
path: {
key_id: string;
};
cookie?: never;
};
requestBody?: never;
responses: {
/** @description Successful Response */
200: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["AccountKeyring"];
};
};
/** @description Validation Error */
422: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["HTTPValidationError"];
};
};
};
};
update_keyring_api_v1_keyring__user_id___key_id__put: {
parameters: {
query?: never;
header?: never;
path: {
user_id: number;
key_id: string;
};
cookie?: never;
};
requestBody: {
content: {
"application/json": components["schemas"]["AccountKeyringUpdate"];
};
};
responses: {
/** @description Successful Response */
200: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["AccountKeyring"];
};
};
/** @description Validation Error */
422: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["HTTPValidationError"];
};
};
};
};
create_keyring_api_v1_keyring__user_id___key_id__post: {
parameters: {
query?: never;
header?: never;
path: {
user_id: number;
key_id: string;
};
cookie?: never;
};
requestBody: {
content: {
"application/json": components["schemas"]["AccountKeyringUpdate"];
};
};
responses: {
/** @description Successful Response */
200: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["AccountKeyring"];
};
};
/** @description Validation Error */
422: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["HTTPValidationError"];
};
};
};
};
delete_keyring_api_v1_keyring__user_id___key_id__delete: {
parameters: {
query?: never;
header?: never;
path: {
user_id: number;
key_id: string;
};
cookie?: never;
};
requestBody?: never;
responses: {
/** @description Successful Response */
200: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["AccountKeyring"];
};
};
/** @description Validation Error */
422: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["HTTPValidationError"];
};
};
};
};
}

9
client/src/types/user.ts
View File

@ -1,9 +0,0 @@
import { components } from './openapi-types';
export type User = components['schemas']['User'];
export type AllUserResponse = components['schemas']['AllUserResponse'];
export type AllUser = components['schemas']['AllUser'];
export type AccountStatus = components['schemas']['AccountStatus'];
export type AccountRole = components['schemas']['AccountRole'];
export type UserUpdate = components['schemas']['UserUpdate'];
export type UserCreate = components['schemas']['UserCreate'];

16
client/tsconfig.json
View File

@ -1,7 +1,11 @@
{ {
"compilerOptions": { "compilerOptions": {
"target": "es5", "target": "es5",
"lib": ["dom", "dom.iterable", "esnext"], "lib": [
"dom",
"dom.iterable",
"esnext"
],
"allowJs": true, "allowJs": true,
"skipLibCheck": true, "skipLibCheck": true,
"esModuleInterop": true, "esModuleInterop": true,
@ -14,11 +18,9 @@
"resolveJsonModule": true, "resolveJsonModule": true,
"isolatedModules": true, "isolatedModules": true,
"noEmit": true, "noEmit": true,
"jsx": "react-jsx", "jsx": "react-jsx"
"baseUrl": ".",
"paths": {
"@/*": ["./src/*"]
}
}, },
"include": ["src"] "include": [
"src"
]
} }

23
client/vite.config.ts
View File

@ -1,23 +0,0 @@
import { defineConfig } from 'vite';
import react from '@vitejs/plugin-react';
import path from 'path';
export default defineConfig({
plugins: [react()],
server: {
port: 3000,
open: false,
},
build: {
outDir: 'build',
},
preview: {
port: 3000,
open: false,
},
resolve: {
alias: {
'@': path.resolve(__dirname, './src'),
},
},
});

10
supervisord.conf
View File

@ -32,11 +32,11 @@ startretries=5
[program:client] [program:client]
environment= environment=
VITE_APP_WEBSOCKET_PROTOCOL=ws, REACT_APP_WEBSOCKET_PROTOCOL=ws,
VITE_APP_HTTP_PROTOCOL=http, REACT_APP_HTTP_PROTOCOL=http,
VITE_APP_API_URL=localhost:8000, REACT_APP_API_URL=localhost:8000,
VITE_APP_URL=localhost:3000 REACT_APP_URL=localhost:3000
command=bash -c 'cd client; npm run build; npm run preview' command=bash -c 'cd client; npm run build; serve -s build'
numprocs=1 numprocs=1
process_name=node-%(process_num)d process_name=node-%(process_num)d
stdout_logfile=client.out.log stdout_logfile=client.out.log