Wex: Fix race condition with applying request_timeout value (#905)

CERT-Polska · Feb 6, 2024 · e44c58a · e44c58a
1 parent ee5cb12
commit e44c58a
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/mwdb/web/src/commons/config/provider.tsx b/mwdb/web/src/commons/config/provider.tsx
@@ -60,9 +60,12 @@ export function ConfigProvider(props: Props) {
     async function updateServerInfo() {
         try {
             const response = await api.getServerInfo();
+            const serverConfig = response.data;
+            // Update default axios timeout before marking config as ready
+            api.axios.defaults.timeout = serverConfig["request_timeout"];
             setServerConfig({
                 type: configUpdate,
-                config: response.data,
+                config: serverConfig,
             });
         } catch (error) {
             setServerConfig({
@@ -117,15 +120,6 @@ export function ConfigProvider(props: Props) {
         if (auth.isAuthenticated) updateRemoteInfo();
     }, [auth.isAuthenticated]);
 
-    useEffect(() => {
-        if (
-            serverConfig.config &&
-            Number.isInteger(serverConfig.config.request_timeout)
-        ) {
-            api.axios.defaults.timeout = serverConfig.config["request_timeout"];
-        }
-    }, [serverConfig]);
-
     useEffect(() => {
         if (
             serverConfig.config &&