fix: update timeToLive to timeoutWindowExpression

Author: eshankvaish

src/Pages/GlobalConfigurations/Authorization/types.ts

@@ -64,12 +64,12 @@ export interface UserDto {
      */
     lastLoginTime?: string
     /**
-     * Time until which the user is active
-     * Note: Only a user with status 'active' can have 'timeToLive'
+     * Expression for the time until which the user is active
+     * Note: Only a user with status 'active' can have 'timeoutWindowExpression'
      *
      * @default ''
      */
-    timeToLive?: string
+    timeoutWindowExpression?: string
     /**
      * Role filters (direct permissions) for the user
      */
@@ -87,7 +87,15 @@ export interface UserDto {
     roleGroups?: Pick<PermissionGroup, 'id' | 'name' | 'description'>
 }
 
-export type User = UserDto
+export interface User extends Omit<UserDto, 'timeoutWindowExpression'> {
+    /**
+     * Time until which the user is active
+     * Note: Only a user with status 'active' can have 'timeToLive'
+     *
+     * @default ''
+     */
+    timeToLive?: string
+}
 
 export type UserCreateOrUpdatePayload = Pick<
     User,

src/Pages/GlobalConfigurations/Authorization/utils.ts

@@ -5,15 +5,18 @@ import { PermissionGroup, User, UserDto } from './types'
 import { LAST_LOGIN_TIME_NULL_STATE } from './UserPermissions/constants'
 
 export const transformUserResponse = (_user: UserDto): User => {
-    const { lastLoginTime, timeToLive, ...user } = _user
+    const { lastLoginTime, timeoutWindowExpression, ...user } = _user
 
     return {
         ...user,
         lastLoginTime:
             lastLoginTime === ZERO_TIME_STRING || !lastLoginTime
                 ? LAST_LOGIN_TIME_NULL_STATE
                 : moment(lastLoginTime).format(Moment12HourFormat),
-        timeToLive: timeToLive === ZERO_TIME_STRING || !timeToLive ? '' : moment(timeToLive).format(Moment12HourFormat),
+        timeToLive:
+            timeoutWindowExpression === ZERO_TIME_STRING || !timeoutWindowExpression
+                ? ''
+                : moment(timeoutWindowExpression).format(Moment12HourFormat),
     }
 }