Merge branch 'master' into 2188-update-the-dropdownmenu-to-set-the-selected-item

Author: flacial

__tests__/pages/__snapshots__/forgotpassword.test.js.snap

@@ -182,13 +182,12 @@ exports[`ForgotPassword Page Should render invalid user/email form on error 1`]
           <p
             class="card-text"
           />
-          <a
+          <button
             class="btn btn-primary btn-lg btn-block mb-3"
-            href="/forgotpassword"
-            role="button"
+            data-testid="back"
           >
             Go Back
-          </a>
+          </button>
         </div>
       </div>
     </div>

__tests__/pages/forgotpassword.test.js

@@ -112,5 +112,11 @@ describe('ForgotPassword Page', () => {
 
     // wait for mutation updates after submitButton is clicked
     await waitFor(() => expect(container).toMatchSnapshot())
+
+    const backButton = getByTestId('back')
+
+    await waitFor(() => fireEvent.click(backButton))
+
+    await waitFor(() => getByRole('heading', { name: /reset your password/i }))
   })
 })

graphql/index.tsx

@@ -137,6 +137,7 @@ export type Mutation = {
   reqPwReset: SuccessResponse
   setStar: SuccessResponse
   signup?: Maybe<AuthResponse>
+  unlinkDiscord?: Maybe<User>
   updateChallenge?: Maybe<Array<Maybe<Lesson>>>
   updateExercise: Exercise
   updateLesson: Array<Lesson>
@@ -1059,6 +1060,13 @@ export type SignupMutation = {
   } | null
 }
 
+export type UnlinkDiscordMutationVariables = Exact<{ [key: string]: never }>
+
+export type UnlinkDiscordMutation = {
+  __typename?: 'Mutation'
+  unlinkDiscord?: { __typename?: 'User'; id: number } | null
+}
+
 export type UpdateChallengeMutationVariables = Exact<{
   lessonId: Scalars['Int']
   order: Scalars['Int']
@@ -1654,6 +1662,11 @@ export type MutationResolvers<
       'email' | 'firstName' | 'lastName' | 'password' | 'username'
     >
   >
+  unlinkDiscord?: Resolver<
+    Maybe<ResolversTypes['User']>,
+    ParentType,
+    ContextType
+  >
   updateChallenge?: Resolver<
     Maybe<Array<Maybe<ResolversTypes['Lesson']>>>,
     ParentType,
@@ -4588,6 +4601,86 @@ export type SignupMutationOptions = Apollo.BaseMutationOptions<
   SignupMutation,
   SignupMutationVariables
 >
+export const UnlinkDiscordDocument = gql`
+  mutation unlinkDiscord {
+    unlinkDiscord {
+      id
+    }
+  }
+`
+export type UnlinkDiscordMutationFn = Apollo.MutationFunction<
+  UnlinkDiscordMutation,
+  UnlinkDiscordMutationVariables
+>
+export type UnlinkDiscordProps<
+  TChildProps = {},
+  TDataName extends string = 'mutate'
+> = {
+  [key in TDataName]: Apollo.MutationFunction<
+    UnlinkDiscordMutation,
+    UnlinkDiscordMutationVariables
+  >
+} & TChildProps
+export function withUnlinkDiscord<
+  TProps,
+  TChildProps = {},
+  TDataName extends string = 'mutate'
+>(
+  operationOptions?: ApolloReactHoc.OperationOption<
+    TProps,
+    UnlinkDiscordMutation,
+    UnlinkDiscordMutationVariables,
+    UnlinkDiscordProps<TChildProps, TDataName>
+  >
+) {
+  return ApolloReactHoc.withMutation<
+    TProps,
+    UnlinkDiscordMutation,
+    UnlinkDiscordMutationVariables,
+    UnlinkDiscordProps<TChildProps, TDataName>
+  >(UnlinkDiscordDocument, {
+    alias: 'unlinkDiscord',
+    ...operationOptions
+  })
+}
+
+/**
+ * __useUnlinkDiscordMutation__
+ *
+ * To run a mutation, you first call `useUnlinkDiscordMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useUnlinkDiscordMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [unlinkDiscordMutation, { data, loading, error }] = useUnlinkDiscordMutation({
+ *   variables: {
+ *   },
+ * });
+ */
+export function useUnlinkDiscordMutation(
+  baseOptions?: Apollo.MutationHookOptions<
+    UnlinkDiscordMutation,
+    UnlinkDiscordMutationVariables
+  >
+) {
+  const options = { ...defaultOptions, ...baseOptions }
+  return Apollo.useMutation<
+    UnlinkDiscordMutation,
+    UnlinkDiscordMutationVariables
+  >(UnlinkDiscordDocument, options)
+}
+export type UnlinkDiscordMutationHookResult = ReturnType<
+  typeof useUnlinkDiscordMutation
+>
+export type UnlinkDiscordMutationResult =
+  Apollo.MutationResult<UnlinkDiscordMutation>
+export type UnlinkDiscordMutationOptions = Apollo.BaseMutationOptions<
+  UnlinkDiscordMutation,
+  UnlinkDiscordMutationVariables
+>
 export const UpdateChallengeDocument = gql`
   mutation updateChallenge(
     $lessonId: Int!
@@ -5281,6 +5374,7 @@ export type MutationKeySpecifier = (
   | 'reqPwReset'
   | 'setStar'
   | 'signup'
+  | 'unlinkDiscord'
   | 'updateChallenge'
   | 'updateExercise'
   | 'updateLesson'
@@ -5310,6 +5404,7 @@ export type MutationFieldPolicy = {
   reqPwReset?: FieldPolicy<any> | FieldReadFunction<any>
   setStar?: FieldPolicy<any> | FieldReadFunction<any>
   signup?: FieldPolicy<any> | FieldReadFunction<any>
+  unlinkDiscord?: FieldPolicy<any> | FieldReadFunction<any>
   updateChallenge?: FieldPolicy<any> | FieldReadFunction<any>
   updateExercise?: FieldPolicy<any> | FieldReadFunction<any>
   updateLesson?: FieldPolicy<any> | FieldReadFunction<any>

graphql/queries/unlinkDiscord.ts

@@ -0,0 +1,9 @@
+import { gql } from '@apollo/client'
+
+export const UNLINK_DISCORD = gql`
+  mutation unlinkDiscord {
+    unlinkDiscord {
+      id
+    }
+  }
+`

graphql/resolvers.ts

@@ -23,6 +23,7 @@ import { changeAdminRights } from './resolvers/adminController'
 import { createLesson, updateLesson } from './resolvers/lessonsController'
 import { getPreviousSubmissions } from './resolvers/getPreviousSubmissions'
 import { deleteComment } from './resolvers/deleteComment'
+import { unlinkDiscord } from './resolvers/unlinkDiscord'
 import {
   addModule,
   modules,
@@ -78,6 +79,7 @@ export default {
     addComment,
     deleteComment,
     flagExercise,
-    removeExerciseFlag
+    removeExerciseFlag,
+    unlinkDiscord
   }
 }

graphql/resolvers/unlinkDiscord.test.js

@@ -0,0 +1,26 @@
+import prismaMock from '../../__tests__/utils/prismaMock'
+import { unlinkDiscord } from './unlinkDiscord'
+
+const mockUser = {
+  username: 'noob',
+  id: 1
+}
+
+const ctx = { req: { user: { id: 1 } } }
+const ctxWithError = { req: { user: { id: null } } }
+
+describe('unlinkDiscord resolver', () => {
+  it('should unlink discord successfully', async () => {
+    prismaMock.user.update.mockResolvedValue(mockUser)
+
+    expect(unlinkDiscord(null, null, ctx)).resolves.toStrictEqual(mockUser)
+  })
+
+  it('should throw error', async () => {
+    prismaMock.user.update.mockResolvedValue(mockUser)
+
+    expect(unlinkDiscord(null, null, ctxWithError)).rejects.toThrow(
+      'Invalid user'
+    )
+  })
+})

graphql/resolvers/unlinkDiscord.ts

@@ -0,0 +1,20 @@
+import prisma from '../../prisma'
+import { Context } from '../../@types/helpers'
+
+export const unlinkDiscord = async (_parent: void, _: any, ctx: Context) => {
+  const userId = ctx.req.user?.id
+
+  if (!userId) throw new Error('Invalid user')
+
+  return await prisma.user.update({
+    where: {
+      id: userId
+    },
+    data: {
+      discordAccessToken: '',
+      discordAccessTokenExpires: null,
+      discordId: '',
+      discordRefreshToken: ''
+    }
+  })
+}

graphql/typeDefs.ts

@@ -122,6 +122,7 @@ export default gql`
       title: String!
       id: Int!
     ): [Lesson]
