fix: expose baseurl to loginappwrapper

dhis2 · Apr 25, 2024 · 8330626 · 8330626
1 parent 3e24d35
commit 8330626
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/adapter/src/components/ServerVersionProvider.js b/adapter/src/components/ServerVersionProvider.js
@@ -18,6 +18,7 @@ export const ServerVersionProvider = ({
     parentAlertsAdd,
     showAlertsInPlugin,
     loginApp,
+    setLoginBaseUrl,
     children,
 }) => {
     const offlineInterface = useOfflineInterface()
@@ -149,6 +150,10 @@ export const ServerVersionProvider = ({
         }
     }, [appName, baseUrl, loginApp])
 
+    useEffect(() => {
+        setLoginBaseUrl(baseUrl)
+    }, [setLoginBaseUrl, baseUrl])
+
     useEffect(() => {
         if (pwaEnabled) {
             offlineInterface.ready.then(() => {

diff --git a/adapter/src/index.js b/adapter/src/index.js
@@ -1,10 +1,9 @@
 import { checkForSWUpdateAndReload } from '@dhis2/pwa'
 import PropTypes from 'prop-types'
-import React from 'react'
+import React, { useState } from 'react'
 import { AppWrapper } from './components/AppWrapper.js'
 import { ErrorBoundary } from './components/ErrorBoundary.js'
 import { LoginAppWrapper } from './components/LoginAppWrapper.js'
-import { LoginAppWrapper } from './components/LoginAppWrapper.js'
 import { OfflineInterfaceProvider } from './components/OfflineInterfaceContext.js'
 import { PWALoadingBoundary } from './components/PWALoadingBoundary.js'
 import { ServerVersionProvider } from './components/ServerVersionProvider.js'
@@ -24,6 +23,7 @@ const AppAdapter = ({
     loginApp,
     children,
 }) => {
+    const [loginBaseUrl, setLoginBaseUrl] = useState(url)
     if (loginApp) {
         return (
             <ErrorBoundary
@@ -43,8 +43,11 @@ const AppAdapter = ({
                     pwaEnabled={pwaEnabled}
                     loginApp={loginApp}
                     plugin={false}
+                    setLoginBaseUrl={setLoginBaseUrl}
                 >
-                    <LoginAppWrapper url={url}>{children}</LoginAppWrapper>
+                    <LoginAppWrapper url={loginBaseUrl}>
+                        {children}
+                    </LoginAppWrapper>
                 </ServerVersionProvider>
             </ErrorBoundary>
         )
@@ -66,6 +69,7 @@ const AppAdapter = ({
                         plugin={plugin}
                         parentAlertsAdd={parentAlertsAdd}
                         showAlertsInPlugin={showAlertsInPlugin}
+                        setLoginBaseUrl={() => {}}
                     >
                         <AppWrapper
                             plugin={plugin}