diff --git a/src/store/modules/user/actions.ts b/src/store/modules/user/actions.ts index 7620395f..a725ebd7 100644 --- a/src/store/modules/user/actions.ts +++ b/src/store/modules/user/actions.ts @@ -105,12 +105,19 @@ const actions: ActionTree = { // Calling the logout api to flag the user as logged out, only when user is authorised // if the user is already unauthorised then not calling the logout api as it returns 401 again that results in a loop, thus there is no need to call logout api if the user is unauthorised if(!payload?.isUserUnauthorised) { - let resp = await logout(); + let resp; - // Added logic to remove the `//` from the resp as in case of get request we are having the extra characters and in case of post we are having 403 - resp = JSON.parse(resp.startsWith('//') ? resp.replace('//', '') : resp) + // wrapping the parsing logic in try catch as in some case the logout api makes redirection, and then we are unable to parse the resp and thus the logout process halts + try { + resp = await logout(); - if(resp.logoutAuthType == 'SAML2SSO') { + // Added logic to remove the `//` from the resp as in case of get request we are having the extra characters and in case of post we are having 403 + resp = JSON.parse(resp.startsWith('//') ? resp.replace('//', '') : resp) + } catch(err) { + logger.error('Error parsing data', err) + } + + if(resp?.logoutAuthType == 'SAML2SSO') { redirectionUrl = resp.logoutUrl } }