From 7fe2c1908a213ff6ecf5d7a18ed0139e81494b6b Mon Sep 17 00:00:00 2001 From: Praveen D Date: Fri, 11 Jan 2019 18:55:27 +0530 Subject: [PATCH 1/2] remove permission-denied check for login redirect --- console/src/components/Main/Actions.js | 5 +---- console/src/components/Main/Main.js | 2 +- console/src/utils/requestAction.js | 7 +++---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/console/src/components/Main/Actions.js b/console/src/components/Main/Actions.js index 55beded10e8c8..4f1436182c6e3 100644 --- a/console/src/components/Main/Actions.js +++ b/console/src/components/Main/Actions.js @@ -137,10 +137,7 @@ const validateLogin = isInitialLoad => (dispatch, getState) => { dispatch({ type: LOGIN_IN_PROGRESS, data: false }); dispatch({ type: LOGIN_ERROR, data: true }); console.error('Failed to validate access key ' + JSON.stringify(error)); - if ( - error.code !== 'access-denied' && - error.code !== 'permission-denied' - ) { + if (error.code !== 'access-denied') { alert(JSON.stringify(error)); } } diff --git a/console/src/components/Main/Main.js b/console/src/components/Main/Main.js index 55a37471d4586..128b8b4962017 100644 --- a/console/src/components/Main/Main.js +++ b/console/src/components/Main/Main.js @@ -456,7 +456,7 @@ class Main extends React.Component {
  • diff --git a/console/src/utils/requestAction.js b/console/src/utils/requestAction.js index 4954665f52462..9195e8db8bc44 100644 --- a/console/src/utils/requestAction.js +++ b/console/src/utils/requestAction.js @@ -58,10 +58,7 @@ const requestAction = ( statusCode: response.status, }); } - if ( - (msg.code && msg.code === 'access-denied') || - msg.code === 'permission-denied' - ) { + if (msg.code && msg.code === 'access-denied') { dispatch({ type: UPDATE_DATA_HEADERS, data: { @@ -72,6 +69,8 @@ const requestAction = ( dispatch({ type: LOGIN_IN_PROGRESS, data: false }); dispatch({ type: LOGIN_ERROR, data: false }); dispatch(push(globals.urlPrefix + '/login')); + } else { + alert(JSON.stringify(msg)); } reject(msg); }); From d5a1f14fa770340579b510bee4859fccbfde5955 Mon Sep 17 00:00:00 2001 From: Praveen D Date: Fri, 11 Jan 2019 19:06:26 +0530 Subject: [PATCH 2/2] remove alert --- console/src/utils/requestAction.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/console/src/utils/requestAction.js b/console/src/utils/requestAction.js index 9195e8db8bc44..d0f193871eea9 100644 --- a/console/src/utils/requestAction.js +++ b/console/src/utils/requestAction.js @@ -69,8 +69,6 @@ const requestAction = ( dispatch({ type: LOGIN_IN_PROGRESS, data: false }); dispatch({ type: LOGIN_ERROR, data: false }); dispatch(push(globals.urlPrefix + '/login')); - } else { - alert(JSON.stringify(msg)); } reject(msg); });