Only override the authentication type from server when not already se…

…t in the component
dolittle · Aug 29, 2023 · e0ccd9f · e0ccd9f
1 parent fcd6c9c
commit e0ccd9f
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/Source/SelfService/Web/integrations/connection/connectionDetails/configuration/index.tsx b/Source/SelfService/Web/integrations/connection/connectionDetails/configuration/index.tsx
@@ -72,19 +72,22 @@ export const ConfigurationView = () => {
         if (!connection || !connection.chosenEnvironment.value) {
             return;
         }
-        let authenticationType: M3AuthenticationType | undefined;
+        let authenticationFromServer: M3AuthenticationType | undefined;
         if (connection.chosenEnvironment.value.toLowerCase() === 'cloud') {
-            authenticationType = 'ion';
+            authenticationFromServer = 'ion';
         }
         if (connection.chosenEnvironment.value.toLowerCase() === 'on premises') {
-            if(connection._configuration.m3BasicAuth?.host) {
-                authenticationType = 'basic';
+            if (connection._configuration.m3BasicAuth?.host) {
+                authenticationFromServer = 'basic';
             }
-            if(connection._configuration.ion?.gatewayUrl) {
-                authenticationType = 'ion';
+            if (connection._configuration.ion?.gatewayUrl) {
+                authenticationFromServer = 'ion';
             }
         }
-        setAuthenticationType(authenticationType);
+        const shouldOverrideAuthenticationFromServer = authenticationFromServer && !authenticationType;
+        if (shouldOverrideAuthenticationFromServer) {
+            setAuthenticationType(authenticationFromServer);
+        }
     }, [
         connection?._configuration.ion,
         connection?._configuration.mdp,