Skip to content

fix: hide New user button if no permission #1794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions site/src/pages/UsersPage/UsersPage.test.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { fireEvent, screen, waitFor, within } from "@testing-library/react"
import { rest } from "msw"
import React from "react"
import * as API from "../../api/api"
import { Role } from "../../api/typesGenerated"
Expand All @@ -7,8 +8,11 @@ import { Language as ResetPasswordDialogLanguage } from "../../components/ResetP
import { Language as RoleSelectLanguage } from "../../components/RoleSelect/RoleSelect"
import { Language as UsersTableLanguage } from "../../components/UsersTable/UsersTable"
import { MockAuditorRole, MockUser, MockUser2, render } from "../../testHelpers/renderHelpers"
import { server } from "../../testHelpers/server"
import { permissionsToCheck } from "../../xServices/auth/authXService"
import { Language as usersXServiceLanguage } from "../../xServices/users/usersXService"
import { Language as UsersPageLanguage, UsersPage } from "./UsersPage"
import { Language as UsersViewLanguage } from "./UsersPageView"

const suspendUser = async (setupActionSpies: () => void) => {
// Get the first user in the table
Expand Down Expand Up @@ -99,6 +103,32 @@ describe("Users Page", () => {
expect(users.length).toEqual(2)
})

it("shows 'New user' button to an authorized user", () => {
render(<UsersPage />)
const newUserButton = screen.queryByText(UsersViewLanguage.newUserButton)
expect(newUserButton).toBeDefined()
})

it("does not show 'New user' button to unauthorized user", () => {
server.use(
rest.post("/api/v2/users/:userId/authorization", async (req, res, ctx) => {
const permissions = Object.keys(permissionsToCheck)
const response = permissions.reduce((obj, permission) => {
return {
...obj,
[permission]: true,
createUser: false,
}
}, {})

return res(ctx.status(200), ctx.json(response))
}),
)
render(<UsersPage />)
const newUserButton = screen.queryByText(UsersViewLanguage.newUserButton)
expect(newUserButton).toBeNull()
})

describe("suspend user", () => {
describe("when it is success", () => {
it("shows a success message and refresh the page", async () => {
Expand Down
2 changes: 2 additions & 0 deletions site/src/pages/UsersPage/UsersPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export const UsersPage: React.FC = () => {
const userToResetPassword = users?.find((u) => u.id === userIdToResetPassword)
const permissions = useSelector(xServices.authXService, selectPermissions)
const canEditUsers = permissions && permissions.updateUsers
const canCreateUser = permissions && permissions.createUser
const { roles } = rolesState.context
// Is loading if
// - permissions are not loaded or
Expand Down Expand Up @@ -70,6 +71,7 @@ export const UsersPage: React.FC = () => {
isUpdatingUserRoles={usersState.matches("updatingUserRoles")}
isLoading={isLoading}
canEditUsers={canEditUsers}
canCreateUser={canCreateUser}
/>

<ConfirmDialog
Expand Down
15 changes: 9 additions & 6 deletions site/src/pages/UsersPage/UsersPageView.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,16 @@ export default {

const Template: Story<UsersPageViewProps> = (args) => <UsersPageView {...args} />

export const Ready = Template.bind({})
Ready.args = {
export const Admin = Template.bind({})
Admin.args = {
users: [MockUser, MockUser2],
roles: MockSiteRoles,
canCreateUser: true,
canEditUsers: true,
}

export const Member = Template.bind({})
Member.args = { ...Admin.args, canCreateUser: false, canEditUsers: false }

export const Empty = Template.bind({})
Empty.args = {
users: [],
roles: MockSiteRoles,
}
Empty.args = { ...Admin.args, users: [] }
5 changes: 4 additions & 1 deletion site/src/pages/UsersPage/UsersPageView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export interface UsersPageViewProps {
error?: unknown
isUpdatingUserRoles?: boolean
canEditUsers?: boolean
canCreateUser?: boolean
isLoading?: boolean
openUserCreationDialog: () => void
onSuspendUser: (user: TypesGen.User) => void
Expand All @@ -34,11 +35,13 @@ export const UsersPageView: React.FC<UsersPageViewProps> = ({
error,
isUpdatingUserRoles,
canEditUsers,
canCreateUser,
isLoading,
}) => {
const newUserAction = canCreateUser ? { text: Language.newUserButton, onClick: openUserCreationDialog } : undefined
return (
<Stack spacing={4}>
<Header title={Language.pageTitle} action={{ text: Language.newUserButton, onClick: openUserCreationDialog }} />
<Header title={Language.pageTitle} action={newUserAction} />
<Margins>
{error ? (
<ErrorSummary error={error} />
Expand Down
7 changes: 7 additions & 0 deletions site/src/xServices/auth/authXService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export const Language = {
export const checks = {
readAllUsers: "readAllUsers",
updateUsers: "updateUsers",
createUser: "createUser",
createTemplates: "createTemplates",
} as const

Expand All @@ -28,6 +29,12 @@ export const permissionsToCheck = {
},
action: "update",
},
[checks.createUser]: {
object: {
resource_type: "user",
},
action: "create",
},
[checks.createTemplates]: {
object: {
resource_type: "template",
Expand Down