+    unlinkDiscord: User
   }
 
   type AuthResponse {

pages/forgotpassword.tsx

@@ -1,5 +1,5 @@
-import { useMutation } from '@apollo/client'
-import React from 'react'
+import { ApolloError, useMutation } from '@apollo/client'
+import React, { useState } from 'react'
 import { Formik, Form, Field } from 'formik'
 import RESET_PASSWORD from '../graphql/queries/resetPassword'
 import { resetPasswordValidation } from '../helpers/formValidation'
@@ -12,7 +12,10 @@ const initialValues = {
 }
 
 export const ResetPassword: React.FC = () => {
-  const [reqPwReset, { data, error }] = useMutation(RESET_PASSWORD)
+  const [error, setError] = useState<null | ApolloError>(null)
+  const [reqPwReset, { data }] = useMutation(RESET_PASSWORD, {
+    onError: setError
+  })
   const handleSubmit = async ({ userOrEmail }: { userOrEmail: string }) => {
     try {
       await reqPwReset({ variables: { userOrEmail } })
@@ -27,17 +30,16 @@ export const ResetPassword: React.FC = () => {
       </Card>
     )
   }
-  // Can't use NavLink since page needs to reload.
   if (error) {
     return (
       <Card title="Username or Email does not exist">
-        <a
-          href="/forgotpassword"
+        <button
           className="btn btn-primary btn-lg btn-block mb-3"
-          role="button"
+          onClick={() => setError(null)}
+          data-testid="back"
         >
           Go Back
-        </a>
+        </button>
       </Card>
     )
   }