From 1c156d735eeb38876eaa72e9586624db7c0e10fe Mon Sep 17 00:00:00 2001 From: Niko Lindroos Date: Fri, 3 Nov 2023 14:45:33 +0200 Subject: [PATCH] refactor: improve Askem api key api config --- apps/events-helsinki/src/domain/app/AppConfig.ts | 13 ++++++------- apps/hobbies-helsinki/src/domain/app/AppConfig.ts | 13 ++++++------- apps/sports-helsinki/src/domain/app/AppConfig.ts | 13 ++++++------- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/apps/events-helsinki/src/domain/app/AppConfig.ts b/apps/events-helsinki/src/domain/app/AppConfig.ts index ef22bc40b..5f51bc257 100644 --- a/apps/events-helsinki/src/domain/app/AppConfig.ts +++ b/apps/events-helsinki/src/domain/app/AppConfig.ts @@ -173,16 +173,15 @@ class AppConfig { } static askemFeedbackConfiguration(locale: 'en' | 'fi' | 'sv') { + const askemApiKeyByLocale: Record = { + fi: process.env.NEXT_PUBLIC_ASKEM_API_KEY_FI, + sv: process.env.NEXT_PUBLIC_ASKEM_API_KEY_SV, + en: process.env.NEXT_PUBLIC_ASKEM_API_KEY_EN, + }; const askemEnabled = process.env.NEXT_PUBLIC_ASKEM_ENABLED; - let askemApiKey = process.env.NEXT_PUBLIC_ASKEM_API_KEY_FI; - if (locale === 'en') { - askemApiKey = process.env.NEXT_PUBLIC_ASKEM_API_KEY_EN; - } else if (locale === 'sv') { - askemApiKey = process.env.NEXT_PUBLIC_ASKEM_API_KEY_SV; - } return { disabled: !parseEnvValue(askemEnabled), - apiKey: askemApiKey as string, + apiKey: askemApiKeyByLocale[locale] ?? '', }; } diff --git a/apps/hobbies-helsinki/src/domain/app/AppConfig.ts b/apps/hobbies-helsinki/src/domain/app/AppConfig.ts index 33a49dd88..45e4baa74 100644 --- a/apps/hobbies-helsinki/src/domain/app/AppConfig.ts +++ b/apps/hobbies-helsinki/src/domain/app/AppConfig.ts @@ -173,16 +173,15 @@ class AppConfig { } static askemFeedbackConfiguration(locale: 'en' | 'fi' | 'sv') { + const askemApiKeyByLocale: Record = { + fi: process.env.NEXT_PUBLIC_ASKEM_API_KEY_FI, + sv: process.env.NEXT_PUBLIC_ASKEM_API_KEY_SV, + en: process.env.NEXT_PUBLIC_ASKEM_API_KEY_EN, + }; const askemEnabled = process.env.NEXT_PUBLIC_ASKEM_ENABLED; - let askemApiKey = process.env.NEXT_PUBLIC_ASKEM_API_KEY_FI; - if (locale === 'en') { - askemApiKey = process.env.NEXT_PUBLIC_ASKEM_API_KEY_EN; - } else if (locale === 'sv') { - askemApiKey = process.env.NEXT_PUBLIC_ASKEM_API_KEY_SV; - } return { disabled: !parseEnvValue(askemEnabled), - apiKey: askemApiKey as string, + apiKey: askemApiKeyByLocale[locale] ?? '', }; } diff --git a/apps/sports-helsinki/src/domain/app/AppConfig.ts b/apps/sports-helsinki/src/domain/app/AppConfig.ts index 9aef78eb9..7121a7274 100644 --- a/apps/sports-helsinki/src/domain/app/AppConfig.ts +++ b/apps/sports-helsinki/src/domain/app/AppConfig.ts @@ -172,16 +172,15 @@ class AppConfig { } static askemFeedbackConfiguration(locale: 'en' | 'fi' | 'sv') { + const askemApiKeyByLocale: Record = { + fi: process.env.NEXT_PUBLIC_ASKEM_API_KEY_FI, + sv: process.env.NEXT_PUBLIC_ASKEM_API_KEY_SV, + en: process.env.NEXT_PUBLIC_ASKEM_API_KEY_EN, + }; const askemEnabled = process.env.NEXT_PUBLIC_ASKEM_ENABLED; - let askemApiKey = process.env.NEXT_PUBLIC_ASKEM_API_KEY_FI; - if (locale === 'en') { - askemApiKey = process.env.NEXT_PUBLIC_ASKEM_API_KEY_EN; - } else if (locale === 'sv') { - askemApiKey = process.env.NEXT_PUBLIC_ASKEM_API_KEY_SV; - } return { disabled: !parseEnvValue(askemEnabled), - apiKey: askemApiKey as string, + apiKey: askemApiKeyByLocale[locale] ?? '', }; }