From 84ead2af99044a1b88f7c1e2440af944a2148520 Mon Sep 17 00:00:00 2001
From: HotelSync <admin@hotelsync.ru>
Date: Thu, 2 Apr 2026 11:21:37 +0300
Subject: [PATCH] =?UTF-8?q?fix:=20TTLock=20=E2=80=94=20correct=20OAuth=20s?=
 =?UTF-8?q?erver=20(api.sciener.com)=20and=20API=20servers=20(euapi/cnapi)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- OAuth token: always https://api.sciener.com/oauth2/token (was euopen.ttlock.com = wrong)
- EU API: https://euapi.ttlock.com/v3/... (was euopen.ttlock.com)
- CN API: https://cnapi.ttlock.com/v3/... (was open.ttlock.com)
- Migration 054: update existing DB records with old server URLs
- UI: update radio button values to correct server names

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 backend/migrations/054_ttlock_fix_api_server.sql | 12 ++++++++++++
 backend/src/routes/ttlock.ts                     |  8 ++++----
 src/pages/TTLockPage.tsx                         | 10 +++++-----
 3 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100644 backend/migrations/054_ttlock_fix_api_server.sql

diff --git a/backend/migrations/054_ttlock_fix_api_server.sql b/backend/migrations/054_ttlock_fix_api_server.sql
new file mode 100644
index 0000000..c81a423
--- /dev/null
+++ b/backend/migrations/054_ttlock_fix_api_server.sql
@@ -0,0 +1,12 @@
+-- Исправляем старые значения api_server: euopen.ttlock.com → euapi.ttlock.com
+-- (euopen — это веб-портал разработчиков, а не API-сервер)
+UPDATE hotel_ttlock_config
+SET api_server = 'https://euapi.ttlock.com'
+WHERE api_server = 'https://euopen.ttlock.com';
+
+UPDATE hotel_ttlock_config
+SET api_server = 'https://cnapi.ttlock.com'
+WHERE api_server = 'https://open.ttlock.com';
+
+ALTER TABLE hotel_ttlock_config
+  ALTER COLUMN api_server SET DEFAULT 'https://euapi.ttlock.com';
diff --git a/backend/src/routes/ttlock.ts b/backend/src/routes/ttlock.ts
index ebcff79..8cf7505 100644
--- a/backend/src/routes/ttlock.ts
+++ b/backend/src/routes/ttlock.ts
@@ -51,14 +51,14 @@ const ttlockRoutes: FastifyPluginAsync = async (fastify) => {
       [hotelId],
     )
     if (!rows[0]) {
-      return { isEnabled: false, clientId: '', cardSectors: '1,2,3,4,5,6,7,8,9,10', apiServer: 'https://euopen.ttlock.com' }
+      return { isEnabled: false, clientId: '', cardSectors: '1,2,3,4,5,6,7,8,9,10', apiServer: 'https://euapi.ttlock.com' }
     }
     const r = rows[0]
     return {
       isEnabled:   r.is_enabled,
       clientId:    r.client_id,
       cardSectors: r.card_sectors,
-      apiServer:   r.api_server ?? 'https://euopen.ttlock.com',
+      apiServer:   r.api_server ?? 'https://euapi.ttlock.com',
     }
   })
 
@@ -187,7 +187,7 @@ const ttlockRoutes: FastifyPluginAsync = async (fastify) => {
           type:         'ttlock:test_api',
           clientId:     cfg.client_id,
           clientSecret: cfg.client_secret,
-          apiServer:    cfg.api_server ?? 'https://euopen.ttlock.com',
+          apiServer:    cfg.api_server ?? 'https://euapi.ttlock.com',
         }, 15_000) as { ok?: boolean; lockCount?: number; error?: string }
 
         if (!result.ok) return reply.code(502).send({ error: result.error ?? 'Ошибка API' })
@@ -394,7 +394,7 @@ const ttlockRoutes: FastifyPluginAsync = async (fastify) => {
           cardSectors:  cfg.card_sectors,
           clientId:     cfg.client_id,
           clientSecret: cfg.client_secret,
-          apiServer:    cfg.api_server ?? 'https://euopen.ttlock.com',
+          apiServer:    cfg.api_server ?? 'https://euapi.ttlock.com',
           startDate:    checkIn,
           endDate:      checkOut,
         }, 30_000)
diff --git a/src/pages/TTLockPage.tsx b/src/pages/TTLockPage.tsx
index e081047..c4f503f 100644
--- a/src/pages/TTLockPage.tsx
+++ b/src/pages/TTLockPage.tsx
@@ -143,7 +143,7 @@ export function TTLockPage() {
   const [clientId, setClientId]         = useState('')
   const [clientSecret, setClientSecret] = useState('')
   const [cardSectors, setCardSectors]   = useState('1,2,3,4,5,6,7,8,9,10')
-  const [apiServer, setApiServer]       = useState('https://euopen.ttlock.com')
+  const [apiServer, setApiServer]       = useState('https://euapi.ttlock.com')
 
   // Per-workstation COM port state
   const [wsComPorts, setWsComPorts]   = useState<Record<string, string>>({})
@@ -243,7 +243,7 @@ export function TTLockPage() {
       setIsEnabled(cfg.isEnabled)
       setClientId(cfg.clientId)
       setCardSectors(cfg.cardSectors || '1,2,3,4,5,6,7,8,9,10')
-      setApiServer(cfg.apiServer || 'https://euopen.ttlock.com')
+      setApiServer(cfg.apiServer || 'https://euapi.ttlock.com')
       setMappings(maps)
       setRooms(roomList)
       setWorkstations(wsList)
@@ -415,8 +415,8 @@ export function TTLockPage() {
             <label className="form-label">Сервер TTLock API</label>
             <div className="flex gap-3 mt-1">
               {[
-                { value: 'https://euopen.ttlock.com', label: 'EU', hint: 'euopen.ttlock.com' },
-                { value: 'https://open.ttlock.com',   label: 'China', hint: 'open.ttlock.com' },
+                { value: 'https://euapi.ttlock.com', label: 'EU',    hint: 'euapi.ttlock.com' },
+                { value: 'https://cnapi.ttlock.com', label: 'China', hint: 'cnapi.ttlock.com' },
               ].map(opt => (
                 <label
                   key={opt.value}
@@ -441,7 +441,7 @@ export function TTLockPage() {
               ))}
             </div>
             <p className="text-xs text-slate-400 mt-1.5">
-              Если получаете ошибку 404 при выдаче карты — попробуйте другой сервер.
+              OAuth авторизация всегда через api.sciener.com. Выберите регион для /v3/ API.
             </p>
           </div>