From 7926d86861f412a9d87981394d501242ce386353 Mon Sep 17 00:00:00 2001 From: Rakshitha-D Date: Thu, 30 Jan 2025 15:26:09 +0530 Subject: [PATCH 1/2] feat: #OBS-I537: updates expiry time for jwt token --- src/main/middlewares/passportAuthenticate.ts | 3 ++- src/shared/resources/appConfig.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/middlewares/passportAuthenticate.ts b/src/main/middlewares/passportAuthenticate.ts index e31fa2b4..f1ea6ff4 100644 --- a/src/main/middlewares/passportAuthenticate.ts +++ b/src/main/middlewares/passportAuthenticate.ts @@ -8,7 +8,7 @@ import { logger } from '../../shared/utils/logger'; const baseURL = appConfig.BASE_URL; const private_key: string = appConfig.USER_TOKEN_PRIVATE_KEY; -const expiresIn = appConfig.USER_TOKEN_EXPIRY; +const expiresIn = parseInt(appConfig.USER_TOKEN_EXPIRY) || 86400; const generateToken = (user: User) => { const payload = _.pick(user, ['id', 'user_name', 'email_address', 'roles', 'is_owner']); @@ -40,6 +40,7 @@ export default { return generateToken(user) .then((token: any) => { req.session.token = token; + console.log("token: ", token) req.session.roles = _.get(user, ['roles']); req.session.userDetails = _.pick(user, ['id', 'user_name', 'email_address', 'roles', 'is_owner']); return res.redirect(baseURL || '/'); diff --git a/src/shared/resources/appConfig.ts b/src/shared/resources/appConfig.ts index 7d395b95..5afd1ce3 100644 --- a/src/shared/resources/appConfig.ts +++ b/src/shared/resources/appConfig.ts @@ -73,6 +73,6 @@ export default { PUBLIC_CLIENT: env.KEYCLOAK_PUBLIC_CLIENT || 'false', SSL_REQUIRED: env.KEYCLOAK_SSL_REQUIRED || 'external', }, - USER_TOKEN_EXPIRY: env.USER_TOKEN_EXPIRY || '1d', + USER_TOKEN_EXPIRY: env.USER_TOKEN_EXPIRY || '86400', STORAGE_TYPES: env.STORAGE_TYPES || '{"lake_house":true,"realtime_store":true}' }; From 965067b23b33e03cdc53d4898023e6d19c027f84 Mon Sep 17 00:00:00 2001 From: Rakshitha-D Date: Thu, 30 Jan 2025 15:29:09 +0530 Subject: [PATCH 2/2] feat: #OBS-I537: removed console statement --- src/main/middlewares/passportAuthenticate.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/middlewares/passportAuthenticate.ts b/src/main/middlewares/passportAuthenticate.ts index f1ea6ff4..b32be402 100644 --- a/src/main/middlewares/passportAuthenticate.ts +++ b/src/main/middlewares/passportAuthenticate.ts @@ -40,7 +40,6 @@ export default { return generateToken(user) .then((token: any) => { req.session.token = token; - console.log("token: ", token) req.session.roles = _.get(user, ['roles']); req.session.userDetails = _.pick(user, ['id', 'user_name', 'email_address', 'roles', 'is_owner']); return res.redirect(baseURL || '/');