From 36b286bfea21420c355b08d1fe5d2e7a8636d688 Mon Sep 17 00:00:00 2001
From: Teal Larson <LARSON.TEAL@GMAIL.COM>
Date: Tue, 5 Jul 2022 10:22:15 -0400
Subject: [PATCH 1/4] don't disable setup button

---
 .../views/Connector/ServiceForm/components/CreateControls.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airbyte-webapp/src/views/Connector/ServiceForm/components/CreateControls.tsx b/airbyte-webapp/src/views/Connector/ServiceForm/components/CreateControls.tsx
index 4e06d591857d..939c88e60216 100644
--- a/airbyte-webapp/src/views/Connector/ServiceForm/components/CreateControls.tsx
+++ b/airbyte-webapp/src/views/Connector/ServiceForm/components/CreateControls.tsx
@@ -55,7 +55,7 @@ const CreateControls: React.FC<CreateControlProps> = ({
     <ButtonContainer>
       {errorMessage && !fetchingConnectorError && <TestingConnectionError errorMessage={errorMessage} />}
       {fetchingConnectorError && <FetchingConnectorError />}
-      <SubmitButton type="submit" disabled={isLoadSchema || !isValid}>
+      <SubmitButton type="submit" disabled={isLoadSchema}>
         <FormattedMessage id={`onboarding.${formType}SetUp.buttonText`} />
       </SubmitButton>
     </ButtonContainer>

From c36106dfe40d3c85f64d82d0ccc08a8f47dbcb80 Mon Sep 17 00:00:00 2001
From: Teal Larson <LARSON.TEAL@GMAIL.COM>
Date: Tue, 5 Jul 2022 10:36:09 -0400
Subject: [PATCH 2/4] make eslint happy

---
 .../views/Connector/ServiceForm/components/CreateControls.tsx   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/airbyte-webapp/src/views/Connector/ServiceForm/components/CreateControls.tsx b/airbyte-webapp/src/views/Connector/ServiceForm/components/CreateControls.tsx
index 939c88e60216..29625867c0c6 100644
--- a/airbyte-webapp/src/views/Connector/ServiceForm/components/CreateControls.tsx
+++ b/airbyte-webapp/src/views/Connector/ServiceForm/components/CreateControls.tsx
@@ -18,7 +18,6 @@ interface CreateControlProps {
 
   isTestConnectionInProgress: boolean;
   onCancelTesting?: () => void;
-  isValid: boolean;
 }
 
 const ButtonContainer = styled.div`
@@ -41,7 +40,6 @@ const CreateControls: React.FC<CreateControlProps> = ({
   fetchingConnectorError,
   isLoadSchema,
   onCancelTesting,
-  isValid,
 }) => {
   if (isSubmitting) {
     return <TestingConnectionSpinner isCancellable={isTestConnectionInProgress} onCancelTesting={onCancelTesting} />;

From 3784a441531bcbad4595eb56b8aa7beabeeeb39c Mon Sep 17 00:00:00 2001
From: Teal Larson <LARSON.TEAL@GMAIL.COM>
Date: Tue, 5 Jul 2022 10:58:09 -0400
Subject: [PATCH 3/4] one more cleanup

---
 airbyte-webapp/src/views/Connector/ServiceForm/FormRoot.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/airbyte-webapp/src/views/Connector/ServiceForm/FormRoot.tsx b/airbyte-webapp/src/views/Connector/ServiceForm/FormRoot.tsx
index c8ce9b79845b..4da0ad1161f0 100644
--- a/airbyte-webapp/src/views/Connector/ServiceForm/FormRoot.tsx
+++ b/airbyte-webapp/src/views/Connector/ServiceForm/FormRoot.tsx
@@ -89,7 +89,6 @@ const FormRoot: React.FC<FormRootProps> = ({
           isLoadSchema={isLoadingSchema}
           fetchingConnectorError={fetchingConnectorError}
           hasSuccess={hasSuccess}
-          isValid={isValid}
         />
       )}
     </FormContainer>

From b7787110f84b2eb42dc1e2077db180b2fcc53284 Mon Sep 17 00:00:00 2001
From: Teal Larson <LARSON.TEAL@GMAIL.COM>
Date: Tue, 5 Jul 2022 15:43:17 -0400
Subject: [PATCH 4/4] use the spec to decide how to create config object

---
 .../components/Sections/auth/useOauthFlowAdapter.tsx         | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/airbyte-webapp/src/views/Connector/ServiceForm/components/Sections/auth/useOauthFlowAdapter.tsx b/airbyte-webapp/src/views/Connector/ServiceForm/components/Sections/auth/useOauthFlowAdapter.tsx
index cad37bc54f5c..5758c37310f2 100644
--- a/airbyte-webapp/src/views/Connector/ServiceForm/components/Sections/auth/useOauthFlowAdapter.tsx
+++ b/airbyte-webapp/src/views/Connector/ServiceForm/components/Sections/auth/useOauthFlowAdapter.tsx
@@ -7,7 +7,6 @@ import pick from "lodash/pick";
 import { ConnectorDefinitionSpecification } from "core/domain/connector";
 import { useRunOauthFlow } from "hooks/services/useConnectorAuth";
 
-import { isSourceDefinitionSpecification } from "../../../../../../core/domain/connector/source";
 import { useServiceForm } from "../../../serviceFormContext";
 import { ServiceFormValues } from "../../../types";
 import { makeConnectionConfigurationPath, serverProvidedOauthPaths } from "../../../utils";
@@ -24,7 +23,7 @@ function useFormikOauthAdapter(connector: ConnectorDefinitionSpecification): {
   const onDone = (completeOauthResponse: Record<string, unknown>) => {
     let newValues: ServiceFormValues;
 
-    if (connector.advancedAuth && !isSourceDefinitionSpecification(connector)) {
+    if (connector.advancedAuth) {
       const oauthPaths = serverProvidedOauthPaths(connector);
 
       newValues = Object.entries(oauthPaths).reduce(
@@ -34,7 +33,7 @@ function useFormikOauthAdapter(connector: ConnectorDefinitionSpecification): {
       );
     } else {
       newValues = merge(values, {
-        connectionConfiguration: { credentials: completeOauthResponse },
+        connectionConfiguration: completeOauthResponse,
       });
     }