Client mutation id on logOut mutation

Author: davimacedo

spec/ParseGraphQLServer.spec.js

@@ -943,6 +943,42 @@ describe('ParseGraphQLServer', () => {
 
           expect(payloadFields).toEqual(['clientMutationId', 'viewer']);
         });
+
+        it('should have clientMutationId in log out mutation input', async () => {
+          const inputFields = (await apolloClient.query({
+            query: gql`
+              query {
+                __type(name: "LogOutInput") {
+                  inputFields {
+                    name
+                  }
+                }
+              }
+            `,
+          })).data['__type'].inputFields
+            .map(field => field.name)
+            .sort();
+
+          expect(inputFields).toEqual(['clientMutationId']);
+        });
+
+        it('should have clientMutationId in log out mutation payload', async () => {
+          const payloadFields = (await apolloClient.query({
+            query: gql`
+              query {
+                __type(name: "LogOutPayload") {
+                  fields {
+                    name
+                  }
+                }
+              }
+            `,
+          })).data['__type'].fields
+            .map(field => field.name)
+            .sort();
+
+          expect(payloadFields).toEqual(['clientMutationId', 'viewer']);
+        });
       });
 
       describe('Parse Class Types', () => {
@@ -5902,6 +5938,7 @@ describe('ParseGraphQLServer', () => {
         });
 
         it('should log the user out', async () => {
+          const clientMutationId = uuidv4();
           const user = new Parse.User();
           user.setUsername('user1');
           user.setPassword('user1');
@@ -5930,9 +5967,12 @@ describe('ParseGraphQLServer', () => {
 
           const logOut = await apolloClient.mutate({
             mutation: gql`
-              mutation LogOutUser {
-                logOut {
-                  sessionToken
+              mutation LogOutUser($input: LogOutInput!) {
+                logOut(input: $input) {
+                  clientMutationId
+                  viewer {
+                    sessionToken
+                  }
                 }
               }
             `,
@@ -5941,8 +5981,14 @@ describe('ParseGraphQLServer', () => {
                 'X-Parse-Session-Token': sessionToken,
               },
             },
+            variables: {
+              input: {
+                clientMutationId,
+              },
+            },
           });
-          expect(logOut.data.logOut).toBeDefined();
+          expect(logOut.data.logOut.clientMutationId).toEqual(clientMutationId);
+          expect(logOut.data.logOut.viewer.sessionToken).toEqual(sessionToken);
 
           try {
             await apolloClient.query({

src/GraphQL/ParseGraphQLSchema.js

@@ -40,6 +40,8 @@ const RESERVED_GRAPHQL_TYPE_NAMES = [
   'SignUpPayload',
   'LogInInput',
   'LogInPayload',
+  'LogOutInput',
+  'LogOutPayload',
   'CloudCodeFunction',
   'CallCloudCodeInput',
   'CallCloudCodePayload',

src/GraphQL/loaders/usersMutations.js

@@ -117,36 +117,46 @@ const load = parseGraphQLSchema => {
   parseGraphQLSchema.addGraphQLType(logInMutation.type, true, true);
   parseGraphQLSchema.addGraphQLMutation('logIn', logInMutation, true, true);
 
-  parseGraphQLSchema.addGraphQLMutation(
-    'logOut',
-    {
-      description: 'The logOut mutation can be used to log the user out.',
-      type: new GraphQLNonNull(parseGraphQLSchema.viewerType),
-      async resolve(_source, _args, context, mutationInfo) {
-        try {
-          const { config, auth, info } = context;
-
-          const viewer = await getUserFromSessionToken(
-            config,
-            info,
-            mutationInfo
-          );
-
-          await usersRouter.handleLogOut({
-            config,
-            auth,
-            info,
-          });
-
-          return viewer;
-        } catch (e) {
-          parseGraphQLSchema.handleError(e);
-        }
+  const logOutMutation = mutationWithClientMutationId({
+    name: 'LogOut',
+    description: 'The logOut mutation can be used to log out an existing user.',
+    outputFields: {
+      viewer: {
+        description:
+          'This is the existing user that was logged out and returned as a viewer.',
+        type: new GraphQLNonNull(parseGraphQLSchema.viewerType),
       },
     },
+    mutateAndGetPayload: async (_args, context, mutationInfo) => {
+      try {
+        const { config, auth, info } = context;
+
+        const viewer = await getUserFromSessionToken(
+          config,
+          info,
+          mutationInfo
+        );
+
+        await usersRouter.handleLogOut({
+          config,
+          auth,
+          info,
+        });
+
+        return { viewer };
+      } catch (e) {
+        parseGraphQLSchema.handleError(e);
+      }
+    },
+  });
+
+  parseGraphQLSchema.addGraphQLType(
+    logOutMutation.args.input.type.ofType,
     true,
     true
   );
+  parseGraphQLSchema.addGraphQLType(logOutMutation.type, true, true);
+  parseGraphQLSchema.addGraphQLMutation('logOut', logOutMutation, true, true);
 };
 
 export { load };