From 838fd644e927032454962856cc04d88ac6873236 Mon Sep 17 00:00:00 2001 From: Mariya Trishina Date: Fri, 21 Aug 2026 15:47:43 +0500 Subject: [PATCH 01/13] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=B4=D0=B5=D0=BF=D0=BB=D0=BE=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .dockerignore | 7 +++ .gitea/workflows/deploy.yml | 113 ++++++++++++++++++++++++++++++++++++ Dockerfile | 16 +++++ docker-compose.yml | 8 +++ nginx.conf | 11 ++++ 5 files changed, 155 insertions(+) create mode 100644 .dockerignore create mode 100644 .gitea/workflows/deploy.yml create mode 100644 Dockerfile create mode 100644 docker-compose.yml create mode 100644 nginx.conf diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..a2d3019 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,7 @@ +node_modules +dist +dist-ssr +.git +.vscode +.idea +npm-debug.log* diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml new file mode 100644 index 0000000..85fbaf9 --- /dev/null +++ b/.gitea/workflows/deploy.yml @@ -0,0 +1,113 @@ +name: build-and-deploy + +# Прод — единственное окружение деплоя, поэтому катим при каждом пуше в main. +# Раннер должен быть self-hosted во внутренней сети: Nexus (nexus.tnsu.kz) снаружи +# не достаётся. workflow_dispatch — на случай ручного передеплоя (например, старым тегом). +on: + push: + branches: [main] + workflow_dispatch: + inputs: + image_tag: + description: "Тег образа (по умолчанию — короткий sha коммита)" + required: false + default: "" + +env: + REGISTRY: nexus.tnsu.kz:8082 + IMAGE: hr-appeals-web + +jobs: + # Единый источник тега для образа и для деплоя + prepare: + runs-on: ubuntu-22.04 + outputs: + tag: ${{ steps.vars.outputs.tag }} + steps: + - name: Resolve image tag + id: vars + run: | + TAG="${{ github.event.inputs.image_tag }}" + if [ -z "$TAG" ]; then TAG="${GITHUB_SHA::8}"; fi + echo "tag=$TAG" >> "$GITHUB_OUTPUT" + + build-and-push: + needs: prepare + runs-on: ubuntu-22.04 + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Ensure docker CLI is installed + run: | + set -e + SUDO="" + if [ "$(id -u)" -ne 0 ]; then SUDO="sudo"; fi + if ! command -v docker >/dev/null 2>&1; then + $SUDO apt-get update + $SUDO env DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends docker.io + fi + + - name: Docker login to Nexus + run: echo "${{ secrets.NEXUS_PASSWORD }}" | docker login "$REGISTRY" -u "${{ secrets.NEXUS_USER }}" --password-stdin + + - name: Build image + run: | + docker build \ + -t "$REGISTRY/$IMAGE:${{ needs.prepare.outputs.tag }}" \ + -t "$REGISTRY/$IMAGE:latest" \ + . + + - name: Push image + run: | + docker push "$REGISTRY/$IMAGE:${{ needs.prepare.outputs.tag }}" + docker push "$REGISTRY/$IMAGE:latest" + + - name: Docker logout + if: always() + run: docker logout "$REGISTRY" + + deploy: + needs: [prepare, build-and-push] + runs-on: ubuntu-22.04 + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Ensure ssh client is installed + run: | + set -e + SUDO="" + if [ "$(id -u)" -ne 0 ]; then SUDO="sudo"; fi + if ! command -v ssh >/dev/null 2>&1 || ! command -v scp >/dev/null 2>&1 || ! command -v ssh-keyscan >/dev/null 2>&1; then + $SUDO apt-get update + $SUDO env DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends openssh-client + fi + + - name: Configure SSH + run: | + mkdir -p ~/.ssh + printf '%s\n' "${{ secrets.DEPLOY_SSH_KEY }}" > ~/.ssh/deploy_key + chmod 600 ~/.ssh/deploy_key + ssh-keyscan -H "${{ vars.DEPLOY_HOST }}" >> ~/.ssh/known_hosts + + - name: Upload compose file + run: | + scp -i ~/.ssh/deploy_key docker-compose.yml \ + "${{ vars.DEPLOY_USER }}@${{ vars.DEPLOY_HOST }}:${{ vars.DEPLOY_PATH }}/docker-compose.yml" + + - name: Roll out + run: | + ssh -i ~/.ssh/deploy_key "${{ vars.DEPLOY_USER }}@${{ vars.DEPLOY_HOST }}" " + set -e + cd '${{ vars.DEPLOY_PATH }}' + sed -i '/^IMAGE_TAG=/d' .env + echo 'IMAGE_TAG=${{ needs.prepare.outputs.tag }}' >> .env + docker compose pull + docker compose up -d --remove-orphans + docker image prune -f + " + + - name: Cleanup SSH key + if: always() + run: rm -f ~/.ssh/deploy_key diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..35d8fff --- /dev/null +++ b/Dockerfile @@ -0,0 +1,16 @@ +# syntax=docker/dockerfile:1 + +FROM node:20-alpine AS build +WORKDIR /app + +COPY package.json package-lock.json .npmrc ./ +RUN npm ci + +COPY . . +RUN npm run build + +FROM nginx:1.27-alpine AS runtime +COPY nginx.conf /etc/nginx/conf.d/default.conf +COPY --from=build /app/dist /usr/share/nginx/html + +EXPOSE 80 diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..7213e65 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,8 @@ +services: + hr-appeals-web: + image: nexus.tnsu.kz:8082/hr-appeals-web:${IMAGE_TAG:-latest} + restart: unless-stopped + ports: + - "8080:80" + + diff --git a/nginx.conf b/nginx.conf new file mode 100644 index 0000000..3aa17e6 --- /dev/null +++ b/nginx.conf @@ -0,0 +1,11 @@ +server { + listen 80; + server_name _; + + root /usr/share/nginx/html; + index index.html; + + location / { + try_files $uri $uri/ /index.html; + } +} -- 2.34.1 From 60e654c80ecfbdb45875135a47ece3911e85c49d Mon Sep 17 00:00:00 2001 From: Mariya Trishina Date: Fri, 21 Aug 2026 16:36:27 +0500 Subject: [PATCH 02/13] fix: update port mapping for hr-appeals-web service to use 80:80 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7213e65..8506aad 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,6 +3,6 @@ services: image: nexus.tnsu.kz:8082/hr-appeals-web:${IMAGE_TAG:-latest} restart: unless-stopped ports: - - "8080:80" + - "80:80" -- 2.34.1 From a8d46208a64c2c03bb23d253542da66a1199a1d9 Mon Sep 17 00:00:00 2001 From: Mariya Trishina Date: Fri, 21 Aug 2026 17:11:34 +0500 Subject: [PATCH 03/13] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=B0=D0=B2=D1=82=D0=BE=D1=80=D0=B8=D0=B7?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=D1=81=D0=BE=D0=B2=20=D0=BD=D0=B0=20api.tnsu.?= =?UTF-8?q?kz?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/deploy.yml | 22 +- docker-compose.yml | 15 +- nginx.conf | 7 + server/.dockerignore | 2 + server/Dockerfile | 22 + server/package-lock.json | 1113 +++++++++++++++++++++++++++++++++++ server/package.json | 23 + server/src/config.ts | 16 + server/src/graphAuth.ts | 81 +++ server/src/index.ts | 25 + server/tsconfig.json | 15 + 11 files changed, 1334 insertions(+), 7 deletions(-) create mode 100644 server/.dockerignore create mode 100644 server/Dockerfile create mode 100644 server/package-lock.json create mode 100644 server/package.json create mode 100644 server/src/config.ts create mode 100644 server/src/graphAuth.ts create mode 100644 server/src/index.ts create mode 100644 server/tsconfig.json diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 85fbaf9..ed7d2b0 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -15,7 +15,6 @@ on: env: REGISTRY: nexus.tnsu.kz:8082 - IMAGE: hr-appeals-web jobs: # Единый источник тега для образа и для деплоя @@ -34,6 +33,16 @@ jobs: build-and-push: needs: prepare runs-on: ubuntu-22.04 + strategy: + fail-fast: false + matrix: + include: + - image: hr-appeals-web + context: . + dockerfile: Dockerfile + - image: hr-appeals-auth + context: server + dockerfile: server/Dockerfile steps: - name: Checkout uses: actions/checkout@v4 @@ -54,14 +63,15 @@ jobs: - name: Build image run: | docker build \ - -t "$REGISTRY/$IMAGE:${{ needs.prepare.outputs.tag }}" \ - -t "$REGISTRY/$IMAGE:latest" \ - . + -f "${{ matrix.dockerfile }}" \ + -t "$REGISTRY/${{ matrix.image }}:${{ needs.prepare.outputs.tag }}" \ + -t "$REGISTRY/${{ matrix.image }}:latest" \ + "${{ matrix.context }}" - name: Push image run: | - docker push "$REGISTRY/$IMAGE:${{ needs.prepare.outputs.tag }}" - docker push "$REGISTRY/$IMAGE:latest" + docker push "$REGISTRY/${{ matrix.image }}:${{ needs.prepare.outputs.tag }}" + docker push "$REGISTRY/${{ matrix.image }}:latest" - name: Docker logout if: always() diff --git a/docker-compose.yml b/docker-compose.yml index 8506aad..463e2b6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,5 +4,18 @@ services: restart: unless-stopped ports: - "80:80" + depends_on: + - hr-appeals-auth - + hr-appeals-auth: + image: nexus.tnsu.kz:8082/hr-appeals-auth:${IMAGE_TAG:-latest} + restart: unless-stopped + environment: + GRAPH_TENANT_ID: ${GRAPH_TENANT_ID:?в .env на сервере не задан GRAPH_TENANT_ID} + GRAPH_CLIENT_ID: ${GRAPH_CLIENT_ID:?в .env на сервере не задан GRAPH_CLIENT_ID} + GRAPH_CERT_PATH: /certs/SPFxDeploy_cert.pem + GRAPH_KEY_PATH: /certs/SPFxDeploy_key.pem + volumes: + # Каталог с сертификатом/ключом на сервере — путь задаётся в .env + # (GRAPH_CERT_DIR), сами файлы в git не попадают. + - ${GRAPH_CERT_DIR:?в .env на сервере не задан GRAPH_CERT_DIR}:/certs:ro diff --git a/nginx.conf b/nginx.conf index 3aa17e6..6170009 100644 --- a/nginx.conf +++ b/nginx.conf @@ -5,6 +5,13 @@ server { root /usr/share/nginx/html; index index.html; + # Запросы к Graph/SharePoint идут не из браузера, а через сервис + # hr-appeals-auth — он подписывает JWT сертификатом и меняет его на + # app-only токен, клиенту токен и приватный ключ не видны. + location /api/ { + proxy_pass http://hr-appeals-auth:3000/; + } + location / { try_files $uri $uri/ /index.html; } diff --git a/server/.dockerignore b/server/.dockerignore new file mode 100644 index 0000000..f06235c --- /dev/null +++ b/server/.dockerignore @@ -0,0 +1,2 @@ +node_modules +dist diff --git a/server/Dockerfile b/server/Dockerfile new file mode 100644 index 0000000..6529084 --- /dev/null +++ b/server/Dockerfile @@ -0,0 +1,22 @@ +# syntax=docker/dockerfile:1 + +FROM node:20-alpine AS build +WORKDIR /app + +COPY package.json package-lock.json ./ +RUN npm ci + +COPY . . +RUN npm run build + +FROM node:20-alpine AS runtime +WORKDIR /app +ENV NODE_ENV=production + +COPY package.json package-lock.json ./ +RUN npm ci --omit=dev + +COPY --from=build /app/dist ./dist + +EXPOSE 3000 +CMD ["node", "dist/index.js"] diff --git a/server/package-lock.json b/server/package-lock.json new file mode 100644 index 0000000..3a9cab7 --- /dev/null +++ b/server/package-lock.json @@ -0,0 +1,1113 @@ +{ + "name": "hr-appeals-auth", + "version": "0.1.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "hr-appeals-auth", + "version": "0.1.0", + "dependencies": { + "express": "^4.21.2", + "jsonwebtoken": "^9.0.2" + }, + "devDependencies": { + "@types/express": "^4.17.21", + "@types/jsonwebtoken": "^9.0.7", + "@types/node": "^22.20.1", + "typescript": "~5.8.0" + }, + "engines": { + "node": ">=20" + } + }, + "node_modules/@types/body-parser": { + "version": "1.19.6", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz", + "integrity": "sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/connect": "*", + "@types/node": "*" + } + }, + "node_modules/@types/connect": { + "version": "3.4.38", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", + "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/express": { + "version": "4.17.25", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.25.tgz", + "integrity": "sha512-dVd04UKsfpINUnK0yBoYHDF3xu7xVH4BuDotC/xGuycx4CgbP48X/KF/586bcObxT0HENHXEU8Nqtu6NR+eKhw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/body-parser": "*", + "@types/express-serve-static-core": "^4.17.33", + "@types/qs": "*", + "@types/serve-static": "^1" + } + }, + "node_modules/@types/express-serve-static-core": { + "version": "4.19.9", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.9.tgz", + "integrity": "sha512-QP2ESEe/ImWY0HDwNAnK9PvEffUyhLTnWkk7KXzHfyeWAnlrDe1fN77bXl6ia8KT3wPlmA7t9/VPRpnf4Ex9sg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*", + "@types/qs": "*", + "@types/range-parser": "*", + "@types/send": "*" + } + }, + "node_modules/@types/http-errors": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.5.tgz", + "integrity": "sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/jsonwebtoken": { + "version": "9.0.10", + "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.10.tgz", + "integrity": "sha512-asx5hIG9Qmf/1oStypjanR7iKTv0gXQ1Ov/jfrX6kS/EO0OFni8orbmGCn0672NHR3kXHwpAwR+B368ZGN/2rA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/ms": "*", + "@types/node": "*" + } + }, + "node_modules/@types/mime": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", + "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/ms": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@types/ms/-/ms-2.1.0.tgz", + "integrity": "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/node": { + "version": "22.20.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.20.1.tgz", + "integrity": "sha512-EANqOCF9QFyra+4pfxUcX9STKJpCLjMbObVzljIJomAWSnuSIEAvyzEU53GaajbXJEgdh0iEcPL+DGvpUd4k1Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.21.0" + } + }, + "node_modules/@types/qs": { + "version": "6.15.1", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.15.1.tgz", + "integrity": "sha512-GZHUBZR9hckSUhrxmp1nG6NwdpM9fCunJwyThLW1X3AyHgd9IlHb6VANpQQqDr2o/qQp6McZ3y/IA2rVzKzSbw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/range-parser": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", + "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/send": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@types/send/-/send-1.2.1.tgz", + "integrity": "sha512-arsCikDvlU99zl1g69TcAB3mzZPpxgw0UQnaHeC1Nwb015xp8bknZv5rIfri9xTOcMuaVgvabfIRA7PSZVuZIQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/serve-static": { + "version": "1.15.10", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.10.tgz", + "integrity": "sha512-tRs1dB+g8Itk72rlSI2ZrW6vZg0YrLI81iQSTkMmOqnqCaNr/8Ek4VwWcN5vZgCYWbg/JJSGBlUaYGAOP73qBw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/http-errors": "*", + "@types/node": "*", + "@types/send": "<1" + } + }, + "node_modules/@types/serve-static/node_modules/@types/send": { + "version": "0.17.6", + "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.6.tgz", + "integrity": "sha512-Uqt8rPBE8SY0RK8JB1EzVOIZ32uqy8HwdxCnoCOsYrvnswqmFZ/k+9Ikidlk/ImhsdvBsloHbAlewb2IEBV/Og==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/mime": "^1", + "@types/node": "*" + } + }, + "node_modules/accepts": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", + "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "license": "MIT", + "dependencies": { + "mime-types": "~2.1.34", + "negotiator": "0.6.3" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", + "license": "MIT" + }, + "node_modules/body-parser": { + "version": "1.20.6", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.6.tgz", + "integrity": "sha512-p5tAzS57i5MV9fZFDj9LeIiTZEufbSe2eDozP+ElheSUq1m74CRq1jI4mYNDdVs9vQztXFLuk/Gd6BWTdwRJ5g==", + "license": "MIT", + "dependencies": { + "bytes": "~3.1.2", + "content-type": "~1.0.5", + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "~1.2.0", + "http-errors": "~2.0.1", + "iconv-lite": "~0.4.24", + "on-finished": "~2.4.1", + "qs": "~6.15.1", + "raw-body": "~2.5.3", + "type-is": "~1.6.18", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } + }, + "node_modules/buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==", + "license": "BSD-3-Clause" + }, + "node_modules/bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/call-bound": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/content-disposition": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "license": "MIT", + "dependencies": { + "safe-buffer": "5.2.1" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/content-type": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie-signature": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz", + "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==", + "license": "MIT" + }, + "node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "license": "MIT", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/destroy": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", + "license": "MIT", + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } + }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/ecdsa-sig-formatter": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", + "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", + "license": "Apache-2.0", + "dependencies": { + "safe-buffer": "^5.0.1" + } + }, + "node_modules/ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", + "license": "MIT" + }, + "node_modules/encodeurl": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.2.tgz", + "integrity": "sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", + "license": "MIT" + }, + "node_modules/etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/express": { + "version": "4.22.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.22.2.tgz", + "integrity": "sha512-IuL+Elrou2ZvCFHs18/CIzy2Nzvo25nZ1/D2eIZlz7c+QUayAcYoiM2BthCjs+EBHVpjYjcuLDAiCWgeIX3X1Q==", + "license": "MIT", + "dependencies": { + "accepts": "~1.3.8", + "array-flatten": "1.1.1", + "body-parser": "~1.20.5", + "content-disposition": "~0.5.4", + "content-type": "~1.0.4", + "cookie": "~0.7.1", + "cookie-signature": "~1.0.6", + "debug": "2.6.9", + "depd": "2.0.0", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.3.1", + "fresh": "~0.5.2", + "http-errors": "~2.0.0", + "merge-descriptors": "1.0.3", + "methods": "~1.1.2", + "on-finished": "~2.4.1", + "parseurl": "~1.3.3", + "path-to-regexp": "~0.1.12", + "proxy-addr": "~2.0.7", + "qs": "~6.15.1", + "range-parser": "~1.2.1", + "safe-buffer": "5.2.1", + "send": "~0.19.0", + "serve-static": "~1.16.2", + "setprototypeof": "1.2.0", + "statuses": "~2.0.1", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "engines": { + "node": ">= 0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/finalhandler": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz", + "integrity": "sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg==", + "license": "MIT", + "dependencies": { + "debug": "2.6.9", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "on-finished": "~2.4.1", + "parseurl": "~1.3.3", + "statuses": "~2.0.2", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/forwarded": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-intrinsic": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasown": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz", + "integrity": "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/http-errors": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz", + "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==", + "license": "MIT", + "dependencies": { + "depd": "~2.0.0", + "inherits": "~2.0.4", + "setprototypeof": "~1.2.0", + "statuses": "~2.0.2", + "toidentifier": "~1.0.1" + }, + "engines": { + "node": ">= 0.8" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "license": "ISC" + }, + "node_modules/ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "license": "MIT", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/jsonwebtoken": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.3.tgz", + "integrity": "sha512-MT/xP0CrubFRNLNKvxJ2BYfy53Zkm++5bX9dtuPbqAeQpTVe0MQTFhao8+Cp//EmJp244xt6Drw/GVEGCUj40g==", + "license": "MIT", + "dependencies": { + "jws": "^4.0.1", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^7.5.4" + }, + "engines": { + "node": ">=12", + "npm": ">=6" + } + }, + "node_modules/jsonwebtoken/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, + "node_modules/jwa": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.1.tgz", + "integrity": "sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==", + "license": "MIT", + "dependencies": { + "buffer-equal-constant-time": "^1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/jws": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.1.tgz", + "integrity": "sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==", + "license": "MIT", + "dependencies": { + "jwa": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==", + "license": "MIT" + }, + "node_modules/lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==", + "license": "MIT" + }, + "node_modules/lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==", + "license": "MIT" + }, + "node_modules/lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==", + "license": "MIT" + }, + "node_modules/lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==", + "license": "MIT" + }, + "node_modules/lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==", + "license": "MIT" + }, + "node_modules/lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==", + "license": "MIT" + }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/merge-descriptors": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "license": "MIT", + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "license": "MIT" + }, + "node_modules/negotiator": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/object-inspect": { + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "license": "MIT", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/path-to-regexp": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.13.tgz", + "integrity": "sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA==", + "license": "MIT" + }, + "node_modules/proxy-addr": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "license": "MIT", + "dependencies": { + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/qs": { + "version": "6.15.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.3.tgz", + "integrity": "sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A==", + "license": "BSD-3-Clause", + "dependencies": { + "es-define-property": "^1.0.1", + "side-channel": "^1.1.1" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/raw-body": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.3.tgz", + "integrity": "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA==", + "license": "MIT", + "dependencies": { + "bytes": "~3.1.2", + "http-errors": "~2.0.1", + "iconv-lite": "~0.4.24", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "license": "MIT" + }, + "node_modules/semver": { + "version": "7.8.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", + "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/send": { + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.2.tgz", + "integrity": "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==", + "license": "MIT", + "dependencies": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "~0.5.2", + "http-errors": "~2.0.1", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "~2.4.1", + "range-parser": "~1.2.1", + "statuses": "~2.0.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/send/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, + "node_modules/serve-static": { + "version": "1.16.3", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.3.tgz", + "integrity": "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA==", + "license": "MIT", + "dependencies": { + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "~0.19.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "license": "ISC" + }, + "node_modules/side-channel": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.1.tgz", + "integrity": "sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.4", + "side-channel-list": "^1.0.1", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-list": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.1.tgz", + "integrity": "sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/statuses": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", + "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "license": "MIT", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "license": "MIT", + "dependencies": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/typescript": { + "version": "5.8.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz", + "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/undici-types": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", + "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", + "license": "MIT", + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + } + } +} diff --git a/server/package.json b/server/package.json new file mode 100644 index 0000000..6d9fd79 --- /dev/null +++ b/server/package.json @@ -0,0 +1,23 @@ +{ + "name": "hr-appeals-auth", + "version": "0.1.0", + "private": true, + "engines": { + "node": ">=20" + }, + "scripts": { + "build": "tsc", + "start": "node dist/index.js", + "typecheck": "tsc --noEmit" + }, + "dependencies": { + "express": "^4.21.2", + "jsonwebtoken": "^9.0.2" + }, + "devDependencies": { + "@types/express": "^4.17.21", + "@types/jsonwebtoken": "^9.0.7", + "@types/node": "^22.20.1", + "typescript": "~5.8.0" + } +} diff --git a/server/src/config.ts b/server/src/config.ts new file mode 100644 index 0000000..0aa44ee --- /dev/null +++ b/server/src/config.ts @@ -0,0 +1,16 @@ +function requireEnv(name: string): string { + const value = process.env[name]; + if (!value) { + throw new Error(`Не задана переменная окружения ${name}`); + } + return value; +} + +export const config = { + tenantId: requireEnv('GRAPH_TENANT_ID'), + clientId: requireEnv('GRAPH_CLIENT_ID'), + certPath: requireEnv('GRAPH_CERT_PATH'), + keyPath: requireEnv('GRAPH_KEY_PATH'), + scope: process.env.GRAPH_SCOPE ?? 'https://graph.microsoft.com/.default', + port: Number(process.env.PORT ?? 3000) +}; diff --git a/server/src/graphAuth.ts b/server/src/graphAuth.ts new file mode 100644 index 0000000..624422f --- /dev/null +++ b/server/src/graphAuth.ts @@ -0,0 +1,81 @@ +import { readFileSync } from 'node:fs'; +import { createHash, randomUUID } from 'node:crypto'; +import jwt from 'jsonwebtoken'; +import { config } from './config'; + +interface CachedToken { + accessToken: string; + expiresAt: number; +} + +interface TokenResponse { + access_token: string; + expires_in: number; +} + +const TOKEN_ENDPOINT = `https://login.microsoftonline.com/${config.tenantId}/oauth2/v2.0/token`; + +// Обновляем токен заранее, а не строго по истечении — иначе запрос, уже летящий +// к Graph с почти протухшим токеном, может получить 401. +const REFRESH_MARGIN_MS = 60_000; + +let cached: CachedToken | null = null; + +function buildClientAssertion(): string { + const certificatePem = readFileSync(config.certPath, 'utf8'); + const privateKey = readFileSync(config.keyPath, 'utf8'); + + // x5t — SHA-1 отпечаток DER-сертификата, base64url. По нему Azure AD находит + // публичный ключ приложения и проверяет подпись JWT. + const der = certificatePem + .replace(/-----BEGIN CERTIFICATE-----/, '') + .replace(/-----END CERTIFICATE-----/, '') + .replace(/\s+/g, ''); + const thumbprint = createHash('sha1').update(Buffer.from(der, 'base64')).digest('base64url'); + + const nowSeconds = Math.floor(Date.now() / 1000); + + return jwt.sign( + { + aud: TOKEN_ENDPOINT, + iss: config.clientId, + sub: config.clientId, + jti: randomUUID(), + nbf: nowSeconds, + exp: nowSeconds + 5 * 60 + }, + privateKey, + { algorithm: 'RS256', header: { alg: 'RS256', x5t: thumbprint } } + ); +} + +export async function getAppOnlyToken(): Promise { + if (cached && cached.expiresAt - REFRESH_MARGIN_MS > Date.now()) { + return cached.accessToken; + } + + const body = new URLSearchParams({ + grant_type: 'client_credentials', + client_id: config.clientId, + client_assertion_type: 'urn:ietf:params:oauth:client-assertion-type:jwt-bearer', + client_assertion: buildClientAssertion(), + scope: config.scope + }); + + const response = await fetch(TOKEN_ENDPOINT, { + method: 'POST', + headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, + body + }); + + if (!response.ok) { + throw new Error(`Не удалось получить app-only токен: ${response.status} ${await response.text()}`); + } + + const data = (await response.json()) as TokenResponse; + cached = { + accessToken: data.access_token, + expiresAt: Date.now() + data.expires_in * 1000 + }; + return cached.accessToken; +} diff --git a/server/src/index.ts b/server/src/index.ts new file mode 100644 index 0000000..39fad2b --- /dev/null +++ b/server/src/index.ts @@ -0,0 +1,25 @@ +import express from 'express'; +import { config } from './config'; +import { getAppOnlyToken } from './graphAuth'; + +const app = express(); + +app.get('/healthz', (_req, res) => { + res.status(200).send('ok'); +}); + +// Временный диагностический эндпоинт: подтверждает, что связка +// "сертификат -> подписанный JWT -> access-токен" реально работает, +// до того как появится сама логика сохранения формы в Graph/SharePoint. +app.get('/diag/token', async (_req, res) => { + try { + await getAppOnlyToken(); + res.status(200).json({ ok: true }); + } catch (error) { + res.status(502).json({ ok: false, error: (error as Error).message }); + } +}); + +app.listen(config.port, () => { + console.log(`hr-appeals-auth listening on :${config.port}`); +}); diff --git a/server/tsconfig.json b/server/tsconfig.json new file mode 100644 index 0000000..0861666 --- /dev/null +++ b/server/tsconfig.json @@ -0,0 +1,15 @@ +{ + "compilerOptions": { + "target": "ES2022", + "module": "commonjs", + "moduleResolution": "node", + "lib": ["ES2022"], + "outDir": "dist", + "rootDir": "src", + "strict": true, + "esModuleInterop": true, + "skipLibCheck": true, + "forceConsistentCasingInFileNames": true + }, + "include": ["src"] +} -- 2.34.1 From 49bf9b3c4e0503d54ac95399042bfba0cc1f9371 Mon Sep 17 00:00:00 2001 From: "gorbenko.pavel" Date: Mon, 24 Aug 2026 11:13:23 +0500 Subject: [PATCH 04/13] =?UTF-8?q?fix:=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B8?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=B2=D0=B8?= =?UTF-8?q?=D0=B4=20=D0=BE=D0=B1=D1=80=D0=B0=D1=89=D0=B5=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20"=D0=96=D0=B0=D0=BB=D0=BE=D0=B1=D0=B0"=20=D0=B2=20"=D0=9E?= =?UTF-8?q?=D0=B1=D1=80=D0=B0=D1=89=D0=B5=D0=BD=D0=B8=D0=B5"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Обновлены label в KIND_OPTIONS, комментарии и placeholder ФИО в форме. Co-Authored-By: Claude Sonnet 5 --- src/features/feedback/model.test.ts | 2 +- src/features/feedback/model.ts | 4 ++-- src/features/feedback/texts.ts | 2 +- src/features/feedback/validateFeedback.test.ts | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/features/feedback/model.test.ts b/src/features/feedback/model.test.ts index 6642779..341310a 100644 --- a/src/features/feedback/model.test.ts +++ b/src/features/feedback/model.test.ts @@ -4,7 +4,7 @@ import { COMPANY_OPTIONS, getAppealFieldsConfig } from './model'; // правило из getAppealFieldsConfig — если оно разойдётся, форма и валидация // начнут спорить друг с другом. Эти тесты фиксируют контракт правила. describe('getAppealFieldsConfig', () => { - it('жалоба: описание обязательно, предложение показано, но необязательно', () => { + it('обращение: описание обязательно, предложение показано, но необязательно', () => { const fields = getAppealFieldsConfig('complaint'); expect(fields.situation).toEqual({ visible: true, required: true }); expect(fields.suggestion).toEqual({ visible: true, required: false }); diff --git a/src/features/feedback/model.ts b/src/features/feedback/model.ts index e264b05..dd2a861 100644 --- a/src/features/feedback/model.ts +++ b/src/features/feedback/model.ts @@ -43,7 +43,7 @@ export const COMPANY_OPTIONS: ISelectOption[] = [ // значением ниже (EMPTY_FEEDBACK.kind), так что выбор пользователя. export const KIND_OPTIONS: ISelectOption[] = [ { value: 'suggestion', label: 'Предложение' }, - { value: 'complaint', label: 'Жалоба' }, + { value: 'complaint', label: 'Обращение' }, { value: 'other', label: 'Другое' } ]; @@ -61,7 +61,7 @@ export interface IAppealFieldsConfig { /** * Состав полей зависит от вида обращения: - * жалоба — обязательно описание, а предложение — на желание автора; + * обращение — обязательно описание, а предложение — на желание автора; * предложение — только само предложение, «ситуации» ещё нет; * другое — свободное описание, без предложения. * Одно правило на форму и на валидацию, чтобы они не разошлись. diff --git a/src/features/feedback/texts.ts b/src/features/feedback/texts.ts index b3b8f5a..31fbc62 100644 --- a/src/features/feedback/texts.ts +++ b/src/features/feedback/texts.ts @@ -28,7 +28,7 @@ export const TEXTS = { placeholders: { company: 'Выберите компанию', - fullName: 'Иванов Иван Иванович', + fullName: 'Нурлан Нурланович Нурланов', position: 'Например: инженер-проектировщик', kindOther: 'Свой вариант', situation: 'Опишите, что произошло: когда, где, кто участвовал', diff --git a/src/features/feedback/validateFeedback.test.ts b/src/features/feedback/validateFeedback.test.ts index 70e6705..9eb2288 100644 --- a/src/features/feedback/validateFeedback.test.ts +++ b/src/features/feedback/validateFeedback.test.ts @@ -6,7 +6,7 @@ const VALID_COMPANY = '9de064a4-44c8-88ef-11ec-8285925d83d2'; const LONG_TEXT = 'Развёрнутое описание, которого достаточно для проверки правила'; const SHORT_TEXT = 'коротко'; -/** Полностью заполненное «жалоба»-обращение — стартовая точка для тестов. */ +/** Полностью заполненное обращение — стартовая точка для тестов. */ function buildValidComplaint(overrides: Partial = {}): IFeedbackData { return { ...EMPTY_FEEDBACK, @@ -61,17 +61,17 @@ describe('validateFeedback: вид обращения "Другое"', () => { // Состав обязательных полей зависит от вида обращения (см. getAppealFieldsConfig // в model.ts) — эти тесты фиксируют контракт, чтобы форма и валидация не разошлись. describe('validateFeedback: обязательность полей по видам обращения', () => { - it('жалоба: описание ситуации обязательно', () => { + it('обращение: описание ситуации обязательно', () => { const errors = validateFeedback(buildValidComplaint({ situation: '' })); expect(errors.situation).toBeDefined(); }); - it('жалоба: предложение по улучшению НЕ обязательно', () => { + it('обращение: предложение по улучшению НЕ обязательно', () => { const errors = validateFeedback(buildValidComplaint({ suggestion: '' })); expect(errors.suggestion).toBeUndefined(); }); - it('жалоба: если предложение всё же указано, но слишком коротко — ошибка', () => { + it('обращение: если предложение всё же указано, но слишком коротко — ошибка', () => { const errors = validateFeedback(buildValidComplaint({ suggestion: SHORT_TEXT })); expect(errors.suggestion).toBeDefined(); }); -- 2.34.1 From 07bafde43ffd9639eeaf50f7d613806e731cfcfb Mon Sep 17 00:00:00 2001 From: "gorbenko.pavel" Date: Mon, 24 Aug 2026 11:39:20 +0500 Subject: [PATCH 05/13] =?UTF-8?q?feat:=20=D0=BE=D1=82=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BA=D0=B0=20=D1=84=D0=BE=D1=80=D0=BC=D1=8B=20=D0=BE?= =?UTF-8?q?=D0=B1=D1=80=D0=B0=D1=89=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B2=20Sha?= =?UTF-8?q?rePoint=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20api.tnsu.kz?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit POST /feedback собирает поля формы в столбцы списка (Company резолвится в название по справочнику, Type/Title — по виду обращения) и создаёт элемент через api.tnsu.kz /SharePoint/ListItem. Ошибки авторизации и апстрима логируются в stdout и возвращаются клиенту как 502, чтобы сбой на проде было видно явно. Co-Authored-By: Claude Sonnet 5 --- docker-compose.yml | 2 + server/src/config.ts | 4 +- server/src/index.ts | 16 +++++++ server/src/sharepoint.ts | 91 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 server/src/sharepoint.ts diff --git a/docker-compose.yml b/docker-compose.yml index 463e2b6..59fff5d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,6 +15,8 @@ services: GRAPH_CLIENT_ID: ${GRAPH_CLIENT_ID:?в .env на сервере не задан GRAPH_CLIENT_ID} GRAPH_CERT_PATH: /certs/SPFxDeploy_cert.pem GRAPH_KEY_PATH: /certs/SPFxDeploy_key.pem + SHAREPOINT_SITE_URL: ${SHAREPOINT_SITE_URL:?в .env на сервере не задан SHAREPOINT_SITE_URL} + SHAREPOINT_LIST_NAME: ${SHAREPOINT_LIST_NAME:?в .env на сервере не задан SHAREPOINT_LIST_NAME} volumes: # Каталог с сертификатом/ключом на сервере — путь задаётся в .env # (GRAPH_CERT_DIR), сами файлы в git не попадают. diff --git a/server/src/config.ts b/server/src/config.ts index 0aa44ee..7b23608 100644 --- a/server/src/config.ts +++ b/server/src/config.ts @@ -12,5 +12,7 @@ export const config = { certPath: requireEnv('GRAPH_CERT_PATH'), keyPath: requireEnv('GRAPH_KEY_PATH'), scope: process.env.GRAPH_SCOPE ?? 'https://graph.microsoft.com/.default', - port: Number(process.env.PORT ?? 3000) + port: Number(process.env.PORT ?? 3000), + sharepointSiteUrl: requireEnv('SHAREPOINT_SITE_URL'), + sharepointListName: requireEnv('SHAREPOINT_LIST_NAME') }; diff --git a/server/src/index.ts b/server/src/index.ts index 39fad2b..da89b4a 100644 --- a/server/src/index.ts +++ b/server/src/index.ts @@ -1,8 +1,10 @@ import express from 'express'; import { config } from './config'; import { getAppOnlyToken } from './graphAuth'; +import { submitFeedback } from './sharepoint'; const app = express(); +app.use(express.json()); app.get('/healthz', (_req, res) => { res.status(200).send('ok'); @@ -20,6 +22,20 @@ app.get('/diag/token', async (_req, res) => { } }); +app.post('/feedback', async (req, res) => { + try { + await submitFeedback(req.body); + res.status(201).json({ ok: true }); + } catch (error) { + const message = (error as Error).message; + // Логируем целиком в stdout прод-контейнера — если отвалится авторизация + // (протухший/незарегистрированный сертификат, неверный scope), это должно + // быть видно сразу в логах, а не тонуть в одной строке ответа клиенту. + console.error('Не удалось отправить обращение в SharePoint:', message); + res.status(502).json({ ok: false, error: message }); + } +}); + app.listen(config.port, () => { console.log(`hr-appeals-auth listening on :${config.port}`); }); diff --git a/server/src/sharepoint.ts b/server/src/sharepoint.ts new file mode 100644 index 0000000..a5a78e4 --- /dev/null +++ b/server/src/sharepoint.ts @@ -0,0 +1,91 @@ +import { config } from './config'; +import { getAppOnlyToken } from './graphAuth'; + +const SHAREPOINT_API_URL = 'https://api.tnsu.kz/SharePoint/ListItem'; + +export type AppealKind = 'complaint' | 'suggestion' | 'other'; + +const KIND_LABELS: Record = { + complaint: 'Обращение', + suggestion: 'Предложение', + other: 'Другое' +}; + +// Форма присылает id компании из справочника (см. COMPANY_OPTIONS во фронтовом +// src/features/feedback/model.ts) — колонка Company в SharePoint текстовая и +// ждёт название, а не id, поэтому здесь его резолвим. Список держим в синхроне +// с фронтовым вручную — общего пакета между сервером и клиентом сейчас нет. +const COMPANY_NAMES: Record = { + '8028abac-ac23-8fd8-11ef-cb57631a9ab0': 'ТОО AFL Engineering', + '9de064a4-44c8-88ef-11ec-831c058b1141': 'ТОО CL MANAGEMENT', + '9de064a4-44c8-88ef-11ec-8287fb7737a2': 'ТОО KazPromService', + 'ec3c78a7-29ef-4725-11ed-a6d8fcd0911d': 'ТОО QAZGEOMAX', + '15009595-005d-00fa-11ef-11309f5e395d': 'ТОО Selin Invest', + '03f4deac-f543-e8cf-11f1-84eb25329fc3': 'ТОО Selin Studio', + '9de064a4-44c8-88ef-11ec-8284930fad96': 'ТОО TANSU Construction', + '9de064a4-44c8-88ef-11ec-8285925d83d2': 'ТОО АСТЕЛ-К', + '15009595-005d-00fa-11ef-0b8bb5ec1a88': 'ТОО ГеоТрек', + '15009595-005d-00fa-11ef-0b8714483372': 'ТОО Монтажник-Т', + '8028beac-ac23-8fd8-11f0-5351706e5996': 'ТОО ОСН Беркут', + '8028b0ac-ac23-8fd8-11ef-dcdb24b82e02': 'ТОО СТ Global', + '15009595-005d-00fa-11ef-1131801d9f3e': 'ТОО ТехЛаб', + '03f4deac-f543-e8cf-11f1-84f51483f59e': 'Частная компания Seline Holding Ltd' +}; + +export interface IFeedbackSubmission { + company: string; + isAnonymous: boolean; + fullName: string; + position: string; + wantsFeedback: boolean; + kind: AppealKind; + kindOther: string; + situation: string; + suggestion: string; +} + +// Имена полей — internal name столбцов списка SharePoint (Company/Name/Position/ +// Type/IssueDescription/SuggestionText/WantsFeedback), не отображаемые названия. +function buildFields(data: IFeedbackSubmission): Record { + const typeLabel = data.kind === 'other' ? data.kindOther : KIND_LABELS[data.kind]; + const name = data.isAnonymous ? '' : data.fullName; + const companyName = COMPANY_NAMES[data.company]; + + if (!companyName) { + console.warn(`Неизвестный id компании из формы, отправляю как есть: ${data.company}`); + } + + return { + Title: name ? `${typeLabel} — ${name}` : typeLabel, + Company: companyName ?? data.company, + Name: name, + Position: data.isAnonymous ? '' : data.position, + Type: typeLabel, + IssueDescription: data.situation, + SuggestionText: data.suggestion, + WantsFeedback: data.wantsFeedback + }; +} + +export async function submitFeedback(data: IFeedbackSubmission): Promise { + const token = await getAppOnlyToken(); + + const response = await fetch(SHAREPOINT_API_URL, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + Authorization: `Bearer ${token}` + }, + body: JSON.stringify({ + siteUrl: config.sharepointSiteUrl, + listName: config.sharepointListName, + fields: buildFields(data) + }) + }); + + if (!response.ok) { + throw new Error( + `api.tnsu.kz вернул ошибку при создании элемента списка: ${response.status} ${await response.text()}` + ); + } +} -- 2.34.1 From f2d4fd17685aafdcf391bdb459cf3c5ebc4e122e Mon Sep 17 00:00:00 2001 From: "gorbenko.pavel" Date: Mon, 24 Aug 2026 11:42:17 +0500 Subject: [PATCH 06/13] =?UTF-8?q?fix:=20=D0=B7=D0=B0=D1=85=D0=B0=D1=80?= =?UTF-8?q?=D0=B4=D0=BA=D0=BE=D0=B4=D0=B8=D1=82=D1=8C=20SHAREPOINT=5FSITE?= =?UTF-8?q?=5FURL=20=D0=B8=20SHAREPOINT=5FLIST=5FNAME?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Убрал требование задавать их через .env на сервере — значения одни и те же для единственного прод-окружения. Co-Authored-By: Claude Sonnet 5 --- docker-compose.yml | 2 -- server/src/config.ts | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 59fff5d..463e2b6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,8 +15,6 @@ services: GRAPH_CLIENT_ID: ${GRAPH_CLIENT_ID:?в .env на сервере не задан GRAPH_CLIENT_ID} GRAPH_CERT_PATH: /certs/SPFxDeploy_cert.pem GRAPH_KEY_PATH: /certs/SPFxDeploy_key.pem - SHAREPOINT_SITE_URL: ${SHAREPOINT_SITE_URL:?в .env на сервере не задан SHAREPOINT_SITE_URL} - SHAREPOINT_LIST_NAME: ${SHAREPOINT_LIST_NAME:?в .env на сервере не задан SHAREPOINT_LIST_NAME} volumes: # Каталог с сертификатом/ключом на сервере — путь задаётся в .env # (GRAPH_CERT_DIR), сами файлы в git не попадают. diff --git a/server/src/config.ts b/server/src/config.ts index 7b23608..7dbe230 100644 --- a/server/src/config.ts +++ b/server/src/config.ts @@ -13,6 +13,6 @@ export const config = { keyPath: requireEnv('GRAPH_KEY_PATH'), scope: process.env.GRAPH_SCOPE ?? 'https://graph.microsoft.com/.default', port: Number(process.env.PORT ?? 3000), - sharepointSiteUrl: requireEnv('SHAREPOINT_SITE_URL'), - sharepointListName: requireEnv('SHAREPOINT_LIST_NAME') + sharepointSiteUrl: 'https://tnsukz.sharepoint.com/sites/hrm', + sharepointListName: 'Обращения' }; -- 2.34.1 From 948ef76d17c3bef046a75ada4c6b304b4accb6f1 Mon Sep 17 00:00:00 2001 From: "gorbenko.pavel" Date: Mon, 24 Aug 2026 12:10:11 +0500 Subject: [PATCH 07/13] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .claude/launch.json | 11 ++++++++++ src/features/feedback/texts.ts | 3 ++- src/features/feedback/useFeedbackForm.ts | 27 ++++++++++++++++++------ vite.config.ts | 11 +++++++++- 4 files changed, 43 insertions(+), 9 deletions(-) create mode 100644 .claude/launch.json diff --git a/.claude/launch.json b/.claude/launch.json new file mode 100644 index 0000000..67f2ca8 --- /dev/null +++ b/.claude/launch.json @@ -0,0 +1,11 @@ +{ + "version": "0.0.1", + "configurations": [ + { + "name": "hr-appeals-web", + "runtimeExecutable": "npm", + "runtimeArgs": ["run", "dev"], + "port": 3000 + } + ] +} diff --git a/src/features/feedback/texts.ts b/src/features/feedback/texts.ts index 31fbc62..f033195 100644 --- a/src/features/feedback/texts.ts +++ b/src/features/feedback/texts.ts @@ -46,7 +46,8 @@ export const TEXTS = { required: 'Заполните поле', selectRequired: 'Выберите значение', tooShort: 'Слишком короткий ответ — опишите подробнее', - hasErrors: 'Проверьте выделенные поля — что-то заполнено не полностью.' + hasErrors: 'Проверьте выделенные поля — что-то заполнено не полностью.', + submitFailed: 'Не удалось отправить обращение. Попробуйте ещё раз позже.' }, thanks: { diff --git a/src/features/feedback/useFeedbackForm.ts b/src/features/feedback/useFeedbackForm.ts index 6bba609..0cd1816 100644 --- a/src/features/feedback/useFeedbackForm.ts +++ b/src/features/feedback/useFeedbackForm.ts @@ -18,8 +18,8 @@ export interface IFeedbackForm { /** * Состояние формы обращения: данные, валидация, отправка. - * Бэкенда пока нет — submit только имитирует отправку (см. TODO ниже), - * поэтому вся логика синхронная и живёт здесь, без сервисного слоя. + * Отправка идёт через nginx (/api/... -> hr-appeals-auth) — сервис сам + * меняет её на app-only токен и создаёт элемент в списке SharePoint. */ export function useFeedbackForm(): IFeedbackForm { const [data, setData] = useState(EMPTY_FEEDBACK); @@ -53,11 +53,24 @@ export function useFeedbackForm(): IFeedbackForm { setFormError(''); setStatus('submitting'); - // TODO: заменить на реальную отправку, когда определимся с бэкендом. - // Сейчас это заглушка по договорённости: делаем только UI. - // eslint-disable-next-line no-console - console.info('Обращение (заглушка отправки):', data); - setStatus('done'); + fetch('/api/feedback', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(data) + }) + .then(async (response) => { + if (!response.ok) { + const body = await response.json().catch(() => null); + throw new Error(body?.error ?? `Сервер вернул ${response.status}`); + } + setStatus('done'); + }) + .catch((error) => { + // eslint-disable-next-line no-console + console.error('Не удалось отправить обращение:', error); + setFormError(TEXTS.errors.submitFailed); + setStatus('idle'); + }); }, [data]); const reset = useCallback((): void => { diff --git a/vite.config.ts b/vite.config.ts index 6ef91fc..2342cbc 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -12,7 +12,16 @@ export default defineConfig({ }, server: { port: 3000, - open: true + open: true, + // Как nginx в проде (nginx.conf): /api/... идёт на hr-appeals-auth без + // префикса. Локально сервис запускаем на 3100 — порт 3000 занят самим vite. + proxy: { + '/api': { + target: 'http://localhost:3100', + changeOrigin: true, + rewrite: (path) => path.replace(/^\/api/, '') + } + } }, test: { // globals: true — describe/it/expect доступны без импорта, как привычно по Jest. -- 2.34.1 From 091e4e41b928e9af7528c96334acc6306ecf51d0 Mon Sep 17 00:00:00 2001 From: "gorbenko.pavel" Date: Mon, 24 Aug 2026 12:43:38 +0500 Subject: [PATCH 08/13] =?UTF-8?q?fix:=20=D0=B7=D0=B0=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D1=88=D0=B8=D0=B2=D0=B0=D1=82=D1=8C=20=D1=82=D0=BE=D0=BA=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=B4=D0=BB=D1=8F=20api.tnsu.kz,=20=D0=B0=20=D0=BD?= =?UTF-8?q?=D0=B5=20=D0=B4=D0=BB=D1=8F=20Graph?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Токен с aud=graph.microsoft.com api.tnsu.kz отклонял с 401 — он проверяет аудиторию входящего JWT. Меняем scope по умолчанию на App ID URI самого api-tnsu-portal; наш сертификат для него уже авторизован, отдельный client secret не нужен. Co-Authored-By: Claude Opus 5 --- server/src/config.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/src/config.ts b/server/src/config.ts index 7dbe230..37fecd7 100644 --- a/server/src/config.ts +++ b/server/src/config.ts @@ -11,7 +11,10 @@ export const config = { clientId: requireEnv('GRAPH_CLIENT_ID'), certPath: requireEnv('GRAPH_CERT_PATH'), keyPath: requireEnv('GRAPH_KEY_PATH'), - scope: process.env.GRAPH_SCOPE ?? 'https://graph.microsoft.com/.default', + // Токен нужен не для Graph напрямую, а для api.tnsu.kz — он сам ходит в + // SharePoint. Это его App ID URI: с graph.microsoft.com/.default api вернёт + // 401, потому что проверяет aud во входящем JWT. + scope: process.env.GRAPH_SCOPE ?? 'api://9232d9e2-9807-4753-808f-07250e5474b0/.default', port: Number(process.env.PORT ?? 3000), sharepointSiteUrl: 'https://tnsukz.sharepoint.com/sites/hrm', sharepointListName: 'Обращения' -- 2.34.1 From 07a44e3b0edb3b7f8d36d703e32d2228445095cb Mon Sep 17 00:00:00 2001 From: "gorbenko.pavel" Date: Mon, 24 Aug 2026 12:52:07 +0500 Subject: [PATCH 09/13] =?UTF-8?q?chore:=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81?= =?UTF-8?q?=D0=BA=20auth-=D1=81=D0=B5=D1=80=D0=B2=D0=B8=D1=81=D0=B0=20?= =?UTF-8?q?=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=20=D0=BE=D0=B4?= =?UTF-8?q?=D0=BD=D0=BE=D0=B9=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D0=BE?= =?UTF-8?q?=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit npm run dev читает server/.env через --env-file (нативно в Node 20+), чтобы не передавать GRAPH_* руками при каждом старте. Без запущенного сервиса на 3100 vite-прокси отдаёт 500, что легко принять за баг формы. .env добавлен в .gitignore, в репозиторий положен только .env.example. Co-Authored-By: Claude Opus 5 --- .gitignore | 2 ++ server/.env.example | 13 +++++++++++++ server/package.json | 1 + 3 files changed, 16 insertions(+) create mode 100644 server/.env.example diff --git a/.gitignore b/.gitignore index 5459af9..b38ea7c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ Thumbs.db npm-debug.log* yarn-error.log* pnpm-debug.log* + +.env diff --git a/server/.env.example b/server/.env.example new file mode 100644 index 0000000..00eca37 --- /dev/null +++ b/server/.env.example @@ -0,0 +1,13 @@ +# Локальный запуск: скопируйте в server/.env и подставьте свои пути к сертификату. +# На проде эти переменные задаёт docker-compose (см. docker-compose.yml), .env там свой. + +GRAPH_TENANT_ID=b4c2af35-bfd6-4cff-9af9-556efb53e65a +GRAPH_CLIENT_ID=26d2e058-0b27-4a00-b49f-1f17c4eecd1d + +# Сертификат и приватный ключ приложения — в git не хранятся, взять у администратора. +GRAPH_CERT_PATH=C:/path/to/SPFxDeploy_cert.pem +GRAPH_KEY_PATH=C:/path/to/SPFxDeploy_key.pem + +# 3000 занят vite (см. vite.config.ts), поэтому локально сервис слушает 3100 — +# именно туда проксирует /api из dev-сервера. +PORT=3100 diff --git a/server/package.json b/server/package.json index 6d9fd79..f39ff4c 100644 --- a/server/package.json +++ b/server/package.json @@ -8,6 +8,7 @@ "scripts": { "build": "tsc", "start": "node dist/index.js", + "dev": "tsc && node --env-file=.env dist/index.js", "typecheck": "tsc --noEmit" }, "dependencies": { -- 2.34.1 From 0eb81e61e595109561da9f951719b3c02ea20522 Mon Sep 17 00:00:00 2001 From: "gorbenko.pavel" Date: Mon, 24 Aug 2026 12:57:36 +0500 Subject: [PATCH 10/13] =?UTF-8?q?chore:=20npm=20run=20dev=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=B4=D0=BD=D0=B8=D0=BC=D0=B0=D0=B5=D1=82=20=D1=84=D1=80=D0=BE?= =?UTF-8?q?=D0=BD=D1=82=D0=B5=D0=BD=D0=B4=20=D0=B8=20auth-=D1=81=D0=B5?= =?UTF-8?q?=D1=80=D0=B2=D0=B8=D1=81=20=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Локальное окружение требовало двух терминалов, а без запущенного auth-сервиса форма отдаёт 500 от vite-прокси — это легко принять за баг приложения. Теперь concurrently стартует оба процесса с метками [web]/[auth]; только фронтенд — npm run dev:web. Заодно поправлен README сервиса: GRAPH_SCOPE больше не нужно задавать руками, дефолт уже указывает на App ID URI api.tnsu.kz. Co-Authored-By: Claude Opus 5 --- README.md | 12 +++ package-lock.json | 246 ++++++++++++++++++++++++++++++++++++++++++++++ package.json | 4 +- server/README.md | 16 ++- 4 files changed, 275 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 13921e4..02ee682 100644 --- a/README.md +++ b/README.md @@ -26,9 +26,21 @@ npm install npm run dev ``` +`npm run dev` поднимает сразу оба процесса: фронтенд на `:3000` и сервис +авторизации `hr-appeals-auth` на `:3100` (логи помечены `[web]` и `[auth]`). +Форма отправляется на `/api/feedback`, dev-сервер проксирует это на `:3100` — +так же, как nginx в проде (`nginx.conf`). Без запущенного `[auth]` отправка +формы отдаёт 500 от прокси. + +Сервису нужен `server/.env` с сертификатом Azure AD — скопируйте +[server/.env.example](server/.env.example) и подставьте свои пути. Сами +`.pem`-файлы в git не хранятся, их надо взять у администратора. Подробнее — +в [server/README.md](server/README.md). + Прочие команды: ```bash +npm run dev:web # только фронтенд, без сервиса авторизации npm run build # проверка типов + тесты + production-сборка в dist/ npm run typecheck # только проверка типов npm run test # тесты один раз (то же, что гоняет CI) diff --git a/package-lock.json b/package-lock.json index ca2f75f..ba347f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,6 +19,7 @@ "@types/react": "17.0.45", "@types/react-dom": "17.0.17", "@vitejs/plugin-react": "^4.3.4", + "concurrently": "^10.0.5", "sass": "^1.83.0", "typescript": "~5.8.0", "vite": "^6.0.7", @@ -1957,6 +1958,32 @@ "url": "https://opencollective.com/vitest" } }, + "node_modules/ansi-regex": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.3.0.tgz", + "integrity": "sha512-WpDfL7NO6j7tH88IDBNVdUJxDh9nmCteAVW9dsep846XdwF4naCBK+/tGLX3KJgcpgMRXCFlTM2hKGoK9FsdrQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/ansi-styles": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, "node_modules/assertion-error": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", @@ -2045,6 +2072,19 @@ "node": ">=18" } }, + "node_modules/chalk": { + "version": "5.6.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz", + "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.17.0 || ^14.13 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, "node_modules/chokidar": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", @@ -2061,6 +2101,46 @@ "url": "https://paulmillr.com/funding/" } }, + "node_modules/cliui": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-9.0.1.tgz", + "integrity": "sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^7.2.0", + "strip-ansi": "^7.1.0", + "wrap-ansi": "^9.0.0" + }, + "engines": { + "node": ">=20" + } + }, + "node_modules/concurrently": { + "version": "10.0.5", + "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-10.0.5.tgz", + "integrity": "sha512-JaP/CoftUrCcAFW/g//RbgEGwlelnEae6cfBLgH6ZdO6s8jPkn6p9SB9u6pdVxYXoiSnFqseOlHfrEfF82TVOg==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "5.6.2", + "rxjs": "7.8.2", + "shell-quote": "1.9.0", + "supports-color": "10.2.2", + "tree-kill": "1.2.2", + "yargs": "18.0.0" + }, + "bin": { + "conc": "dist/bin/index.js", + "concurrently": "dist/bin/index.js" + }, + "engines": { + "node": ">=22" + }, + "funding": { + "url": "https://github.com/open-cli-tools/concurrently?sponsor=1" + } + }, "node_modules/convert-source-map": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", @@ -2110,6 +2190,13 @@ "dev": true, "license": "ISC" }, + "node_modules/emoji-regex": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", + "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==", + "dev": true, + "license": "MIT" + }, "node_modules/es-module-lexer": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.3.2.tgz", @@ -2232,6 +2319,29 @@ "node": ">=6.9.0" } }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-east-asian-width": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.6.0.tgz", + "integrity": "sha512-QRbvDIbx6YklUe6RxeTeleMR0yv3cYH6PsPZHcnVn7xv7zO1BHN8r0XETu8n6Ye3Q+ahtSarc3WgtNWmehIBfA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/immutable": { "version": "5.1.9", "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.9.tgz", @@ -2548,6 +2658,16 @@ "fsevents": "~2.3.2" } }, + "node_modules/rxjs": { + "version": "7.8.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz", + "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.1.0" + } + }, "node_modules/sass": { "version": "1.103.0", "resolved": "https://registry.npmjs.org/sass/-/sass-1.103.0.tgz", @@ -2589,6 +2709,19 @@ "semver": "bin/semver.js" } }, + "node_modules/shell-quote": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.9.0.tgz", + "integrity": "sha512-Iov+JwFv/2HcTpcwNMKd8+IWNb8tboQJNQTkAY/LLVK7gGH9jy+LGkVqPxfekHl+yMmiqXszdGWXgkfml7hjqA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/siginfo": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz", @@ -2620,6 +2753,53 @@ "dev": true, "license": "MIT" }, + "node_modules/string-width": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", + "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/strip-ansi": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", + "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.2.2" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/supports-color": { + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-10.2.2.tgz", + "integrity": "sha512-SS+jx45GF1QjgEXQx4NJZV9ImqmO2NPz5FNsIHrsDjh2YsHnawpan7SNQ1o8NuhrbHZy9AZhIoCUiCeaW/C80g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, "node_modules/tinybench": { "version": "2.9.0", "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz", @@ -2664,6 +2844,16 @@ "node": ">=14.0.0" } }, + "node_modules/tree-kill": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", + "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", + "dev": true, + "license": "MIT", + "bin": { + "tree-kill": "cli.js" + } + }, "node_modules/tslib": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", @@ -2904,12 +3094,68 @@ "node": ">=8" } }, + "node_modules/wrap-ansi": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz", + "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.2.1", + "string-width": "^7.0.0", + "strip-ansi": "^7.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, "node_modules/yallist": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", "dev": true, "license": "ISC" + }, + "node_modules/yargs": { + "version": "18.0.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-18.0.0.tgz", + "integrity": "sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg==", + "dev": true, + "license": "MIT", + "dependencies": { + "cliui": "^9.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "string-width": "^7.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^22.0.0" + }, + "engines": { + "node": "^20.19.0 || ^22.12.0 || >=23" + } + }, + "node_modules/yargs-parser": { + "version": "22.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-22.0.0.tgz", + "integrity": "sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^20.19.0 || ^22.12.0 || >=23" + } } } } diff --git a/package.json b/package.json index 077aa5d..4395eb5 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ "node": ">=20" }, "scripts": { - "dev": "vite", + "dev": "concurrently -n web,auth -c cyan,magenta -k \"vite\" \"npm --prefix server run dev\"", + "dev:web": "vite", "build": "tsc --noEmit && vitest run && vite build", "preview": "vite preview", "typecheck": "tsc --noEmit", @@ -27,6 +28,7 @@ "@types/react": "17.0.45", "@types/react-dom": "17.0.17", "@vitejs/plugin-react": "^4.3.4", + "concurrently": "^10.0.5", "sass": "^1.83.0", "typescript": "~5.8.0", "vite": "^6.0.7", diff --git a/server/README.md b/server/README.md index 2178c07..5d8c100 100644 --- a/server/README.md +++ b/server/README.md @@ -15,8 +15,20 @@ assertion) и используется для авторизованных за | `GRAPH_CLIENT_ID` | Client ID App Registration, к которому привязан сертификат `SPFxDeploy` | | `GRAPH_CERT_PATH` | Путь к `SPFxDeploy_cert.pem` внутри контейнера (см. `docker-compose.yml` в корне репозитория) | | `GRAPH_KEY_PATH` | Путь к `SPFxDeploy_key.pem` внутри контейнера | -| `GRAPH_SCOPE` | OAuth-scope запрашиваемого токена. **По умолчанию `https://graph.microsoft.com/.default` — для api.tnsu.kz это неверное значение.** Нужно явно указать App ID URI, под которым `api.tnsu.kz` зарегистрирован в Azure AD, например `api:///.default`. Точное значение уточнить у того, кто регистрировал API в Azure AD | -| `PORT` | Порт HTTP-сервера сервиса, по умолчанию `3000` | +| `GRAPH_SCOPE` | OAuth-scope запрашиваемого токена. По умолчанию — App ID URI самого `api.tnsu.kz` (`api://9232d9e2-.../.default`), задавать не нужно. Токен для `https://graph.microsoft.com/.default` тут не подойдёт: `api.tnsu.kz` проверяет `aud` входящего JWT и отвечает 401 | +| `PORT` | Порт HTTP-сервера сервиса, по умолчанию `3000` (локально — `3100`, см. `.env.example`) | + +## Локальный запуск + +Из корня репозитория `npm run dev` поднимает сервис вместе с фронтендом. Отдельно: + +```bash +cp .env.example .env # подставить свои пути к SPFxDeploy_cert.pem / _key.pem +npm run dev # tsc + запуск с чтением .env (--env-file, Node 20+) +``` + +Проверить, что авторизация работает: `curl http://localhost:3100/diag/token` → +`{"ok":true}`. Если вернулась ошибка — в ней будет ответ Azure AD целиком. ## Как обратиться к api.tnsu.kz с авторизацией -- 2.34.1 From e9ae3d5babc8fea657649f6450172da11b2889d0 Mon Sep 17 00:00:00 2001 From: "gorbenko.pavel" Date: Mon, 24 Aug 2026 13:01:25 +0500 Subject: [PATCH 11/13] =?UTF-8?q?fix:=20=D0=BD=D0=B5=20=D0=BE=D1=82=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BB=D1=8F=D1=82=D1=8C=20=D0=B2=20SharePoin?= =?UTF-8?q?t=20=D0=BF=D0=BE=D0=BB=D1=8F=20=D1=81=20=D0=BF=D1=83=D1=81?= =?UTF-8?q?=D1=82=D1=8B=D0=BC=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Состав полей зависит от вида обращения и анонимности, поэтому часть строк заведомо пустая. Пустая строка в списке выглядит как заполненное значение, а не как отсутствующее поле — теперь такие поля выпадают из payload. Значения обрезаются, так что поле из одних пробелов тоже не уедет. WantsFeedback остаётся всегда: false здесь осмысленно, а не пусто. Co-Authored-By: Claude Opus 5 --- server/src/sharepoint.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/server/src/sharepoint.ts b/server/src/sharepoint.ts index a5a78e4..a83f20c 100644 --- a/server/src/sharepoint.ts +++ b/server/src/sharepoint.ts @@ -55,7 +55,7 @@ function buildFields(data: IFeedbackSubmission): Record { console.warn(`Неизвестный id компании из формы, отправляю как есть: ${data.company}`); } - return { + const fields: Record = { Title: name ? `${typeLabel} — ${name}` : typeLabel, Company: companyName ?? data.company, Name: name, @@ -65,6 +65,17 @@ function buildFields(data: IFeedbackSubmission): Record { SuggestionText: data.suggestion, WantsFeedback: data.wantsFeedback }; + + // Состав полей зависит от вида обращения и анонимности, поэтому часть строк + // заведомо пустая (у предложения нет описания ситуации, у анонимного — ФИО). + // Такие поля не отправляем вовсе: пустая строка в списке выглядит как + // заполненное значение, а не как «поля не было». WantsFeedback при этом + // остаётся всегда — false здесь осмысленное значение, а не пустота. + return Object.fromEntries( + Object.entries(fields) + .map(([key, value]) => [key, typeof value === 'string' ? value.trim() : value]) + .filter(([, value]) => value !== '') + ); } export async function submitFeedback(data: IFeedbackSubmission): Promise { -- 2.34.1 From b4a10510e1530d6285e6018b22c4ffb5d4cc6e11 Mon Sep 17 00:00:00 2001 From: "gorbenko.pavel" Date: Mon, 24 Aug 2026 13:06:09 +0500 Subject: [PATCH 12/13] =?UTF-8?q?feat:=20=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BE=D1=87=D0=BD=D0=B8=D0=BA=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D0=B9=20=D0=B8=D0=B7=20api.tnsu.kz=20=D0=B2=D0=BC?= =?UTF-8?q?=D0=B5=D1=81=D1=82=D0=BE=20=D0=BA=D0=BE=D0=BF=D0=B8=D0=B8=20?= =?UTF-8?q?=D0=B2=20=D0=BA=D0=BE=D0=B4=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Список юрлиц группы меняется без нашего участия, а две копии в репозитории (COMPANY_OPTIONS во фронте и COMPANY_NAMES на сервере) неизбежно разошлись бы с источником и между собой. Теперь единственный источник — /Dictionary/Companies: - GET /companies проксирует справочник, чтобы токен не утекал в браузер; - имя компании для колонки Company резолвится по нему же, на сервере; - в кэше 10 минут — новое юрлицо подхватится без перезапуска сервиса. Пока список грузится, в select показывается «Загружаем…»; если не загрузился — ошибка в слоте обязательного поля, а не пустой список. Co-Authored-By: Claude Opus 5 --- server/src/companies.ts | 52 +++++++++++++++++ server/src/index.ts | 13 +++++ server/src/sharepoint.ts | 33 ++--------- src/features/feedback/model.test.ts | 17 +----- src/features/feedback/model.ts | 21 ------- .../feedback/sections/AuthorSection.tsx | 22 +++++-- src/features/feedback/texts.ts | 4 +- src/features/feedback/useCompanies.ts | 57 +++++++++++++++++++ 8 files changed, 146 insertions(+), 73 deletions(-) create mode 100644 server/src/companies.ts create mode 100644 src/features/feedback/useCompanies.ts diff --git a/server/src/companies.ts b/server/src/companies.ts new file mode 100644 index 0000000..ecc51b5 --- /dev/null +++ b/server/src/companies.ts @@ -0,0 +1,52 @@ +import { getAppOnlyToken } from './graphAuth'; + +const COMPANIES_URL = 'https://api.tnsu.kz/Dictionary/Companies'; + +// Справочник компаний меняется редко (новое юрлицо в группе), но перезапуск +// сервиса ради этого — лишнее, поэтому кэш с коротким временем жизни. +const CACHE_TTL_MS = 10 * 60 * 1000; + +export interface ICompany { + Id: string; + Name: string; +} + +let cached: { companies: ICompany[]; expiresAt: number } | null = null; + +export async function getCompanies(): Promise { + if (cached && cached.expiresAt > Date.now()) { + return cached.companies; + } + + const token = await getAppOnlyToken(); + const response = await fetch(COMPANIES_URL, { + headers: { Authorization: `Bearer ${token}` } + }); + + if (!response.ok) { + throw new Error( + `Не удалось получить справочник компаний: ${response.status} ${await response.text()}` + ); + } + + const companies = (await response.json()) as ICompany[]; + cached = { companies, expiresAt: Date.now() + CACHE_TTL_MS }; + return companies; +} + +/** + * Колонка Company в списке текстовая и ждёт название, а форма присылает Id из + * справочника. Если Id неизвестен — возвращаем его как есть: потерять обращение + * из-за рассинхрона справочника хуже, чем записать в колонку сырой Id. + */ +export async function resolveCompanyName(id: string): Promise { + const companies = await getCompanies(); + const found = companies.find((company) => company.Id === id); + + if (!found) { + console.warn(`Неизвестный Id компании из формы, пишу как есть: ${id}`); + return id; + } + + return found.Name; +} diff --git a/server/src/index.ts b/server/src/index.ts index da89b4a..d58532e 100644 --- a/server/src/index.ts +++ b/server/src/index.ts @@ -1,4 +1,5 @@ import express from 'express'; +import { getCompanies } from './companies'; import { config } from './config'; import { getAppOnlyToken } from './graphAuth'; import { submitFeedback } from './sharepoint'; @@ -22,6 +23,18 @@ app.get('/diag/token', async (_req, res) => { } }); +// Справочник компаний для выпадающего списка формы. Ходит в api.tnsu.kz за +// нас, чтобы токен не утекал в браузер, и отдаёт список как есть. +app.get('/companies', async (_req, res) => { + try { + res.status(200).json(await getCompanies()); + } catch (error) { + const message = (error as Error).message; + console.error('Не удалось получить справочник компаний:', message); + res.status(502).json({ ok: false, error: message }); + } +}); + app.post('/feedback', async (req, res) => { try { await submitFeedback(req.body); diff --git a/server/src/sharepoint.ts b/server/src/sharepoint.ts index a83f20c..2bd255e 100644 --- a/server/src/sharepoint.ts +++ b/server/src/sharepoint.ts @@ -1,3 +1,4 @@ +import { resolveCompanyName } from './companies'; import { config } from './config'; import { getAppOnlyToken } from './graphAuth'; @@ -11,27 +12,6 @@ const KIND_LABELS: Record = { other: 'Другое' }; -// Форма присылает id компании из справочника (см. COMPANY_OPTIONS во фронтовом -// src/features/feedback/model.ts) — колонка Company в SharePoint текстовая и -// ждёт название, а не id, поэтому здесь его резолвим. Список держим в синхроне -// с фронтовым вручную — общего пакета между сервером и клиентом сейчас нет. -const COMPANY_NAMES: Record = { - '8028abac-ac23-8fd8-11ef-cb57631a9ab0': 'ТОО AFL Engineering', - '9de064a4-44c8-88ef-11ec-831c058b1141': 'ТОО CL MANAGEMENT', - '9de064a4-44c8-88ef-11ec-8287fb7737a2': 'ТОО KazPromService', - 'ec3c78a7-29ef-4725-11ed-a6d8fcd0911d': 'ТОО QAZGEOMAX', - '15009595-005d-00fa-11ef-11309f5e395d': 'ТОО Selin Invest', - '03f4deac-f543-e8cf-11f1-84eb25329fc3': 'ТОО Selin Studio', - '9de064a4-44c8-88ef-11ec-8284930fad96': 'ТОО TANSU Construction', - '9de064a4-44c8-88ef-11ec-8285925d83d2': 'ТОО АСТЕЛ-К', - '15009595-005d-00fa-11ef-0b8bb5ec1a88': 'ТОО ГеоТрек', - '15009595-005d-00fa-11ef-0b8714483372': 'ТОО Монтажник-Т', - '8028beac-ac23-8fd8-11f0-5351706e5996': 'ТОО ОСН Беркут', - '8028b0ac-ac23-8fd8-11ef-dcdb24b82e02': 'ТОО СТ Global', - '15009595-005d-00fa-11ef-1131801d9f3e': 'ТОО ТехЛаб', - '03f4deac-f543-e8cf-11f1-84f51483f59e': 'Частная компания Seline Holding Ltd' -}; - export interface IFeedbackSubmission { company: string; isAnonymous: boolean; @@ -46,18 +26,13 @@ export interface IFeedbackSubmission { // Имена полей — internal name столбцов списка SharePoint (Company/Name/Position/ // Type/IssueDescription/SuggestionText/WantsFeedback), не отображаемые названия. -function buildFields(data: IFeedbackSubmission): Record { +async function buildFields(data: IFeedbackSubmission): Promise> { const typeLabel = data.kind === 'other' ? data.kindOther : KIND_LABELS[data.kind]; const name = data.isAnonymous ? '' : data.fullName; - const companyName = COMPANY_NAMES[data.company]; - - if (!companyName) { - console.warn(`Неизвестный id компании из формы, отправляю как есть: ${data.company}`); - } const fields: Record = { Title: name ? `${typeLabel} — ${name}` : typeLabel, - Company: companyName ?? data.company, + Company: await resolveCompanyName(data.company), Name: name, Position: data.isAnonymous ? '' : data.position, Type: typeLabel, @@ -90,7 +65,7 @@ export async function submitFeedback(data: IFeedbackSubmission): Promise { body: JSON.stringify({ siteUrl: config.sharepointSiteUrl, listName: config.sharepointListName, - fields: buildFields(data) + fields: await buildFields(data) }) }); diff --git a/src/features/feedback/model.test.ts b/src/features/feedback/model.test.ts index 341310a..a0cf078 100644 --- a/src/features/feedback/model.test.ts +++ b/src/features/feedback/model.test.ts @@ -1,4 +1,4 @@ -import { COMPANY_OPTIONS, getAppealFieldsConfig } from './model'; +import { getAppealFieldsConfig } from './model'; // Форма (AppealSection) и валидация (validateFeedback) читают одно и то же // правило из getAppealFieldsConfig — если оно разойдётся, форма и валидация @@ -32,18 +32,3 @@ describe('getAppealFieldsConfig', () => { }); }); }); - -// Справочник компаний используется бэкендом по Id (см. комментарий в model.ts) — -// дубликат Id незаметно перепутал бы два разных юрлица. -describe('COMPANY_OPTIONS', () => { - it('не содержит повторяющихся Id', () => { - const ids = COMPANY_OPTIONS.map((option) => option.value); - expect(new Set(ids).size).toBe(ids.length); - }); - - it('у каждой компании есть непустое название', () => { - COMPANY_OPTIONS.forEach((option) => { - expect(option.label.trim().length).toBeGreaterThan(0); - }); - }); -}); diff --git a/src/features/feedback/model.ts b/src/features/feedback/model.ts index dd2a861..1673b8a 100644 --- a/src/features/feedback/model.ts +++ b/src/features/feedback/model.ts @@ -18,27 +18,6 @@ export interface IFeedbackData { suggestion: string; } -/** - * Компании группы. В value — реальный Id из справочника, а не slug: именно его - * ждёт бэкенд, когда появится отправка. Порядок как в источнике (по алфавиту). - */ -export const COMPANY_OPTIONS: ISelectOption[] = [ - { value: '8028abac-ac23-8fd8-11ef-cb57631a9ab0', label: 'ТОО AFL Engineering' }, - { value: '9de064a4-44c8-88ef-11ec-831c058b1141', label: 'ТОО CL MANAGEMENT' }, - { value: '9de064a4-44c8-88ef-11ec-8287fb7737a2', label: 'ТОО KazPromService' }, - { value: 'ec3c78a7-29ef-4725-11ed-a6d8fcd0911d', label: 'ТОО QAZGEOMAX' }, - { value: '15009595-005d-00fa-11ef-11309f5e395d', label: 'ТОО Selin Invest' }, - { value: '03f4deac-f543-e8cf-11f1-84eb25329fc3', label: 'ТОО Selin Studio' }, - { value: '9de064a4-44c8-88ef-11ec-8284930fad96', label: 'ТОО TANSU Construction' }, - { value: '9de064a4-44c8-88ef-11ec-8285925d83d2', label: 'ТОО АСТЕЛ-К' }, - { value: '15009595-005d-00fa-11ef-0b8bb5ec1a88', label: 'ТОО ГеоТрек' }, - { value: '15009595-005d-00fa-11ef-0b8714483372', label: 'ТОО Монтажник-Т' }, - { value: '8028beac-ac23-8fd8-11f0-5351706e5996', label: 'ТОО ОСН Беркут' }, - { value: '8028b0ac-ac23-8fd8-11ef-dcdb24b82e02', label: 'ТОО СТ Global' }, - { value: '15009595-005d-00fa-11ef-1131801d9f3e', label: 'ТОО ТехЛаб' }, - { value: '03f4deac-f543-e8cf-11f1-84f51483f59e', label: 'Частная компания Seline Holding Ltd' } -]; - // Порядок как в исходной форме: «Предложение» первым — совпадает с дефолтным // значением ниже (EMPTY_FEEDBACK.kind), так что выбор пользователя. export const KIND_OPTIONS: ISelectOption[] = [ diff --git a/src/features/feedback/sections/AuthorSection.tsx b/src/features/feedback/sections/AuthorSection.tsx index 9a2c069..0f27454 100644 --- a/src/features/feedback/sections/AuthorSection.tsx +++ b/src/features/feedback/sections/AuthorSection.tsx @@ -1,24 +1,33 @@ import { FormGrid, Select, TextInput, Toggle } from '@tnsu/ui-kit'; import { Field } from '../../../components/Field/Field'; -import { COMPANY_OPTIONS } from '../model'; import { TEXTS } from '../texts'; +import { useCompanies } from '../useCompanies'; import type { ISectionProps } from './ISectionProps'; /** Кто обращается: компания, анонимность, ФИО и должность. */ -export const AuthorSection: React.FC = ({ data, errors, set }) => ( +export const AuthorSection: React.FC = ({ data, errors, set }) => { + const companies = useCompanies(); + + return ( + {/* Ошибку справочника показываем в слоте ошибки поля: без списка компанию + не выбрать, а обязательное поле молча пустым оставлять нельзя. */}