[Users] Add delete user mutation fixes(#134)

api/graphql/mutation/userDisable/index.js

@@ -0,0 +1,17 @@
+import UserForm from 'Services/User/Form';
+import BaseMutationResolver from 'Graphql/base/MutationResolver';
+
+class UserDisable extends BaseMutationResolver {
+  resolve = () => {
+    const { viewer } = this.ctx;
+    const { id } = this.args;
+    const form = new UserForm({
+      viewer,
+      id,
+    });
+
+    return form.delete();
+  };
+}
+
+export default UserDisable.resolver();

api/graphql/mutation/userDisable/type.graphql

@@ -0,0 +1,3 @@
+extend type Mutation {
+  userDisable(id: ID!): User!
+}

api/routes/login/callback.js

@@ -16,6 +16,7 @@ class LoginCallback extends BaseController {
 
       const user = new User();
       await user.loadByUsername(profile.username);
+      if (user.deleted_at) return App.redirectToHome(res);
       if (user.exists) {
         await user.syncProfile(profile);
       } else {

api/services/AuthorizationPolicy/index.js

@@ -32,7 +32,7 @@ policy.include('features', (p) => {
 });
 
 policy.include('user', (p) => {
-  p.register('impersonate', ({ viewer }) => isAdmin(viewer));
+  p.register(['impersonate', 'delete'], ({ viewer }) => isAdmin(viewer));
   p.register('read', ({ viewer }) => isUser(viewer));
   p.register(
     'update',
@@ -126,10 +126,11 @@ policy.include('calendarEventInvite', (p) => {
     ({ viewer, entity: { event, status }, action }) =>
       isOrganiser(event, viewer) ||
       isAdmin(viewer) ||
-      isUser(viewer) 
-      && action === ':create' 
-      && event?.is_requestable 
-      && (status === 'Requested' || status === 'Accepted' && event?.auto_accept_requests)
+      (isUser(viewer) &&
+        action === ':create' &&
+        event?.is_requestable &&
+        (status === 'Requested' ||
+          (status === 'Accepted' && event?.auto_accept_requests))),
   );
   p.register(
     'update',

api/services/User/Form.js

@@ -1,6 +1,8 @@
+import Models from 'Models';
 import User from './';
 import { isEmail, isPhoneNumber } from 'Utils/validators';
 import BaseModelForm from 'Services/BaseModelService/Form';
+import { saveInstance, requireInstance } from 'Services/BaseModelService';
 
 class UserForm extends BaseModelForm {
   name = 'user';
@@ -23,6 +25,17 @@ class UserForm extends BaseModelForm {
   onUpdate() {
     return new User(this.instance).update(this.body);
   }
+
+  @saveInstance
+  @requireInstance
+  async beforeDelete() {
+    return Models.User.findByPk(this.id);
+  }
+
+  @requireInstance
+  onDelete() {
+    return new User(this.instance).delete();
+  }
 }
 
 export default UserForm;

api/services/User/index.js

@@ -10,7 +10,7 @@ import Availability from './Loaders/Availability';
 
 export default class User extends BaseModelService {
   static findByUsername(username) {
-    return Models.User.findOne({ where: { username } });
+    return Models.User.findOne({ where: { username }, paranoid: false });
   }
 
   static findById(id) {
@@ -143,4 +143,16 @@ export default class User extends BaseModelService {
       config.app.secret,
     );
   }
+
+  @saveInstance
+  @requireInstance
+  async delete() {
+    const count = await Models.User.destroy({
+      where: { id: this.instance.id },
+    });
+
+    if (count) return null;
+
+    return this.instance;
+  }
 }

app/mutations/userDisable.graphql

@@ -0,0 +1,5 @@
+mutation UserDisable($id: ID!) {
+  disableUser: UserDisable(id: $id) {
+    id
+  }
+}