Merge branch 'main' into enterprise-features

Sanketika-Obsrv · Dec 2, 2024 · 183803e · 183803e
2 parents c1a591d + 4e1fd22
commit 183803e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/src/main/helpers/proxy.ts b/src/main/helpers/proxy.ts
@@ -3,6 +3,7 @@ import { Request, Response } from "express";
 import _ from 'lodash'
 import { incrementApiCalls, incrementFailedApiCalls, setQueryResponseTime } from "./prometheus";
 import appConfig from "../../shared/resources/appConfig";
+import promEntities from '../resources/prometheusEntities';
 
 const authenticationType = appConfig.AUTHENTICATION_TYPE;
 
@@ -23,14 +24,15 @@ export const onProxyRes = ({ entity }: any) => (proxyReq: any, req: any, res: Re
 export const onProxyReq = ({ entity }: any) => (proxyReq: any, req: any, res: Response) => {
     const startTime = Date.now();
     req.startTime = startTime;
-    if(authenticationType === 'keycloak'){
-        const keycloakToken = JSON.parse(req?.session['keycloak-token']);
-        const access_token: string = keycloakToken.access_token;
-        proxyReq.setHeader('x-user-token', `${access_token}`);
-    }else if(authenticationType === 'basic'){
-        const jwtToken: string = req.session?.token;
-        proxyReq.setHeader('x-user-token', `${jwtToken}`);
-
+    if (entity !== promEntities.alerts) {
+        if(authenticationType === 'keycloak'){
+            const keycloakToken = JSON.parse(req?.session['keycloak-token']);
+            const access_token: string = keycloakToken.access_token;
+            proxyReq.setHeader('Authorization', `Bearer ${access_token}`);
+        }else if(authenticationType === 'basic'){
+            const jwtToken: string = req.session?.token;
+            proxyReq.setHeader('Authorization', `Bearer ${jwtToken}`);
+        }
     }
     incrementApiCalls({ entity, endpoint: req.url });
 }
diff --git a/src/main/middlewares/passportAuthenticate.ts b/src/main/middlewares/passportAuthenticate.ts
@@ -12,7 +12,7 @@ const private_key: string = appConfig.USER_TOKEN_PRIVATE_KEY;
 const generateToken = (user: User) => {
     const payload = _.pick(user, ['id', 'user_name', 'email_address', 'roles']);
     return new Promise((resolve, reject) => {
-        jwt.sign(payload, private_key, { algorithm: 'RS512' }, (err, token) => {
+        jwt.sign(payload, private_key, { algorithm: 'RS256' }, (err, token) => {
             if (err) {
                 return reject(err);
             }

diff --git a/web-console-v2/src/services/http.ts b/web-console-v2/src/services/http.ts
@@ -13,7 +13,6 @@ const checkForSessionExpiry = (config: any) => {
         if (getSystemSetting("AUTHENTICATION_TYPE") !== 'basic') {
             window.location.href = '/console/logout';
         } else {
-            // alert('Unauthorized access !!');
             navigate(`/login`);
         }
     }