Skip to content

Allow query access when impersonating #2863

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
matt-aitken merged 2 commits into from
Jan 9, 2026
+5 −4
Merged

Allow query access when impersonating #2863

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9730cae
Allow query access when impersonating
matt-aitken Jan 9, 2026
4a819fc
Merge branch 'main' into query-access
mpcgrid Jan 9, 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
2 changes: 1 addition & 1 deletion apps/webapp/app/components/navigation/SideMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ export function SideMenu({
to={v3TestPath(organization, project, environment)}
data-action="test"
/>
{(user.admin || featureFlags.hasQueryAccess) && (
{(user.admin || user.isImpersonating || featureFlags.hasQueryAccess) && (
<SideMenuItem
name="Query"
icon={TableCellsIcon}
Expand Down
7 changes: 4 additions & 3 deletions ...p/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/route.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,10 @@ import { querySchemas } from "~/v3/querySchemas";
async function hasQueryAccess(
userId: string,
isAdmin: boolean,
isImpersonating: boolean,
organizationSlug: string
): Promise<boolean> {
if (isAdmin) {
if (isAdmin || isImpersonating) {
return true;
}

Expand Down Expand Up @@ -117,7 +118,7 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
const user = await requireUser(request);
const { projectParam, organizationSlug, envParam } = EnvironmentParamSchema.parse(params);

const canAccess = await hasQueryAccess(user.id, user.admin, organizationSlug);
const canAccess = await hasQueryAccess(user.id, user.admin, user.isImpersonating, organizationSlug);
if (!canAccess) {
throw redirect("/");
}
Expand Down Expand Up @@ -158,7 +159,7 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
const user = await requireUser(request);
const { projectParam, organizationSlug, envParam } = EnvironmentParamSchema.parse(params);

const canAccess = await hasQueryAccess(user.id, user.admin, organizationSlug);
const canAccess = await hasQueryAccess(user.id, user.admin, user.isImpersonating, organizationSlug);
if (!canAccess) {
return typedjson(
{ error: "Unauthorized", rows: null, columns: null, stats: null },
Expand Down
Loading