From 2f52e0fdb638acc2b2c9618458762ba38581081f Mon Sep 17 00:00:00 2001 From: martmull Date: Mon, 27 May 2024 15:13:11 +0200 Subject: [PATCH] 5505 forgot password feature broken (#5602) - add missing `excludedOperations` in `packages/twenty-server/src/engine/middlewares/graphql-hydrate-request-from-token.middleware.ts` - update generated graphql file - Add missing redirection to index after password update --- .../twenty-front/src/generated/graphql.tsx | 20 +++++++++---------- .../queries/validatePasswordResetToken.ts | 2 +- .../src/pages/auth/PasswordReset.tsx | 1 + ...l-hydrate-request-from-token.middleware.ts | 3 +++ 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/packages/twenty-front/src/generated/graphql.tsx b/packages/twenty-front/src/generated/graphql.tsx index c096e728d..829b47714 100644 --- a/packages/twenty-front/src/generated/graphql.tsx +++ b/packages/twenty-front/src/generated/graphql.tsx @@ -157,6 +157,14 @@ export type DeleteOneObjectInput = { id: Scalars['UUID']; }; +/** Schema update on a table */ +export enum DistantTableUpdate { + ColumnsAdded = 'COLUMNS_ADDED', + ColumnsDeleted = 'COLUMNS_DELETED', + ColumnsTypeChanged = 'COLUMNS_TYPE_CHANGED', + TableDeleted = 'TABLE_DELETED' +} + export type EmailPasswordResetLink = { __typename?: 'EmailPasswordResetLink'; /** Boolean that confirms query was dispatched */ @@ -585,7 +593,7 @@ export type RemoteTable = { id?: Maybe; name: Scalars['String']; schema?: Maybe; - schemaPendingUpdates?: Maybe>; + schemaPendingUpdates?: Maybe>; status: RemoteTableStatus; }; @@ -625,14 +633,6 @@ export type Support = { supportFrontChatId?: Maybe; }; -/** Schema update on a table */ -export enum TableUpdate { - ColumnsAdded = 'COLUMNS_ADDED', - ColumnsDeleted = 'COLUMNS_DELETED', - ColumnsTypeChanged = 'COLUMNS_TYPE_CHANGED', - TableDeleted = 'TABLE_DELETED' -} - export type Telemetry = { __typename?: 'Telemetry'; anonymizationEnabled: Scalars['Boolean']; @@ -2095,7 +2095,7 @@ export type CheckUserExistsQueryHookResult = ReturnType; export type CheckUserExistsQueryResult = Apollo.QueryResult; export const ValidatePasswordResetTokenDocument = gql` - query validatePasswordResetToken($token: String!) { + query ValidatePasswordResetToken($token: String!) { validatePasswordResetToken(passwordResetToken: $token) { id email diff --git a/packages/twenty-front/src/modules/auth/graphql/queries/validatePasswordResetToken.ts b/packages/twenty-front/src/modules/auth/graphql/queries/validatePasswordResetToken.ts index b6631e4bf..112a9c5dc 100644 --- a/packages/twenty-front/src/modules/auth/graphql/queries/validatePasswordResetToken.ts +++ b/packages/twenty-front/src/modules/auth/graphql/queries/validatePasswordResetToken.ts @@ -1,7 +1,7 @@ import { gql } from '@apollo/client'; export const VALIDATE_PASSWORD_RESET_TOKEN = gql` - query validatePasswordResetToken($token: String!) { + query ValidatePasswordResetToken($token: String!) { validatePasswordResetToken(passwordResetToken: $token) { id email diff --git a/packages/twenty-front/src/pages/auth/PasswordReset.tsx b/packages/twenty-front/src/pages/auth/PasswordReset.tsx index 7b247fa2c..f40e98c3e 100644 --- a/packages/twenty-front/src/pages/auth/PasswordReset.tsx +++ b/packages/twenty-front/src/pages/auth/PasswordReset.tsx @@ -144,6 +144,7 @@ export const PasswordReset = () => { } await signInWithCredentials(email || '', formData.newPassword); + navigate(AppPath.Index); } catch (err) { logError(err); enqueueSnackBar( diff --git a/packages/twenty-server/src/engine/middlewares/graphql-hydrate-request-from-token.middleware.ts b/packages/twenty-server/src/engine/middlewares/graphql-hydrate-request-from-token.middleware.ts index 4b416ea79..b9d3d2cd5 100644 --- a/packages/twenty-server/src/engine/middlewares/graphql-hydrate-request-from-token.middleware.ts +++ b/packages/twenty-server/src/engine/middlewares/graphql-hydrate-request-from-token.middleware.ts @@ -31,6 +31,9 @@ export class GraphQLHydrateRequestFromTokenMiddleware 'Verify', 'SignUp', 'RenewToken', + 'EmailPasswordResetLink', + 'ValidatePasswordResetToken', + 'UpdatePasswordViaResetToken', 'IntrospectionQuery', 'ExchangeAuthorizationCode', ];