Merge pull request #510 from SavinduDimal/mtls-http-ui

Uncheck and disable http checkbox when Mutual SSL is enabled
wso2 · Dec 5, 2023 · 3cb113f · 3cb113f
2 parents 51d6b39 + 2121317
commit 3cb113f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/...omponents/Apis/Details/Configuration/components/APISecurity/components/TransportLevel.jsx b/...omponents/Apis/Details/Configuration/components/APISecurity/components/TransportLevel.jsx
@@ -149,6 +149,20 @@ function TransportLevel(props) {
         });
     };
 
+    const handleMutualSSLChange = (event) => {
+        const { checked } = event.target;
+        if (checked) {
+            configDispatcher({
+                action: 'transport',
+                event: { checked: false, value: 'http' },
+            });
+        }
+        configDispatcher({
+            action: 'securityScheme',
+            event: { checked, value: API_SECURITY_MUTUAL_SSL },
+        });
+    };
+
     // Get the client certificates from backend.
     useEffect(() => {
         API.getAllClientCertificates(id).then((resp) => {
@@ -192,11 +206,7 @@ function TransportLevel(props) {
                                 <Checkbox
                                     disabled={isRestricted(['apim:api_create'], apiFromContext)}
                                     checked={isMutualSSLEnabled}
-                                    onChange={({ target: { checked, value } }) => configDispatcher({
-                                        action: 'securityScheme',
-                                        event: { checked, value },
-                                    })}
-                                    value={API_SECURITY_MUTUAL_SSL}
+                                    onChange={handleMutualSSLChange}
                                     color='primary'
                                     id='mutual-ssl-checkbox'
                                 />

diff --git a/...ain/webapp/source/src/app/components/Apis/Details/Configuration/components/Transports.jsx b/...ain/webapp/source/src/app/components/Apis/Details/Configuration/components/Transports.jsx
@@ -84,9 +84,9 @@ export default function Transports(props) {
                         <FormControlLabel
                             control={(
                                 <Checkbox
-                                    disabled={isRestricted(['apim:api_create'], apiFromContext)}
+                                    disabled={isRestricted(['apim:api_create'], apiFromContext) || isMutualSSLEnabled}
                                     checked={api.transport
-                                        ? api.transport.includes('http') : null}
+                                        ? api.transport.includes('http') && !isMutualSSLEnabled : null}
                                     onChange={({ target: { checked } }) => configDispatcher({
                                         action: 'transport',
                                         event: { checked, value: 'http' },