Correct tests after changing login and logout from queries to mutations.

backend/src/graphql/resolver/AdminResolver.test.ts

@@ -13,6 +13,7 @@ import { peterLustig } from '@/seeds/users/peter-lustig'
 import { stephenHawking } from '@/seeds/users/stephen-hawking'
 import { garrickOllivander } from '@/seeds/users/garrick-ollivander'
 import {
+  login,
   setUserRole,
   deleteUser,
   unDeleteUser,
@@ -27,7 +28,6 @@ import {
 } from '@/seeds/graphql/mutations'
 import {
   listUnconfirmedContributions,
-  login,
   searchUsers,
   listTransactionLinksAdmin,
   listContributionLinks,
@@ -96,8 +96,8 @@ describe('AdminResolver', () => {
       describe('without admin rights', () => {
         beforeAll(async () => {
           user = await userFactory(testEnv, bibiBloxberg)
-          await query({
-            query: login,
+          await mutate({
+            mutation: login,
             variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
           })
         })
@@ -121,8 +121,8 @@ describe('AdminResolver', () => {
       describe('with admin rights', () => {
         beforeAll(async () => {
           admin = await userFactory(testEnv, peterLustig)
-          await query({
-            query: login,
+          await mutate({
+            mutation: login,
             variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
           })
         })
@@ -249,8 +249,8 @@ describe('AdminResolver', () => {
       describe('without admin rights', () => {
         beforeAll(async () => {
           user = await userFactory(testEnv, bibiBloxberg)
-          await query({
-            query: login,
+          await mutate({
+            mutation: login,
             variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
           })
         })
@@ -274,8 +274,8 @@ describe('AdminResolver', () => {
       describe('with admin rights', () => {
         beforeAll(async () => {
           admin = await userFactory(testEnv, peterLustig)
-          await query({
-            query: login,
+          await mutate({
+            mutation: login,
             variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
           })
         })
@@ -357,8 +357,8 @@ describe('AdminResolver', () => {
       describe('without admin rights', () => {
         beforeAll(async () => {
           user = await userFactory(testEnv, bibiBloxberg)
-          await query({
-            query: login,
+          await mutate({
+            mutation: login,
             variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
           })
         })
@@ -382,8 +382,8 @@ describe('AdminResolver', () => {
       describe('with admin rights', () => {
         beforeAll(async () => {
           admin = await userFactory(testEnv, peterLustig)
-          await query({
-            query: login,
+          await mutate({
+            mutation: login,
             variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
           })
         })
@@ -469,8 +469,8 @@ describe('AdminResolver', () => {
       describe('without admin rights', () => {
         beforeAll(async () => {
           user = await userFactory(testEnv, bibiBloxberg)
-          await query({
-            query: login,
+          await mutate({
+            mutation: login,
             variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
           })
         })
@@ -514,8 +514,8 @@ describe('AdminResolver', () => {
 
         beforeAll(async () => {
           admin = await userFactory(testEnv, peterLustig)
-          await query({
-            query: login,
+          await mutate({
+            mutation: login,
             variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
           })
 
@@ -766,8 +766,8 @@ describe('AdminResolver', () => {
       describe('without admin rights', () => {
         beforeAll(async () => {
           user = await userFactory(testEnv, bibiBloxberg)
-          await query({
-            query: login,
+          await mutate({
+            mutation: login,
             variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
           })
         })
@@ -875,8 +875,8 @@ describe('AdminResolver', () => {
       describe('with admin rights', () => {
         beforeAll(async () => {
           admin = await userFactory(testEnv, peterLustig)
-          await query({
-            query: login,
+          await mutate({
+            mutation: login,
             variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
           })
         })
@@ -1553,8 +1553,8 @@ describe('AdminResolver', () => {
       describe('without admin rights', () => {
         beforeAll(async () => {
           user = await userFactory(testEnv, bibiBloxberg)
-          await query({
-            query: login,
+          await mutate({
+            mutation: login,
             variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
           })
         })
@@ -1599,8 +1599,8 @@ describe('AdminResolver', () => {
           }
 
           // admin: only now log in
-          await query({
-            query: login,
+          await mutate({
+            mutation: login,
             variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
           })
         })
@@ -1859,8 +1859,8 @@ describe('AdminResolver', () => {
       describe('without admin rights', () => {
         beforeAll(async () => {
           user = await userFactory(testEnv, bibiBloxberg)
-          await query({
-            query: login,
+          await mutate({
+            mutation: login,
             variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
           })
         })
@@ -1933,8 +1933,8 @@ describe('AdminResolver', () => {
       describe('with admin rights', () => {
         beforeAll(async () => {
           user = await userFactory(testEnv, peterLustig)
-          await query({
-            query: login,
+          await mutate({
+            mutation: login,
             variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
           })
         })

backend/src/graphql/resolver/ContributionMessageResolver.test.ts

@@ -7,8 +7,9 @@ import {
   adminCreateContributionMessage,
   createContribution,
   createContributionMessage,
+  login,
 } from '@/seeds/graphql/mutations'
-import { listContributionMessages, login } from '@/seeds/graphql/queries'
+import { listContributionMessages } from '@/seeds/graphql/queries'
 import { userFactory } from '@/seeds/factory/user'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { peterLustig } from '@/seeds/users/peter-lustig'
@@ -59,8 +60,8 @@ describe('ContributionMessageResolver', () => {
       beforeAll(async () => {
         await userFactory(testEnv, bibiBloxberg)
         await userFactory(testEnv, peterLustig)
-        await query({
-          query: login,
+        await mutate({
+          mutation: login,
           variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
         })
         result = await mutate({
@@ -71,8 +72,8 @@ describe('ContributionMessageResolver', () => {
             creationDate: new Date().toString(),
           },
         })
-        await query({
-          query: login,
+        await mutate({
+          mutation: login,
           variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
         })
       })
@@ -103,8 +104,8 @@ describe('ContributionMessageResolver', () => {
         })
 
         it('throws error when contribution.userId equals user.id', async () => {
-          await query({
-            query: login,
+          await mutate({
+            mutation: login,
             variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
           })
           const result2 = await mutate({
@@ -195,8 +196,8 @@ describe('ContributionMessageResolver', () => {
 
     describe('authenticated', () => {
       beforeAll(async () => {
-        await query({
-          query: login,
+        await mutate({
+          mutation: login,
           variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
         })
       })
@@ -227,8 +228,8 @@ describe('ContributionMessageResolver', () => {
         })
 
         it('throws error when other user tries to send createContributionMessage', async () => {
-          await query({
-            query: login,
+          await mutate({
+            mutation: login,
             variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
           })
           await expect(
@@ -253,8 +254,8 @@ describe('ContributionMessageResolver', () => {
 
       describe('valid input', () => {
         beforeAll(async () => {
-          await query({
-            query: login,
+          await mutate({
+            mutation: login,
             variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
           })
         })
@@ -304,8 +305,8 @@ describe('ContributionMessageResolver', () => {
 
     describe('authenticated', () => {
       beforeAll(async () => {
-        await query({
-          query: login,
+        await mutate({
+          mutation: login,
           variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
         })
       })

backend/src/graphql/resolver/ContributionResolver.test.ts

@@ -8,8 +8,9 @@ import {
   createContribution,
   deleteContribution,
   updateContribution,
+  login,
 } from '@/seeds/graphql/mutations'
-import { listAllContributions, listContributions, login } from '@/seeds/graphql/queries'
+import { listAllContributions, listContributions } from '@/seeds/graphql/queries'
 import { cleanDB, resetToken, testEnvironment } from '@test/helpers'
 import { GraphQLError } from 'graphql'
 import { userFactory } from '@/seeds/factory/user'
@@ -54,8 +55,8 @@ describe('ContributionResolver', () => {
     describe('authenticated with valid user', () => {
       beforeAll(async () => {
         await userFactory(testEnv, bibiBloxberg)
-        await query({
-          query: login,
+        await mutate({
+          mutation: login,
           variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
         })
       })
@@ -197,8 +198,8 @@ describe('ContributionResolver', () => {
         const bibisCreation = creations.find((creation) => creation.email === 'bibi@bloxberg.de')
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         await creationFactory(testEnv, bibisCreation!)
-        await query({
-          query: login,
+        await mutate({
+          mutation: login,
           variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
         })
         await mutate({
@@ -310,8 +311,8 @@ describe('ContributionResolver', () => {
       beforeAll(async () => {
         await userFactory(testEnv, peterLustig)
         await userFactory(testEnv, bibiBloxberg)
-        await query({
-          query: login,
+        await mutate({
+          mutation: login,
           variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
         })
         result = await mutate({
@@ -393,8 +394,8 @@ describe('ContributionResolver', () => {
 
       describe('wrong user tries to update the contribution', () => {
         beforeAll(async () => {
-          await query({
-            query: login,
+          await mutate({
+            mutation: login,
             variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
           })
         })
@@ -445,8 +446,8 @@ describe('ContributionResolver', () => {
 
       describe('update too much so that the limit is exceeded', () => {
         beforeAll(async () => {
-          await query({
-            query: login,
+          await mutate({
+            mutation: login,
             variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
           })
         })
@@ -553,8 +554,8 @@ describe('ContributionResolver', () => {
         const bibisCreation = creations.find((creation) => creation.email === 'bibi@bloxberg.de')
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         await creationFactory(testEnv, bibisCreation!)
-        await query({
-          query: login,
+        await mutate({
+          mutation: login,
           variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
         })
         await mutate({
@@ -630,8 +631,8 @@ describe('ContributionResolver', () => {
       beforeAll(async () => {
         await userFactory(testEnv, bibiBloxberg)
         await userFactory(testEnv, peterLustig)
-        await query({
-          query: login,
+        await mutate({
+          mutation: login,
           variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
         })
         result = await mutate({
@@ -668,8 +669,8 @@ describe('ContributionResolver', () => {
 
       describe('other user sends a deleteContribtuion', () => {
         it('returns an error', async () => {
-          await query({
-            query: login,
+          await mutate({
+            mutation: login,
             variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
           })
           await expect(
@@ -702,8 +703,8 @@ describe('ContributionResolver', () => {
 
       describe('User deletes already confirmed contribution', () => {
         it('throws an error', async () => {
-          await query({
-            query: login,
+          await mutate({
+            mutation: login,
             variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
           })
           await mutate({
@@ -712,8 +713,8 @@ describe('ContributionResolver', () => {
               id: result.data.createContribution.id,
             },
           })
-          await query({
-            query: login,
+          await mutate({
+            mutation: login,
             variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
           })
           await expect(

backend/src/graphql/resolver/UserResolver.test.ts

@@ -4,8 +4,15 @@
 import { testEnvironment, headerPushMock, resetToken, cleanDB, resetEntity } from '@test/helpers'
 import { userFactory } from '@/seeds/factory/user'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
-import { createUser, setPassword, forgotPassword, updateUserInfos } from '@/seeds/graphql/mutations'
-import { login, logout, verifyLogin, queryOptIn, searchAdminUsers } from '@/seeds/graphql/queries'
+import {
+  login,
+  logout,
+  createUser,
+  setPassword,
+  forgotPassword,
+  updateUserInfos,
+} from '@/seeds/graphql/mutations'
+import { verifyLogin, queryOptIn, searchAdminUsers } from '@/seeds/graphql/queries'
 import { GraphQLError } from 'graphql'
 import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
 import { User } from '@entity/User'
@@ -459,7 +466,7 @@ bei Gradidio sei dabei!`,
 
     describe('no users in database', () => {
       beforeAll(async () => {
-        result = await query({ query: login, variables })
+        result = await mutate({ mutation: login, variables })
       })
 
       it('throws an error', () => {
@@ -478,7 +485,7 @@ bei Gradidio sei dabei!`,
     describe('user is in database and correct login data', () => {
       beforeAll(async () => {
         await userFactory(testEnv, bibiBloxberg)
-        result = await query({ query: login, variables })
+        result = await mutate({ mutation: login, variables })
       })
 
       afterAll(async () => {
@@ -515,7 +522,7 @@ bei Gradidio sei dabei!`,
     describe('user is in database and wrong password', () => {
       beforeAll(async () => {
         await userFactory(testEnv, bibiBloxberg)
-        result = await query({ query: login, variables: { ...variables, password: 'wrong' } })
+        result = await mutate({ mutation: login, variables: { ...variables, password: 'wrong' } })
       })
 
       afterAll(async () => {
@@ -540,7 +547,7 @@ bei Gradidio sei dabei!`,
     describe('unauthenticated', () => {
       it('throws an error', async () => {
         resetToken()
-        await expect(query({ query: logout })).resolves.toEqual(
+        await expect(mutate({ mutation: logout })).resolves.toEqual(
           expect.objectContaining({
             errors: [new GraphQLError('401 Unauthorized')],
           }),
@@ -556,7 +563,7 @@ bei Gradidio sei dabei!`,
 
       beforeAll(async () => {
         await userFactory(testEnv, bibiBloxberg)
-        await query({ query: login, variables })
+        await mutate({ mutation: login, variables })
       })
 
       afterAll(async () => {
@@ -564,7 +571,7 @@ bei Gradidio sei dabei!`,
       })
 
       it('returns true', async () => {
-        await expect(query({ query: logout })).resolves.toEqual(
+        await expect(mutate({ mutation: logout })).resolves.toEqual(
           expect.objectContaining({
             data: { logout: 'true' },
             errors: undefined,
@@ -613,7 +620,7 @@ bei Gradidio sei dabei!`,
         }
 
         beforeAll(async () => {
-          await query({ query: login, variables })
+          await mutate({ mutation: login, variables })
           user = await User.find()
         })
 
@@ -781,8 +788,8 @@ bei Gradidio sei dabei!`,
     describe('authenticated', () => {
       beforeAll(async () => {
         await userFactory(testEnv, bibiBloxberg)
-        await query({
-          query: login,
+        await mutate({
+          mutation: login,
           variables: {
             email: 'bibi@bloxberg.de',
             password: 'Aa12345_',
@@ -913,8 +920,8 @@ bei Gradidio sei dabei!`,
 
           it('can login with new password', async () => {
             await expect(
-              query({
-                query: login,
+              mutate({
+                mutation: login,
                 variables: {
                   email: 'bibi@bloxberg.de',
                   password: 'Bb12345_',
@@ -933,8 +940,8 @@ bei Gradidio sei dabei!`,
 
           it('cannot login with old password', async () => {
             await expect(
-              query({
-                query: login,
+              mutate({
+                mutation: login,
                 variables: {
                   email: 'bibi@bloxberg.de',
                   password: 'Aa12345_',
@@ -971,8 +978,8 @@ bei Gradidio sei dabei!`,
       beforeAll(async () => {
         await userFactory(testEnv, bibiBloxberg)
         await userFactory(testEnv, peterLustig)
-        await query({
-          query: login,
+        await mutate({
+          mutation: login,
           variables: {
             email: 'bibi@bloxberg.de',
             password: 'Aa12345_',

backend/src/seeds/factory/contributionLink.ts

@@ -1,6 +1,5 @@
 import { ApolloServerTestClient } from 'apollo-server-testing'
-import { createContributionLink } from '@/seeds/graphql/mutations'
-import { login } from '@/seeds/graphql/queries'
+import { login, createContributionLink } from '@/seeds/graphql/mutations'
 import { ContributionLink } from '@model/ContributionLink'
 import { ContributionLinkInterface } from '@/seeds/contributionLink/ContributionLinkInterface'
 
@@ -8,10 +7,10 @@ export const contributionLinkFactory = async (
   client: ApolloServerTestClient,
   contributionLink: ContributionLinkInterface,
 ): Promise<ContributionLink> => {
-  const { mutate, query } = client
+  const { mutate } = client
 
   // login as admin
-  await query({ query: login, variables: { email: 'peter@lustig.de', password: 'Aa12345_' } })
+  await mutate({ mutation: login, variables: { email: 'peter@lustig.de', password: 'Aa12345_' } })
 
   const variables = {
     amount: contributionLink.amount,

backend/src/seeds/factory/creation.ts

@@ -1,8 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
-import { adminCreateContribution, confirmContribution } from '@/seeds/graphql/mutations'
-import { login } from '@/seeds/graphql/queries'
+import { login, adminCreateContribution, confirmContribution } from '@/seeds/graphql/mutations'
 import { CreationInterface } from '@/seeds/creation/CreationInterface'
 import { ApolloServerTestClient } from 'apollo-server-testing'
 import { User } from '@entity/User'
@@ -18,9 +17,9 @@ export const creationFactory = async (
   client: ApolloServerTestClient,
   creation: CreationInterface,
 ): Promise<Contribution | void> => {
-  const { mutate, query } = client
+  const { mutate } = client
 
-  await query({ query: login, variables: { email: 'peter@lustig.de', password: 'Aa12345_' } })
+  await mutate({ mutation: login, variables: { email: 'peter@lustig.de', password: 'Aa12345_' } })
 
   // TODO it would be nice to have this mutation return the id
   await mutate({ mutation: adminCreateContribution, variables: { ...creation } })

backend/src/seeds/factory/transactionLink.ts

@@ -1,6 +1,5 @@
 import { ApolloServerTestClient } from 'apollo-server-testing'
-import { createTransactionLink } from '@/seeds/graphql/mutations'
-import { login } from '@/seeds/graphql/queries'
+import { login, createTransactionLink } from '@/seeds/graphql/mutations'
 import { TransactionLinkInterface } from '@/seeds/transactionLink/TransactionLinkInterface'
 import { transactionLinkExpireDate } from '@/graphql/resolver/TransactionLinkResolver'
 import { TransactionLink } from '@entity/TransactionLink'
@@ -9,10 +8,13 @@ export const transactionLinkFactory = async (
   client: ApolloServerTestClient,
   transactionLink: TransactionLinkInterface,
 ): Promise<void> => {
-  const { mutate, query } = client
+  const { mutate } = client
 
   // login
-  await query({ query: login, variables: { email: transactionLink.email, password: 'Aa12345_' } })
+  await mutate({
+    mutation: login,
+    variables: { email: transactionLink.email, password: 'Aa12345_' },
+  })
 
   const variables = {
     amount: transactionLink.amount,

backend/src/seeds/graphql/mutations.ts

@@ -289,3 +289,27 @@ export const adminCreateContributionMessage = gql`
     }
   }
 `
+
+export const login = gql`
+  mutation ($email: String!, $password: String!, $publisherId: Int) {
+    login(email: $email, password: $password, publisherId: $publisherId) {
+      id
+      email
+      firstName
+      lastName
+      language
+      klickTipp {
+        newsletterState
+      }
+      hasElopage
+      publisherId
+      isAdmin
+    }
+  }
+`
+
+export const logout = gql`
+  mutation {
+    logout
+  }
+`

backend/src/seeds/graphql/queries.ts

@@ -1,23 +1,5 @@
 import gql from 'graphql-tag'
 
-export const login = gql`
-  query ($email: String!, $password: String!, $publisherId: Int) {
-    login(email: $email, password: $password, publisherId: $publisherId) {
-      id
-      email
-      firstName
-      lastName
-      language
-      klickTipp {
-        newsletterState
-      }
-      hasElopage
-      publisherId
-      isAdmin
-    }
-  }
-`
-
 export const verifyLogin = gql`
   query {
     verifyLogin {
@@ -35,12 +17,6 @@ export const verifyLogin = gql`
   }
 `
 
-export const logout = gql`
-  query {
-    logout
-  }
-`
-
 export const queryOptIn = gql`
   query ($optIn: String!) {
     queryOptIn(optIn: $optIn)