test: Add permissions and roles e2e tests

.github/workflows/platform-pull-request.yml

@@ -154,3 +154,5 @@ jobs:
             concurrency: 2
           - tests: versioning
             concurrency: 1
+          - tests: organisation-permission environment-permission project-permission roles
+            concurrency: 1

docs/docs/system-administration/rbac.md

@@ -134,6 +134,11 @@ Assigning roles to groups has several benefits over assigning permissions direct
 
 Permissions can be assigned at four levels: user group, organisation, project, and environment.
 
+## Tagged Permissions
+
+When creating a role, some permissions allow you to grant access when features have specific tags. For example, you can
+configure a role to create change requests only for features tagged with "marketing".
+
 ### User group
 
 | Permission  | Ability                                          |
@@ -149,25 +154,27 @@ Permissions can be assigned at four levels: user group, organisation, project, a
 
 ### Project
 
-| Permission         | Ability                                                                                                                                      |
-| ------------------ | -------------------------------------------------------------------------------------------------------------------------------------------- |
-| Administrator      | Grants full read and write access to all environments, features and segments.                                                                |
-| View Project       | Allows viewing this project. The project is hidden from users without this permission.                                                       |
-| Create Environment | Allows creating new environments in this project. Users are automatically granted Administrator permissions on any environments they create. |
-| Create Feature     | Allows creating new features in all environments.                                                                                            |
-| Delete Feature     | Allows deleting features from all environments.                                                                                              |
-| Manage Segments    | Grants write access to segments in this project.                                                                                             |
-| View audit log     | Allows viewing all audit log entries for this project.                                                                                       |
+### Project
+
+| Permission         | Ability                                                                                                                                      | Supports Tags |
+| ------------------ | -------------------------------------------------------------------------------------------------------------------------------------------- | ------------- |
+| Administrator      | Grants full read and write access to all environments, features, and segments.                                                               |               |
+| View Project       | Allows viewing this project. The project is hidden from users without this permission.                                                       |               |
+| Create Environment | Allows creating new environments in this project. Users are automatically granted Administrator permissions on any environments they create. |               |
+| Create Feature     | Allows creating new features in all environments.                                                                                            |               |
+| Delete Feature     | Allows deleting features from all environments.                                                                                              | Yes           |
+| Manage Segments    | Grants write access to segments in this project.                                                                                             |               |
+| View audit log     | Allows viewing all audit log entries for this project.                                                                                       |               |
 
 ### Environment
 
-| Permission               | Ability                                                                                                                 |
-| ------------------------ | ----------------------------------------------------------------------------------------------------------------------- |
-| Administrator            | Grants full read and write access to all feature states, overrides, identities and change requests in this environment. |
-| View Environment         | Allows viewing this environment. The environment is hidden from users without this permission.                          |
-| Update Feature State     | Allows updating updating any feature state or values in this environment.                                               |
-| Manage Identities        | Grants read and write access to identities in this environment.                                                         |
-| Manage Segment Overrides | Grants write access to segment overrides in this environment.                                                           |
-| Create Change Request    | Allows creating change requests for features in this environment.                                                       |
-| Approve Change Request   | Allows approving or denying change requests in this environment.                                                        |
-| View Identities          | Grants read-only access to identities in this environment.                                                              |
+| Permission               | Ability                                                                                                                  | Supports Tags |
+| ------------------------ | ------------------------------------------------------------------------------------------------------------------------ | ------------- |
+| Administrator            | Grants full read and write access to all feature states, overrides, identities, and change requests in this environment. |               |
+| View Environment         | Allows viewing this environment. The environment is hidden from users without this permission.                           |               |
+| Update Feature State     | Allows updating any feature state or values in this environment.                                                         | Yes           |
+| Manage Identities        | Grants read and write access to identities in this environment.                                                          |               |
+| Manage Segment Overrides | Grants write access to segment overrides in this environment.                                                            |               |
+| Create Change Request    | Allows creating change requests for features in this environment.                                                        | Yes           |
+| Approve Change Request   | Allows approving or denying change requests in this environment.                                                         | Yes           |
+| View Identities          | Grants read-only access to identities in this environment.                                                               |               |

