fix: code review cleanup

dhis2 · Apr 26, 2024 · 98b9f55 · 98b9f55
1 parent 1febb1f
commit 98b9f55
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/adapter/src/components/LoginModal.js b/adapter/src/components/LoginModal.js
@@ -17,13 +17,14 @@ import { styles } from './styles/LoginModal.style.js'
 // Check if base URL is set statically as an env var (typical in production)
 const staticUrl = process.env.REACT_APP_DHIS2_BASE_URL
 
-const getUseNewLoginAPI = async (server) => {
+const getIsNewLoginAPIAvailable = async (server) => {
     try {
         // if loginConfig is available, the instance can use new endpoints
         await get(`${server}/api/loginConfig`)
         return true
     } catch (e) {
         // if loginConfig is not available, the instance must use old endpoints
+        console.error(e)
         return false
     }
 }
@@ -99,9 +100,11 @@ export const LoginModal = ({ appName, baseUrl, loginApp = false }) => {
                 }
             }
 
-            const useNewLoginAPI = await getUseNewLoginAPI(server)
+            const isNewLoginAPIAvailable = await getIsNewLoginAPIAvailable(
+                server
+            )
 
-            if (useNewLoginAPI) {
+            if (isNewLoginAPIAvailable) {
                 loginWithNewEndpoints({
                     server,
                     username,
@@ -129,7 +132,7 @@ export const LoginModal = ({ appName, baseUrl, loginApp = false }) => {
                     {error && (
                         <div className="errorNotification">
                             <NoticeBox error title={i18n.t('Could not log in')}>
-                                {error?.message || error?.details?.message}
+                                {error?.message}
                             </NoticeBox>
                         </div>
                     )}

diff --git a/adapter/src/components/ServerVersionProvider.js b/adapter/src/components/ServerVersionProvider.js
@@ -194,7 +194,6 @@ export const ServerVersionProvider = ({
             plugin={plugin}
             parentAlertsAdd={parentAlertsAdd}
             showAlertsInPlugin={showAlertsInPlugin}
-            skipApiVersion={loginApp ? true : false}
         >
             {children}
         </Provider>

diff --git a/adapter/src/index.js b/adapter/src/index.js
@@ -65,7 +65,6 @@ const AppAdapter = ({
                         plugin={plugin}
                         parentAlertsAdd={parentAlertsAdd}
                         showAlertsInPlugin={showAlertsInPlugin}
-                        setLoginBaseUrl={() => {}}
                     >
                         <AppWrapper
                             plugin={plugin}

diff --git a/adapter/src/utils/api.js b/adapter/src/utils/api.js
@@ -14,7 +14,14 @@ const request = (url, options) => {
         })
             .then((response) => {
                 if (response.status !== 200) {
-                    reject('Request failed ' + response.statusText)
+                    response
+                        .json()
+                        .then((json) => {
+                            reject(json)
+                        })
+                        .catch(() => {
+                            reject('Request failed ' + response.statusText)
+                        })
                     return
                 }
                 try {