Reset Password Fix (#353)

* feat(errors): added email error to common error list * fix(server): return reset password mutation * fix(internal error): implemented abstract class for password reset mutation response
c2c-project · Dec 8, 2022 · be38ee7 · be38ee7
1 parent 4058c53
commit be38ee7
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 67 deletions.
diff --git a/app/client/schema.graphql b/app/client/schema.graphql
@@ -479,7 +479,7 @@ type Mutation {
   prevQuestion(eventId: ID!): Event!
   register(input: RegistrationForm!): UserMutationResponse!
   removeQuestionFromQueue(input: RemoveQuestionFromQueue!): EventQuestionMutationResponse!
-  resetPassword(input: ResetPasswordForm!): MutationResponse!
+  resetPassword(input: ResetPasswordForm!): ResetPasswordMutationResponse!
 
   """
   send a reset password request if the account exists
@@ -597,6 +597,11 @@ input ResetPasswordForm {
   token: String!
 }
 
+type ResetPasswordMutationResponse implements MutationResponse {
+  isError: Boolean!
+  message: String!
+}
+
 input ResetPasswordRequestForm {
   email: String!
 }

diff --git a/app/client/src/__generated__/PasswordResetFormMutation.graphql.ts b/app/client/src/__generated__/PasswordResetFormMutation.graphql.ts
diff --git a/app/client/src/graphql-types.ts b/app/client/src/graphql-types.ts
diff --git a/app/server/src/features/accounts/resolvers.ts b/app/server/src/features/accounts/resolvers.ts
@@ -87,9 +87,7 @@ export const resolvers: Resolvers = {
         },
         async resetPassword(parent, args, ctx, info) {
             return runMutation(async () => {
-                // No need to return anything, a no error response is fine
-                // since the user will simply be redirected to login after resetting
-                await User.resetPassword(ctx.prisma, args.input);
+                return User.resetPassword(ctx.prisma, args.input);
             });
         },
         async deleteAccount(parent, args, ctx, info) {

diff --git a/app/server/src/features/accounts/schema.graphql b/app/server/src/features/accounts/schema.graphql
@@ -100,6 +100,11 @@ type ResetPasswordRequestMutationResponse implements MutationResponse {
     body: Boolean
 }
 
+type ResetPasswordMutationResponse implements MutationResponse {
+    isError: Boolean!
+    message: String!
+}
+
 type ValidatePasswordResetTokenQueryResponse {
     valid: Boolean!
     message: String!
@@ -123,7 +128,7 @@ type Mutation {
     returns false if an account with the provided email cannot be found
     """
     resetPasswordRequest(input: ResetPasswordRequestForm!): ResetPasswordRequestMutationResponse!
-    resetPassword(input: ResetPasswordForm!): MutationResponse!
+    resetPassword(input: ResetPasswordForm!): ResetPasswordMutationResponse!
     deleteAccount(input: DeleteAccountForm!): UserMutationResponse!
     """
     The logout just returns the timestamp of the logout action

diff --git a/app/server/src/features/utils.ts b/app/server/src/features/utils.ts
@@ -36,7 +36,7 @@ export const errors = {
     fileNotFound: 'File not found',
     fileSize: 'File too large',
     email: 'Emailed failed to send due to an unexpected error',
-    jwt: 'Invalid Token'
+    jwt: 'Invalid Token',
 };
 interface TFilterFieldArgs<TObj extends Record<string, unknown>, TKeys extends keyof TObj> {
     input: TObj;

diff --git a/app/server/src/graphql-types.ts b/app/server/src/graphql-types.ts