diff --git a/docker-compose.yml b/docker-compose.yml index 4a3f1d3..3fcf464 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,6 +3,8 @@ services: build: . ports: - "4321:4321" + env_file: + - .env environment: - NODE_ENV=production - HOST=0.0.0.0 diff --git a/src/lib/auth/oauth.ts b/src/lib/auth/oauth.ts index 9af5975..9f1a442 100644 --- a/src/lib/auth/oauth.ts +++ b/src/lib/auth/oauth.ts @@ -1,6 +1,6 @@ import { SignJWT, jwtVerify } from 'jose'; -const JWT_SECRET = new TextEncoder().encode(import.meta.env.JWT_SECRET || ''); +const JWT_SECRET = new TextEncoder().encode(process.env.JWT_SECRET || ''); export function generateCodeVerifier(): string { const array = new Uint8Array(64); @@ -30,16 +30,16 @@ export function generateState(): string { } export const vkOAuthConfig = { - clientId: import.meta.env.VK_CLIENT_ID || '', - clientSecret: import.meta.env.VK_CLIENT_SECRET || '', + clientId: process.env.VK_CLIENT_ID || '', + clientSecret: process.env.VK_CLIENT_SECRET || '', authUrl: 'https://id.vk.com/oauth2/auth', tokenUrl: 'https://id.vk.ru/oauth2/auth', scope: 'email phone', }; export const yandexOAuthConfig = { - clientId: import.meta.env.YANDEX_CLIENT_ID || '', - clientSecret: import.meta.env.YANDEX_CLIENT_SECRET || '', + clientId: process.env.YANDEX_CLIENT_ID || '', + clientSecret: process.env.YANDEX_CLIENT_SECRET || '', authUrl: 'https://oauth.yandex.com/authorize', tokenUrl: 'https://oauth.yandex.com/token', scope: 'login:email login:info login:avatar', diff --git a/src/pages/api/auth/login/vk.ts b/src/pages/api/auth/login/vk.ts index b2ffdb9..a6f7d00 100644 --- a/src/pages/api/auth/login/vk.ts +++ b/src/pages/api/auth/login/vk.ts @@ -8,7 +8,7 @@ export const GET: APIRoute = async ({ url }) => { const challenge = await generateCodeChallenge(verifier); const state = generateState(); - const redirectUri = `${import.meta.env.PUBLIC_APP_URL || url.origin}/api/auth/callback/vk`; + const redirectUri = `${process.env.PUBLIC_APP_URL || url.origin}/api/auth/callback/vk`; const params = new URLSearchParams({ client_id: vkOAuthConfig.clientId, diff --git a/src/pages/api/auth/login/yandex.ts b/src/pages/api/auth/login/yandex.ts index e503525..5c35908 100644 --- a/src/pages/api/auth/login/yandex.ts +++ b/src/pages/api/auth/login/yandex.ts @@ -8,7 +8,7 @@ export const GET: APIRoute = async ({ url }) => { const challenge = await generateCodeChallenge(verifier); const state = generateState(); - const redirectUri = `${import.meta.env.PUBLIC_APP_URL || url.origin}/api/auth/callback/yandex`; + const redirectUri = `${process.env.PUBLIC_APP_URL || url.origin}/api/auth/callback/yandex`; const params = new URLSearchParams({ client_id: yandexOAuthConfig.clientId,