fix(auth): add captcha auto-refresh via ApolloLink

packages/twenty-front/src/modules/apollo/components/ApolloProvider.tsx

@@ -1,10 +1,17 @@
 import { ApolloProvider as ApolloProviderBase } from '@apollo/client';
 
 import { useApolloFactory } from '@/apollo/hooks/useApolloFactory';
+import { useRequestFreshCaptchaToken } from '@/captcha/hooks/useRequestFreshCaptchaToken';
+import { createCaptchaRefreshLink } from '@/apollo/utils/captchaRefreshLink';
 
 export const ApolloProvider = ({ children }: React.PropsWithChildren) => {
+  const { requestFreshCaptchaToken } = useRequestFreshCaptchaToken();
+
+  const captchaRefreshLink = createCaptchaRefreshLink(requestFreshCaptchaToken);
+
   const apolloClient = useApolloFactory({
     connectToDevTools: true,
+    extraLinks: [captchaRefreshLink],
   });
 
   // This will attach the right apollo client to Apollo Dev Tools

packages/twenty-front/src/modules/apollo/utils/captchaRefreshLink.ts

@@ -0,0 +1,19 @@
+import { ApolloLink } from '@apollo/client';
+
+export const createCaptchaRefreshLink = (
+  requestFreshCaptchaToken: () => void
+) => {
+  return new ApolloLink((operation, forward) => {
+    const { variables } = operation;
+
+    const hasCaptchaToken = variables && 'captchaToken' in variables;
+
+    return forward(operation).map((response) => {
+      if (hasCaptchaToken) {
+        requestFreshCaptchaToken();
+      }
+
+      return response;
+    });
+  });
+};

packages/twenty-front/src/modules/auth/hooks/useAuth.ts

@@ -501,7 +501,8 @@ export const useAuth = () => {
 
   const handleSignOut = useCallback(async () => {
     await clearSession();
-  }, [clearSession]);
+    await requestFreshCaptchaToken();
+  }, [clearSession, requestFreshCaptchaToken]);
 
   const handleCredentialsSignUpInWorkspace = useCallback(
     async ({
@@ -519,60 +520,55 @@ export const useAuth = () => {
       captchaToken?: string;
       verifyEmailNextPath?: string;
     }) => {
-      try {
-        const signUpInWorkspaceResult = await signUpInWorkspace({
-          variables: {
-            email,
-            password,
-            workspaceInviteHash,
-            workspacePersonalInviteToken,
-            captchaToken,
-            locale: i18n.locale ?? 'en',
-            ...(workspacePublicData?.id
-              ? { workspaceId: workspacePublicData.id }
-              : {}),
-            verifyEmailNextPath,
-          },
-        });
-
-        if (isDefined(signUpInWorkspaceResult.errors)) {
-          throw signUpInWorkspaceResult.errors;
-        }
+      const signUpInWorkspaceResult = await signUpInWorkspace({
+        variables: {
+          email,
+          password,
+          workspaceInviteHash,
+          workspacePersonalInviteToken,
+          captchaToken,
+          locale: i18n.locale ?? 'en',
+          ...(workspacePublicData?.id
+            ? { workspaceId: workspacePublicData.id }
+            : {}),
+          verifyEmailNextPath,
+        },
+      });
 
-        if (!signUpInWorkspaceResult.data?.signUpInWorkspace) {
-          throw new Error('No login token');
-        }
+      if (isDefined(signUpInWorkspaceResult.errors)) {
+        throw signUpInWorkspaceResult.errors;
+      }
 
-        if (isEmailVerificationRequired) {
-          setSearchParams({ email });
-          setSignInUpStep(SignInUpStep.EmailVerification);
-          return null;
-        }
+      if (!signUpInWorkspaceResult.data?.signUpInWorkspace) {
+        throw new Error('No login token');
+      }
 
-        if (isMultiWorkspaceEnabled) {
-          return await redirectToWorkspaceDomain(
-            getWorkspaceUrl(
-              signUpInWorkspaceResult.data.signUpInWorkspace.workspace
-                .workspaceUrls,
-            ),
-            isEmailVerificationRequired ? AppPath.SignInUp : AppPath.Verify,
-            {
-              ...(!isEmailVerificationRequired && {
-                loginToken:
-                  signUpInWorkspaceResult.data.signUpInWorkspace.loginToken
-                    .token,
-              }),
-              email,
-            },
-          );
-        }
+      if (isEmailVerificationRequired) {
+        setSearchParams({ email });
+        setSignInUpStep(SignInUpStep.EmailVerification);
+        return null;
+      }
 
-        await handleGetAuthTokensFromLoginToken(
-          signUpInWorkspaceResult.data?.signUpInWorkspace.loginToken.token,
+      if (isMultiWorkspaceEnabled) {
+        return await redirectToWorkspaceDomain(
+          getWorkspaceUrl(
+            signUpInWorkspaceResult.data.signUpInWorkspace.workspace
+              .workspaceUrls,
+          ),
+          isEmailVerificationRequired ? AppPath.SignInUp : AppPath.Verify,
+          {
+            ...(!isEmailVerificationRequired && {
+              loginToken:
+                signUpInWorkspaceResult.data.signUpInWorkspace.loginToken.token,
+            }),
+            email,
+          },
         );
-      } finally {
-        requestFreshCaptchaToken();
       }
+
+      await handleGetAuthTokensFromLoginToken(
+        signUpInWorkspaceResult.data?.signUpInWorkspace.loginToken.token,
+      );
     },
     [
       signUpInWorkspace,
@@ -583,7 +579,6 @@ export const useAuth = () => {
       setSearchParams,
       isEmailVerificationRequired,
       redirectToWorkspaceDomain,
-      requestFreshCaptchaToken,
     ],
   );
 

packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUp.ts

@@ -54,7 +54,6 @@ export const useSignInUp = (form: UseFormReturn<Form>) => {
     useBuildSearchParamsFromUrlSyncedStates();
 
   const continueWithEmail = useCallback(() => {
-    requestFreshCaptchaToken();
     setSignInUpStep(SignInUpStep.Email);
   }, [requestFreshCaptchaToken, setSignInUpStep]);
 
@@ -74,7 +73,6 @@ export const useSignInUp = (form: UseFormReturn<Form>) => {
         });
       },
       onCompleted: (data) => {
-        requestFreshCaptchaToken();
         setSignInUpMode(
           data?.checkUserExists.exists
             ? SignInUpMode.SignIn
@@ -154,8 +152,6 @@ export const useSignInUp = (form: UseFormReturn<Form>) => {
         enqueueSnackBar(err?.message, {
           variant: SnackBarVariant.Error,
         });
-      } finally {
-        requestFreshCaptchaToken();
       }
     },
     [