refactor(permissions-provider): change teamMember query with environmentMember

Author: Selnapenek

packages/permissions-provider/src/PermissionsProvider.tsx

@@ -1,12 +1,11 @@
 import React from 'react';
 import { DocumentNode } from 'graphql';
 import gql from 'graphql-tag';
-import * as R from 'ramda';
 import { Query } from 'react-apollo';
 import { withAuth, WithAuthProps } from '@8base-react/auth';
 
 import { PermissionsContext } from './PermissionsContext';
-import { getPermissions } from './getPermissions';
+import { getPermissions, getRoles } from './utils';
 import { RequestPermissions } from './types';
 
 const USER_PERMISSIONS_QUERY = gql`
@@ -32,19 +31,21 @@ const USER_PERMISSIONS_QUERY = gql`
 
 const TEAM_MEMBER_PERMISSIONS_QUERY = gql`
   query TeamMemberPermissions {
-    teamMember {
-      id
-      permissions {
-        items {
-          resource
-          resourceType
-          permission
+    system {
+      environmentMember {
+        email
+        permissions {
+          items {
+            resource
+            resourceType
+            permission
+          }
         }
-      }
-      roles {
-        items {
-          id
-          name
+        roles {
+          items {
+            id
+            name
+          }
         }
       }
     }
@@ -84,11 +85,7 @@ const PermissionsProvider: React.ComponentType<PermissionsProviderProps> = withA
       const { type = 'teamMember' } = this.props;
 
       const permissions = getPermissions(data, type);
-
-      const roles = R.pipe(
-        R.pathOr([], [type, 'roles', 'items']),
-        R.map(({ name }) => name),
-      )(data);
+      const roles = getRoles(data, type);
 
       return (
         <PermissionsContext.Provider value={{ permissions, roles }}>

packages/permissions-provider/src/getPermissions.ts

@@ -0,0 +1,23 @@
+import * as R from 'ramda';
+import { RequestPermissions, TransformedPermissions, ApolloPermission } from './types';
+
+const PERMISSIONS_PATH = {
+  teamMember: ['system', 'environmentMember'],
+  user: ['user'],
+};
+
+export const getPermissions = (data: RequestPermissions, type: 'teamMember' | 'user'): TransformedPermissions =>
+  R.pipe(
+    R.pathOr([], PERMISSIONS_PATH[type]),
+    R.pipe(
+      R.pathOr([], ['permissions', 'items']),
+      R.groupBy<ApolloPermission>(R.prop('resourceType')),
+      R.mapObjIndexed(R.indexBy<ApolloPermission>(R.prop('resource'))),
+    ),
+  )(data);
+
+export const getRoles = (data: RequestPermissions, type: 'teamMember' | 'user'): string[] =>
+  R.pipe(
+    R.pathOr([], [...PERMISSIONS_PATH[type], 'roles', 'items']),
+    R.map(({ name }) => name),
+  )(data);

packages/permissions-provider/src/utils.ts

@@ -4,18 +4,20 @@ import * as renderer from 'react-test-renderer';
 import { PermissionsProvider, IfAllowedRoles } from '../../src';
 
 const mockPermissionsData = {
-  teamMember: {
-    roles: {
-      items: [
-        {
-          id: '1',
-          name: 'Admin',
-        },
-        {
-          id: '2',
-          name: 'Support',
-        },
-      ],
+  system: {
+    environmentMember: {
+      roles: {
+        items: [
+          {
+            id: '1',
+            name: 'Admin',
+          },
+          {
+            id: '2',
+            name: 'Support',
+          },
+        ],
+      },
     },
   },
 };

packages/permissions-provider/test/__tests__/IfAllowedRoles.test.tsx

@@ -10,68 +10,72 @@ import {
   usePermissions,
 } from '../../src';
 
-const mockPermissionsData = {
-  teamMember: {
-    permissions: {
-      items: [
-        {
-          resource: 'Users',
-          resourceType: 'data',
-          permission: {
-            create: {
-              allow: true,
-            },
-            delete: {
-              allow: true,
-            },
-            read: {
-              allow: true,
-              fields: {
-                createdAt: true,
-                updatedAt: true,
-                email: true,
-                isOwner: true,
-                firstName: true,
-                lastName: true,
-                cellPhone: true,
-                workPhone: true,
-                workPhoneExt: true,
-                gender: true,
-                birthday: true,
-                language: true,
-                timezone: true,
-              },
-            },
-            update: {
-              allow: true,
-              fields: {
-                createdAt: true,
-                updatedAt: true,
-                email: false,
-                isOwner: true,
-                firstName: true,
-                lastName: true,
-                cellPhone: true,
-                workPhone: true,
-                workPhoneExt: true,
-                gender: true,
-                birthday: true,
-                language: true,
-                timezone: true,
-              },
-            },
+const mockPermissions = {
+  items: [
+    {
+      resource: 'Users',
+      resourceType: 'data',
+      permission: {
+        create: {
+          allow: true,
+        },
+        delete: {
+          allow: true,
+        },
+        read: {
+          allow: true,
+          fields: {
+            createdAt: true,
+            updatedAt: true,
+            email: true,
+            isOwner: true,
+            firstName: true,
+            lastName: true,
+            cellPhone: true,
+            workPhone: true,
+            workPhoneExt: true,
+            gender: true,
+            birthday: true,
+            language: true,
+            timezone: true,
           },
         },
-        {
-          resource: 'schema',
-          resourceType: 'custom',
-          permission: {
-            edit: {
-              allow: false,
-            },
+        update: {
+          allow: true,
+          fields: {
+            createdAt: true,
+            updatedAt: true,
+            email: false,
+            isOwner: true,
+            firstName: true,
+            lastName: true,
+            cellPhone: true,
+            workPhone: true,
+            workPhoneExt: true,
+            gender: true,
+            birthday: true,
+            language: true,
+            timezone: true,
           },
         },
-      ],
+      },
+    },
+    {
+      resource: 'schema',
+      resourceType: 'custom',
+      permission: {
+        edit: {
+          allow: false,
+        },
+      },
+    },
+  ],
+};
+
+const mockPermissionsData = {
+  system: {
+    environmentMember: {
+      permissions: mockPermissions,
     },
   },
 };