From 9ebf673afbce60e28c9658b6730366f23401b9e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1muel=20Fekete?= Date: Sun, 8 Sep 2024 21:18:15 +0200 Subject: [PATCH] configurable mtfsz api url --- .github/workflows/azure-swa.yml | 5 +++-- .github/workflows/deploy.yml | 1 + packages/client/src/util/environment.ts | 1 + packages/client/src/util/onLoginClick.ts | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/azure-swa.yml b/.github/workflows/azure-swa.yml index a86b6ab..d336498 100644 --- a/.github/workflows/azure-swa.yml +++ b/.github/workflows/azure-swa.yml @@ -10,8 +10,9 @@ jobs: runs-on: ubuntu-latest name: Build and Deploy Job env: - VITE_FUNC_HOST: https://pontozo-api.azurewebsites.net - VITE_APIM_HOST: https://pontozoapim.azure-api.net + VITE_FUNC_HOST: ${{ secrets.FUNC_HOST }} + VITE_APIM_HOST: ${{ secrets.APIM_HOST }} + VITE_MTFSZ_API_URL: ${{ secrets.MTFSZ_API_URL }} VITE_APIM_KEY: ${{ secrets.APIM_KEY }} VITE_CLIENT_ID: ${{ secrets.CLIENT_ID }} VITE_APP_INSIGHTS_CONN_STR: ${{ secrets.APP_INSIGHTS_CONN_STR}} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c69549b..a0f370f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -72,6 +72,7 @@ jobs: env: VITE_FUNC_HOST: ${{ secrets.FUNC_HOST }} VITE_APIM_HOST: ${{ secrets.APIM_HOST }} + VITE_MTFSZ_API_URL: ${{ secrets.MTFSZ_API_URL }} VITE_APIM_KEY: ${{ secrets.APIM_KEY }} VITE_CLIENT_ID: ${{ secrets.CLIENT_ID }} VITE_APP_INSIGHTS_CONN_STR: ${{ secrets.APP_INSIGHTS_CONN_STR}} diff --git a/packages/client/src/util/environment.ts b/packages/client/src/util/environment.ts index f9df6d0..d9e5527 100644 --- a/packages/client/src/util/environment.ts +++ b/packages/client/src/util/environment.ts @@ -1,5 +1,6 @@ export const FUNC_HOST = import.meta.env.VITE_FUNC_HOST || 'http://localhost:3000' export const APIM_HOST = import.meta.env.VITE_APIM_HOST || 'https://pontozoapim.azure-api.net' +export const MTFSZ_API_URL = import.meta.env.VITE_MTFSZ_API_URL export const APIM_KEY = import.meta.env.VITE_APIM_KEY export const CLIENT_ID = import.meta.env.VITE_CLIENT_ID export const APP_INSIGHTS_CONN_STR = import.meta.env.VITE_APP_INSIGHTS_CONN_STR diff --git a/packages/client/src/util/onLoginClick.ts b/packages/client/src/util/onLoginClick.ts index ba212da..fdeb585 100644 --- a/packages/client/src/util/onLoginClick.ts +++ b/packages/client/src/util/onLoginClick.ts @@ -1,5 +1,5 @@ -import { CLIENT_ID, FUNC_HOST } from './environment' +import { CLIENT_ID, FUNC_HOST, MTFSZ_API_URL } from './environment' export const onLoginClick = () => { - window.location.href = `https://api.mtfsz.hu/oauth/v2/auth?client_id=${CLIENT_ID}&scope=&redirect_uri=${FUNC_HOST}/auth/callback&response_type=code` + window.location.href = `${MTFSZ_API_URL}/oauth/v2/auth?client_id=${CLIENT_ID}&scope=&redirect_uri=${FUNC_HOST}/auth/callback&response_type=code` }