This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 3fd2b8f ATLAS-4224:UI : Redirect Atlas UI to login/index page when
session is expired in backend.
3fd2b8f is described below
commit 3fd2b8f22192d744d605a4976f9c05322e08f224
Author: prasad pawar <[email protected]>
AuthorDate: Tue Mar 23 14:49:42 2021 +0530
ATLAS-4224:UI : Redirect Atlas UI to login/index page when session is
expired in backend.
Signed-off-by: nixonrodrigues <[email protected]>
(cherry picked from commit b5ef017400d390bd891296721387d66229d6f1e1)
---
dashboardv2/public/js/utils/Overrides.js | 7 ++++++-
dashboardv3/public/js/utils/Overrides.js | 7 ++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/dashboardv2/public/js/utils/Overrides.js
b/dashboardv2/public/js/utils/Overrides.js
index 3318a72..492785a 100644
--- a/dashboardv2/public/js/utils/Overrides.js
+++ b/dashboardv2/public/js/utils/Overrides.js
@@ -48,7 +48,12 @@ define(['require', 'utils/Utils', 'lossless-json',
'marionette', 'backgrid', 'as
try {
return LosslessJSON.parse(data, function(k, v) {
try { return (v.isLosslessNumber) ? v.valueOf() : v } catch (err) { return
v.value } });
} catch (err) {
- return $.parseJSON(data);
+ if (err.name.toLowerCase() === "syntaxerror" &&
data.length > 0 && data.indexOf("<html") > -1) { // to handel logout for
multile windows
+ var redirectUrl = window.location.origin +
window.location.pathname;
+ window.location = redirectUrl.substring(0,
redirectUrl.lastIndexOf("/"));
+ } else {
+ return $.parseJSON(data);
+ }
}
}
})
diff --git a/dashboardv3/public/js/utils/Overrides.js
b/dashboardv3/public/js/utils/Overrides.js
index 3318a72..492785a 100644
--- a/dashboardv3/public/js/utils/Overrides.js
+++ b/dashboardv3/public/js/utils/Overrides.js
@@ -48,7 +48,12 @@ define(['require', 'utils/Utils', 'lossless-json',
'marionette', 'backgrid', 'as
try {
return LosslessJSON.parse(data, function(k, v) {
try { return (v.isLosslessNumber) ? v.valueOf() : v } catch (err) { return
v.value } });
} catch (err) {
- return $.parseJSON(data);
+ if (err.name.toLowerCase() === "syntaxerror" &&
data.length > 0 && data.indexOf("<html") > -1) { // to handel logout for
multile windows
+ var redirectUrl = window.location.origin +
window.location.pathname;
+ window.location = redirectUrl.substring(0,
redirectUrl.lastIndexOf("/"));
+ } else {
+ return $.parseJSON(data);
+ }
}
}
})
