diff --git a/apps/api/.env.example b/apps/api/.env.example index 23374c6..2ba13dd 100644 --- a/apps/api/.env.example +++ b/apps/api/.env.example @@ -11,7 +11,7 @@ AUTH_ISSUER=https://auth.queo.ru AUTH_AUDIENCE=queo.ru AUTH_JWKS_URL=https://auth.queo.ru/.well-known/jwks.json AUTH_COOKIE_NAME=q_at -AUTH_LOGIN_URL=https://auth.queo.ru/auth/login +AUTH_LOGIN_URL=https://auth.queo.ru/login # --- CORS --- # Допустимые источники для браузера (запятая). На проде: https://doc.queo.ru diff --git a/apps/api/src/env.ts b/apps/api/src/env.ts index 4c8d197..0c4e64a 100644 --- a/apps/api/src/env.ts +++ b/apps/api/src/env.ts @@ -11,7 +11,7 @@ const EnvSchema = z.object({ AUTH_AUDIENCE: z.string().default('queo.ru'), AUTH_JWKS_URL: z.string().url().default('https://auth.queo.ru/.well-known/jwks.json'), AUTH_COOKIE_NAME: z.string().default('q_at'), - AUTH_LOGIN_URL: z.string().url().default('https://auth.queo.ru/auth/login'), + AUTH_LOGIN_URL: z.string().url().default('https://auth.queo.ru/login'), CORS_ORIGINS: z .string() diff --git a/apps/web/.env.example b/apps/web/.env.example index 5649ca1..e114216 100644 --- a/apps/web/.env.example +++ b/apps/web/.env.example @@ -1,2 +1,2 @@ # URL центра аутентификации Queo -VITE_AUTH_LOGIN_URL=https://auth.queo.ru/auth/login +VITE_AUTH_LOGIN_URL=https://auth.queo.ru/login diff --git a/apps/web/src/auth.ts b/apps/web/src/auth.ts index 93d7609..b261415 100644 --- a/apps/web/src/auth.ts +++ b/apps/web/src/auth.ts @@ -9,7 +9,7 @@ export type Me = { docPermission: PermissionRole | null; }; -const AUTH_LOGIN_URL = import.meta.env.VITE_AUTH_LOGIN_URL ?? 'https://auth.queo.ru/auth/login'; +const AUTH_LOGIN_URL = import.meta.env.VITE_AUTH_LOGIN_URL ?? 'https://auth.queo.ru/login'; export function redirectToLogin(): never { const returnTo = encodeURIComponent(window.location.href); diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 4f83361..467f207 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -37,7 +37,7 @@ services: AUTH_AUDIENCE: ${AUTH_AUDIENCE:-queo.ru} AUTH_JWKS_URL: ${AUTH_JWKS_URL:-https://auth.queo.ru/.well-known/jwks.json} AUTH_COOKIE_NAME: q_at - AUTH_LOGIN_URL: ${AUTH_LOGIN_URL:-https://auth.queo.ru/auth/login} + AUTH_LOGIN_URL: ${AUTH_LOGIN_URL:-https://auth.queo.ru/login} CORS_ORIGINS: ${CORS_ORIGINS:-https://doc.queo.ru} TOCHKA_JWT_KEY: ${TOCHKA_JWT_KEY:-} TOCHKA_WEBHOOK_SECRET: ${TOCHKA_WEBHOOK_SECRET:-}