frontend/api/index.js

@@ -124,6 +124,10 @@ app.get('/config/project-overrides', (req, res) => {
       name: 'githubAppURL',
       value: process.env.GITHUB_APP_URL,
     },
+    {
+      name: 'e2eToken',
+      value: process.env.E2E_TEST_TOKEN || '',
+    },
   ]
   let output = values.map(getVariable).join('')
   let dynatrace = ''

frontend/common/providers/Permission.tsx

@@ -1,11 +1,15 @@
-import React, { FC, ReactNode } from 'react'
+import React, { FC, ReactNode, useMemo } from 'react'
 import { useGetPermissionQuery } from 'common/services/usePermission'
 import { PermissionLevel } from 'common/types/requests'
-import AccountStore from 'common/stores/account-store' // we need this to make JSX compile
+import AccountStore from 'common/stores/account-store'
+import intersection from 'lodash/intersection'
+import { add } from 'ionicons/icons';
+import { cloneDeep } from 'lodash'; // we need this to make JSX compile
 
 type PermissionType = {
   id: any
   permission: string
+  tags?: number[]
   level: PermissionLevel
   children: (data: { permission: boolean; isLoading: boolean }) => ReactNode
 }
@@ -14,11 +18,26 @@ export const useHasPermission = ({
   id,
   level,
   permission,
+  tags,
 }: Omit<PermissionType, 'children'>) => {
-  const { data, isLoading, isSuccess } = useGetPermissionQuery(
-    { id: `${id}`, level },
-    { skip: !id || !level },
-  )
+  const {
+    data: permissionsData,
+    isLoading,
+    isSuccess,
+  } = useGetPermissionQuery({ id: `${id}`, level }, { skip: !id || !level })
+  const data = useMemo(() => {
+    if (!tags?.length || !permissionsData?.tag_based_permissions)
+      return permissionsData
+    const addedPermissions = cloneDeep(permissionsData)
+    permissionsData.tag_based_permissions.forEach((tagBasedPermission) => {
+      if (intersection(tagBasedPermission.tags, tags).length) {
+        tagBasedPermission.permissions.forEach((key) => {
+          addedPermissions[key] = true
+        })
+      }
+    })
+    return addedPermissions
+  }, [permissionsData, tags])
   const hasPermission = !!data?.[permission] || !!data?.ADMIN
   return {
     isLoading,
@@ -32,11 +51,13 @@ const Permission: FC<PermissionType> = ({
   id,
   level,
   permission,
+  tags,
 }) => {
   const { isLoading, permission: hasPermission } = useHasPermission({
     id,
     level,
     permission,
+    tags,
   })
   return (
     <>

frontend/common/services/usePermission.ts

@@ -13,16 +13,25 @@ export const permissionService = service
         query: ({ id, level }: Req['getPermission']) => ({
           url: `${level}s/${id}/my-permissions/`,
         }),
-        transformResponse(baseQueryReturnValue: {
-          admin: boolean
-          permissions: string[]
-        }) {
+        transformResponse(
+          baseQueryReturnValue: {
+            admin: boolean
+            permissions: string[]
+            tag_based_permissions?: Res['permission']['tag_based_permissions']
+          },
+          _,
+        ) {
           const res: Res['permission'] = {
             ADMIN: baseQueryReturnValue.admin,
           }
+          if (baseQueryReturnValue.tag_based_permissions) {
+            res.tag_based_permissions =
+              baseQueryReturnValue.tag_based_permissions
+          }
           baseQueryReturnValue.permissions.forEach((v) => {
             res[v] = true
           })
+
           return res
         },
       }),

frontend/common/services/useProject.ts

@@ -18,7 +18,7 @@ export const projectService = service
         query: (data) => ({
           url: `projects/?organisation=${data.organisationId}`,
         }),
-        transformResponse: (res) => sortBy(res, 'name'),
+        transformResponse: (res) => sortBy(res, (v) => v.name.toLowerCase()),
       }),
       // END OF ENDPOINTS
     }),

