Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix(site): include owner context in Agents org picker permission check #28076

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

Merged
ibetitsmike merged 2 commits into from
Aug 13, 2026
Merged

fix(site): include owner context in Agents org picker permission check #28076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
831c62f
fix(site): include owner context in Agents org picker permission check
ibetitsmike Aug 12, 2026
6635b94
fix(site): address Codex review on org picker regression story
ibetitsmike Aug 12, 2026
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
8 changes: 7 additions & 1 deletion site/src/api/queries/organizations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,14 +294,20 @@ export const provisionerJobs = (
};
};

export const permittedOrganizationsKey = (check: AuthorizationCheck) => [
"organizations",
"permitted",
check,
];

/**
* Fetch organizations the current user is permitted to use for a given
* action. Fetches all organizations, runs a per-org authorization
* check, and returns only those that pass.
*/
export const permittedOrganizations = (check: AuthorizationCheck) => {
return {
queryKey: ["organizations", "permitted", check],
queryKey: permittedOrganizationsKey(check),
queryFn: async (): Promise<Organization[]> => {
const orgs = await API.getOrganizations();
const checks = Object.fromEntries(
Expand Down
57 changes: 51 additions & 6 deletions site/src/pages/AgentsPage/components/AgentCreateForm.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
within,
} from "storybook/test";
import { API } from "#/api/api";
import { permittedOrganizationsKey } from "#/api/queries/organizations";
import type * as TypesGen from "#/api/typesGenerated";
import { ConfirmDialog } from "#/components/Dialog/ConfirmDialog/ConfirmDialog";
import { MockChatModelConfig } from "#/testHelpers/chatModels";
Expand All @@ -24,12 +25,10 @@ import {
} from "../utils/reasoningEffort";
import { AgentCreateForm } from "./AgentCreateForm";

// Query key used by permittedOrganizations() in the form.
const permittedOrgsKey = [
"organizations",
"permitted",
{ object: { resource_type: "chat" }, action: "create" },
];
const permittedOrgsKey = permittedOrganizationsKey({
object: { resource_type: "chat", owner_id: "me" },
action: "create",
});

const modelConfigID = "model-config-1";
const claudeModelConfigID = "model-config-claude";
Expand Down Expand Up @@ -1104,3 +1103,49 @@ export const PermittedOrgsResolvesToSubset: Story = {
expect(options.organizationId).toBe(MockOrganization2.id);
},
};

/**
* Member-scoped roles like agents-access grant chat:create only on
* chats the user owns, so the per-org check must carry owner context
* for the picker to render.
*/
export const MemberScopedPermissionsShowOrgPicker: Story = {
parameters: {
showOrganizations: true,
organizations: [MockDefaultOrganization, MockOrganization2],
},
beforeEach: () => {
spyOn(API, "getOrganizations").mockResolvedValue([
MockDefaultOrganization,
MockOrganization2,
]);
spyOn(API, "checkAuthorization").mockImplementation(async ({ checks }) =>
Object.fromEntries(
Object.entries(checks).map(([id, check]) => [
id,
check.object.owner_id === "me",
]),
),
);
},
play: async ({ canvasElement }) => {
const canvas = within(canvasElement);
const picker = await canvas.findByRole(
"button",
{ name: /^Organization:/ },
{ timeout: 3000 },
);
Comment thread
ibetitsmike marked this conversation as resolved.
await userEvent.click(picker);
await screen.findByRole("option", {
name: MockDefaultOrganization.display_name,
});
await userEvent.click(
screen.getByRole("option", { name: MockOrganization2.display_name }),
);
expect(
canvas.getByRole("button", {
name: `Organization: ${MockOrganization2.display_name}`,
}),
).toBeInTheDocument();
},
};
2 changes: 1 addition & 1 deletion site/src/pages/AgentsPage/components/AgentCreateForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ export const AgentCreateForm: FC<AgentCreateFormProps> = ({

const permittedOrgsQuery = useQuery({
...permittedOrganizations({
object: { resource_type: "chat" },
object: { resource_type: "chat", owner_id: "me" },
action: "create",
}),
enabled: showOrganizations,
Expand Down
Loading