Merge branch 'fix/user-status-api-v2' into service-worker-fix

Author: vivek-devtron

src/Pages/GlobalConfigurations/Authorization/authorization.service.ts

@@ -36,12 +36,16 @@ export const getUserById = async (userId: User['id']): Promise<User> => {
     }
 }
 
-export const createOrUpdateUser = (data: UserCreateOrUpdatePayload) => {
-    const isUpdate = !!data.id
+export const createOrUpdateUser = ({ emailId, ...data }: UserCreateOrUpdatePayload) => {
+    const _data: UserDto = {
+        ...data,
+        email_id: emailId,
+    }
+    const isUpdate = !!_data.id
     const options: APIOptions = {
         timeout: window._env_.CONFIGURABLE_TIMEOUT ? parseInt(window._env_.CONFIGURABLE_TIMEOUT, 10) : null,
     }
-    return isUpdate ? put(Routes.USER, data, options) : post(Routes.USER, data, options)
+    return isUpdate ? put(Routes.USER, _data, options) : post(Routes.USER, _data, options)
 }
 
 export const deleteUser = (userId: User['id']) => trash(`${Routes.USER}/${userId}`)
@@ -56,7 +60,9 @@ export const getUserList = async (
     try {
         const {
             result: { users, totalCount },
-        } = (await get(getUrlWithSearchParams(Routes.USER, queryParams ?? {}), { signal })) as ResponseType<{
+        } = (await get(getUrlWithSearchParams(`${Routes.USER}/${Routes.API_VERSION_V2}`, queryParams ?? {}), {
+            signal,
+        })) as ResponseType<{
             users: UserDto[]
             totalCount: number
         }>
@@ -103,7 +109,10 @@ export const getPermissionGroupList = async (
     try {
         const {
             result: { roleGroups: permissionGroups, totalCount },
-        } = (await get(getUrlWithSearchParams(Routes.USER_ROLE_GROUP, queryParams ?? {}), { signal })) as ResponseType<{
+        } = (await get(
+            getUrlWithSearchParams(`${Routes.USER_ROLE_GROUP}/${Routes.API_VERSION_V2}`, queryParams ?? {}),
+            { signal },
+        )) as ResponseType<{
             roleGroups: PermissionGroupDto[]
             totalCount: number
         }>

src/Pages/GlobalConfigurations/Authorization/types.ts

@@ -50,7 +50,7 @@ export interface UserDto {
     /**
      * Email of the user
      */
-    emailId: string
+    email_id: string
     /**
      * Status of the user
      *
@@ -87,14 +87,15 @@ export interface UserDto {
     roleGroups?: Pick<PermissionGroup, 'id' | 'name' | 'description'>
 }
 
-export interface User extends Omit<UserDto, 'timeoutWindowExpression'> {
+export interface User extends Omit<UserDto, 'timeoutWindowExpression' | 'email_id'> {
     /**
      * Time until which the user is active
      * Note: Only a user with status 'active' can have 'timeToLive'
      *
      * @default ''
      */
     timeToLive?: string
+    emailId: UserDto['email_id']
 }
 
 export type UserCreateOrUpdatePayload = Pick<

src/Pages/GlobalConfigurations/Authorization/utils.ts

@@ -5,10 +5,11 @@ import { PermissionGroup, User, UserDto } from './types'
 import { LAST_LOGIN_TIME_NULL_STATE } from './UserPermissions/constants'
 
 export const transformUserResponse = (_user: UserDto): User => {
-    const { lastLoginTime, timeoutWindowExpression, ...user } = _user
+    const { lastLoginTime, timeoutWindowExpression, email_id: emailId, ...user } = _user
 
     return {
         ...user,
+        emailId,
         lastLoginTime:
             lastLoginTime === ZERO_TIME_STRING || !lastLoginTime
                 ? LAST_LOGIN_TIME_NULL_STATE

src/service-worker.ts

@@ -47,3 +47,4 @@ const staticAssetsRoute = new Route(
 
 // Register the route handling static assets
 registerRoute(staticAssetsRoute)
+