Merge pull request #563 from Kodylow/fix-single-auth

fedimint · Oct 18, 2024 · 7af7332 · 7af7332
2 parents 6dad54a + c520cb6
commit 7af7332
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/apps/router/src/index.tsx b/apps/router/src/index.tsx
@@ -15,29 +15,55 @@ import { ColorModeScript } from '@chakra-ui/react';
 
 import { i18nProvider, sha256Hash } from '@fedimint/utils';
 import { languages } from './languages';
-import { AppContextProvider } from './context/AppContext';
+import { APP_ACTION_TYPE, AppContextProvider } from './context/AppContext';
 import { HomePage } from './home/HomePage';
 import { GuardianContextProvider } from './context/guardian/GuardianContext';
 import { GatewayContextProvider } from './context/gateway/GatewayContext';
 import { Wrapper } from './components/Wrapper';
+import { useAppContext } from './context/hooks';
 
 i18nProvider(languages);
 
 const App = () => {
+  const { dispatch } = useAppContext();
   const [redirectPath, setRedirectPath] = useState<string | null>(null);
 
   useEffect(() => {
     const calculateRedirectPath = async () => {
       if (process.env.REACT_APP_FM_CONFIG_API) {
         try {
           const hash = await sha256Hash(process.env.REACT_APP_FM_CONFIG_API);
+          dispatch({
+            type: APP_ACTION_TYPE.ADD_GUARDIAN,
+            payload: {
+              id: hash,
+              guardian: {
+                config: {
+                  id: hash,
+                  baseUrl: process.env.REACT_APP_FM_CONFIG_API,
+                },
+              },
+            },
+          });
           setRedirectPath(`/guardian/${hash}`);
         } catch (e) {
           console.error(e);
         }
       } else if (process.env.REACT_APP_FM_GATEWAY_API) {
         try {
           const hash = await sha256Hash(process.env.REACT_APP_FM_GATEWAY_API);
+          dispatch({
+            type: APP_ACTION_TYPE.ADD_GATEWAY,
+            payload: {
+              id: hash,
+              gateway: {
+                config: {
+                  id: hash,
+                  baseUrl: process.env.REACT_APP_FM_GATEWAY_API,
+                },
+              },
+            },
+          });
           setRedirectPath(`/gateway/${hash}`);
         } catch (e) {
           console.error(e);
@@ -46,7 +72,7 @@ const App = () => {
     };
 
     calculateRedirectPath();
-  }, []);
+  }, [dispatch]);
 
   return (
     <Router>

diff --git a/mprocs-nix-gateway.yml b/mprocs-nix-gateway.yml
@@ -46,7 +46,7 @@ procs:
       BROWSER: none
       GATEWAY_TYPE: ldk
   guardian-ui-1:
-    shell: bash --init-file scripts/mprocs-nix-guardian-manual.sh
+    shell: bash --init-file scripts/mprocs-nix-guardian.sh
     stop: SIGKILL
     env:
       PORT: '3000'