frontend/common/services/useRole.ts

@@ -22,6 +22,7 @@ export const roleService = service
         }),
       }),
       getRole: builder.query<Res['role'], Req['getRole']>({
+        providesTags: (res) => [{ id: res?.id, type: 'Role' }],
         query: (query: Req['getRole']) => ({
           url: `organisations/${query.organisation_id}/roles/${query.role_id}/`,
         }),
@@ -33,7 +34,10 @@ export const roleService = service
         }),
       }),
       updateRole: builder.mutation<Res['roles'], Req['updateRole']>({
-        invalidatesTags: (res) => [{ id: 'LIST', type: 'Role' }],
+        invalidatesTags: (res, _, req) => [
+          { id: 'LIST', type: 'Role' },
+          { id: req.role_id, type: 'Role' },
+        ],
         query: (query: Req['updateRole']) => ({
           body: query.body,
           method: 'PUT',

frontend/common/services/useRolePermission.ts

@@ -121,15 +121,12 @@ export async function getRoleProjectPermissions(
     typeof rolePermissionService.endpoints.getRoleProjectPermissions.initiate
   >[1],
 ) {
-  store.dispatch(
+  return store.dispatch(
     rolePermissionService.endpoints.getRoleProjectPermissions.initiate(
       data,
       options,
     ),
   )
-  return Promise.all(
-    store.dispatch(rolePermissionService.util.getRunningQueriesThunk()),
-  )
 }
 
 export async function getRoleEnvironmentPermissions(
@@ -139,15 +136,12 @@ export async function getRoleEnvironmentPermissions(
     typeof rolePermissionService.endpoints.getRoleEnvironmentPermissions.initiate
   >[1],
 ) {
-  store.dispatch(
+  return store.dispatch(
     rolePermissionService.endpoints.getRoleEnvironmentPermissions.initiate(
       data,
       options,
     ),
   )
-  return Promise.all(
-    store.dispatch(rolePermissionService.util.getRunningQueriesThunk()),
-  )
 }
 
 export async function createRolePermissions(

frontend/common/stores/account-store.js

@@ -7,6 +7,8 @@ import Constants from 'common/constants'
 import dataRelay from 'data-relay'
 import { sortBy } from 'lodash'
 import Project from 'common/project'
+import { getStore } from 'common/store'
+import { service } from "common/service";
 
 const controller = {
   acceptInvite: (id) => {
@@ -341,6 +343,7 @@ const controller = {
         API.reset().finally(() => {
           store.model = user
           store.organisation = null
+          getStore().dispatch(service.util.resetApiState())
           store.trigger('logout')
         })
       })

frontend/common/stores/organisation-store.js

@@ -39,7 +39,11 @@ const controller = {
         )
       : ['Development', 'Production']
     data
-      .post(`${Project.api}projects/`, { name, organisation: store.id })
+      .post(
+        `${Project.api}projects/`,
+        { name, organisation: store.id },
+        E2E ? { 'X-E2E-Test-Auth-Token': Project.e2eToken } : {},
+      )
       .then((project) => {
         Promise.all(
           defaultEnvironmentNames.map((envName) => {

frontend/common/types/requests.ts

@@ -14,6 +14,8 @@ import {
   UserGroup,
   AttributeName,
   Identity,
+  Role,
+  RolePermission,
 } from './responses'
 
 export type PagedRequest<T> = T & {
@@ -158,7 +160,7 @@ export type Req = {
   updateRole: {
     organisation_id: number
     role_id: number
-    body: { description: string | null; name: string }
+    body: Role
   }
   deleteRole: { organisation_id: number; role_id: number }
   getRolePermissionEnvironment: {
@@ -179,7 +181,7 @@ export type Req = {
     level: PermissionLevel
     body: {
       admin?: boolean
-      permissions: string[]
+      permissions: RolePermission['permissions']
       project: number
       environment: number
     }

frontend/common/types/responses.ts

@@ -261,8 +261,12 @@ export type UserPermission = {
   id: number
   role?: number
 }
+
+export type RolePermission = Omit<UserPermission, 'permissions'> & {
+  permissions: { permission_key: string; tags: number[] }[]
+}
 export type GroupPermission = Omit<UserPermission, 'user'> & {
-  group: UserGroup
+  group: UserGroupSummary
 }
 
 export type AuditLogItem = {
@@ -328,6 +332,7 @@ export type Identity = {
 export type AvailablePermission = {
   key: string
   description: string
+  supports_tag: boolean
 }
 
 export type APIKey = {
@@ -657,7 +662,10 @@ export type Res = {
   }
   identity: { id: string } //todo: we don't consider this until we migrate identity-store
   identities: EdgePagedResponse<Identity>
-  permission: Record<string, boolean>
+  permission: Record<string, boolean> & {
+    ADMIN: boolean
+    tag_based_permissions?: { permissions: string[]; tags: number[] }[]
+  }
   availablePermissions: AvailablePermission[]
   tag: Tag
   tags: Tag[]
@@ -695,7 +703,7 @@ export type Res = {
   versionFeatureState: FeatureState[]
   role: Role
   roles: PagedResponse<Role>
-  rolePermission: PagedResponse<UserPermission>
+  rolePermission: PagedResponse<RolePermission>
   projectFlags: PagedResponse<ProjectFlag>
   projectFlag: ProjectFlag
   identityFeatureStatesAll: IdentityFeatureState[]

frontend/common/utils/utils.tsx

@@ -341,36 +341,6 @@ const Utils = Object.assign({}, require('./base/_utils'), {
     return `/organisation/${orgId}/projects`
   },
 
-  getPermissionList(
-    isAdmin: boolean,
-    permissions: string[] | undefined | null,
-    numberToTruncate = 3,
-  ): {
-    items: string[]
-    truncatedItems: string[]
-  } {
-    if (isAdmin) {
-      return {
-        items: ['Administrator'],
-        truncatedItems: [],
-      }
-    }
-    if (!permissions) return { items: [], truncatedItems: [] }
-
-    const items =
-      permissions && permissions.length
-        ? permissions
-            .slice(0, numberToTruncate)
-            .map((item) => `${Format.enumeration.get(item)}`)
-        : []
-
-    return {
-      items,
-      truncatedItems: (permissions || [])
-        .slice(numberToTruncate)
-        .map((item) => `${Format.enumeration.get(item)}`),
-    }
-  },
   getPlanName: (plan: string) => {
     if (plan && plan.includes('free')) {
       return planNames.free

frontend/e2e/config.ts

@@ -1,5 +1,11 @@
 const E2E_EMAIL_DOMAIN = 'flagsmithe2etestdomain.io'
 export const E2E_SIGN_UP_USER = `e2e_signup_user@${E2E_EMAIL_DOMAIN}`
 export const E2E_USER = `e2e_user@${E2E_EMAIL_DOMAIN}`
+export const E2E_NON_ADMIN_USER = `e2e_user@${E2E_EMAIL_DOMAIN}`
+export const E2E_NON_ADMIN_USER_WITH_ORG_PERMISSIONS = `e2e_non_admin_user_with_org_permissions@${E2E_EMAIL_DOMAIN}`
+export const E2E_NON_ADMIN_USER_WITH_PROJECT_PERMISSIONS = `e2e_non_admin_user_with_project_permissions@${E2E_EMAIL_DOMAIN}`
+export const E2E_NON_ADMIN_USER_WITH_PROJECT_READ_PERMISSIONS = `e2e_non_admin_user_with_project_read_permissions@${E2E_EMAIL_DOMAIN}`
+export const E2E_NON_ADMIN_USER_WITH_ENV_PERMISSIONS = `e2e_non_admin_user_with_env_permissions@${E2E_EMAIL_DOMAIN}`
+export const E2E_NON_ADMIN_USER_WITH_A_ROLE = `e2e_non_admin_user_with_a_role@${E2E_EMAIL_DOMAIN}`
 export const E2E_CHANGE_MAIL = `e2e_change_email@${E2E_EMAIL_DOMAIN}`
 export const PASSWORD = 'Str0ngp4ssw0rd!'