chore: parameterize URLs

Signed-off-by: Akiff Manji <[email protected]>
bcgov · Oct 10, 2024 · 592789b · 592789b
1 parent 19b03fc
commit 592789b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/services/tenant-ui/config/custom-environment-variables.json b/services/tenant-ui/config/custom-environment-variables.json
@@ -46,6 +46,7 @@
   },
   "server": {
     "tractionUrl": "SERVER_TRACTION_URL",
+    "lokiUrl": "SERVER_LOKI_URL",
     "oidc": {
       "jwksUri": "SERVER_OIDC_JWKS",
       "realm": "SERVER_OIDC_REALM",
@@ -65,4 +66,4 @@
       "innkeeperInbox": "SERVER_SMTP_INNKEEPER_INBOX"
     }
   }
-}
+}
diff --git a/services/tenant-ui/config/default.json b/services/tenant-ui/config/default.json
@@ -54,6 +54,7 @@
     "port": "8080",
     "staticFiles": "../../frontend/dist",
     "tractionUrl": "http://localhost:5100",
+    "lokiUrl": "ws://localhost:3100",
     "oidc": {
       "jwksUri": "https://dev.loginproxy.gov.bc.ca/auth/realms/digitaltrust-citz/protocol/openid-connect/certs",
       "realm": "digitaltrust-citz",
@@ -73,4 +74,4 @@
       "innkeeperInbox": "lucas.o'[email protected]"
     }
   }
-}
+}
diff --git a/services/tenant-ui/frontend/src/store/logStore.ts b/services/tenant-ui/frontend/src/store/logStore.ts
@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia';
 import { Ref, ref } from 'vue';
-import { useTokenStore } from './tokenStore';
+import { useConfigStore, useTokenStore } from '@/store';
 
 export enum LogStreamState {
   OPEN,
@@ -13,6 +13,7 @@ export enum LogOrder {
 }
 
 export const useLogStore = defineStore('log', () => {
+  const { config } = useConfigStore();
   const { token } = useTokenStore();
 
   const logStream: Ref<WebSocket | null> = ref(null);
@@ -41,7 +42,9 @@ export const useLogStore = defineStore('log', () => {
         throw new Error('No token available to start log stream');
       }
       if (!logStream.value) {
-        logStream.value = new WebSocket('ws://localhost:8080?token=' + token);
+        logStream.value = new WebSocket(
+          `${config.server.lokiUrl}?token=${token}`
+        );
         logStream.value.onopen = () => {
           logStreamState.value = LogStreamState.OPEN;
         };

diff --git a/services/tenant-ui/src/routes/router.ts b/services/tenant-ui/src/routes/router.ts
@@ -22,7 +22,7 @@ router.use(express.json());
 // For the secured innkeepr OIDC login request to verify the token and get a token from Traction
 router.get(
   "/innkeeperLogin",
-  // @ts-ignore
+  // @ts-expect-error: secure function is not typed correctly
   secure(jwksService),
   async (req: any, res: Response, next: NextFunction) => {
     try {

diff --git a/services/tenant-ui/src/services/log-stream.ts b/services/tenant-ui/src/services/log-stream.ts
@@ -4,9 +4,8 @@ import config from "config";
 import jwt from "jsonwebtoken";
 import WebSocket from "ws";
 
-const WEBSOCKET_URL = "ws://host.docker.internal:3100/loki/api/v1/tail";
-// const TRACTION_URL: string = config.get("server.tractionUrl");
-const TRACTION_URL = "http://host.docker.internal:8032";
+const LOKI_URL: string = config.get("server.lokiUrl");
+const TRACTION_URL: string = config.get("server.tractionUrl");
 
 const wss = new WebSocket.Server({ noServer: true });
 
@@ -54,7 +53,7 @@ const logError = (err: Error) => {
 
 const handleLokiWebSocket = (tenantId: string, ws: WebSocket) => {
   const loki = new WebSocket(
-    `${WEBSOCKET_URL}?query={container_name="scripts-traction-agent-1"} |= \`${tenantId}\``
+    `${LOKI_URL}/loki/api/v1/tail?query={container_name="scripts-traction-agent-1"} |= \`${tenantId}\``
   );
 
   loki.on("open", () => {