commit b5ef017400d390bd891296721387d66229d6f1e1
author prasad pawar <prasad.pawar@freestoneinfotech.com> Tue Mar 23 14:49:42 2021 +0530
committer nixonrodrigues <nixon@apache.org> Tue Mar 30 11:20:25 2021 +0530
tree e71f6fc94deac4184820fbaeceeb609f22e06fc7
parent 3a59132a5fb05516d590f3061fd10c8af32a86f9

ATLAS-4224:UI : Redirect Atlas UI to login/index page when session is expired in backend.

Signed-off-by: nixonrodrigues <nixon@apache.org>

dashboardv2/public/js/utils/Overrides.js

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 @@
                         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);
+                            }
                         }
                     }
                 })

dashboardv3/public/js/utils/Overrides.js

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 @@
                         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);
+                            }
                         }
                     }
                 })