Compare commits
1
Commits
v1.2.1
..
cb97ced66c
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cb97ced66c |
@@ -40,11 +40,6 @@ Authorization. Auth endpoints исключены из Bearer/retry middleware. R
|
|||||||
координируется single-flight; после `401` с `UNAUTHORIZED` возможен один retry.
|
координируется single-flight; после `401` с `UNAUTHORIZED` возможен один retry.
|
||||||
Не добавляй собственный refresh/retry loop в caller.
|
Не добавляй собственный refresh/retry loop в caller.
|
||||||
|
|
||||||
Refresh, завершившийся `401`, очищает session. Сетевая ошибка и `5xx`
|
|
||||||
(например, деплой backend) не доказывают конец session: она сохраняется,
|
|
||||||
`unavailable` показывает retry-экран вместо login, а следующий `401` снова
|
|
||||||
запускает refresh. Retry/backoff внутри refresh не добавляется.
|
|
||||||
|
|
||||||
Cookie-writing requests упорядочены только в текущей вкладке. Cross-tab auth
|
Cookie-writing requests упорядочены только в текущей вкладке. Cross-tab auth
|
||||||
synchronization не требуется; допустим reload/re-login. Web Locks и отдельные
|
synchronization не требуется; допустим reload/re-login. Web Locks и отдельные
|
||||||
token stores не добавляются.
|
token stores не добавляются.
|
||||||
|
|||||||
@@ -89,9 +89,4 @@ Commits и PR titles — Conventional Commits с parser-recognized Issue referen
|
|||||||
содержит одну связанную задачу. Исключения release и правила ссылки — в
|
содержит одну связанную задачу. Исключения release и правила ссылки — в
|
||||||
Engineering Workflow из AGENTS. Root другого checkout не управляет этим repo.
|
Engineering Workflow из AGENTS. Root другого checkout не управляет этим repo.
|
||||||
Прямой push в `main`, force-push и перенос опубликованных тегов не входят в
|
Прямой push в `main`, force-push и перенос опубликованных тегов не входят в
|
||||||
обычную работу. PR сливается squash или rebase-merge; merge-коммит не
|
обычную работу. Перед release/hotfix прочитай местный README, раздел «Релизы».
|
||||||
используется. `main` обновляется только fast-forward из `develop`, поэтому
|
|
||||||
`origin/main` всегда предок `origin/develop`:
|
|
||||||
`git merge-base --is-ancestor origin/main origin/develop`. Срочный fix —
|
|
||||||
обычная ветка `fix/*` от `develop`; пути hotfix от `main` нет.
|
|
||||||
Перед релизом прочитай местный README, раздел «Релизы».
|
|
||||||
|
|||||||
@@ -34,11 +34,7 @@ jobs:
|
|||||||
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
|
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
|
||||||
run: |
|
run: |
|
||||||
printf '%s\n' "$PR_TITLE" | npm run commitlint -- --strict
|
printf '%s\n' "$PR_TITLE" | npm run commitlint -- --strict
|
||||||
if [[ "$PR_TITLE" =~ ^chore\(release\):\ [0-9]+\.[0-9]+\.[0-9]+$ ]]; then
|
npm run commitlint -- --strict --from "$BASE_SHA" --to "$HEAD_SHA"
|
||||||
npm run commitlint -- --strict --from "$HEAD_SHA^" --to "$HEAD_SHA"
|
|
||||||
else
|
|
||||||
npm run commitlint -- --strict --from "$BASE_SHA" --to "$HEAD_SHA"
|
|
||||||
fi
|
|
||||||
|
|
||||||
security:
|
security:
|
||||||
needs: commits
|
needs: commits
|
||||||
|
|||||||
@@ -1,85 +1,5 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## [1.2.1](https://git.personal.ksv741.ru/WealthLedger/frontend/compare/v1.2.0...v1.2.1) (2026-10-24)
|
|
||||||
|
|
||||||
### Bug Fixes
|
|
||||||
|
|
||||||
* keep session when refresh fails on network error or 5xx (WealthLedger/frontend[#97](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/97)) ([3af9df0](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/3af9df0ae2f0fb314c276504ef7d50a7472de680))
|
|
||||||
* show snapshot time in browser time zone ([#101](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/101)) ([b009101](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/b009101b7b954e8462672a9da859267ebb71edc4))
|
|
||||||
|
|
||||||
### Maintenance
|
|
||||||
|
|
||||||
* bump Node to 24.22.1 (WealthLedger/backend[#122](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/122)) ([2cd6b1e](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/2cd6b1e72d97117b0c37465aac3d989b0469c1c3))
|
|
||||||
* bump test stack and fix npm audit findings ([#105](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/105)) ([7e6fd95](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/7e6fd95cfaf7d288242fb46ec7091f561e6f3de5))
|
|
||||||
* **deps:** update non-major dependencies [#9](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/9) ([b5ceb77](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/b5ceb77208e35a0e389258f3d3c4b85852980042))
|
|
||||||
* resolve dev dependency audit findings (WealthLedger/frontend[#103](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/103)) ([7b6f34c](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/7b6f34c776fa3517c93b5c3468e3b277aaa6273f))
|
|
||||||
|
|
||||||
## [1.2.0](https://git.personal.ksv741.ru/WealthLedger/frontend/compare/v1.1.0...v1.2.0) (2026-10-18)
|
|
||||||
|
|
||||||
### Features
|
|
||||||
|
|
||||||
* unify income payment cards and remove comparisons (WealthLedger/main[#33](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/33)) ([#74](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/74)) ([43b0f55](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/43b0f5574a79e26de0abae35de16d8aa8700f718))
|
|
||||||
|
|
||||||
### Bug Fixes
|
|
||||||
|
|
||||||
* align password validation with backend ASCII policy (WealthLedger/backend[#60](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/60)) ([#89](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/89)) ([ebe9268](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/ebe92684a74b4e2617b04ef00d9406b8a0f674ea))
|
|
||||||
* **auth,bank:** guard switch-auth nav and surface banking retry ([e38ecd8](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/e38ecd87d6f69968bb56e6035ceeb6cfda208a3f)), closes [#56](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/56) [#57](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/57)
|
|
||||||
* **bank:** break BankFeedback's shared/api edge for stories ([#80](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/80)) ([2336804](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/233680448f97dc3ec57d7665ec14c68ac92410e5))
|
|
||||||
* deliver screener OpenAPI constraints (WealthLedger/backend[#70](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/70)) ([#85](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/85)) ([ed63ada](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/ed63adad94f5d0e20f7d0d1446a235f953d10ec2))
|
|
||||||
* **events:** seven-date default period and picker from today (WealthLedger/frontend[#63](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/63)) ([612ab62](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/612ab6250979bf8d9b57f4feb6e1476ed3d759e4))
|
|
||||||
* respect query eligibility in screen sync (WealthLedger/frontend[#54](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/54)) ([f295dea](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/f295dea6a6a33c597c753b52aff629d5382c963a))
|
|
||||||
|
|
||||||
### Refactoring
|
|
||||||
|
|
||||||
* derive payment-system options from schema tuple ([#58](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/58)) ([#75](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/75)) ([e67c47b](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/e67c47b102329877eb5d9c9d8bb4ea7c0bc70883))
|
|
||||||
|
|
||||||
### Build
|
|
||||||
|
|
||||||
* use native openapi-typescript --check ([#60](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/60)) ([#77](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/77)) ([df05c8c](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/df05c8c7dbb5d6816fb95d54ca43cd0d83eecd48))
|
|
||||||
|
|
||||||
### CI
|
|
||||||
|
|
||||||
* keep pre-commit proportionate and avoid tool downloads (WealthLedger/frontend[#62](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/62)) ([#86](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/86)) ([d409a29](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/d409a297e5f9ae5658d4efa958bda9a012a859a1))
|
|
||||||
* recheck PR title on edited without the full pipeline (WealthLedger/frontend[#64](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/64)) ([bc28973](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/bc28973d1ad5e15bfbc2e5b73b00ba63449933db))
|
|
||||||
|
|
||||||
### Tests
|
|
||||||
|
|
||||||
* await client settlement in late-response cases (WealthLedger/frontend[#61](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/61)) ([#81](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/81)) ([f3725c2](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/f3725c202bd8cef4ba711085df82a921a2da6b7d))
|
|
||||||
* cover non-retry of INVALID_TBANK_TOKEN reads (WealthLedger/backend[#59](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/59)) ([#90](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/90)) ([5134106](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/513410669680480a1f68f5720744cc85e43c8286))
|
|
||||||
* cover null events and income envelopes on account pages ([#72](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/72)) ([#79](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/79)) ([e5f8bbe](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/e5f8bbe33cd438f432281818c5276abe9a425646))
|
|
||||||
* cover null resource envelopes for account pages ([#70](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/70)) ([#71](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/71)) ([#78](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/78)) ([f7f53ff](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/f7f53ff8e4de3c1d06fac6063974ff9667145ed6))
|
|
||||||
|
|
||||||
### Maintenance
|
|
||||||
|
|
||||||
* adopt linear git model in frontend docs ([#91](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/91)) ([eefdde2](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/eefdde29f8da269581e90bd797078e10a39e472f))
|
|
||||||
|
|
||||||
## [1.1.0](https://git.personal.ksv741.ru/WealthLedger/frontend/compare/v1.0.0...v1.1.0) (2026-10-12)
|
|
||||||
|
|
||||||
### Features
|
|
||||||
|
|
||||||
* add stock screener ([a84411d](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/a84411df39dc131290e9f5b5d9313fed17cc629a))
|
|
||||||
* align investment client with hourly sync ([432cca2](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/432cca299f3a9a9e45b2697527369ee95f2d0adc))
|
|
||||||
* render hourly investment states ([3c226f8](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/3c226f8c29efceccb75af0d6424639a757534f39))
|
|
||||||
|
|
||||||
### Bug Fixes
|
|
||||||
|
|
||||||
* align frontend workflow rules (WealthLedger/main[#27](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/27)) ([c315f80](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/c315f80b1b07ae0888366512ec157b8e29c81d62))
|
|
||||||
* preserve latest stock screener result ([cec9c63](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/cec9c6348a389f16f272dac5533aebc9d12ceae8))
|
|
||||||
* show bank summary totals ([20b2cdf](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/20b2cdfd432f8b01e447f68657cf5c685a297f1e))
|
|
||||||
|
|
||||||
### Documentation
|
|
||||||
|
|
||||||
* clarify frontend verification policy ([cac4351](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/cac4351bc4abf2cec7c5b6611a74d87bf4ec2f70))
|
|
||||||
* pin frontend workflow reference (WealthLedger/main[#27](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/27)) ([0d747cc](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/0d747cc93ee08c337cf300c0367612708f45dfb9))
|
|
||||||
|
|
||||||
### CI
|
|
||||||
|
|
||||||
* skip checks on PR metadata edits ([c882120](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/c8821200ce699dab1ce65360d1968d5877a2e78b))
|
|
||||||
|
|
||||||
### Maintenance
|
|
||||||
|
|
||||||
* align frontend engineering workflow (WealthLedger/main[#27](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/27)) ([617edfd](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/617edfd489a6a84bb33b57386eca4eb54661f4f0))
|
|
||||||
|
|
||||||
## [1.0.0](https://git.personal.ksv741.ru/WealthLedger/frontend/compare/v0.4.0...v1.0.0) (2026-10-07)
|
## [1.0.0](https://git.personal.ksv741.ru/WealthLedger/frontend/compare/v0.4.0...v1.0.0) (2026-10-07)
|
||||||
|
|
||||||
### ⚠ BREAKING CHANGES
|
### ⚠ BREAKING CHANGES
|
||||||
|
|||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
FROM node:24.22.1-bookworm-slim AS dependencies
|
FROM node:24.21.0-bookworm-slim AS dependencies
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
ENV HUSKY=0
|
ENV HUSKY=0
|
||||||
COPY package.json package-lock.json ./
|
COPY package.json package-lock.json ./
|
||||||
@@ -19,7 +19,7 @@ COPY . .
|
|||||||
ENV VITE_API_BASE_URL=""
|
ENV VITE_API_BASE_URL=""
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
FROM nginx:1.31.8-alpine AS production
|
FROM nginx:1.28.0-alpine AS production
|
||||||
ARG VERSION
|
ARG VERSION
|
||||||
ARG REVISION
|
ARG REVISION
|
||||||
LABEL org.opencontainers.image.version=$VERSION \
|
LABEL org.opencontainers.image.version=$VERSION \
|
||||||
|
|||||||
@@ -217,59 +217,36 @@ preset по имени из `.release-it.json`. Версия preset закреп
|
|||||||
Репозиторий выпускается независимо. `develop` — интеграция, `main` — принятые
|
Репозиторий выпускается независимо. `develop` — интеграция, `main` — принятые
|
||||||
релизы. Обычная работа: issue-linked ветка от актуального `develop`, PR в `develop`;
|
релизы. Обычная работа: issue-linked ветка от актуального `develop`, PR в `develop`;
|
||||||
общие правила — в Engineering Workflow по ссылке из AGENTS.
|
общие правила — в Engineering Workflow по ссылке из AGENTS.
|
||||||
PR сливается squash или rebase-merge; merge-коммит не используется. `main`
|
Обычные PR допускают squash; release и обратная синхронизация сохраняют историю.
|
||||||
обновляется только fast-forward из `develop`, поэтому история линейна:
|
|
||||||
|
|
||||||
```text
|
|
||||||
<type>/<issue>-<slug> --squash--> develop --ff-only--> main --> tag vX.Y.Z
|
|
||||||
```
|
|
||||||
|
|
||||||
Инвариант: `origin/main` всегда предок `origin/develop`. Проверка:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git fetch -q origin
|
|
||||||
git merge-base --is-ancestor origin/main origin/develop && echo ok || echo BROKEN
|
|
||||||
```
|
|
||||||
|
|
||||||
Commits и PR titles — Conventional Commits со ссылкой на Issue (кроме release),
|
Commits и PR titles — Conventional Commits со ссылкой на Issue (кроме release),
|
||||||
включая `spec:`. Версии вручную не повышай.
|
включая `spec:`. Версии вручную не повышай.
|
||||||
|
|
||||||
1. Получи `main`, `develop` и теги: `git fetch origin --tags`. Проверь
|
1. Получи `main`, `develop` и теги: `git fetch origin --tags`. Убедись, что
|
||||||
инвариант. Создай `release/X.Y.Z` от проверенного `develop`;
|
`develop` содержит последний релиз. Создай `release/<name>` от проверенного
|
||||||
`nvm use --silent`, `npm ci`.
|
`develop`; `nvm use --silent`, `npm ci`. Hotfix начинается от `main` в
|
||||||
|
`release/hotfix-<name>` и проходит тот же процесс.
|
||||||
2. На чистой ветке выполни `npm run release:preview`, просмотри версию/changelog,
|
2. На чистой ветке выполни `npm run release:preview`, просмотри версию/changelog,
|
||||||
затем `npm run release:prepare`. Команда создаёт `chore(release): X.Y.Z`,
|
затем `npm run release:prepare`. Команда создаёт `chore(release): X.Y.Z`,
|
||||||
обновляет manifest/lockfile/CHANGELOG; тег и push не выполняет. Не обходи
|
обновляет manifest/lockfile/CHANGELOG; тег и push не выполняет. Не обходи
|
||||||
guards ветки, чистого дерева, отсутствующих тегов или уже подготовленной версии.
|
guards ветки, чистого дерева, отсутствующих тегов или уже подготовленной версии.
|
||||||
3. Проверь diff и штатные gates этого репозитория. Отправь только release-ветку,
|
3. Проверь diff и штатные gates этого репозитория. Отправь только release-ветку,
|
||||||
открой PR в **`develop`** с заголовком `chore(release): X.Y.Z`. После зелёных
|
открой PR в `main` с заголовком `chore(release): X.Y.Z`. После зелёных
|
||||||
`verify`, `security`, `commits` выполни fast-forward-only merge. Если
|
`verify`, `security`, `commits` выполни fast-forward-only merge. Если `main`
|
||||||
`develop` изменился, обнови release-ветку и повтори проверки кандидата.
|
изменился, согласуй историю и повтори проверки кандидата.
|
||||||
4. Открой PR `develop → main` с тем же заголовком и слей fast-forward-only.
|
4. Получи удалённый `main`, сравни его HEAD с проверенным release SHA и версией
|
||||||
5. Получи удалённый `main`, сравни его HEAD с проверенным release SHA и версией
|
|
||||||
manifest/lockfile. Создай аннотированный `vX.Y.Z` именно на этом SHA:
|
manifest/lockfile. Создай аннотированный `vX.Y.Z` именно на этом SHA:
|
||||||
`git tag -a vX.Y.Z <release-sha> -m "Release X.Y.Z"`, затем отправь только
|
`git tag -a vX.Y.Z <release-sha> -m "Release X.Y.Z"`, затем отправь только
|
||||||
`git push origin refs/tags/vX.Y.Z`. Не запускай release-it повторно на `main`.
|
`git push origin refs/tags/vX.Y.Z`. Не запускай release-it повторно на `main`.
|
||||||
|
5. Верни release-коммит через PR `main → develop` без squash/rebase; проверь,
|
||||||
Обратная синхронизация не нужна: release-коммит попал в `develop` на шаге 3.
|
что `develop` содержит тег. Опубликованные теги не перемещай. При сбое после
|
||||||
Опубликованные теги не перемещай. При сбое после merge создай отсутствующий тег
|
merge создай отсутствующий тег без нового bump; до merge исправь и проверь
|
||||||
без нового bump; до merge исправь и проверь существующий кандидат без
|
существующий кандидат без повторного повышения версии.
|
||||||
повторного повышения версии.
|
|
||||||
|
|
||||||
Freeze релиза не поддерживается: пока открыт релизный PR, `develop` не двигают.
|
|
||||||
Срочный fix — обычная ветка `fix/*` от `develop` с последующим релизом;
|
|
||||||
пути от `main` нет, он сделал бы `main` не-предком `develop`. Исключение
|
|
||||||
требует явного решения: `release/hotfix-<name>` от `main`, PR в `main`, тег,
|
|
||||||
затем merge `main → develop` для восстановления инварианта.
|
|
||||||
|
|
||||||
`feat:` повышает minor, `fix:`/`perf:` и прочие разрешённые типы — patch;
|
`feat:` повышает minor, `fix:`/`perf:` и прочие разрешённые типы — patch;
|
||||||
`!`/`BREAKING CHANGE:` — major, включая версии до 1.0. `chore(release):`
|
`!`/`BREAKING CHANGE:` — major, включая версии до 1.0. `chore(release):`
|
||||||
исключён из рекомендации и changelog. Конфигурация — `.release-it.json`.
|
исключён из рекомендации и changelog. Конфигурация — `.release-it.json`.
|
||||||
В Gitea для `main`/`develop` должны быть запрещены прямой/force push и обход
|
В Gitea для `main`/`develop` должны быть запрещены прямой/force push и обход
|
||||||
администратором, включена блокировка устаревшей ветки, обязательны `verify`,
|
администратором, обязательны `verify`, `security`, `commits`; теги `v*` защищены.
|
||||||
`security`, `commits`; теги `v*` защищены. Линейность обеспечивают merge styles
|
|
||||||
репозитория: merge-коммиты и rebase `--no-ff` выключены, доступны squash,
|
|
||||||
rebase-merge и fast-forward-only; стиль по умолчанию — squash.
|
|
||||||
Workflow сам не включает эти настройки. Отдельное review approval для одного
|
Workflow сам не включает эти настройки. Отдельное review approval для одного
|
||||||
владельца не требуется. Npm publishing, deploy и Gitea Releases не включены.
|
владельца не требуется. Npm publishing, deploy и Gitea Releases не включены.
|
||||||
|
|
||||||
|
|||||||
Generated
+1290
-1240
File diff suppressed because it is too large
Load Diff
+50
-55
@@ -1,10 +1,10 @@
|
|||||||
{
|
{
|
||||||
"name": "wealth-ledger-frontend",
|
"name": "wealth-ledger-frontend",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "1.2.1",
|
"version": "1.0.0",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "24.22.1"
|
"node": "24.21.0"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "npm run build:packages && vite",
|
"dev": "npm run build:packages && vite",
|
||||||
@@ -37,94 +37,89 @@
|
|||||||
"*.{js,mjs,cjs,ts,tsx}": "eslint --fix --max-warnings=0 --no-warn-ignored"
|
"*.{js,mjs,cjs,ts,tsx}": "eslint --fix --max-warnings=0 --no-warn-ignored"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@hookform/resolvers": "5.9.2",
|
"@hookform/resolvers": "5.9.1",
|
||||||
"@mantine/charts": "9.7.3",
|
"@mantine/charts": "9.6.1",
|
||||||
"@mantine/core": "9.7.3",
|
"@mantine/core": "9.6.1",
|
||||||
"@mantine/dates": "9.7.3",
|
"@mantine/dates": "9.6.1",
|
||||||
"@mantine/hooks": "9.7.3",
|
"@mantine/hooks": "9.6.1",
|
||||||
"@mantine/notifications": "9.7.3",
|
"@mantine/notifications": "9.6.1",
|
||||||
"@tanstack/react-query": "5.104.5",
|
"@tanstack/react-query": "5.102.8",
|
||||||
"@wealthledger/icons": "file:packages/icons",
|
"@wealthledger/icons": "file:packages/icons",
|
||||||
"@wealthledger/tokens": "file:packages/tokens",
|
"@wealthledger/tokens": "file:packages/tokens",
|
||||||
"@wealthledger/ui": "file:packages/ui",
|
"@wealthledger/ui": "file:packages/ui",
|
||||||
"dayjs": "1.11.23",
|
"dayjs": "1.11.23",
|
||||||
"i18next": "26.5.10",
|
"i18next": "26.4.2",
|
||||||
"motion": "13.5.1",
|
"motion": "13.2.0",
|
||||||
"openapi-fetch": "0.17.0",
|
"openapi-fetch": "0.17.0",
|
||||||
"openapi-react-query": "0.5.4",
|
"openapi-react-query": "0.5.4",
|
||||||
"react": "19.3.1",
|
"react": "19.3.0",
|
||||||
"react-dom": "19.3.1",
|
"react-dom": "19.3.0",
|
||||||
"react-hook-form": "7.91.0",
|
"react-hook-form": "7.88.0",
|
||||||
"react-i18next": "17.1.8",
|
"react-i18next": "17.0.14",
|
||||||
"react-is": "19.3.1",
|
"react-is": "19.3.0",
|
||||||
"react-router": "8.5.0",
|
"react-router": "8.3.1",
|
||||||
"recharts": "3.10.1",
|
"recharts": "3.10.1",
|
||||||
"zod": "4.6.7"
|
"zod": "4.6.4"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/core": "8.0.9",
|
"@babel/core": "8.0.5",
|
||||||
"@commitlint/cli": "21.2.4",
|
"@commitlint/cli": "21.2.2",
|
||||||
"@commitlint/config-conventional": "21.2.4",
|
"@commitlint/config-conventional": "21.2.2",
|
||||||
"@eslint-react/eslint-plugin": "5.28.8",
|
"@eslint-react/eslint-plugin": "5.21.0",
|
||||||
"@eslint/js": "10.0.1",
|
"@eslint/js": "10.0.1",
|
||||||
"@release-it/conventional-changelog": "12.0.2",
|
"@release-it/conventional-changelog": "12.0.0",
|
||||||
"@rolldown/plugin-babel": "0.2.4",
|
"@rolldown/plugin-babel": "0.2.4",
|
||||||
"@storybook/addon-docs": "10.6.3",
|
"@storybook/addon-docs": "10.6.0",
|
||||||
"@storybook/react-vite": "10.6.3",
|
"@storybook/react-vite": "10.6.0",
|
||||||
"@stylistic/eslint-plugin": "5.10.0",
|
"@stylistic/eslint-plugin": "5.10.0",
|
||||||
"@tanstack/eslint-plugin-query": "5.104.5",
|
"@tanstack/eslint-plugin-query": "5.104.0",
|
||||||
"@testing-library/jest-dom": "7.0.1",
|
"@testing-library/jest-dom": "7.0.1",
|
||||||
"@testing-library/react": "16.3.3",
|
"@testing-library/react": "16.3.3",
|
||||||
"@types/node": "24.19.2",
|
"@types/node": "24.13.4",
|
||||||
"@types/react": "19.3.0",
|
"@types/react": "19.3.0",
|
||||||
"@types/react-dom": "19.3.0",
|
"@types/react-dom": "19.3.0",
|
||||||
"@vitejs/plugin-react": "6.1.2",
|
"@vitejs/plugin-react": "6.1.1",
|
||||||
"@vitest/browser": "5.0.5",
|
"@vitest/browser-playwright": "5.0.0",
|
||||||
"@vitest/browser-playwright": "5.0.5",
|
"@vitest/coverage-v8": "5.0.0",
|
||||||
"@vitest/coverage-v8": "5.0.5",
|
|
||||||
"@vitest/eslint-plugin": "1.6.27",
|
"@vitest/eslint-plugin": "1.6.27",
|
||||||
"@vitest/ui": "5.0.5",
|
|
||||||
"babel-plugin-react-compiler": "1.0.0",
|
"babel-plugin-react-compiler": "1.0.0",
|
||||||
"conventional-changelog-conventionalcommits": "10.4.1",
|
"conventional-changelog-conventionalcommits": "10.4.0",
|
||||||
"dependency-cruiser": "18.7.0",
|
"dependency-cruiser": "18.2.0",
|
||||||
"eslint": "10.13.0",
|
"eslint": "10.11.0",
|
||||||
"eslint-import-resolver-typescript": "4.4.5",
|
"eslint-import-resolver-typescript": "4.4.5",
|
||||||
"eslint-plugin-import-x": "4.17.1",
|
"eslint-plugin-import-x": "4.17.1",
|
||||||
"eslint-plugin-jest-dom": "5.10.1",
|
"eslint-plugin-jest-dom": "5.10.1",
|
||||||
"eslint-plugin-no-unsanitized": "4.1.5",
|
"eslint-plugin-no-unsanitized": "4.1.5",
|
||||||
"eslint-plugin-perfectionist": "5.13.0",
|
"eslint-plugin-perfectionist": "5.12.1",
|
||||||
"eslint-plugin-react-hooks": "7.1.1",
|
"eslint-plugin-react-hooks": "7.1.1",
|
||||||
"eslint-plugin-react-refresh": "0.5.7",
|
"eslint-plugin-react-refresh": "0.5.7",
|
||||||
"eslint-plugin-regexp": "3.3.1",
|
"eslint-plugin-regexp": "3.3.1",
|
||||||
"eslint-plugin-security": "4.2.0",
|
"eslint-plugin-security": "4.1.0",
|
||||||
"eslint-plugin-sonarjs": "4.2.2",
|
"eslint-plugin-sonarjs": "4.2.1",
|
||||||
"eslint-plugin-storybook": "10.6.3",
|
"eslint-plugin-storybook": "10.6.0",
|
||||||
"eslint-plugin-testing-library": "7.16.2",
|
"eslint-plugin-testing-library": "7.16.2",
|
||||||
"eslint-plugin-unicorn": "76.0.0",
|
"eslint-plugin-unicorn": "76.0.0",
|
||||||
"globals": "17.13.0",
|
"globals": "17.12.0",
|
||||||
"husky": "9.1.7",
|
"husky": "9.1.7",
|
||||||
"jsdom": "30.1.3",
|
"jsdom": "30.0.1",
|
||||||
"knip": "6.43.0",
|
"knip": "6.35.1",
|
||||||
"lint-staged": "17.6.0",
|
"lint-staged": "17.5.1",
|
||||||
"msw": "2.15.0",
|
"msw": "2.15.0",
|
||||||
"openapi-typescript": "7.13.0",
|
"openapi-typescript": "7.13.0",
|
||||||
"playwright": "1.64.1",
|
"playwright": "1.63.0",
|
||||||
"release-it": "21.1.1",
|
"release-it": "21.0.2",
|
||||||
"storybook": "10.6.3",
|
"storybook": "10.6.0",
|
||||||
"typescript": "5.9.3",
|
"typescript": "5.9.3",
|
||||||
"typescript-eslint": "8.72.0",
|
"typescript-eslint": "8.70.1",
|
||||||
"vite": "8.3.5",
|
"vite": "8.3.0",
|
||||||
"vite-plugin-pwa": "1.3.0",
|
"vite-plugin-pwa": "1.3.0",
|
||||||
"vitest": "5.0.5"
|
"vitest": "5.0.0"
|
||||||
},
|
},
|
||||||
"overrides": {
|
"overrides": {
|
||||||
"release-it": {
|
"release-it": {
|
||||||
"basic-ftp": "6.2.3",
|
"basic-ftp": "6.2.1",
|
||||||
"undici": "8.12.3"
|
"undici": "7.29.1"
|
||||||
},
|
}
|
||||||
"@vitest/browser": "5.0.5",
|
|
||||||
"@vitest/ui": "5.0.5",
|
|
||||||
"@vitest/mocker": "5.0.5"
|
|
||||||
},
|
},
|
||||||
"allowScripts": {
|
"allowScripts": {
|
||||||
"esbuild@0.28.2": true,
|
"esbuild@0.28.2": true,
|
||||||
|
|||||||
@@ -20,14 +20,14 @@
|
|||||||
"build": "vite build && tsc -p tsconfig.json"
|
"build": "vite build && tsc -p tsconfig.json"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"react": "19.3.1"
|
"react": "19.3.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@storybook/react-vite": "10.6.3",
|
"@storybook/react-vite": "10.6.0",
|
||||||
"@testing-library/react": "16.3.3",
|
"@testing-library/react": "16.3.3",
|
||||||
"@types/react": "19.3.0",
|
"@types/react": "19.3.0",
|
||||||
"typescript": "5.9.3",
|
"typescript": "5.9.3",
|
||||||
"vite": "8.3.5",
|
"vite": "8.3.0",
|
||||||
"vitest": "5.0.5"
|
"vitest": "5.0.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,18 +27,18 @@
|
|||||||
"@wealthledger/tokens": "0.3.0"
|
"@wealthledger/tokens": "0.3.0"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@mantine/core": "9.7.3",
|
"@mantine/core": "9.6.1",
|
||||||
"@mantine/hooks": "9.7.3",
|
"@mantine/hooks": "9.6.1",
|
||||||
"react": "19.3.1",
|
"react": "19.3.0",
|
||||||
"react-dom": "19.3.1"
|
"react-dom": "19.3.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@storybook/react-vite": "10.6.3",
|
"@storybook/react-vite": "10.6.0",
|
||||||
"@testing-library/react": "16.3.3",
|
"@testing-library/react": "16.3.3",
|
||||||
"@types/react": "19.3.0",
|
"@types/react": "19.3.0",
|
||||||
"storybook": "10.6.3",
|
"storybook": "10.6.0",
|
||||||
"typescript": "5.9.3",
|
"typescript": "5.9.3",
|
||||||
"vite": "8.3.5",
|
"vite": "8.3.0",
|
||||||
"vitest": "5.0.5"
|
"vitest": "5.0.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -190,30 +190,6 @@ describe("AppRoutes", () => {
|
|||||||
expect(document.title).toBe("Карты — WealthLedger");
|
expect(document.title).toBe("Карты — WealthLedger");
|
||||||
});
|
});
|
||||||
|
|
||||||
it("offers a retry instead of the login form while the server is unreachable, then restores the route", async () => {
|
|
||||||
let isOutage = true;
|
|
||||||
server.use(
|
|
||||||
http.post("*/api/v1/auth/refresh", () =>
|
|
||||||
isOutage
|
|
||||||
? new HttpResponse(null, { status: 502 })
|
|
||||||
: HttpResponse.json({
|
|
||||||
accessToken: "test-token",
|
|
||||||
user: { email: "user@example.com", id: "user-1" },
|
|
||||||
}),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
renderRoutes("/accounts");
|
|
||||||
|
|
||||||
expect(await screen.findByRole("alert")).toHaveTextContent("Не удалось подключиться");
|
|
||||||
expect(screen.queryByRole("heading", { name: "Вход" })).not.toBeInTheDocument();
|
|
||||||
isOutage = false;
|
|
||||||
fireEvent.click(screen.getByRole("button", { name: "Повторить" }));
|
|
||||||
|
|
||||||
expect(
|
|
||||||
await screen.findByRole("heading", { level: 2, name: "Нет инвестиционных счетов" }),
|
|
||||||
).toBeVisible();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("lazy-loads the protected shell for an authenticated accounts route", async () => {
|
it("lazy-loads the protected shell for an authenticated accounts route", async () => {
|
||||||
server.use(
|
server.use(
|
||||||
http.post("*/api/v1/auth/refresh", () =>
|
http.post("*/api/v1/auth/refresh", () =>
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import { useAuth } from "@/features/auth";
|
|||||||
|
|
||||||
type BoundaryProps = PropsWithChildren<{
|
type BoundaryProps = PropsWithChildren<{
|
||||||
authenticated: boolean;
|
authenticated: boolean;
|
||||||
|
routeKey: string;
|
||||||
}>;
|
}>;
|
||||||
|
|
||||||
type RouteErrorFallbackProps = {
|
type RouteErrorFallbackProps = {
|
||||||
@@ -25,6 +26,12 @@ class Boundary extends Component<BoundaryProps, State> {
|
|||||||
|
|
||||||
override state: State = { hasError: false };
|
override state: State = { hasError: false };
|
||||||
|
|
||||||
|
override componentDidUpdate(previousProps: BoundaryProps) {
|
||||||
|
if (previousProps.routeKey !== this.props.routeKey && this.state.hasError) {
|
||||||
|
this.setState({ hasError: false });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
override render() {
|
override render() {
|
||||||
return this.state.hasError
|
return this.state.hasError
|
||||||
? <RouteErrorFallback authenticated={this.props.authenticated} />
|
? <RouteErrorFallback authenticated={this.props.authenticated} />
|
||||||
@@ -63,7 +70,10 @@ const RouteErrorBoundary: FC<PropsWithChildren> = (props) => {
|
|||||||
const { user } = useAuth();
|
const { user } = useAuth();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Boundary authenticated={Boolean(user)} key={`${pathname}${search}:${key}`}>
|
<Boundary
|
||||||
|
authenticated={Boolean(user)}
|
||||||
|
routeKey={`${pathname}${search}:${key}`}
|
||||||
|
>
|
||||||
{children}
|
{children}
|
||||||
</Boundary>
|
</Boundary>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,7 +1,4 @@
|
|||||||
import { Button, Container } from "@mantine/core";
|
|
||||||
import { StateView } from "@wealthledger/ui";
|
|
||||||
import { type FC, type PropsWithChildren, useState } from "react";
|
import { type FC, type PropsWithChildren, useState } from "react";
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
import { Navigate, useLocation } from "react-router";
|
import { Navigate, useLocation } from "react-router";
|
||||||
|
|
||||||
import { useAuth } from "@/features/auth";
|
import { useAuth } from "@/features/auth";
|
||||||
@@ -10,26 +7,12 @@ import { RouteSkeleton } from "./RouteFallback";
|
|||||||
|
|
||||||
const Protected: FC<PropsWithChildren> = (props) => {
|
const Protected: FC<PropsWithChildren> = (props) => {
|
||||||
const { children } = props;
|
const { children } = props;
|
||||||
const { ready, retry, signedOut, unavailable, user } = useAuth();
|
const { ready, signedOut, user } = useAuth();
|
||||||
const { t } = useTranslation();
|
|
||||||
const location = useLocation();
|
const location = useLocation();
|
||||||
const [wasAuthenticated, setWasAuthenticated] = useState(false);
|
const [wasAuthenticated, setWasAuthenticated] = useState(false);
|
||||||
if (user && !wasAuthenticated) setWasAuthenticated(true);
|
if (user && !wasAuthenticated) setWasAuthenticated(true);
|
||||||
if (!ready) return <RouteSkeleton variant="shell" />;
|
if (!ready) return <RouteSkeleton variant="shell" />;
|
||||||
|
|
||||||
// The server was unreachable (e.g. mid-deploy), so the session is unproven, not gone.
|
|
||||||
if (!user && unavailable)
|
|
||||||
return (
|
|
||||||
<Container py="xl" size={560}>
|
|
||||||
<StateView
|
|
||||||
action={<Button onClick={retry}>{t("auth.retry")}</Button>}
|
|
||||||
error
|
|
||||||
text={t("auth.unavailableText")}
|
|
||||||
title={t("auth.unavailableTitle")}
|
|
||||||
/>
|
|
||||||
</Container>
|
|
||||||
);
|
|
||||||
|
|
||||||
const loginState = signedOut && wasAuthenticated
|
const loginState = signedOut && wasAuthenticated
|
||||||
? undefined
|
? undefined
|
||||||
: { returnTo: `${location.pathname}${location.search}` };
|
: { returnTo: `${location.pathname}${location.search}` };
|
||||||
|
|||||||
@@ -7,12 +7,7 @@ type AuthContextValue = {
|
|||||||
logout: () => Promise<void>;
|
logout: () => Promise<void>;
|
||||||
ready: boolean;
|
ready: boolean;
|
||||||
register: (email: string, password: string) => Promise<void>;
|
register: (email: string, password: string) => Promise<void>;
|
||||||
retry: () => void;
|
|
||||||
signedOut: boolean;
|
signedOut: boolean;
|
||||||
/**
|
|
||||||
Refresh failed with a network error or 5xx; the refresh cookie may still be valid.
|
|
||||||
*/
|
|
||||||
unavailable: boolean;
|
|
||||||
user: undefined | User;
|
user: undefined | User;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,55 +0,0 @@
|
|||||||
import { describe, expect, it } from "vitest";
|
|
||||||
|
|
||||||
import { loginSchema, registerSchema } from "./auth.schema";
|
|
||||||
|
|
||||||
const email = "user@example.com";
|
|
||||||
|
|
||||||
function canLogIn(password: string) {
|
|
||||||
return loginSchema.safeParse({ email, password }).success;
|
|
||||||
}
|
|
||||||
|
|
||||||
function canRegister(password: string, confirmation = password) {
|
|
||||||
return registerSchema.safeParse({
|
|
||||||
email,
|
|
||||||
password,
|
|
||||||
passwordConfirmation: confirmation,
|
|
||||||
}).success;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Register policy: 8..72 printable ASCII (bcrypt reads 72 bytes, so non-ASCII could be
|
|
||||||
// truncated). Login stays lenient so accounts created under the old policy still sign in.
|
|
||||||
describe("auth password policy", () => {
|
|
||||||
it.each([
|
|
||||||
["7 chars", "a".repeat(7), false],
|
|
||||||
["8 chars", "a".repeat(8), true],
|
|
||||||
["72 chars", "a".repeat(72), true],
|
|
||||||
["73 chars", "a".repeat(73), false],
|
|
||||||
["printable symbols and space", "Aa1 !~\"#$%&'()*+,-./:;<=>?@", true],
|
|
||||||
["Cyrillic, 8+ chars", "пароль-пароль", false],
|
|
||||||
["emoji", "passw😀rd", false],
|
|
||||||
["tab", "pass\tword1", false],
|
|
||||||
["newline", "password1\n", false],
|
|
||||||
["DEL", "password\u{7F}1", false],
|
|
||||||
])("register: %s", (_, password, accepted) => {
|
|
||||||
expect(canRegister(password)).toBe(accepted);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("register compares the raw password with its confirmation", () => {
|
|
||||||
const padded = " spaced pass ";
|
|
||||||
|
|
||||||
expect(canRegister(padded)).toBe(true);
|
|
||||||
expect(canRegister(padded, padded.trim())).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
it.each([
|
|
||||||
["legacy Cyrillic password", "пароль-пароль", true],
|
|
||||||
["short legacy password", "short", true],
|
|
||||||
["72 bytes", "a".repeat(72), true],
|
|
||||||
["73 bytes", "a".repeat(73), false],
|
|
||||||
["36 Cyrillic letters = 72 bytes", "я".repeat(36), true],
|
|
||||||
["37 Cyrillic letters = 74 bytes", "я".repeat(37), false],
|
|
||||||
["empty", "", false],
|
|
||||||
])("login: %s", (_, password, accepted) => {
|
|
||||||
expect(canLogIn(password)).toBe(accepted);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -7,10 +7,8 @@ const EMAIL_PART_COUNT = 2;
|
|||||||
const ASCII_SPACE = 32;
|
const ASCII_SPACE = 32;
|
||||||
const ASCII_DELETE = 127;
|
const ASCII_DELETE = 127;
|
||||||
const MAX_EMAIL_LENGTH = 254;
|
const MAX_EMAIL_LENGTH = 254;
|
||||||
const MIN_PASSWORD_LENGTH = 8;
|
const MIN_PASSWORD_BYTES = 12;
|
||||||
const MAX_PASSWORD_BYTES = 72;
|
const MAX_PASSWORD_BYTES = 72;
|
||||||
// Printable ASCII keeps characters == bytes, within the bcrypt 72-byte limit.
|
|
||||||
const ASCII_TILDE = 126;
|
|
||||||
|
|
||||||
function isEmailCharacterInvalid(character: string): boolean {
|
function isEmailCharacterInvalid(character: string): boolean {
|
||||||
const codePoint = character.codePointAt(0);
|
const codePoint = character.codePointAt(0);
|
||||||
@@ -22,14 +20,6 @@ function isEmailCharacterInvalid(character: string): boolean {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function isPrintableAscii(value: string): boolean {
|
|
||||||
return value.split("").every((character) => {
|
|
||||||
const code = character.codePointAt(0) ?? 0;
|
|
||||||
|
|
||||||
return code >= ASCII_SPACE && code <= ASCII_TILDE;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const email = z
|
const email = z
|
||||||
.string()
|
.string()
|
||||||
.trim()
|
.trim()
|
||||||
@@ -43,42 +33,28 @@ const email = z
|
|||||||
{ error: validationMessage("auth.validation.invalidEmail") },
|
{ error: validationMessage("auth.validation.invalidEmail") },
|
||||||
);
|
);
|
||||||
|
|
||||||
// Login stays lenient: accounts created under an older policy must still sign in.
|
const password = z
|
||||||
const loginPassword = z
|
|
||||||
.string()
|
.string()
|
||||||
.min(1)
|
|
||||||
.refine(
|
.refine(
|
||||||
value => new TextEncoder().encode(value).length <= MAX_PASSWORD_BYTES,
|
value =>
|
||||||
{ error: validationMessage("auth.validation.passwordTooLong") },
|
new TextEncoder().encode(value).length >= MIN_PASSWORD_BYTES
|
||||||
|
&& new TextEncoder().encode(value).length <= MAX_PASSWORD_BYTES,
|
||||||
|
{ error: validationMessage("auth.validation.invalidPasswordLength") },
|
||||||
);
|
);
|
||||||
|
|
||||||
const registerPassword = z
|
|
||||||
.string()
|
|
||||||
.min(MIN_PASSWORD_LENGTH, {
|
|
||||||
error: validationMessage("auth.validation.invalidPasswordLength"),
|
|
||||||
})
|
|
||||||
.max(MAX_PASSWORD_BYTES, {
|
|
||||||
error: validationMessage("auth.validation.invalidPasswordLength"),
|
|
||||||
})
|
|
||||||
.refine(isPrintableAscii, {
|
|
||||||
error: validationMessage("auth.validation.invalidPasswordLength"),
|
|
||||||
});
|
|
||||||
|
|
||||||
const loginSchema = z.object({
|
const loginSchema = z.object({
|
||||||
email,
|
email,
|
||||||
password: loginPassword,
|
password,
|
||||||
passwordConfirmation: z.string().optional(),
|
passwordConfirmation: z.string().optional(),
|
||||||
});
|
});
|
||||||
|
|
||||||
const registerSchema = loginSchema
|
const registerSchema = loginSchema.refine(
|
||||||
.extend({ password: registerPassword })
|
value => value.password === value.passwordConfirmation,
|
||||||
.refine(
|
{
|
||||||
value => value.password === value.passwordConfirmation,
|
error: validationMessage("auth.validation.passwordsDoNotMatch"),
|
||||||
{
|
path: ["passwordConfirmation"],
|
||||||
error: validationMessage("auth.validation.passwordsDoNotMatch"),
|
},
|
||||||
path: ["passwordConfirmation"],
|
);
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
type AuthFormValues = z.input<typeof loginSchema>;
|
type AuthFormValues = z.input<typeof loginSchema>;
|
||||||
|
|
||||||
|
|||||||
@@ -92,10 +92,8 @@ describe("AuthProvider", () => {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("settles unauthenticated and clears cached data when cold-start refresh is rejected with 401", async () => {
|
it("settles unauthenticated and clears cached data when cold-start refresh has a transport error", async () => {
|
||||||
server.use(http.post("*/api/v1/auth/refresh", () =>
|
server.use(http.post("*/api/v1/auth/refresh", () => HttpResponse.error()));
|
||||||
HttpResponse.json({ code: "UNAUTHORIZED" }, { status: 401 }),
|
|
||||||
));
|
|
||||||
const queryClient = createTestQueryClient();
|
const queryClient = createTestQueryClient();
|
||||||
queryClient.setQueryData(["cached-query"], { value: "stale" });
|
queryClient.setQueryData(["cached-query"], { value: "stale" });
|
||||||
queryClient.setQueryData(bankCardsKey, [{ id: "bank-card-1" }]);
|
queryClient.setQueryData(bankCardsKey, [{ id: "bank-card-1" }]);
|
||||||
@@ -105,54 +103,12 @@ describe("AuthProvider", () => {
|
|||||||
await waitFor(() => expect(result.current.ready).toBe(true));
|
await waitFor(() => expect(result.current.ready).toBe(true));
|
||||||
|
|
||||||
expect(result.current.user).toBeUndefined();
|
expect(result.current.user).toBeUndefined();
|
||||||
expect(result.current.unavailable).toBe(false);
|
|
||||||
expect(await requestAuthorization()).toBeNull();
|
expect(await requestAuthorization()).toBeNull();
|
||||||
expect(queryClient.getQueryData(["cached-query"])).toBeUndefined();
|
expect(queryClient.getQueryData(["cached-query"])).toBeUndefined();
|
||||||
expect(queryClient.getQueryData(bankCardsKey)).toBeUndefined();
|
expect(queryClient.getQueryData(bankCardsKey)).toBeUndefined();
|
||||||
});
|
});
|
||||||
|
|
||||||
it.each([
|
it("keeps the original protected 401 when serialized refresh has a transport error", async () => {
|
||||||
["a transport error", () => HttpResponse.error()],
|
|
||||||
["a 502 from the proxy", () => new HttpResponse(null, { status: 502 })],
|
|
||||||
["a 503 problem", () => HttpResponse.json({ code: "INTERNAL_SERVER_ERROR" }, { status: 503 })],
|
|
||||||
])("settles as unavailable and keeps cached data when cold-start refresh gets %s", async (_name, failure) => {
|
|
||||||
server.use(http.post("*/api/v1/auth/refresh", failure));
|
|
||||||
const queryClient = createTestQueryClient();
|
|
||||||
queryClient.setQueryData(["cached-query"], { value: "kept" });
|
|
||||||
const wrapper: FC<PropsWithChildren> = createAuthWrapper(queryClient);
|
|
||||||
const { result } = renderHook(() => useAuth(), { wrapper });
|
|
||||||
|
|
||||||
await waitFor(() => expect(result.current.ready).toBe(true));
|
|
||||||
|
|
||||||
expect(result.current.user).toBeUndefined();
|
|
||||||
expect(result.current.unavailable).toBe(true);
|
|
||||||
expect(queryClient.getQueryData(["cached-query"])).toEqual({ value: "kept" });
|
|
||||||
});
|
|
||||||
|
|
||||||
it("restores the session when retry succeeds after an outage", async () => {
|
|
||||||
let isOutage = true;
|
|
||||||
server.use(http.post("*/api/v1/auth/refresh", () =>
|
|
||||||
isOutage
|
|
||||||
? new HttpResponse(null, { status: 502 })
|
|
||||||
: HttpResponse.json({
|
|
||||||
accessToken: "restored-token",
|
|
||||||
user: { email: "user@example.com", id: "user-1" },
|
|
||||||
}),
|
|
||||||
));
|
|
||||||
const queryClient = createTestQueryClient();
|
|
||||||
const wrapper: FC<PropsWithChildren> = createAuthWrapper(queryClient);
|
|
||||||
const { result } = renderHook(() => useAuth(), { wrapper });
|
|
||||||
|
|
||||||
await waitFor(() => expect(result.current.unavailable).toBe(true));
|
|
||||||
isOutage = false;
|
|
||||||
act(() => result.current.retry());
|
|
||||||
|
|
||||||
await waitFor(() => expect(result.current.user?.id).toBe("user-1"));
|
|
||||||
expect(result.current.unavailable).toBe(false);
|
|
||||||
expect(await requestAuthorization()).toBe("Bearer restored-token");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("keeps the original protected 401 and the session when serialized refresh has a transport error", async () => {
|
|
||||||
let refreshCalls = 0;
|
let refreshCalls = 0;
|
||||||
server.use(
|
server.use(
|
||||||
http.post("*/api/v1/auth/refresh", () => {
|
http.post("*/api/v1/auth/refresh", () => {
|
||||||
@@ -181,11 +137,10 @@ describe("AuthProvider", () => {
|
|||||||
const response = await apiClient.GET("/api/v1/brokerage-accounts");
|
const response = await apiClient.GET("/api/v1/brokerage-accounts");
|
||||||
|
|
||||||
expect(response.response.status).toBe(401);
|
expect(response.response.status).toBe(401);
|
||||||
// An unreachable server does not prove the session ended; the next 401 refreshes again.
|
await waitFor(() => expect(result.current.user).toBeUndefined());
|
||||||
await waitFor(() => expect(result.current.unavailable).toBe(true));
|
expect(await requestAuthorization()).toBeNull();
|
||||||
expect(result.current.user?.id).toBe("user-1");
|
expect(queryClient.getQueryData(["cached-query"])).toBeUndefined();
|
||||||
expect(queryClient.getQueryData(["cached-query"])).toEqual({ value: "stale" });
|
expect(queryClient.getQueryData(bankCardsKey)).toBeUndefined();
|
||||||
expect(queryClient.getQueryData(bankCardsKey)).toEqual([{ id: "bank-card-1" }]);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it("clears connection status and financial cache independently on logout", async () => {
|
it("clears connection status and financial cache independently on logout", async () => {
|
||||||
|
|||||||
@@ -5,9 +5,6 @@ import { apiClient, configureAuthClient, type paths } from "@/shared/api";
|
|||||||
|
|
||||||
import { type User } from "./auth-context";
|
import { type User } from "./auth-context";
|
||||||
|
|
||||||
// A 5xx or network error means the server is unreachable, not that the session ended.
|
|
||||||
const HTTP_SERVER_ERROR = 500;
|
|
||||||
|
|
||||||
type Authentication
|
type Authentication
|
||||||
= paths["/api/v1/auth/login"]["post"]["responses"][200]["content"]["application/json"];
|
= paths["/api/v1/auth/login"]["post"]["responses"][200]["content"]["application/json"];
|
||||||
|
|
||||||
@@ -35,8 +32,6 @@ function useAuthProviderVm() {
|
|||||||
const accessTokenRef = useRef<string | undefined>(undefined);
|
const accessTokenRef = useRef<string | undefined>(undefined);
|
||||||
const [ready, setReady] = useState(false);
|
const [ready, setReady] = useState(false);
|
||||||
const [signedOut, setSignedOut] = useState(false);
|
const [signedOut, setSignedOut] = useState(false);
|
||||||
const [unavailable, setUnavailable] = useState(false);
|
|
||||||
const unavailableRef = useRef(false);
|
|
||||||
|
|
||||||
const generationRef = useRef(0);
|
const generationRef = useRef(0);
|
||||||
const userRef = useRef<undefined | User>(undefined);
|
const userRef = useRef<undefined | User>(undefined);
|
||||||
@@ -54,18 +49,12 @@ function useAuthProviderVm() {
|
|||||||
return next;
|
return next;
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const markUnavailable = useCallback((isUnavailable: boolean) => {
|
|
||||||
unavailableRef.current = isUnavailable;
|
|
||||||
setUnavailable(isUnavailable);
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const applyAuthentication = useCallback(
|
const applyAuthentication = useCallback(
|
||||||
(authentication: Authentication) => {
|
(authentication: Authentication) => {
|
||||||
const changedIdentity
|
const changedIdentity
|
||||||
= userRef.current && userRef.current.id !== authentication.user.id;
|
= userRef.current && userRef.current.id !== authentication.user.id;
|
||||||
|
|
||||||
setSignedOut(false);
|
setSignedOut(false);
|
||||||
markUnavailable(false);
|
|
||||||
accessTokenRef.current = authentication.accessToken;
|
accessTokenRef.current = authentication.accessToken;
|
||||||
|
|
||||||
if (changedIdentity) {
|
if (changedIdentity) {
|
||||||
@@ -78,17 +67,16 @@ function useAuthProviderVm() {
|
|||||||
userRef.current = authentication.user;
|
userRef.current = authentication.user;
|
||||||
setUser(authentication.user);
|
setUser(authentication.user);
|
||||||
},
|
},
|
||||||
[markUnavailable, queryClient],
|
[queryClient],
|
||||||
);
|
);
|
||||||
|
|
||||||
const clearSession = useCallback(() => {
|
const clearSession = useCallback(() => {
|
||||||
markUnavailable(false);
|
|
||||||
generationRef.current += 1;
|
generationRef.current += 1;
|
||||||
userRef.current = undefined;
|
userRef.current = undefined;
|
||||||
setUser(undefined);
|
setUser(undefined);
|
||||||
accessTokenRef.current = undefined;
|
accessTokenRef.current = undefined;
|
||||||
queryClient.clear();
|
queryClient.clear();
|
||||||
}, [markUnavailable, queryClient]);
|
}, [queryClient]);
|
||||||
|
|
||||||
const refresh = useCallback((): Promise<boolean> => {
|
const refresh = useCallback((): Promise<boolean> => {
|
||||||
if (refreshPromiseRef.current) return refreshPromiseRef.current;
|
if (refreshPromiseRef.current) return refreshPromiseRef.current;
|
||||||
@@ -98,12 +86,11 @@ function useAuthProviderVm() {
|
|||||||
if (started !== generationRef.current) return false;
|
if (started !== generationRef.current) return false;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const { data, response } = await apiClient.POST("/api/v1/auth/refresh");
|
const { data } = await apiClient.POST("/api/v1/auth/refresh");
|
||||||
if (started !== generationRef.current) return false;
|
if (started !== generationRef.current) return false;
|
||||||
|
|
||||||
if (!data) {
|
if (!data) {
|
||||||
if (response.status >= HTTP_SERVER_ERROR) markUnavailable(true);
|
clearSession();
|
||||||
else clearSession();
|
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -113,7 +100,7 @@ function useAuthProviderVm() {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
catch {
|
catch {
|
||||||
if (started === generationRef.current) markUnavailable(true);
|
if (started === generationRef.current) clearSession();
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -125,7 +112,7 @@ function useAuthProviderVm() {
|
|||||||
refreshPromiseRef.current = pending;
|
refreshPromiseRef.current = pending;
|
||||||
|
|
||||||
return pending;
|
return pending;
|
||||||
}, [applyAuthentication, clearSession, markUnavailable, serialize]);
|
}, [applyAuthentication, clearSession, serialize]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
void refresh().finally(() => setReady(true));
|
void refresh().finally(() => setReady(true));
|
||||||
@@ -159,7 +146,6 @@ function useAuthProviderVm() {
|
|||||||
clear: clearSession,
|
clear: clearSession,
|
||||||
generation: () => generationRef.current,
|
generation: () => generationRef.current,
|
||||||
refresh,
|
refresh,
|
||||||
unavailable: () => unavailableRef.current,
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
useEffect(() => () => configureAuthClient(), []);
|
useEffect(() => () => configureAuthClient(), []);
|
||||||
@@ -171,9 +157,7 @@ function useAuthProviderVm() {
|
|||||||
ready,
|
ready,
|
||||||
register: (email: string, password: string) =>
|
register: (email: string, password: string) =>
|
||||||
authenticate("/api/v1/auth/register", email, password),
|
authenticate("/api/v1/auth/register", email, password),
|
||||||
retry: () => void refresh(),
|
|
||||||
signedOut,
|
signedOut,
|
||||||
unavailable,
|
|
||||||
user,
|
user,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -70,39 +70,4 @@ describe("AuthForm", () => {
|
|||||||
resolve();
|
resolve();
|
||||||
await screen.findByRole("link", { name: linkLabel });
|
await screen.findByRole("link", { name: linkLabel });
|
||||||
});
|
});
|
||||||
|
|
||||||
// Register policy is 8..72 printable ASCII; login accepts legacy passwords.
|
|
||||||
it.each([
|
|
||||||
["register", "Регистрация", "пароль-пароль", false],
|
|
||||||
["register", "Регистрация", "passw😀rd", false],
|
|
||||||
["register", "Регистрация", "a".repeat(7), false],
|
|
||||||
["register", "Регистрация", "a".repeat(8), true],
|
|
||||||
["register", "Регистрация", "a".repeat(72), true],
|
|
||||||
["register", "Регистрация", "a".repeat(73), false],
|
|
||||||
["login", "Вход", "пароль-пароль", true],
|
|
||||||
])("%s submits password %j: %s", async (mode, submitLabel, password, submitted) => {
|
|
||||||
const onSubmit = vi.fn().mockResolvedValue(undefined);
|
|
||||||
|
|
||||||
render(
|
|
||||||
<MantineProvider>
|
|
||||||
<MemoryRouter>
|
|
||||||
<AuthForm onSubmit={onSubmit} register={mode === "register"} />
|
|
||||||
</MemoryRouter>
|
|
||||||
</MantineProvider>,
|
|
||||||
);
|
|
||||||
|
|
||||||
fireEvent.change(screen.getByLabelText("Email"), { target: { value: "user@example.com" } });
|
|
||||||
fireEvent.change(screen.getByLabelText("Пароль"), { target: { value: password } });
|
|
||||||
|
|
||||||
if (mode === "register") {
|
|
||||||
fireEvent.change(screen.getByLabelText("Подтвердите пароль"), { target: { value: password } });
|
|
||||||
}
|
|
||||||
|
|
||||||
fireEvent.click(screen.getByRole("button", { name: submitLabel }));
|
|
||||||
|
|
||||||
await waitFor(() => expect(
|
|
||||||
screen.queryByText(/Пароль: от 8 до 72 символов/) === null,
|
|
||||||
).toBe(submitted));
|
|
||||||
expect(onSubmit).toHaveBeenCalledTimes(submitted ? 1 : 0);
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ import {
|
|||||||
useLocation,
|
useLocation,
|
||||||
useNavigate,
|
useNavigate,
|
||||||
} from "react-router";
|
} from "react-router";
|
||||||
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||||
|
|
||||||
import { configureAuthClient } from "@/shared/api";
|
import { configureAuthClient } from "@/shared/api";
|
||||||
import { defaultPeriod, formatDate, moscowDate } from "@/shared/lib";
|
import { defaultPeriod, formatDate, moscowDate } from "@/shared/lib";
|
||||||
@@ -72,14 +72,7 @@ function renderEvents(accountId: string, searches: string[]) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
describe("Upcoming event date filters", () => {
|
describe("Upcoming event date filters", () => {
|
||||||
afterEach(() => {
|
|
||||||
vi.useRealTimers();
|
|
||||||
});
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
// Pin "today": the test picks today + 10 days, which must be inside the visible calendar grid.
|
|
||||||
// Real dates can push it beyond the grid (e.g. 2026-10-23 -> 2 November).
|
|
||||||
vi.useFakeTimers({ toFake: ["Date"] });
|
|
||||||
vi.setSystemTime(new Date("2026-08-10T09:00:00Z"));
|
|
||||||
configureAuthClient({
|
configureAuthClient({
|
||||||
accessToken: () => "token",
|
accessToken: () => "token",
|
||||||
clear: vi.fn(),
|
clear: vi.fn(),
|
||||||
@@ -87,8 +80,6 @@ describe("Upcoming event date filters", () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
afterEach(() => vi.useRealTimers());
|
|
||||||
|
|
||||||
it("keeps reads and sync disabled without an account scope", async () => {
|
it("keeps reads and sync disabled without an account scope", async () => {
|
||||||
const requests: string[] = [];
|
const requests: string[] = [];
|
||||||
server.use(
|
server.use(
|
||||||
@@ -238,10 +229,6 @@ describe("Upcoming event date filters", () => {
|
|||||||
it.each(["account-1", "all"])(
|
it.each(["account-1", "all"])(
|
||||||
"applies dates only on submit, restores URL dates, and resets from empty results for %s",
|
"applies dates only on submit, restores URL dates, and resets from empty results for %s",
|
||||||
async (accountId) => {
|
async (accountId) => {
|
||||||
// Pin "today" mid-month so "today + 10 days" stays in the calendar's
|
|
||||||
// visible month regardless of the real date.
|
|
||||||
vi.useFakeTimers({ toFake: ["Date"] });
|
|
||||||
vi.setSystemTime(new Date("2026-10-15T12:00:00+03:00"));
|
|
||||||
const [defaultFrom, defaultTo] = defaultPeriod();
|
const [defaultFrom, defaultTo] = defaultPeriod();
|
||||||
const searches: string[] = [];
|
const searches: string[] = [];
|
||||||
server.use(
|
server.use(
|
||||||
|
|||||||
@@ -413,9 +413,7 @@ describe("stock page", () => {
|
|||||||
expect(await screen.findByText("Продажа")).toBeVisible();
|
expect(await screen.findByText("Продажа")).toBeVisible();
|
||||||
expect(screen.getByText("2 шт.")).toBeVisible();
|
expect(screen.getByText("2 шт.")).toBeVisible();
|
||||||
expect(screen.getByText("Цена: 100 ₽")).toBeVisible();
|
expect(screen.getByText("Цена: 100 ₽")).toBeVisible();
|
||||||
const snapshotTime = new Intl.DateTimeFormat("ru-RU", { dateStyle: "short", timeStyle: "short" });
|
expect(screen.getByText(/02.01.2022, 10:00 UTC/)).toBeVisible();
|
||||||
const operationTime = snapshotTime.format(new Date("2022-01-02T10:00:00Z"));
|
|
||||||
expect(screen.getByText(operationTime, { exact: false })).toBeVisible();
|
|
||||||
expect(
|
expect(
|
||||||
requests.some(
|
requests.some(
|
||||||
url =>
|
url =>
|
||||||
|
|||||||
@@ -93,9 +93,7 @@ describe("stock search", () => {
|
|||||||
expect(
|
expect(
|
||||||
await screen.findByRole("link", { name: /Сбербанк/ }),
|
await screen.findByRole("link", { name: /Сбербанк/ }),
|
||||||
).toHaveAttribute("href", "/stocks/e6123145-9665-43e0-8413-cd61b8aa9b13");
|
).toHaveAttribute("href", "/stocks/e6123145-9665-43e0-8413-cd61b8aa9b13");
|
||||||
const snapshotTime = new Intl.DateTimeFormat("ru-RU", { dateStyle: "short", timeStyle: "short" });
|
expect(screen.getByText("Список получен 10.10.2026, 10:00")).toBeVisible();
|
||||||
const fetchedAt = snapshotTime.format(new Date("2026-10-10T10:00:00Z"));
|
|
||||||
expect(screen.getByText(`Список получен ${fetchedAt}`)).toBeVisible();
|
|
||||||
expect(screen.getByText("Лот: 10 шт.")).toBeVisible();
|
expect(screen.getByText("Лот: 10 шт.")).toBeVisible();
|
||||||
expect(screen.getByText("ISIN: RU0009029540")).toBeVisible();
|
expect(screen.getByText("ISIN: RU0009029540")).toBeVisible();
|
||||||
expect(screen.getAllByText("Мосбиржа")[0]).toBeVisible();
|
expect(screen.getAllByText("Мосбиржа")[0]).toBeVisible();
|
||||||
|
|||||||
@@ -67,25 +67,6 @@ describe("apiClient authentication", () => {
|
|||||||
expect(clear).toHaveBeenCalledOnce();
|
expect(clear).toHaveBeenCalledOnce();
|
||||||
});
|
});
|
||||||
|
|
||||||
it("keeps the session when refresh failed because the server was unreachable", async () => {
|
|
||||||
const clear = vi.fn();
|
|
||||||
server.use(
|
|
||||||
http.get("*/api/v1/brokerage-accounts", () =>
|
|
||||||
HttpResponse.json({ code: "UNAUTHORIZED" }, { status: 401 }),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
configureAuthClient({
|
|
||||||
accessToken: () => "expired",
|
|
||||||
clear,
|
|
||||||
refresh: () => Promise.resolve(false),
|
|
||||||
unavailable: () => true,
|
|
||||||
});
|
|
||||||
|
|
||||||
await apiClient.GET("/api/v1/brokerage-accounts");
|
|
||||||
|
|
||||||
expect(clear).not.toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("does not attach Bearer auth to authentication endpoints", async () => {
|
it("does not attach Bearer auth to authentication endpoints", async () => {
|
||||||
let authorization: null | string
|
let authorization: null | string
|
||||||
|
|
||||||
@@ -300,33 +281,6 @@ describe("apiClient transient read recovery", () => {
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
it("does not retry a read refused with INVALID_TBANK_TOKEN", async () => {
|
|
||||||
let requests = 0;
|
|
||||||
server.use(
|
|
||||||
http.get("*/api/v1/brokerage-accounts", () => {
|
|
||||||
requests += 1;
|
|
||||||
|
|
||||||
return HttpResponse.json(
|
|
||||||
{ code: "INVALID_TBANK_TOKEN", status: 400 },
|
|
||||||
{ status: 400 },
|
|
||||||
);
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
configureAuthClient({
|
|
||||||
accessToken: () => "token",
|
|
||||||
clear: vi.fn(),
|
|
||||||
refresh: () => Promise.resolve(false),
|
|
||||||
});
|
|
||||||
|
|
||||||
const { error, response } = await apiClient.GET(
|
|
||||||
"/api/v1/brokerage-accounts",
|
|
||||||
);
|
|
||||||
|
|
||||||
expect(response.status).toBe(400);
|
|
||||||
expect(error).toMatchObject({ code: "INVALID_TBANK_TOKEN" });
|
|
||||||
expect(requests).toBe(1);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("does not retry mutations", async () => {
|
it("does not retry mutations", async () => {
|
||||||
let requests = 0;
|
let requests = 0;
|
||||||
server.use(
|
server.use(
|
||||||
|
|||||||
@@ -32,10 +32,6 @@ type AuthHandlers = {
|
|||||||
clear: () => void;
|
clear: () => void;
|
||||||
generation?: () => number;
|
generation?: () => number;
|
||||||
refresh: () => Promise<boolean>;
|
refresh: () => Promise<boolean>;
|
||||||
/**
|
|
||||||
True after a refresh failed transiently (network/5xx): the session is not proven gone.
|
|
||||||
*/
|
|
||||||
unavailable?: () => boolean;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
type ReadAttempt = {
|
type ReadAttempt = {
|
||||||
@@ -104,8 +100,7 @@ async function authenticatedFetch(request: Request): Promise<Response> {
|
|||||||
if (!isCurrent()) throw new DOMException("Session changed", "AbortError");
|
if (!isCurrent()) throw new DOMException("Session changed", "AbortError");
|
||||||
|
|
||||||
if (!(await sessionState.handlers.refresh())) {
|
if (!(await sessionState.handlers.refresh())) {
|
||||||
if (isCurrent() && !sessionState.handlers.unavailable?.())
|
if (isCurrent()) sessionState.handlers.clear();
|
||||||
sessionState.handlers.clear();
|
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
+4
-16
@@ -746,13 +746,10 @@ export interface components {
|
|||||||
detail: string;
|
detail: string;
|
||||||
}[];
|
}[];
|
||||||
};
|
};
|
||||||
RegisterDto: {
|
CredentialsDto: {
|
||||||
/** @example user@example.com */
|
/** @example user@example.com */
|
||||||
email: string;
|
email: string;
|
||||||
/**
|
/** @example a secure password */
|
||||||
* @description Raw password: 8-72 printable ASCII characters (letters, digits, symbols, space). Not trimmed or normalized.
|
|
||||||
* @example a secure password
|
|
||||||
*/
|
|
||||||
password: string;
|
password: string;
|
||||||
};
|
};
|
||||||
UserDto: {
|
UserDto: {
|
||||||
@@ -763,15 +760,6 @@ export interface components {
|
|||||||
accessToken: string;
|
accessToken: string;
|
||||||
user: components["schemas"]["UserDto"];
|
user: components["schemas"]["UserDto"];
|
||||||
};
|
};
|
||||||
LoginDto: {
|
|
||||||
/** @example user@example.com */
|
|
||||||
email: string;
|
|
||||||
/**
|
|
||||||
* @description Raw password, at most 72 UTF-8 bytes. Not trimmed or normalized.
|
|
||||||
* @example a secure password
|
|
||||||
*/
|
|
||||||
password: string;
|
|
||||||
};
|
|
||||||
MoneyDto: {
|
MoneyDto: {
|
||||||
currency: string;
|
currency: string;
|
||||||
value: string;
|
value: string;
|
||||||
@@ -1720,7 +1708,7 @@ export interface operations {
|
|||||||
};
|
};
|
||||||
requestBody: {
|
requestBody: {
|
||||||
content: {
|
content: {
|
||||||
"application/json": components["schemas"]["RegisterDto"];
|
"application/json": components["schemas"]["CredentialsDto"];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
responses: {
|
responses: {
|
||||||
@@ -1788,7 +1776,7 @@ export interface operations {
|
|||||||
};
|
};
|
||||||
requestBody: {
|
requestBody: {
|
||||||
content: {
|
content: {
|
||||||
"application/json": components["schemas"]["LoginDto"];
|
"application/json": components["schemas"]["CredentialsDto"];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
responses: {
|
responses: {
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
"content": {
|
"content": {
|
||||||
"application/json": {
|
"application/json": {
|
||||||
"schema": {
|
"schema": {
|
||||||
"$ref": "#/components/schemas/RegisterDto"
|
"$ref": "#/components/schemas/CredentialsDto"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -91,7 +91,7 @@
|
|||||||
"content": {
|
"content": {
|
||||||
"application/json": {
|
"application/json": {
|
||||||
"schema": {
|
"schema": {
|
||||||
"$ref": "#/components/schemas/LoginDto"
|
"$ref": "#/components/schemas/CredentialsDto"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5236,7 +5236,7 @@
|
|||||||
"code"
|
"code"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"RegisterDto": {
|
"CredentialsDto": {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
"email": {
|
"email": {
|
||||||
@@ -5245,8 +5245,8 @@
|
|||||||
},
|
},
|
||||||
"password": {
|
"password": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"description": "Raw password: 8-72 printable ASCII characters (letters, digits, symbols, space). Not trimmed or normalized.",
|
"minLength": 12,
|
||||||
"pattern": "^[\\x20-\\x7E]{8,72}$",
|
"maxLength": 72,
|
||||||
"example": "a secure password"
|
"example": "a secure password"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -5285,24 +5285,6 @@
|
|||||||
"user"
|
"user"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"LoginDto": {
|
|
||||||
"type": "object",
|
|
||||||
"properties": {
|
|
||||||
"email": {
|
|
||||||
"type": "string",
|
|
||||||
"example": "user@example.com"
|
|
||||||
},
|
|
||||||
"password": {
|
|
||||||
"type": "string",
|
|
||||||
"description": "Raw password, at most 72 UTF-8 bytes. Not trimmed or normalized.",
|
|
||||||
"example": "a secure password"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"required": [
|
|
||||||
"email",
|
|
||||||
"password"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"MoneyDto": {
|
"MoneyDto": {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
|
|||||||
@@ -53,14 +53,10 @@ const ru = {
|
|||||||
passwordConfirmation: "Подтвердите пароль",
|
passwordConfirmation: "Подтвердите пароль",
|
||||||
register: "Регистрация",
|
register: "Регистрация",
|
||||||
requestError: "Не удалось выполнить запрос. Попробуйте ещё раз.",
|
requestError: "Не удалось выполнить запрос. Попробуйте ещё раз.",
|
||||||
retry: "Повторить",
|
|
||||||
unavailableText: "Сервер временно недоступен. Ваш вход сохранён, попробуйте через минуту.",
|
|
||||||
unavailableTitle: "Не удалось подключиться",
|
|
||||||
validation: {
|
validation: {
|
||||||
invalidEmail: "Некорректный email",
|
invalidEmail: "Некорректный email",
|
||||||
invalidPasswordLength: "Пароль: от 8 до 72 символов, только латинские буквы, цифры, спецсимволы и пробел",
|
invalidPasswordLength: "Пароль должен содержать от 12 до 72 байт",
|
||||||
passwordsDoNotMatch: "Пароли не совпадают",
|
passwordsDoNotMatch: "Пароли не совпадают",
|
||||||
passwordTooLong: "Пароль не должен превышать 72 байта",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
bank: {
|
bank: {
|
||||||
@@ -420,7 +416,7 @@ const ru = {
|
|||||||
next: "Далее",
|
next: "Далее",
|
||||||
noInstrument: "Без инструмента",
|
noInstrument: "Без инструмента",
|
||||||
noMoney: "Без движения денег",
|
noMoney: "Без движения денег",
|
||||||
occurredAt: "{{date}}",
|
occurredAt: "{{date}} UTC",
|
||||||
open: "Открыть журнал",
|
open: "Открыть журнал",
|
||||||
operationType: {
|
operationType: {
|
||||||
buy: "Покупка",
|
buy: "Покупка",
|
||||||
@@ -632,7 +628,7 @@ const ru = {
|
|||||||
position: "Моя позиция",
|
position: "Моя позиция",
|
||||||
previous: "Назад",
|
previous: "Назад",
|
||||||
price: "Цена",
|
price: "Цена",
|
||||||
priceAt: "Цена на {{date}}",
|
priceAt: "Цена на {{date}} UTC",
|
||||||
priceTable: "Цены в таблице",
|
priceTable: "Цены в таблице",
|
||||||
priceTableHint: "Дневные закрытия · записей: {{count}} · сначала новые",
|
priceTableHint: "Дневные закрытия · записей: {{count}} · сначала новые",
|
||||||
priceUnavailable: "Цена недоступна",
|
priceUnavailable: "Цена недоступна",
|
||||||
@@ -721,7 +717,7 @@ const ru = {
|
|||||||
SHARE_TYPE_GDR: "Депозитарная расписка",
|
SHARE_TYPE_GDR: "Депозитарная расписка",
|
||||||
SHARE_TYPE_PREFERRED: "Привилегированная акция",
|
SHARE_TYPE_PREFERRED: "Привилегированная акция",
|
||||||
},
|
},
|
||||||
snapshotAt: "Позиция на {{date}}",
|
snapshotAt: "Позиция на {{date}} UTC",
|
||||||
trading: {
|
trading: {
|
||||||
SECURITY_TRADING_STATUS_BREAK_IN_TRADING: "Перерыв в торгах",
|
SECURITY_TRADING_STATUS_BREAK_IN_TRADING: "Перерыв в торгах",
|
||||||
SECURITY_TRADING_STATUS_CLOSING_AUCTION: "Аукцион закрытия",
|
SECURITY_TRADING_STATUS_CLOSING_AUCTION: "Аукцион закрытия",
|
||||||
|
|||||||
@@ -12,16 +12,9 @@ describe("shared display helpers", () => {
|
|||||||
expect(formatDate("2027-09-10")).toBe("10.09.2027");
|
expect(formatDate("2027-09-10")).toBe("10.09.2027");
|
||||||
expect(formatDate("2024-02-29")).toBe("29.02.2024");
|
expect(formatDate("2024-02-29")).toBe("29.02.2024");
|
||||||
expect(formatDate("2027-09-10T00:30:00+03:00")).toBe("09.09.2027");
|
expect(formatDate("2027-09-10T00:30:00+03:00")).toBe("09.09.2027");
|
||||||
});
|
expect(formatSnapshotTime("2027-09-10T00:30:00+03:00")).toBe(
|
||||||
it("formats snapshot time in the browser time zone", () => {
|
"09.09.2027, 21:30",
|
||||||
const instant = "2027-09-10T00:30:00+03:00";
|
);
|
||||||
|
|
||||||
const expected = new Intl.DateTimeFormat("ru-RU", {
|
|
||||||
dateStyle: "short",
|
|
||||||
timeStyle: "short",
|
|
||||||
}).format(new Date(instant));
|
|
||||||
|
|
||||||
expect(formatSnapshotTime(instant)).toBe(expected);
|
|
||||||
});
|
});
|
||||||
it("formats decimal strings without financial arithmetic", () => {
|
it("formats decimal strings without financial arithmetic", () => {
|
||||||
expect(formatMoney({ currency: "RUB", value: "-1234567.89" })).toBe(
|
expect(formatMoney({ currency: "RUB", value: "-1234567.89" })).toBe(
|
||||||
|
|||||||
@@ -61,10 +61,10 @@ function formatMoney(
|
|||||||
return `${formatDecimal(decimal)} ${currency}`;
|
return `${formatDecimal(decimal)} ${currency}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Без timeZone Intl берёт часовой пояс браузера пользователя.
|
|
||||||
const snapshotFormatter = new Intl.DateTimeFormat("ru-RU", {
|
const snapshotFormatter = new Intl.DateTimeFormat("ru-RU", {
|
||||||
dateStyle: "short",
|
dateStyle: "short",
|
||||||
timeStyle: "short",
|
timeStyle: "short",
|
||||||
|
timeZone: "UTC",
|
||||||
});
|
});
|
||||||
|
|
||||||
function formatSnapshotTime(value: string): string {
|
function formatSnapshotTime(value: string): string {
|
||||||
|
|||||||
Reference in New Issue
Block a user