refactor(auth): simplify Google connection logic by removing session linking option

- Removed the `shouldTryLinkingWithSessionUser` option from the Google authentication hooks and related tests to streamline the connection process.
- Updated the `initSupertokens` middleware to automatically disable account linking for new accounts without email.
- Adjusted tests for `useConnectGoogle` to reflect the removal of session linking logic, ensuring accurate behavior during Google connection scenarios.

Author: tyler-dane

packages/backend/src/common/middleware/supertokens.middleware.ts

@@ -54,15 +54,8 @@ export const initSupertokens = () => {
     framework: "express",
     recipeList: [
       AccountLinking.init({
-        shouldDoAutomaticAccountLinking: async (newAccountInfo) => {
-          if (!newAccountInfo.email) {
-            return { shouldAutomaticallyLink: false };
-          }
-
-          return {
-            shouldAutomaticallyLink: true,
-            shouldRequireVerification: true,
-          };
+        shouldDoAutomaticAccountLinking: () => {
+          return Promise.resolve({ shouldAutomaticallyLink: false });
         },
       }),
       // see added endpoints

packages/web/src/auth/hooks/oauth/useConnectGoogle.test.ts

@@ -70,7 +70,6 @@ describe("useConnectGoogle", () => {
 
     expect(mockUseGoogleAuth).toHaveBeenCalledWith({
       prompt: "consent",
-      shouldTryLinkingWithSessionUser: true,
     });
     expect(result.current.commandAction.label).toBe(
       "Checking Google Calendar…",
@@ -99,7 +98,6 @@ describe("useConnectGoogle", () => {
 
     expect(mockUseGoogleAuth).toHaveBeenCalledWith({
       prompt: "consent",
-      shouldTryLinkingWithSessionUser: true,
     });
     expect(result.current.commandAction.label).toBe("Connect Google Calendar");
     expect(result.current.commandAction.isDisabled).toBe(false);
@@ -126,7 +124,6 @@ describe("useConnectGoogle", () => {
 
     expect(mockUseGoogleAuth).toHaveBeenCalledWith({
       prompt: "consent",
-      shouldTryLinkingWithSessionUser: true,
     });
     expect(result.current.commandAction.label).toBe(
       "Google Calendar Connected",
@@ -154,7 +151,6 @@ describe("useConnectGoogle", () => {
 
     expect(mockUseGoogleAuth).toHaveBeenCalledWith({
       prompt: "consent",
-      shouldTryLinkingWithSessionUser: true,
     });
     expect(result.current.commandAction.label).toBe(
       "Reconnect Google Calendar",
@@ -185,7 +181,6 @@ describe("useConnectGoogle", () => {
 
     expect(mockUseGoogleAuth).toHaveBeenCalledWith({
       prompt: "consent",
-      shouldTryLinkingWithSessionUser: true,
     });
     expect(result.current.commandAction.label).toBe("Syncing Google Calendar…");
     expect(result.current.commandAction.isDisabled).toBe(true);
@@ -211,7 +206,6 @@ describe("useConnectGoogle", () => {
 
     expect(mockUseGoogleAuth).toHaveBeenCalledWith({
       prompt: "consent",
-      shouldTryLinkingWithSessionUser: true,
     });
     expect(result.current.commandAction.label).toBe("Repair Google Calendar");
     expect(result.current.commandAction.isDisabled).toBe(false);
@@ -257,7 +251,6 @@ describe("useConnectGoogle", () => {
 
     expect(mockUseGoogleAuth).toHaveBeenCalledWith({
       prompt: "consent",
-      shouldTryLinkingWithSessionUser: true,
     });
     expect(result.current.commandAction.label).toBe("Connect Google Calendar");
     expect(result.current.commandAction.isDisabled).toBe(false);
@@ -282,7 +275,6 @@ describe("useConnectGoogle", () => {
 
     expect(mockUseGoogleAuth).toHaveBeenCalledWith({
       prompt: "consent",
-      shouldTryLinkingWithSessionUser: true,
     });
     expect(result.current.commandAction.label).toBe(
       "Reconnect Google Calendar",
@@ -309,7 +301,6 @@ describe("useConnectGoogle", () => {
 
     expect(mockUseGoogleAuth).toHaveBeenCalledWith({
       prompt: "consent",
-      shouldTryLinkingWithSessionUser: true,
     });
     expect(result.current.commandAction.label).toBe("Connect Google Calendar");
     expect(result.current.sidebarStatus.icon).toBe("CloudArrowUpIcon");

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

@@ -1,7 +1,6 @@
 import { useCallback } from "react";
 import { type GoogleConnectionState } from "@core/types/user.types";
 import { useGoogleAuth } from "@web/auth/hooks/oauth/useGoogleAuth";
-import { useSession } from "@web/auth/hooks/session/useSession";
 import { hasUserEverAuthenticated } from "@web/auth/state/auth.state.util";
 import { SyncApi } from "@web/common/apis/sync.api";
 import {
@@ -143,15 +142,13 @@ const getGoogleUiConfig = (
 
 export const useConnectGoogle = () => {
   const dispatch = useAppDispatch();
-  const { authenticated } = useSession();
   const connectionState = useAppSelector(
     selectGoogleConnectionState as (state: RootState) => GoogleConnectionState,
   );
   const userMetadataStatus = useAppSelector(
     selectUserMetadataStatus as (state: RootState) => UserMetadataStatus,
   );
   const { login } = useGoogleAuth({
-    shouldTryLinkingWithSessionUser: authenticated,
     prompt: "consent",
   });
 

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

@@ -36,13 +36,12 @@ const resetAuthState = (dispatch: AppDispatch) => {
 
 export function useGoogleAuth(
   options: {
-    shouldTryLinkingWithSessionUser?: boolean;
     prompt?: "consent" | "none" | "select_account";
   } = {},
 ) {
   const dispatch = useAppDispatch();
   const completeAuthentication = useCompleteAuthentication();
-  const { shouldTryLinkingWithSessionUser, prompt } = options;
+  const { prompt } = options;
 
   const googleLogin = useGoogleAuthWithOverlay({
     prompt,
@@ -55,7 +54,6 @@ export function useGoogleAuth(
       try {
         const authPayload: SignInUpInput = {
           ...data,
-          shouldTryLinkingWithSessionUser,
         };
         const authResult = await authenticate(authPayload);
         if (!authResult.success) {

packages/web/src/components/oauth/ouath.types.ts

@@ -3,7 +3,6 @@ import { type CodeResponse } from "@react-oauth/google";
 export interface SignInUpInput {
   thirdPartyId: string;
   clientType: "web";
-  shouldTryLinkingWithSessionUser?: boolean;
   redirectURIInfo: {
     redirectURIOnProviderDashboard: string;
     redirectURIQueryParams: Omit<