From 57d0c0fe2dea59d698df7289dddda1c6df9b8ae7 Mon Sep 17 00:00:00 2001
From: darrell-thobe-sp <darrell.thobe@sailpoint.com>
Date: Tue, 19 Nov 2024 13:00:27 -0500
Subject: [PATCH] passing env params

---
 docusaurus.config.js               | 14 +++++++-------
 src/services/CMSService.js         | 10 +++-------
 src/theme/AnnouncementBar/index.js |  4 +++-
 src/util/util.js                   |  1 -
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/docusaurus.config.js b/docusaurus.config.js
index 5ada63d01..1d5d383d7 100644
--- a/docusaurus.config.js
+++ b/docusaurus.config.js
@@ -116,13 +116,6 @@ const config = {
           },
         },
       },
-      customFields: {
-        'AUTH_USERNAME': process.env.AUTH_USERNAME,
-        'AUTH_PASSWORD': process.env.AUTH_PASSWORD,
-        'ENDPOINT_OVERRIDE': process.env.ENDPOINT_OVERRIDE,
-        'SAMPLE_TABLE': process.env.SAMPLE_TABLE,
-        'CMS_APP_API_ENDPOINT': process.env.CMS_APP_API_ENDPOINT,
-      },
     }),
 
   plugins: plugins,
@@ -132,6 +125,13 @@ const config = {
   },
 
   themes: ['docusaurus-theme-openapi-docs', '@docusaurus/theme-mermaid'],
+  customFields: {
+    'AUTH_USERNAME': process.env.AUTH_USERNAME,
+    'AUTH_PASSWORD': process.env.AUTH_PASSWORD,
+    'ENDPOINT_OVERRIDE': process.env.ENDPOINT_OVERRIDE,
+    'SAMPLE_TABLE': process.env.SAMPLE_TABLE,
+    'CMS_APP_API_ENDPOINT': process.env.CMS_APP_API_ENDPOINT,
+  },
 };
 
 module.exports = config;
diff --git a/src/services/CMSService.js b/src/services/CMSService.js
index d749c7536..42cdcc538 100644
--- a/src/services/CMSService.js
+++ b/src/services/CMSService.js
@@ -1,13 +1,9 @@
-import {CMSBaseURL} from '../util/util';
-import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
+import { CMSBaseURL } from '../util/util';
 
-export async function getBanner() {
-  const {siteConfig} = useDocusaurusContext();
-  console.log(siteConfig.themeConfig.customFields.CMS_APP_API_ENDPOINT);
-  console.log(siteConfig.customFields.CMS_APP_API_ENDPOINT);
+export async function getBanner(cmsurl) {
 
   try {
-    const response = await fetch(siteConfig.customFields.CMS_APP_API_ENDPOINT + 'banner');
+    const response = await fetch(cmsurl + 'banner');
     return await response.json();
   } catch (error) {
     return [];
diff --git a/src/theme/AnnouncementBar/index.js b/src/theme/AnnouncementBar/index.js
index 254a6c36d..2d6198f4b 100644
--- a/src/theme/AnnouncementBar/index.js
+++ b/src/theme/AnnouncementBar/index.js
@@ -5,7 +5,9 @@ import AnnouncementBarCloseButton from '@theme/AnnouncementBar/CloseButton';
 import AnnouncementBarContent from '@theme/AnnouncementBar/Content';
 import {getBanner} from '../../services/CMSService';
 import styles from './styles.module.css';
+import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
 export default function AnnouncementBar() {
+  const {siteConfig} = useDocusaurusContext();
   const {announcementBar} = useThemeConfig();
   const {isActive, close} = useAnnouncementBar();
   const {backgroundColor, textColor, isCloseable} = announcementBar;
@@ -19,7 +21,7 @@ export default function AnnouncementBar() {
   };
 
   const getBannerText = async () => {
-    let data = await getBanner();
+    let data = await getBanner(siteConfig.customFields.CMS_APP_API_ENDPOINT);
     if (data.Item) {
       if (
         localStorage.getItem('docusaurus.aws.id') !==
diff --git a/src/util/util.js b/src/util/util.js
index 72cb1e5c3..49e7432b7 100644
--- a/src/util/util.js
+++ b/src/util/util.js
@@ -31,6 +31,5 @@ export function discourseProductTag() {
 }
 
 export function CMSBaseURL() {
-  console.log('CMSBaseURL', process.env.CMS_APP_API_ENDPOINT);
   return process.env.CMS_APP_API_ENDPOINT;
 }