feat: add useAppAuth with RQ

packages/web/src/components/AddAppConnection/index.jsx

@@ -16,10 +16,12 @@ import useAuthenticateApp from 'hooks/useAuthenticateApp.ee';
 import useFormatMessage from 'hooks/useFormatMessage';
 import { generateExternalLink } from 'helpers/translationValues';
 import { Form } from './style';
+import useAppAuth from 'hooks/useAppAuth';
 
 function AddAppConnection(props) {
   const { application, connectionId, onClose } = props;
-  const { name, authDocUrl, key, auth } = application;
+  const { name, authDocUrl, key } = application;
+  const { data: auth } = useAppAuth(key);
   const navigate = useNavigate();
   const [searchParams] = useSearchParams();
   const formatMessage = useFormatMessage();
@@ -34,31 +36,40 @@ function AddAppConnection(props) {
     appAuthClientId,
     useShared: !!appAuthClientId,
   });
+
   React.useEffect(function relayProviderData() {
     if (window.opener) {
       window.opener.postMessage({
         source: 'automatisch',
         payload: { search: window.location.search, hash: window.location.hash },
       });
+
       window.close();
     }
   }, []);
+
   React.useEffect(
     function initiateSharedAuthenticationForGivenAuthClient() {
       if (!appAuthClientId) return;
+
       if (!authenticate) return;
+
       const asyncAuthenticate = async () => {
         await authenticate();
         navigate(URLS.APP_CONNECTIONS(key));
       };
+
       asyncAuthenticate();
     },
     [appAuthClientId, authenticate],
   );
+
   const handleClientClick = (appAuthClientId) =>
     navigate(URLS.APP_ADD_CONNECTION_WITH_AUTH_CLIENT_ID(key, appAuthClientId));
+
   const handleAuthClientsDialogClose = () =>
     navigate(URLS.APP_CONNECTIONS(key));
+
   const submitHandler = React.useCallback(
     async (data) => {
       if (!authenticate) return;
@@ -78,6 +89,7 @@ function AddAppConnection(props) {
     },
     [authenticate],
   );
+
   if (useShared)
     return (
       <AppAuthClientsDialog
@@ -86,7 +98,9 @@ function AddAppConnection(props) {
         onClientClick={handleClientClick}
       />
     );
+
   if (appAuthClientId) return <React.Fragment />;
+
   return (
     <Dialog open={true} onClose={onClose} data-test="add-app-connection-dialog">
       <DialogTitle>
@@ -121,7 +135,7 @@ function AddAppConnection(props) {
       <DialogContent>
         <DialogContentText tabIndex={-1} component="div">
           <Form onSubmit={submitHandler}>
-            {auth?.fields?.map((field) => (
+            {auth?.data?.fields?.map((field) => (
               <InputCreator key={field.key} schema={field} />
             ))}
 

packages/web/src/components/AdminApplicationCreateAuthClient/index.jsx

@@ -8,12 +8,14 @@ import { CREATE_APP_AUTH_CLIENT } from 'graphql/mutations/create-app-auth-client
 import useAppConfig from 'hooks/useAppConfig.ee';
 import useFormatMessage from 'hooks/useFormatMessage';
 import AdminApplicationAuthClientDialog from 'components/AdminApplicationAuthClientDialog';
+import useAppAuth from 'hooks/useAppAuth';
 
 function AdminApplicationCreateAuthClient(props) {
-  const { appKey, application, onClose } = props;
-  const { auth } = application;
+  const { appKey, onClose } = props;
+  const { data: auth } = useAppAuth(appKey);
   const formatMessage = useFormatMessage();
   const { appConfig, loading: loadingAppConfig } = useAppConfig(appKey);
+
   const [
     createAppConfig,
     { loading: loadingCreateAppConfig, error: createAppConfigError },
@@ -21,6 +23,7 @@ function AdminApplicationCreateAuthClient(props) {
     refetchQueries: ['GetAppConfig'],
     context: { autoSnackbar: false },
   });
+
   const [
     createAppAuthClient,
     { loading: loadingCreateAppAuthClient, error: createAppAuthClientError },
@@ -28,8 +31,10 @@ function AdminApplicationCreateAuthClient(props) {
     refetchQueries: ['GetAppAuthClients'],
     context: { autoSnackbar: false },
   });
+
   const submitHandler = async (values) => {
     let appConfigId = appConfig?.id;
+
     if (!appConfigId) {
       const { data: appConfigData } = await createAppConfig({
         variables: {
@@ -41,8 +46,10 @@ function AdminApplicationCreateAuthClient(props) {
           },
         },
       });
+
       appConfigId = appConfigData.createAppConfig.id;
     }
+
     const { name, active, ...formattedAuthDefaults } = values;
     await createAppAuthClient({
       variables: {
@@ -54,22 +61,28 @@ function AdminApplicationCreateAuthClient(props) {
         },
       },
     });
+
     onClose();
   };
+
   const getAuthFieldsDefaultValues = useCallback(() => {
-    if (!auth?.fields) {
+    if (!auth?.data?.fields) {
       return {};
     }
+
     const defaultValues = {};
-    auth.fields.forEach((field) => {
+
+    auth.data.fields.forEach((field) => {
       if (field.value || field.type !== 'string') {
         defaultValues[field.key] = field.value;
       } else if (field.type === 'string') {
         defaultValues[field.key] = '';
       }
     });
+
     return defaultValues;
-  }, [auth?.fields]);
+  }, [auth?.data?.fields]);
+
   const defaultValues = useMemo(
     () => ({
       name: '',
@@ -78,6 +91,7 @@ function AdminApplicationCreateAuthClient(props) {
     }),
     [getAuthFieldsDefaultValues],
   );
+
   return (
     <AdminApplicationAuthClientDialog
       onClose={onClose}
@@ -85,7 +99,7 @@ function AdminApplicationCreateAuthClient(props) {
       title={formatMessage('createAuthClient.title')}
       loading={loadingAppConfig}
       submitHandler={submitHandler}
-      authFields={auth?.fields}
+      authFields={auth?.data?.fields}
       submitting={loadingCreateAppConfig || loadingCreateAppAuthClient}
       defaultValues={defaultValues}
     />

packages/web/src/components/ChooseConnectionSubstep/index.jsx

@@ -176,6 +176,7 @@ function ChooseConnectionSubstep(props) {
     }
   }, [step.connection?.id, retestConnection]);
   const onToggle = expanded ? onCollapse : onExpand;
+
   return (
     <React.Fragment>
       <FlowSubstepTitle