fix(auth): update onSuccess handler to return boolean for auth flow control

- Modified the `onSuccess` callback in `useGoogleAuth` to return a boolean value, allowing for better control over the authentication flow.
- Updated the `useConnectGoogle` hook to handle the new return value, ensuring proper state reset when authentication is not completed.
- Added a test case to verify the behavior when the custom success handler returns false, ensuring the authentication state is reset correctly.

Author: tyler-dane

packages/web/src/auth/hooks/google/useConnectGoogle/useConnectGoogle.ts

@@ -47,7 +47,7 @@ export const useConnectGoogle = () => {
     onSuccess: async (data) => {
       const didSyncLocalEvents = await syncPendingLocalEvents(dispatch);
       if (!didSyncLocalEvents) {
-        return;
+        return false;
       }
 
       const googleConnectRequest = buildGoogleConnectRequest(

packages/web/src/auth/hooks/google/useGoogleAuth/useGoogleAuth.test.ts

@@ -255,6 +255,56 @@ describe("useGoogleAuth", () => {
     );
   });
 
+  it("resets auth when a custom success handler returns false", async () => {
+    let onSuccessCallback:
+      | ((data: GoogleAuthConfig) => Promise<boolean | void>)
+      | undefined;
+    const customOnSuccess = jest.fn().mockResolvedValue(false);
+
+    mockUseGoogleLogin.mockImplementation(({ onSuccess }) => {
+      onSuccessCallback = onSuccess;
+      return {
+        login: mockLogin,
+        loading: false,
+        data: null,
+      };
+    });
+
+    renderHook(() =>
+      useGoogleAuth({
+        onSuccess: customOnSuccess,
+        prompt: "consent",
+      }),
+    );
+
+    if (!onSuccessCallback) {
+      throw new Error("Expected onSuccess callback to be registered");
+    }
+
+    const payload: GoogleAuthConfig = {
+      clientType: "web",
+      thirdPartyId: "google",
+      redirectURIInfo: {
+        redirectURIOnProviderDashboard: "",
+        redirectURIQueryParams: {
+          code: "test-auth-code",
+          scope: "email profile",
+          state: undefined,
+        },
+      },
+    };
+
+    await onSuccessCallback(payload);
+
+    expect(customOnSuccess).toHaveBeenCalledWith(payload);
+    expect(mockDispatchFn).toHaveBeenCalledWith(
+      expect.objectContaining({ type: "auth/resetAuth" }),
+    );
+    expect(mockDispatchFn).not.toHaveBeenCalledWith(
+      expect.objectContaining({ type: "auth/authSuccess" }),
+    );
+  });
+
   describe("onError callback", () => {
     it("dispatches auth error when login fails", () => {
       let onErrorCallback: ((error: unknown) => void) | undefined;

packages/web/src/auth/hooks/google/useGoogleAuth/useGoogleAuth.ts

@@ -37,7 +37,7 @@ const resetAuthState = (dispatch: AppDispatch) => {
 
 export function useGoogleAuth(
   options: {
-    onSuccess?: (data: GoogleAuthConfig) => Promise<void>;
+    onSuccess?: (data: GoogleAuthConfig) => Promise<boolean | void>;
     prompt?: "consent" | "none" | "select_account";
     shouldTryLinkingWithSessionUser?: boolean;
   } = {},
@@ -56,7 +56,11 @@ export function useGoogleAuth(
     },
     onSuccess: async (data) => {
       if (onSuccess) {
-        await onSuccess(data);
+        const shouldCompleteAuth = await onSuccess(data);
+        if (shouldCompleteAuth === false) {
+          resetAuthState(dispatch);
+          return;
+        }
         dispatch(authSuccess());
         return;
       }