Skip to content

fix: pass team header when fetching default templates #340

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

Open
devin-ai-integration wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: pass team header when fetching default templates #340

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
9cfb34c
fix: pass team header when fetching default templates
devin-ai-integration[bot] May 22, 2026
d9887db
fix: pass teamSlug to getDefaultTemplatesCached query
devin-ai-integration[bot] May 22, 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
1 change: 1 addition & 0 deletions src/app/dashboard/terminal/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ async function isTerminalTemplateAvailable({

const defaultTemplatesRepository = createDefaultTemplatesRepository({
accessToken,
teamId,
})
const teamTemplatesRepository = createTemplatesRepository({
accessToken,
Expand Down
9 changes: 3 additions & 6 deletions src/core/modules/templates/repository.server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@ import {
} from '@/core/modules/users/auth-user-emails.server'
import { api, infra } from '@/core/shared/clients/api'
import { repoErrorFromHttp } from '@/core/shared/errors'
import type {
RequestScope,
TeamRequestScope,
} from '@/core/shared/repository-scope'
import type { TeamRequestScope } from '@/core/shared/repository-scope'
import { err, ok, type RepoResult } from '@/core/shared/result'

type TemplatesRepositoryDeps = {
Expand Down Expand Up @@ -142,7 +139,7 @@ export function createTemplatesRepository(
}

export function createDefaultTemplatesRepository(
scope: RequestScope,
scope: TeamRequestScope,
deps: Pick<TemplatesRepositoryDeps, 'apiClient' | 'authHeaders'> = {
apiClient: api,
authHeaders: SUPABASE_AUTH_HEADERS,
Expand All @@ -159,7 +156,7 @@ export function createDefaultTemplatesRepository(
const { data, error, response } = await deps.apiClient.GET(
'/templates/defaults',
{
headers: deps.authHeaders(scope.accessToken),
headers: deps.authHeaders(scope.accessToken, scope.teamId),
next: { tags: [CACHE_TAGS.DEFAULT_TEMPLATES] },
}
)
Expand Down
14 changes: 4 additions & 10 deletions src/core/server/api/routers/templates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,12 @@ import {
createTemplatesRepository,
} from '@/core/modules/templates/repository.server'
import { throwTRPCErrorFromRepoError } from '@/core/server/adapters/errors'
import {
withAuthedRequestRepository,
withTeamAuthedRequestRepository,
} from '@/core/server/api/middlewares/repository'
import { withTeamAuthedRequestRepository } from '@/core/server/api/middlewares/repository'
import { createTRPCRouter } from '@/core/server/trpc/init'
import {
protectedProcedure,
protectedTeamProcedure,
} from '@/core/server/trpc/procedures'
import { protectedTeamProcedure } from '@/core/server/trpc/procedures'

const templatesRepositoryProcedure = protectedProcedure.use(
withAuthedRequestRepository(
const templatesRepositoryProcedure = protectedTeamProcedure.use(
withTeamAuthedRequestRepository(
createDefaultTemplatesRepository,
Comment on lines +12 to 14
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot May 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Preserve getDefaultTemplatesCached call compatibility

Changing templatesRepositoryProcedure to protectedTeamProcedure makes getDefaultTemplatesCached require teamSlug input, but existing callers still invoke this query without input (e.g. trpc.templates.getDefaultTemplatesCached.queryOptions(undefined, ...) in src/features/dashboard/templates/list/table.tsx). At runtime this causes input validation to fail for team template pages, so default template loading now errors instead of returning data.

Useful? React with 👍 / 👎.

(templatesRepository) => ({
templatesRepository,
Expand Down
13 changes: 8 additions & 5 deletions src/features/dashboard/templates/list/table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,14 @@ export default function TemplatesTable() {
)

const { data: defaultTemplatesData } = useSuspenseQuery(
trpc.templates.getDefaultTemplatesCached.queryOptions(undefined, {
refetchOnMount: false,
refetchOnWindowFocus: false,
refetchOnReconnect: false,
})
trpc.templates.getDefaultTemplatesCached.queryOptions(
{ teamSlug },
{
refetchOnMount: false,
refetchOnWindowFocus: false,
refetchOnReconnect: false,
}
)
)

const templates = useMemo(
Expand Down
Loading