More fixes

twentyhq · Feb 2, 2025 · 36a94f1 · 36a94f1
1 parent afc284c
commit 36a94f1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 23 deletions.
diff --git a/packages/twenty-front/src/generated/graphql.tsx b/packages/twenty-front/src/generated/graphql.tsx
@@ -958,7 +958,6 @@ export type MutationUpdateOneServerlessFunctionArgs = {
 
 
 export type MutationUpdatePasswordViaResetTokenArgs = {
-  locale: Scalars['String'];
   newPassword: Scalars['String'];
   passwordResetToken: Scalars['String'];
 };
@@ -2059,7 +2058,6 @@ export type SignUpMutation = { __typename?: 'Mutation', signUp: { __typename?: '
 export type UpdatePasswordViaResetTokenMutationVariables = Exact<{
   token: Scalars['String'];
   newPassword: Scalars['String'];
-  locale: Scalars['String'];
 }>;
 
 
@@ -3217,7 +3215,6 @@ export const UpdatePasswordViaResetTokenDocument = gql`
   updatePasswordViaResetToken(
     passwordResetToken: $token
     newPassword: $newPassword
-    locale: $locale
   ) {
     success
   }
@@ -3240,7 +3237,6 @@ export type UpdatePasswordViaResetTokenMutationFn = Apollo.MutationFunction<Upda
  *   variables: {
  *      token: // value for 'token'
  *      newPassword: // value for 'newPassword'
- *      locale: // value for 'locale'
  *   },
  * });
  */

diff --git a/packages/twenty-front/src/modules/auth/graphql/mutations/updatePasswordViaResetToken.ts b/packages/twenty-front/src/modules/auth/graphql/mutations/updatePasswordViaResetToken.ts
@@ -1,15 +1,10 @@
 import { gql } from '@apollo/client';
 
 export const UPDATE_PASSWORD_VIA_RESET_TOKEN = gql`
-  mutation UpdatePasswordViaResetToken(
-    $token: String!
-    $newPassword: String!
-    $locale: String!
-  ) {
+  mutation UpdatePasswordViaResetToken($token: String!, $newPassword: String!) {
     updatePasswordViaResetToken(
       passwordResetToken: $token
       newPassword: $newPassword
-      locale: $locale
     ) {
       success
     }

diff --git a/packages/twenty-front/src/pages/auth/PasswordReset.tsx b/packages/twenty-front/src/pages/auth/PasswordReset.tsx
@@ -72,7 +72,7 @@ const StyledInputContainer = styled.div`
 `;
 
 export const PasswordReset = () => {
-  const { t, i18n } = useLingui();
+  const { t } = useLingui();
   const { enqueueSnackBar } = useSnackBar();
 
   const workspacePublicData = useRecoilValue(workspacePublicDataState);
@@ -132,7 +132,6 @@ export const PasswordReset = () => {
         variables: {
           token: formData.passwordResetToken,
           newPassword: formData.newPassword,
-          locale: i18n.locale,
         },
       });
 

diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts
@@ -354,18 +354,19 @@ export class AuthResolver {
   @Mutation(() => InvalidatePassword)
   async updatePasswordViaResetToken(
     @Args()
-    {
-      passwordResetToken,
-      newPassword,
-      locale,
-    }: UpdatePasswordViaResetTokenInput,
+    { passwordResetToken, newPassword }: UpdatePasswordViaResetTokenInput,
+    @Context() context: I18nContext,
   ): Promise<InvalidatePassword> {
     const { id } =
       await this.resetPasswordService.validatePasswordResetToken(
         passwordResetToken,
       );
 
-    await this.authService.updatePassword(id, newPassword, locale);
+    await this.authService.updatePassword(
+      id,
+      newPassword,
+      context.req.headers['x-locale'] || 'en',
+    );
 
     return await this.resetPasswordService.invalidatePasswordResetToken(id);
   }

diff --git a/...s/twenty-server/src/engine/core-modules/auth/dto/update-password-via-reset-token.input.ts b/...s/twenty-server/src/engine/core-modules/auth/dto/update-password-via-reset-token.input.ts
@@ -13,9 +13,4 @@ export class UpdatePasswordViaResetTokenInput {
   @IsNotEmpty()
   @IsString()
   newPassword: string;
-
-  @Field(() => String)
-  @IsNotEmpty()
-  @IsString()
-  locale: string;
 }