From 1521024abfd861c89fdbbcf3173aaa9ad04e5cdb Mon Sep 17 00:00:00 2001
From: Erik Jan de Wit <erikjan.dewit@gmail.com>
Date: Mon, 26 Apr 2021 09:40:59 +0200
Subject: [PATCH] fixed the wrong comment

---
 src/clients/add/CapabilityConfig.tsx | 14 ++++++++------
 src/clients/add/NewClientForm.tsx    |  1 -
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/clients/add/CapabilityConfig.tsx b/src/clients/add/CapabilityConfig.tsx
index 6bdb510cc5..8f2b58f339 100644
--- a/src/clients/add/CapabilityConfig.tsx
+++ b/src/clients/add/CapabilityConfig.tsx
@@ -26,7 +26,7 @@ export const CapabilityConfig = ({
   const { control, watch, setValue } = useFormContext<ClientForm>();
   const protocol = type || watch("protocol");
   const clientAuthentication = watch("publicClient");
-  const clientAuthorization = watch("authorizationServicesEnabled");
+  const authorization = watch("authorizationServicesEnabled");
 
   return (
     <FormAccess isHorizontal role="manage-clients" unWrap={unWrap}>
@@ -47,7 +47,7 @@ export const CapabilityConfig = ({
             >
               <Controller
                 name="publicClient"
-                defaultValue={true}
+                defaultValue={false}
                 control={control}
                 render={({ onChange, value }) => (
                   <Switch
@@ -85,7 +85,7 @@ export const CapabilityConfig = ({
                     name="authorizationServicesEnabled"
                     label={t("common:on")}
                     labelOff={t("common:off")}
-                    isChecked={value}
+                    isChecked={value && !clientAuthentication}
                     onChange={(value) => {
                       onChange(value);
                       if (value) {
@@ -188,11 +188,13 @@ export const CapabilityConfig = ({
                           id="kc-flow-service-account"
                           name="serviceAccountsEnabled"
                           isChecked={
-                            value ||
-                            (clientAuthentication && clientAuthorization)
+                            value || (clientAuthentication && authorization)
                           }
                           onChange={onChange}
-                          isDisabled={clientAuthorization}
+                          isDisabled={
+                            (clientAuthentication && !authorization) ||
+                            (!clientAuthentication && authorization)
+                          }
                         />
                         <HelpItem
                           helpText="clients-help:serviceAccount"
diff --git a/src/clients/add/NewClientForm.tsx b/src/clients/add/NewClientForm.tsx
index d840706d75..76a0e875dc 100644
--- a/src/clients/add/NewClientForm.tsx
+++ b/src/clients/add/NewClientForm.tsx
@@ -7,7 +7,6 @@ import {
   WizardFooter,
   WizardContextConsumer,
   Button,
-  WizardStepFunctionType,
 } from "@patternfly/react-core";
 import { useTranslation } from "react-i18next";
 import { FormProvider, useForm } from "react-hook-form";