diff --git a/config.template.js b/config.template.js index d807a5ad..4f9fa5f2 100644 --- a/config.template.js +++ b/config.template.js @@ -6,6 +6,5 @@ window.config = { AUTH_CLIENT_ID: '', EXTENSION_PLUGIN_USERS_LIST: '', BUILD_TIME: '', - JANUS_URL: '', ENABLE_SSO: '' }; diff --git a/configuration.js b/configuration.js index 4a5f6b6a..e10da775 100644 --- a/configuration.js +++ b/configuration.js @@ -10,5 +10,4 @@ window.config = { // https://apm.np.navi-tech.in, BUILD_TIME: 0, ENABLE_SSO: "true", - JANUS_URL: "" }; diff --git a/entrypoint.sh b/entrypoint.sh index 222ad181..8de250ac 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -8,7 +8,6 @@ sed -i "s~~${AUTH_BASE_URL}~g" /usr/share/nginx/html/configuratio sed -i "s~~${AUTH_CLIENT_ID}~g" /usr/share/nginx/html/configuration.js sed -i "s~~${SENTRY_DSN}~g" /usr/share/nginx/html/configuration.js sed -i "s~~${ENABLE_SSO}~g" /usr/share/nginx/html/configuration.js -sed -i "s~~${JANUS_URL}~g" /usr/share/nginx/html/configuration.js sed -i 's~~/configuration.js~g' /usr/share/nginx/html/index.html exec "$@" diff --git a/src/service/clickStream.constant.ts b/src/service/clickStream.constant.ts index ed4f4d84..6498d610 100644 --- a/src/service/clickStream.constant.ts +++ b/src/service/clickStream.constant.ts @@ -1,6 +1,7 @@ import { IClickStreamEvent } from './clickStream.type'; export const prefixUrl = 'https://'; +export const janusServiceUrl = '/events/json'; const CLICKSTREAM_GLOBAL_ATTRIBUTES = Object.freeze({ SOURCE: 'source', diff --git a/src/service/clickStreamEventService.ts b/src/service/clickStreamEventService.ts index 3a277d37..d246b304 100644 --- a/src/service/clickStreamEventService.ts +++ b/src/service/clickStreamEventService.ts @@ -3,12 +3,10 @@ import { GLOBAL } from '../constants/Global'; import { LOCAL_STORAGE_KEYS } from 'src/constants/StorageKeys'; import { pushToLocalStorage, removeLocalStorageByKey } from 'src/utils/StorageUtils'; import { APP_NAME } from 'src/components/constant'; -import { prefixUrl } from './clickStream.constant'; +import { janusServiceUrl } from './clickStream.constant'; const MAX_BUFFER_SIZE_FOR_API = 10; -const JANUS_SERVICE_URL = window?.config?.JANUS_URL; - interface IClickstreamEvent { event_name: string; description: string; @@ -68,15 +66,7 @@ const getPayload = (events: IClickstreamEvent[]) => { }; }; -const isValidUrl = (url: string) => { - return url && url.startsWith(prefixUrl); -}; - const fireClickstreamEvents = async () => { - const url = JANUS_SERVICE_URL; - - if (!url || !isValidUrl(url as string)) return; - const clickstreamEventsFromLocalStorage = localStorage.getItem(LOCAL_STORAGE_KEYS.EVENT_LIST); if (clickstreamEventsFromLocalStorage) { @@ -94,9 +84,11 @@ const fireClickstreamEvents = async () => { }); const payload = getPayload(events); - axiosInstance.post(url, payload, { headers: { donotHandleError: true } }).then(() => { - eventsList = []; - removeLocalStorageByKey(LOCAL_STORAGE_KEYS.EVENT_LIST); - }); + axiosInstance + .post(janusServiceUrl, payload, { headers: { donotHandleError: true } }) + .then(() => { + eventsList = []; + removeLocalStorageByKey(LOCAL_STORAGE_KEYS.EVENT_LIST); + }); } }; diff --git a/src/types/AppConfig.ts b/src/types/AppConfig.ts index 23ffb9be..39d7d6c8 100644 --- a/src/types/AppConfig.ts +++ b/src/types/AppConfig.ts @@ -9,7 +9,6 @@ export interface AppConfig { AUTH_CLIENT_ID: string; SENTRY_DSN: string; BUILD_TIME: number; - JANUS_URL?: string; ENABLE_SSO: string; }