Progress : User Enable issue coding-blocks#135

jugshaurya · Jun 13, 2020 · 79cb4d1 · 79cb4d1
1 parent 5ebcc30
commit 79cb4d1
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 5 deletions.
diff --git a/api/graphql/mutation/userEnable/index.js b/api/graphql/mutation/userEnable/index.js
@@ -0,0 +1,17 @@
+import UserForm from 'Services/User/Form';
+import BaseMutationResolver from 'Graphql/base/MutationResolver';
+
+class UserEnable extends BaseMutationResolver {
+  resolve = () => {
+    const { viewer } = this.ctx;
+    const { id } = this.args;
+    const form = new UserForm({
+      viewer,
+      id,
+    });
+
+    return form.restore();
+  };
+}
+
+export default UserEnable.resolver();
diff --git a/api/graphql/mutation/userEnable/type.graphql b/api/graphql/mutation/userEnable/type.graphql
@@ -0,0 +1,3 @@
+extend type Mutation {
+  userEnable(id: ID!): User!
+}
diff --git a/api/services/AuthorizationPolicy/index.js b/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', 'restore'], ({ 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',

diff --git a/api/services/BaseModelService/Form.js b/api/services/BaseModelService/Form.js
@@ -211,6 +211,17 @@ class ModelForm extends BaseModelService {
       );
   }
 
+  async preRestore() {
+    if (
+      !(await AuthPolicy.can(this.viewer)
+        .perform(`${this.name}:restore`)
+        .on(this.instance))
+    )
+      throw new ForbiddenError(
+        `User is not authorized to perform this action.`,
+      );
+  }
+
   @saveInstance
   async create() {
     await this.beforeAll?.call(this);
@@ -250,6 +261,20 @@ class ModelForm extends BaseModelService {
 
     return this.instance;
   }
+
+  @saveInstance
+  async restore() {
+    await this.beforeAll?.call(this);
+    await this.beforeRestore?.call(this);
+    await this.preRestore?.call(this);
+    const success =
+      (await this._handleErrors(() => this.onRestore?.call(this))) === null;
+    if (!success)
+      throw new UserInputError(`No ${this.text || this.name} found to restore`);
+    this.afterRestore?.call(this);
+
+    return this.instance;
+  }
 }
 
 export default ModelForm;
diff --git a/api/services/User/Form.js b/api/services/User/Form.js
@@ -23,6 +23,11 @@ class UserForm extends BaseModelForm {
   onUpdate() {
     return new User(this.instance).update(this.body);
   }
+
+  @requireInstance
+  onRestore() {
+    return new User(this.instance).restore();
+  }
 }
 
 export default UserForm;
diff --git a/api/services/User/index.js b/api/services/User/index.js
@@ -48,6 +48,7 @@ export default class User extends BaseModelService {
           dateTimeRange,
           excludeEvents,
         },
+        viewer,
       ])
     )[0];
   }
@@ -143,4 +144,16 @@ export default class User extends BaseModelService {
       config.app.secret,
     );
   }
+
+  @saveInstance
+  @requireInstance
+  async restore() {
+    const count = await Models.User.restore({
+      where: { id: this.instance.id },
+    });
+
+    if (count) return null;
+
+    return this.instance;
+  }
 }