Skip to content

Commit 7ed0447

Browse files
author
Alexandra Zwinger
committed
Fix Routing behavior
1 parent 0083fd9 commit 7ed0447

File tree

2 files changed

+21
-6
lines changed

2 files changed

+21
-6
lines changed

src/AxiosConfig.tsx

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,26 @@ const axiosInstance = axios.create({
99
withCredentials: true,
1010
});
1111

12+
let isInitialized = false;
13+
14+
keycloak.onReady = () => {
15+
isInitialized = true;
16+
};
17+
1218
axiosInstance.interceptors.request.use(
1319
async (config) => {
14-
const token = keycloak.token;
15-
if (token) {
16-
config.headers['Authorization'] = `Bearer ${token}`;
20+
if (!keycloak.token) {
21+
await new Promise<void>((resolve) => {
22+
const interval = setInterval(() => {
23+
if (keycloak.token) {
24+
clearInterval(interval);
25+
resolve();
26+
}
27+
}, 100);
28+
});
29+
}
30+
if (keycloak.token) {
31+
config.headers['Authorization'] = `Bearer ${keycloak.token}`;
1732
}
1833
return config;
1934
},

src/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import ReactDOM from 'react-dom/client';
33
import './index.css';
44
import App from './App';
55
import reportWebVitals from './reportWebVitals';
6-
import { HashRouter } from 'react-router-dom';
6+
import {BrowserRouter} from 'react-router-dom';
77
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
88

99
const queryClient = new QueryClient();
@@ -14,9 +14,9 @@ const root = ReactDOM.createRoot(
1414

1515
root.render(
1616
<QueryClientProvider client={queryClient}> {}
17-
<HashRouter>
17+
<BrowserRouter>
1818
<App />
19-
</HashRouter>
19+
</BrowserRouter>
2020
</QueryClientProvider>
2121
);
2222

0 commit comments

Comments
 (0)