Accept more then one role to check for permission

packages/activists-api/src/graphql-api.spec.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 import { mocked } from 'ts-jest/utils';
 import fetch from './graphql-api/client';
 import * as ActionsAPI from './graphql-api/actions';
@@ -28,11 +29,12 @@ describe('tests on api graphql', () => {
     return NotificationsAPI
       .send(input)
       .then(({ data }) => {
+        // @ts-ignore
         expect(fetchMocked).toBeCalledWith({
           query: NotificationsAPI.queries.send,
-          variables: { input }
+          variables: { input },
         });
-        expect(data).toEqual({ status: 'OK!' });
+        expect(data).toEqual({ status: "OK!" });
       });
   });
 
@@ -50,9 +52,10 @@ describe('tests on api graphql', () => {
     return ActivistsAPI
       .get_or_create(input)
       .then((activist) => {
+        // @ts-ignore
         expect(fetchMocked).toBeCalledWith({
           query: ActivistsAPI.queries.get_or_create,
-          variables: { activist: input }
+          variables: { activist: input },
         });
         expect(activist).toEqual({ ...input, id: 2 });
       });
@@ -70,9 +73,10 @@ describe('tests on api graphql', () => {
     return WidgetsAPI
       .get(widgetReturned.id)
       .then((widget) => {
+        // @ts-ignore
         expect(fetchMocked).toBeCalledWith({
           query: WidgetsAPI.queries.get,
-          variables: { widget_id: widgetReturned.id }
+          variables: { widget_id: widgetReturned.id },
         });
         expect(widget).toEqual(widgetReturned);
       });
@@ -91,9 +95,10 @@ describe('tests on api graphql', () => {
     return ActionsAPI
       .pressure(input)
       .then((activist_pressure) => {
+        // @ts-ignore
         expect(fetchMocked).toBeCalledWith({
           query: ActionsAPI.queries.pressure,
-          variables: { input }
+          variables: { input },
         });
         expect(activist_pressure).toEqual({ id: 2 });
       });
@@ -110,9 +115,10 @@ describe('tests on api graphql', () => {
     return ActionsAPI
       .pressure_sync_done(input)
       .then((activist_pressure: any) => {
+        // @ts-ignore
         expect(fetchMocked).toBeCalledWith({
           query: ActionsAPI.queries.pressure_sync_done,
-          variables: input
+          variables: input,
         });
         expect(activist_pressure).toEqual({ id: 2 });
       })

packages/redes-api/src/resolvers/create_match.ts

@@ -14,8 +14,14 @@ type Args = {
   input: CreateMatch
 }
 
-const create_match = async (_: void, args: Args, context: Context): Promise<any> => {
-  const { input: { recipient, volunteer, agent, community_id } } = args
+const create_match = async (
+  _: void,
+  args: Args,
+  context: Context
+): Promise<any> => {
+  const {
+    input: { recipient, volunteer, agent, community_id },
+  } = args;
   try {
     const volunteerRes = await create_volunteer_ticket(undefined, {
       input: {
@@ -63,11 +69,11 @@ const create_match = async (_: void, args: Args, context: Context): Promise<any>
       status: "encaminhamento__realizado"
     }
 
-    return await match.create(matchTicket)
-  } catch(e) {
+    return await match.create(matchTicket);
+  } catch (e) {
     logger.error(e)
     return undefined
   }
 }
 
-export default check_user(create_match, Roles.USER)
+export default check_user(create_match, [Roles.USER, Roles.ADMIN]);

packages/redes-api/src/resolvers/create_volunteer_ticket.ts

@@ -84,4 +84,4 @@ const create_volunteer_ticket = async (_: void, args: Args, _context: Context):
   }
 }
 
-export default check_user(create_volunteer_ticket, Roles.USER)
+export default check_user(create_volunteer_ticket, [Roles.USER, Roles.ADMIN]);

packages/redes-api/src/resolvers/update_recipient_ticket.ts

@@ -79,4 +79,4 @@ const update_recipient_ticket = async (_: void, args: Args, _context: Context):
   }
 }
 
-export default check_user(update_recipient_ticket, Roles.USER)
+export default check_user(update_recipient_ticket, [Roles.USER, Roles.ADMIN]);

utils/permissions-utils/src/index.ts

@@ -18,7 +18,7 @@ export enum Roles {
 }
 
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-export const handle_check_user = ({ fetch, logger }: Options) => (next: any, role: Roles) => async (_: void, args: any, context: Context) => {
+export const handle_check_user = ({ fetch, logger }: Options) => (next: any, role: Roles | [Roles]) => async (_: void, args: any, context: Context) => {
   const get_permission = handle_get_permission({ fetch, logger });
   const { session }: Context = context;
 
@@ -27,7 +27,10 @@ export const handle_check_user = ({ fetch, logger }: Options) => (next: any, rol
     // Get permission on API-GraphQL (Hasura)
     const { permission, user } = await get_permission({ user_id: session.user_id, community_id });
     // Execute only when role is permitted from relationship between community users
-    if (permission?.role === role || user.is_admin) return next(_, args, context);
+    const roleInArray = typeof role === 'number' ? [role] : role
+    if (
+      roleInArray.includes(permission?.role) || user.is_admin
+    ) return next(_, args, context);
   }
   // Permission denied
   throw new Error('invalid_permission');