fix(ui): login don't redirect correctly with context-path (#1355)

close #907
tchiotludo · Apr 4, 2023 · bd281de · bd281de
1 parent 336c293
commit bd281de
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/client/src/components/Root/Root.jsx b/client/src/components/Root/Root.jsx
@@ -6,9 +6,10 @@ class Root extends Component {
   cancel = axios.CancelToken.source();
 
   componentWillUnmount() {
-    const pathname = window.location.pathname;
+    /* eslint-disable react/prop-types */
+    const pathname = this.props.location?.pathname;
 
-    if (pathname !== '/ui/login') {
+    if (pathname && pathname !== '/ui/login') {
       sessionStorage.setItem('returnTo', pathname + (window.location.search || ''));
     }