move VITE_CVE_SERVICES_BASE_URL to genericGlobals

Author: rlxdev

src/components/cveRecordSearchModule.vue

@@ -139,11 +139,11 @@ function startSearch() {
   // otherwise we should default back to what we were on a page refresh
   if (searchTypeBoolean.value) {
     cveGenericGlobalsStore.setUseSearch(true);
-    cveGenericGlobalsStore.setCurrentServicesUrl(`https://${import.meta.env.VITE_CVE_SERVICES_BASE_URL}`)
+    cveGenericGlobalsStore.setCurrentServicesUrl(cveGenericGlobalsStore.cveServicesBaseUrl);
   }
   else {
     cveGenericGlobalsStore.setUseSearch(false);
-    cveGenericGlobalsStore.setCurrentServicesUrl(cveGenericGlobalsStore.cveServiceTestBaseUrl)
+    cveGenericGlobalsStore.setCurrentServicesUrl(cveGenericGlobalsStore.cveServiceTestBaseUrl);
   }
   if (cveGenericGlobalsStore.useSearch) {
       cveListSearchStore.$reset();

src/stores/genericGlobals.ts

@@ -2,11 +2,14 @@ import { defineStore } from 'pinia';
 
 export const useGenericGlobalsStore = defineStore('genericGlobals', {
   state: () => {
+    const cveServicesBaseUrlFromEnv = `https://${import.meta.env.VITE_CVE_SERVICES_BASE_URL}`;
     const storedUseSearch = sessionStorage.getItem('useSearch');
     const storedCurrentServicesUrl = sessionStorage.getItem('currentServicesUrl');
     return {
       useSearch: storedUseSearch ? JSON.parse(storedUseSearch) : true, 
-      currentServicesUrl: storedCurrentServicesUrl ? JSON.parse(storedCurrentServicesUrl) : `https://${import.meta.env.VITE_CVE_SERVICES_BASE_URL}`,
+      currentServicesUrl: storedCurrentServicesUrl ? JSON.parse(storedCurrentServicesUrl)
+                          : cveServicesBaseUrlFromEnv,
+      cveServicesBaseUrl: cveServicesBaseUrlFromEnv,
       cveServiceTestBaseUrl: 'https://cveawg-test.mitre.org',
       legacyCveWebsiteLink: 'https://cve.mitre.org/cve/search_cve_list.html'
     };

src/views/CVERecord/CVERecord.vue

@@ -95,8 +95,12 @@ export default {
   data() {
     return {
       isResultFromProd: false,
-      // There is a special case when the website deals with some cached data. This ensures that the correct value is shown, even though it is not pretty
-      resultUrl: this.GenericGlobalsStore.useSearch ? `https://${import.meta.env.VITE_CVE_SERVICES_BASE_URL}` : this.GenericGlobalsStore.cveServiceTestBaseUrl,
+      // There is a special case when the website deals with some cached data.
+      // This ensures that the correct value is shown, even though it is not
+      // pretty
+      resultUrl: this.GenericGlobalsStore.useSearch
+        ? this.GenericGlobalsStore.cveServicesBaseUrl
+        : this.GenericGlobalsStore.cveServiceTestBaseUrl,
       usecveRecordStore: usecveRecordStore(),
       cveId: usecveRecordStore().cveId,
       errorMessageStore: useErrorMessageStore(),

src/views/CVERecord/SearchResults.vue

@@ -280,6 +280,7 @@
 
 <script setup>
 import { useCveListSearchStore } from '@/stores/cveListSearch';
+import { useGenericGlobalsStore } from '@/stores/genericGlobals';
 import { usePartnerStore } from '@/stores/partners';
 import { computed, createApp, ref, watch } from 'vue';
 import { useRouter } from 'vue-router';
@@ -289,7 +290,7 @@ const cveListSearchStore = useCveListSearchStore();
 const partnerStore = usePartnerStore();
 const router = useRouter();
 const app = createApp({});
-const resultUrl = ref(`https://${import.meta.env.VITE_CVE_SERVICES_BASE_URL}`);
+const resultUrl = ref(useGenericGlobalsStore().cveServicesBaseUrl);
 
 app.component('ServiceUnavailable', ServiceUnavailable);