Skip to content

chore: fixup permission story with multi-org on the UI #14049

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.

Sign up for GitHub

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

Closed
wants to merge 7 commits into from
Closed

chore: fixup permission story with multi-org on the UI #14049

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9cee05f
chore: fixup permission story with multi-org on the UI
Emyrk Jul 30, 2024
0b011b5
rename permissions to be more accurate
Emyrk Jul 30, 2024
c761212
type authz checks
Emyrk Jul 30, 2024
82c2481
fixup check names
Emyrk Jul 30, 2024
b277d20
admin deployment page
Emyrk Jul 30, 2024
2885e62
linting
Emyrk Jul 30, 2024
d1cacae
toggle menu items
Emyrk Jul 30, 2024
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
Prev Previous commit
Next Next commit
rename permissions to be more accurate
  • Loading branch information
@Emyrk
Emyrk committed Jul 30, 2024
commit 0b011b5bd36298229440322c36478d0e6ed2d7f2
12 changes: 6 additions & 6 deletions site/src/contexts/auth/permissions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ export const checks = {
readAllUsers: "readAllUsers",
updateUsers: "updateUsers",
createUser: "createUser",
createAnyTemplates: "createAnyTemplates",
updateTemplates: "updateTemplates",
deleteTemplates: "deleteTemplates",
createAnyTemplate: "createAnyTemplate",
updateAllTemplates: "updateAllTemplates",
deleteAllTemplates: "deleteAllTemplates",
viewAnyAuditLog: "viewAnyAuditLog",
viewDeploymentValues: "viewDeploymentValues",
createAnyGroup: "createAnyGroup",
Expand Down Expand Up @@ -35,20 +35,20 @@ export const permissionsToCheck: Record<string, AuthorizationCheck> = {
},
action: "create",
},
[checks.createAnyTemplates]: {
[checks.createAnyTemplate]: {
object: {
resource_type: "template",
any_org: true,
},
action: "update",
},
[checks.updateTemplates]: {
[checks.updateAllTemplates]: {
object: {
resource_type: "template",
},
action: "update",
},
[checks.deleteTemplates]: {
[checks.deleteAllTemplates]: {
object: {
resource_type: "template",
},
Expand Down
3 changes: 2 additions & 1 deletion site/src/pages/TemplateVersionPage/TemplateVersionPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ export const TemplateVersionPage: FC = () => {
versionName={versionName}
templateName={templateName}
createWorkspaceUrl={
permissions.updateTemplates ? createWorkspaceUrl : undefined
// TODO: This permission should be "can update this specific template version"
permissions.updateAllTemplates ? createWorkspaceUrl : undefined
}
/>
</>
Expand Down
4 changes: 2 additions & 2 deletions site/src/pages/TemplatesPage/TemplatesPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const TemplatesPage: FC = () => {
const templatesQuery = useQuery(templates(organizationId));
const examplesQuery = useQuery({
...templateExamples(organizationId),
enabled: permissions.createTemplates,
enabled: permissions.createAnyTemplate,
});
const error = templatesQuery.error || examplesQuery.error;

Expand All @@ -25,7 +25,7 @@ export const TemplatesPage: FC = () => {
</Helmet>
<TemplatesPageView
error={error}
canCreateTemplates={permissions.createTemplates}
canCreateTemplates={permissions.createAnyTemplate}
examples={examplesQuery.data}
templates={templatesQuery.data}
/>
Expand Down
4 changes: 2 additions & 2 deletions site/src/pages/WorkspacePage/WorkspacePage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,9 @@ describe("WorkspacePage", () => {
server.use(
http.post("/api/v2/authcheck", async () => {
return HttpResponse.json({
updateTemplates: true,
updateAllTemplates: true,
updateWorkspace: true,
updateTemplate: true,
updateAnyTemplate: true,
});
}),
);
Expand Down
4 changes: 2 additions & 2 deletions site/src/pages/WorkspacesPage/WorkspacesPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ const WorkspacesPage: FC = () => {
</Helmet>

<WorkspacesPageView
canCreateTemplate={permissions.createTemplates}
canChangeVersions={permissions.updateTemplates}
canCreateTemplate={permissions.createAnyTemplate}
canChangeVersions={permissions.updateAllTemplates}
checkedWorkspaces={checkedWorkspaces}
onCheckChange={setCheckedWorkspaces}
canCheckWorkspaces={canCheckWorkspaces}
Expand Down
8 changes: 4 additions & 4 deletions site/src/testHelpers/entities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2472,11 +2472,11 @@ export const MockTemplateExample2: TypesGen.TemplateExample = {
};

export const MockPermissions: Permissions = {
createGroup: true,
createTemplates: true,
createAnyGroup: true,
createAnyTemplate: true,
createUser: true,
deleteTemplates: true,
updateTemplates: true,
deleteAllTemplates: true,
updateAllTemplates: true,
readAllUsers: true,
updateUsers: true,
viewAuditLog: true,
Expand Down