From c2dcc435dc187a5ddbf771554a45832f07ca97bf Mon Sep 17 00:00:00 2001 From: Satbir Singh Date: Fri, 6 Mar 2020 06:54:44 +0000 Subject: [PATCH] Updating login structure as per backend --- app/client/src/constants/userConstants.ts | 2 +- app/client/src/sagas/userSagas.tsx | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/client/src/constants/userConstants.ts b/app/client/src/constants/userConstants.ts index 7430a36f4a..d3dbe6dda7 100644 --- a/app/client/src/constants/userConstants.ts +++ b/app/client/src/constants/userConstants.ts @@ -6,5 +6,5 @@ export type User = { }; export const CurrentUserDetailsRequestPayload = { - id: "me", + id: "profile", }; diff --git a/app/client/src/sagas/userSagas.tsx b/app/client/src/sagas/userSagas.tsx index 7a51aa3f10..962f03d5f2 100644 --- a/app/client/src/sagas/userSagas.tsx +++ b/app/client/src/sagas/userSagas.tsx @@ -265,11 +265,17 @@ export function* fetchUserSaga(action: ReduxAction) { try { const request: FetchUserRequest = action.payload; const response: FetchUserResponse = yield call(UserApi.fetchUser, request); + const { user, applications, currentOrganization } = response.data; + const finalData = { + ...user, + applications, + currentOrganization, + }; const isValidResponse = yield validateResponse(response); if (isValidResponse) { yield put({ type: ReduxActionTypes.FETCH_USER_SUCCESS, - payload: response.data, + payload: finalData, }); return yield response.data; }