refactor(auth): add workspaces selection (#12098)

packages/twenty-front/src/modules/auth/graphql/fragments/authFragments.ts

@@ -17,3 +17,36 @@ export const AUTH_TOKENS = gql`
     }
   }
 `;
+
+export const AVAILABLE_WORKSPACE_FOR_AUTH_FRAGMENT = gql`
+  fragment AvailableWorkspaceFragment on AvailableWorkspace {
+    id
+    displayName
+    loginToken
+    inviteHash
+    personalInviteToken
+    workspaceUrls {
+      subdomainUrl
+      customUrl
+    }
+    logo
+    sso {
+      type
+      id
+      issuer
+      name
+      status
+    }
+  }
+`;
+
+export const AVAILABLE_WORKSPACES_FOR_AUTH_FRAGMENT = gql`
+  fragment AvailableWorkspacesFragment on AvailableWorkspaces {
+    availableWorkspacesForSignIn {
+      ...AvailableWorkspaceFragment
+    }
+    availableWorkspacesForSignUp {
+      ...AvailableWorkspaceFragment
+    }
+  }
+`;

packages/twenty-front/src/modules/auth/graphql/mutations/getLoginTokenFromEmailVerificationToken.ts

@@ -17,8 +17,7 @@ export const GET_LOGIN_TOKEN_FROM_EMAIL_VERIFICATION_TOKEN = gql`
         ...AuthTokenFragment
       }
       workspaceUrls {
-        subdomainUrl
-        customUrl
+        ...WorkspaceUrlsFragment
       }
     }
   }

packages/twenty-front/src/modules/auth/graphql/mutations/impersonate.ts

@@ -6,8 +6,7 @@ export const IMPERSONATE = gql`
     impersonate(userId: $userId, workspaceId: $workspaceId) {
       workspace {
         workspaceUrls {
-          subdomainUrl
-          customUrl
+          ...WorkspaceUrlsFragment
         }
         id
       }

packages/twenty-front/src/modules/auth/graphql/mutations/signIn.ts

@@ -0,0 +1,14 @@
+import { gql } from '@apollo/client';
+
+export const SIGN_IN = gql`
+  mutation SignIn($email: String!, $password: String!, $captchaToken: String) {
+    signIn(email: $email, password: $password, captchaToken: $captchaToken) {
+      availableWorkspaces {
+        ...AvailableWorkspacesFragment
+      }
+      tokens {
+        ...AuthTokensFragment
+      }
+    }
+  }
+`;

packages/twenty-front/src/modules/auth/graphql/mutations/signUp.ts

@@ -1,35 +1,13 @@
 import { gql } from '@apollo/client';
 
 export const SIGN_UP = gql`
-  mutation SignUp(
-    $email: String!
-    $password: String!
-    $workspaceInviteHash: String
-    $workspacePersonalInviteToken: String = null
-    $captchaToken: String
-    $workspaceId: String
-    $locale: String
-    $verifyEmailNextPath: String
-  ) {
-    signUp(
-      email: $email
-      password: $password
-      workspaceInviteHash: $workspaceInviteHash
-      workspacePersonalInviteToken: $workspacePersonalInviteToken
-      captchaToken: $captchaToken
-      workspaceId: $workspaceId
-      locale: $locale
-      verifyEmailNextPath: $verifyEmailNextPath
-    ) {
-      loginToken {
-        ...AuthTokenFragment
+  mutation SignUp($email: String!, $password: String!, $captchaToken: String) {
+    signUp(email: $email, password: $password, captchaToken: $captchaToken) {
+      availableWorkspaces {
+        ...AvailableWorkspacesFragment
       }
-      workspace {
-        id
-        workspaceUrls {
-          subdomainUrl
-          customUrl
-        }
+      tokens {
+        ...AuthTokensFragment
       }
     }
   }

packages/twenty-front/src/modules/auth/graphql/mutations/signUpInNewWorkspace.ts

@@ -9,8 +9,7 @@ export const SIGN_UP_IN_NEW_WORKSPACE = gql`
       workspace {
         id
         workspaceUrls {
-          subdomainUrl
-          customUrl
+          ...WorkspaceUrlsFragment
         }
       }
     }

packages/twenty-front/src/modules/auth/graphql/mutations/signUpInWorkspace.ts

@@ -0,0 +1,36 @@
+import { gql } from '@apollo/client';
+
+export const SIGN_UP_IN_WORKSPACE = gql`
+  mutation SignUpInWorkspace(
+    $email: String!
+    $password: String!
+    $workspaceInviteHash: String
+    $workspacePersonalInviteToken: String = null
+    $captchaToken: String
+    $workspaceId: String
+    $locale: String
+    $verifyEmailNextPath: String
+  ) {
+    signUpInWorkspace(
+      email: $email
+      password: $password
+      workspaceInviteHash: $workspaceInviteHash
+      workspacePersonalInviteToken: $workspacePersonalInviteToken
+      captchaToken: $captchaToken
+      workspaceId: $workspaceId
+      locale: $locale
+      verifyEmailNextPath: $verifyEmailNextPath
+    ) {
+      loginToken {
+        ...AuthTokenFragment
+      }
+      workspace {
+        id
+        workspaceUrls {
+          subdomainUrl
+          customUrl
+        }
+      }
+    }
+  }
+`;

packages/twenty-front/src/modules/auth/graphql/queries/checkUserExists.ts

@@ -3,30 +3,9 @@ import { gql } from '@apollo/client';
 export const CHECK_USER_EXISTS = gql`
   query CheckUserExists($email: String!, $captchaToken: String) {
     checkUserExists(email: $email, captchaToken: $captchaToken) {
-      __typename
-      ... on UserExists {
-        exists
-        availableWorkspaces {
-          id
-          displayName
-          workspaceUrls {
-            subdomainUrl
-            customUrl
-          }
-          logo
-          sso {
-            type
-            id
-            issuer
-            name
-            status
-          }
-        }
-        isEmailVerified
-      }
-      ... on UserNotExists {
-        exists
-      }
+      exists
+      availableWorkspacesCount
+      isEmailVerified
     }
   }
 `;

packages/twenty-front/src/modules/auth/graphql/queries/getPublicWorkspaceDataByDomain.ts

@@ -1,4 +1,5 @@
 import { gql } from '@apollo/client';
+import { WORKSPACE_URLS_FRAGMENT } from '@/users/graphql/fragments/workspaceUrlsFragment';
 
 export const GET_PUBLIC_WORKSPACE_DATA_BY_DOMAIN = gql`
   query GetPublicWorkspaceDataByDomain($origin: String!) {
@@ -7,8 +8,7 @@ export const GET_PUBLIC_WORKSPACE_DATA_BY_DOMAIN = gql`
       logo
       displayName
       workspaceUrls {
-        subdomainUrl
-        customUrl
+        ...WorkspaceUrlsFragment
       }
       authProviders {
         sso {
@@ -25,4 +25,5 @@ export const GET_PUBLIC_WORKSPACE_DATA_BY_DOMAIN = gql`
       }
     }
   }
+  ${WORKSPACE_URLS_FRAGMENT}
 `;