From fd9f5a35cae617c1a18dccbf4c1f0dcd662e9fc4 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Tue, 2 Aug 2022 20:48:19 -0700
Subject: Support token for any path

---
 modern/src/Navigation.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modern/src/Navigation.js b/modern/src/Navigation.js
index d37ca72c..3aa8a12c 100644
--- a/modern/src/Navigation.js
+++ b/modern/src/Navigation.js
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { Route, Routes, useNavigate } from 'react-router-dom';
+import { Route, Routes, useLocation, useNavigate } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
 import { LinearProgress } from '@mui/material';
 import MainPage from './main/MainPage';
@@ -52,13 +52,14 @@ const Navigation = () => {
 
   const [redirectsHandled, setRedirectsHandled] = useState(false);
 
+  const { pathname } = useLocation();
   const query = useQuery();
 
   useEffectAsync(async () => {
     if (query.get('token')) {
       const token = query.get('token');
       await fetch(`/api/session?token=${encodeURIComponent(token)}`);
-      navigate('/');
+      navigate(pathname);
     } else if (query.get('deviceId')) {
       const deviceId = query.get('deviceId');
       const response = await fetch(`/api/devices?uniqueId=${deviceId}`);
-- 
cgit v1.2.3