From 65cc352fc73ece880f1332ed37027a177168bb46 Mon Sep 17 00:00:00 2001
From: Martin Rohrmeier <martin.ra.rohrmeier@bmw.de>
Date: Fri, 11 Oct 2024 09:12:31 +0200
Subject: [PATCH] fix(env): provide boolean env vars as boolean

---
 .../AdminClearingHouseSDElements.tsx                 |  4 ++--
 src/services/EnvironmentService.ts                   | 12 ++++++------
 src/types/Patterns.ts                                |  7 ++-----
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/components/pages/AdminClearingHouseSD/AdminClearingHouseSDElements.tsx b/src/components/pages/AdminClearingHouseSD/AdminClearingHouseSDElements.tsx
index b4a512811..f37786ad9 100644
--- a/src/components/pages/AdminClearingHouseSD/AdminClearingHouseSDElements.tsx
+++ b/src/components/pages/AdminClearingHouseSD/AdminClearingHouseSDElements.tsx
@@ -36,10 +36,10 @@ import {
   PAGE_SIZE,
 } from 'features/adminClearingHouseSD/adminClearingHouseSDApiSlice'
 import { error } from 'services/NotifyService'
-import { getClearinghouseConnectDisabled } from 'services/EnvironmentService'
+import { isClearinghouseConnectDisabled } from 'services/EnvironmentService'
 
 const AdminclearinghouseSDElements = () => {
-  const [checked, setChecked] = useState(getClearinghouseConnectDisabled())
+  const [checked, setChecked] = useState(isClearinghouseConnectDisabled())
   const [triggerCompanyData] = useTriggerCompanyDataMutation()
   const [triggerConnectors] = useTriggerConnectorsMutation()
   const [triggerCDLoading, setTriggerCDLoading] = useState<boolean>(false)
diff --git a/src/services/EnvironmentService.ts b/src/services/EnvironmentService.ts
index af8b34c6b..5fe93a9ff 100644
--- a/src/services/EnvironmentService.ts
+++ b/src/services/EnvironmentService.ts
@@ -19,11 +19,11 @@
 
 declare const ENV: Record<string, string>
 
-export const getRequireHttpsUrlPattern = () =>
-  ENV.REQUIRE_HTTPS_URL_PATTERN ?? 'true'
+export const isRequireHttpsUrlPattern = () =>
+  ENV.REQUIRE_HTTPS_URL_PATTERN !== 'false'
 
-export const getClearinghouseConnectDisabled = () =>
-  ENV.CLEARINGHOUSE_CONNECT_DISABLED ?? 'false'
+export const isClearinghouseConnectDisabled = () =>
+  ENV.CLEARINGHOUSE_CONNECT_DISABLED === 'true'
 
 export const getRealm = () => ENV.REALM ?? ''
 
@@ -58,8 +58,8 @@ export const getMiwBase = () => ENV.MANAGED_IDENTITY_WALLETS_NEW_URL ?? ''
 export const getSSICredentialBase = () => ENV.SSI_CREDENTIAL_URL ?? ''
 
 const EnvironmentService = {
-  getRequireHttpsUrlPattern,
-  getClearinghouseConnectDisabled,
+  isRequireHttpsUrlPattern,
+  isClearinghouseConnectDisabled,
   getRealm,
   getClientId,
   getClientIdRegistration,
diff --git a/src/types/Patterns.ts b/src/types/Patterns.ts
index 168946180..5449c77bd 100644
--- a/src/types/Patterns.ts
+++ b/src/types/Patterns.ts
@@ -18,16 +18,13 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-import { getRequireHttpsUrlPattern } from '../services/EnvironmentService'
-
-// check the REQUIRE_HTTPS_URL_PATTERN environment variable, defaulting to !== 'false' if not set
-const requireHttpsUrlPattern = getRequireHttpsUrlPattern() !== 'false'
+import { isRequireHttpsUrlPattern } from '../services/EnvironmentService'
 
 const DOMAIN =
   /([a-z0-9]|[a-z0-9][a-z0-9-]{0,61}[a-z0-9])(\.([a-z0-9]|[a-z0-9][a-z0-9-]{0,61}[a-z0-9])){1,10}/i
 const URLPATH = /(\/[a-z0-9-._~:/?#[\]@!$&'()*+,;=%]{0,500}){0,20}/
 // construct regex patterns for URL based on the REQUIRE_HTTPS_URL_PATTERN environment variable
-const urlProtocol = requireHttpsUrlPattern ? 'https' : 'https?'
+const urlProtocol = isRequireHttpsUrlPattern() ? 'https' : 'https?'
 const urlPattern = new RegExp(
   `^(${urlProtocol})://(${DOMAIN.source})(:\\d{1,5})?(${URLPATH.source})?$`,
   'i'