From d28ae229fc4ccc176e74876d2d1440c463581f05 Mon Sep 17 00:00:00 2001 From: barab2002 Date: Tue, 24 Feb 2026 01:42:59 +0200 Subject: [PATCH 1/2] fix: map access_token to token in Firebase login response --- client/src/api/auth.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/api/auth.ts b/client/src/api/auth.ts index 0604691..badb3a2 100644 --- a/client/src/api/auth.ts +++ b/client/src/api/auth.ts @@ -30,10 +30,10 @@ const API_URL = '/api/auth'; export const loginWithGoogle = async (): Promise => { const result = await signInWithPopup(auth, googleProvider); const idToken = await result.user.getIdToken(); - const response = await axios.post(`${API_URL}/firebase`, { + const response = await axios.post<{ access_token: string; user: AuthResponse['user'] }>(`${API_URL}/firebase`, { idToken, }); - return response.data; + return { token: response.data.access_token, user: response.data.user }; }; export const login = async ( From f0f034d147f9a5334fcf3fc7b8ac05c2f535c8fb Mon Sep 17 00:00:00 2001 From: barab2002 Date: Tue, 24 Feb 2026 01:50:45 +0200 Subject: [PATCH 2/2] chore: pull pre-built GHCR images on VM instead of building locally - docker-compose.prod.yml: replace build sections with GHCR image refs - publish.yml: pass VITE_ Firebase vars as build-args from GitHub secrets Co-Authored-By: Claude Sonnet 4.6 --- .github/workflows/publish.yml | 5 +++++ docker-compose.prod.yml | 13 ++----------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 691c2ed..bfd5e3a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -39,3 +39,8 @@ jobs: tags: | ghcr.io/barab2002/knownet-client:latest ghcr.io/barab2002/knownet-client:${{ github.sha }} + build-args: | + VITE_FIREBASE_API_KEY=${{ secrets.VITE_FIREBASE_API_KEY }} + VITE_FIREBASE_AUTH_DOMAIN=${{ secrets.VITE_FIREBASE_AUTH_DOMAIN }} + VITE_FIREBASE_PROJECT_ID=${{ secrets.VITE_FIREBASE_PROJECT_ID }} + VITE_FIREBASE_APP_ID=${{ secrets.VITE_FIREBASE_APP_ID }} diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index fab5f84..b392a3e 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -1,22 +1,13 @@ services: api: - build: - context: . - dockerfile: Dockerfile + image: ghcr.io/barab2002/knownet-api:latest container_name: knownet-api env_file: .env.production network_mode: host restart: always client: - build: - context: . - dockerfile: Dockerfile.client - args: - VITE_FIREBASE_API_KEY: ${VITE_FIREBASE_API_KEY} - VITE_FIREBASE_AUTH_DOMAIN: ${VITE_FIREBASE_AUTH_DOMAIN} - VITE_FIREBASE_PROJECT_ID: ${VITE_FIREBASE_PROJECT_ID} - VITE_FIREBASE_APP_ID: ${VITE_FIREBASE_APP_ID} + image: ghcr.io/barab2002/knownet-client:latest container_name: knownet-client network_mode: host depends_on: