Skip to content
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
5 changes: 3 additions & 2 deletions packages/app/src/features/jobs/editor.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { bearerIntegrationsQuery, modelAccountsQuery } from "../settings/queries";
import { PresetPicker } from "../settings/preset-picker";
import type { VmPreset } from "../settings/preset-queries";
import { RunPermissions, defaultRunScopes } from "./run-permissions";
Expand Down Expand Up @@ -46,8 +47,8 @@ function EditorForm({ initial, section }: { initial?: Job; section?: string }) {
const flyConnection = useQuery(flyConnectionQuery), flyConfigurations = useQuery(flyConfigurationsQuery);
const flyConfiguration = flyConfigurations.data?.find(item => item.id === draft.executionConfigId);
const isFly = draft.executionConfigId === "fly-new" || Boolean(flyConfiguration);
const bearers=useQuery({queryKey:["settings","bearer-integrations"],queryFn:async({signal})=>{const {data,error}=await api.GET("/api/v1/integrations/bearer",{signal});if(!data||error)throw new Error(messageOf(error));return data.integrations;}});
const accounts = useQuery({ enabled: (draft.executionType ?? "agent") === "agent", queryKey: ["settings", "model-accounts"], queryFn: async ({ signal }) => { const { data, error } = await api.GET("/api/v1/model-accounts", { signal }); if (!data || error) throw new Error(messageOf(error)); return data.accounts; } });
const bearers = useQuery({ ...bearerIntegrationsQuery, select: data => data.integrations });
const accounts = useQuery({ ...modelAccountsQuery, enabled: (draft.executionType ?? "agent") === "agent", select: data => data.accounts });
const target = targets.data?.find(t => t.id === draft.executionConfigId);
const verificationFingerprint = JSON.stringify([draft.executionConfigId, canonicalizeVmImage(draft.vmImage ?? ""), draft.tags ?? [], target?.agentKind ?? ""]);
const verificationKey = `factorize-vm-image-verification:${initial?.id ?? "new"}`;
Expand Down
10 changes: 2 additions & 8 deletions packages/app/src/features/settings/bearer-integrations.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { bearerIntegrationsQuery } from "./queries";
import { useState } from "react";
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import { api } from "factorize-api-client";
Expand All @@ -8,13 +9,6 @@ import { Dialog } from "../../shared/dialog";
import { IntegrationRow, ProviderTile } from "./integration-ui";

type BearerRecord = { id: string; name: string; origin: string; description: string | null; revision: number };
const recordsQuery = { queryKey: ["settings", "bearer-integrations"], queryFn: async ({ signal }: { signal: AbortSignal }) => {
const { data, error } = await api.GET("/api/v1/integrations/bearer", { signal });
if (!data || error) throw new Error(messageOf(error));
if (!Array.isArray(data.integrations) || !Number.isSafeInteger(data.revision)) throw new Error("Bearer integrations could not be loaded. Reload the page to try again.");
return data;
} };

function validOrigin(value: string): boolean {
try {
const parsed = new URL(value);
Expand All @@ -33,7 +27,7 @@ function validOrigin(value: string): boolean {
}

export function useBearerIntegrations() {
const cache = useQueryClient(), records = useQuery(recordsQuery);
const cache = useQueryClient(), records = useQuery(bearerIntegrationsQuery);
const [editing, setEditing] = useState<string | null>(null), [name, setName] = useState(""), [origin, setOrigin] = useState(""), [description, setDescription] = useState(""), [token, setToken] = useState("");
const [open, setOpen] = useState(false);
const [notice, setNotice] = useState("");
Expand Down
6 changes: 3 additions & 3 deletions packages/app/src/features/settings/model-accounts.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { modelAccountsQuery } from "./queries";
import {useEffect, useState} from "react";
import {useMutation, useQuery, useQueryClient} from "@tanstack/react-query";
import {api} from "factorize-api-client";
Expand All @@ -9,7 +10,6 @@ import { IntegrationRow, ProviderTile } from "./integration-ui";

type Account={id:string; name:string; description:string|null; revision:number; credentialConfigured:boolean};
type Authorization={state:string; verificationUrl?:string; userCode?:string; pollAfterSeconds?:number};
const queryKey=["settings","model-accounts"];
async function authorization(accountId:string,action:"authorize"|"status"|"cancel"):Promise<Authorization> {
const path=action==="authorize" ? "/api/v1/model-accounts/{accountId}/authorization/authorize" : action==="status" ? "/api/v1/model-accounts/{accountId}/authorization/status" : "/api/v1/model-accounts/{accountId}/authorization/cancel";
const {data,error}=await api.POST(path,{params:{path:{accountId}},body:{}});
Expand All @@ -18,7 +18,7 @@ async function authorization(accountId:string,action:"authorize"|"status"|"cance
}
export function useModelAccounts() {
const cache=useQueryClient();
const accounts=useQuery({queryKey,queryFn:async({signal})=>{const {data,error}=await api.GET("/api/v1/model-accounts",{signal}); if(!data || error) throw new Error(messageOf(error)); if(!Array.isArray(data.accounts) || !Number.isSafeInteger(data.revision)) throw new Error("Model accounts could not be loaded. Reload the page to try again."); return data;}});
const accounts = useQuery(modelAccountsQuery);
const [open,setOpen]=useState(false);
const [active,setActive]=useState<string|null>(null),[states,setStates]=useState<Record<string,Authorization>>({}),[error,setError]=useState("");
const [name,setName]=useState(""),[description,setDescription]=useState(""),[kind,setKind]=useState<"chatgpt"|"api-key">("chatgpt"),[key,setKey]=useState(""),[editId,setEditId]=useState<string|null>(null);
Expand All @@ -34,7 +34,7 @@ export function useModelAccounts() {
const poll=async()=>{
if(inFlight) return;
inFlight=true;
try {const state=await authorization(active,"status"); if(stopped) return; setStates(current=>({...current,[active]:state})); if(state.state!=="pending") {setActive(null); await cache.invalidateQueries({queryKey});}}
try {const state=await authorization(active,"status"); if(stopped) return; setStates(current=>({...current,[active]:state})); if(state.state!=="pending") {setActive(null); await cache.invalidateQueries({queryKey: modelAccountsQuery.queryKey});}}
catch(reason) {if(!stopped) setError(reason instanceof Error?reason.message:"Could not check authorization.");}
finally {inFlight=false;}
};
Expand Down
24 changes: 24 additions & 0 deletions packages/app/src/features/settings/queries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,27 @@ import { messageOf } from "../auth/session";
export const integrationsQuery = queryOptions({ queryKey: ["settings", "integrations"], queryFn: async ({ signal }) => { const { data, error } = await api.GET("/api/v1/integrations", { signal }); if (!data || error) throw new Error(messageOf(error)); return data; }, staleTime: 30_000 });
export const tokensQuery = queryOptions({ queryKey: ["settings", "tokens"], queryFn: async ({ signal }) => { const { data, error } = await api.GET("/api/v1/access-tokens", { signal }); if (!data || error) throw new Error(messageOf(error)); return data; }, staleTime: 0 });
export const clientsQuery = queryOptions({ queryKey: ["settings", "clients"], queryFn: async ({ signal }) => { const { data, error } = await api.GET("/api/v1/access/authorized-clients", { signal }); if (!data || error) throw new Error(messageOf(error)); return data; }, staleTime: 30_000 });

export const bearerIntegrationsQuery = queryOptions({
queryKey: ["settings", "bearer-integrations"],
queryFn: async ({ signal }) => {
const { data, error } = await api.GET("/api/v1/integrations/bearer", { signal });
if (!data || error) throw new Error(messageOf(error));
if (!Array.isArray(data.integrations) || !Number.isSafeInteger(data.revision)) {
throw new Error("Bearer integrations could not be loaded. Reload the page to try again.");
}
return data;
},
});

export const modelAccountsQuery = queryOptions({
queryKey: ["settings", "model-accounts"],
queryFn: async ({ signal }) => {
const { data, error } = await api.GET("/api/v1/model-accounts", { signal });
if (!data || error) throw new Error(messageOf(error));
if (!Array.isArray(data.accounts) || !Number.isSafeInteger(data.revision)) {
throw new Error("Model accounts could not be loaded. Reload the page to try again.");
}
return data;
},
});
21 changes: 20 additions & 1 deletion packages/app/test/editor.browser.test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,25 @@ async function setup(options) {
await page.route("**/api/v1/job-trigger-availability", route => route.fulfill({ json: { manual: true, schedule: true, jobLifecycle: true, linear: true, clickup: true, github: true, cloudflareTail: true } }));
return { context, page };
}
test("Integrations displays credentials cached by the job editor", async t => {
const { context, page } = await setup();
t.after(() => context.close());
const bearer = { id: "bearer-1", name: "Build API", origin: "https://api.example.test", description: null, revision: 1 };
const account = { id: "account-1", name: "Build account", credentialConfigured: true, revision: 1 };
await page.route(`**/api/v1/jobs/${id}`, route => route.fulfill({ json: { ...initial, modelAccess: "portable" } }));
await page.route("**/api/v1/integrations/bearer", route => route.fulfill({ json: { revision: 1, integrations: [bearer] } }));
await page.route("**/api/v1/model-accounts", route => route.fulfill({ json: { revision: 1, accounts: [account] } }));
await page.route("**/api/v1/providers/github/installations", route => route.fulfill({ json: [] }));
await page.goto(origin + `/jobs/${id}/settings/execution`);
await page.getByRole("checkbox", { name: bearer.name }).waitFor();
await page.getByRole("option", { name: account.name }).waitFor({ state: "attached" });
await page.getByRole("link", { name: "Factorize dashboard" }).click();
await page.getByRole("link", { name: "Integrations", exact: true }).click();
const list = page.getByRole("list", { name: "Your integrations" });
await list.getByText(bearer.name, { exact: true }).waitFor();
await list.getByText(account.name, { exact: true }).waitFor();
});

test("stale editor reconciles non-overlapping fields, requires explicit conflict choice and preserves trigger identity", async () => {
const { context, page } = await setup(); let current = structuredClone(initial); const writes = [];
await page.route(`**/api/v1/jobs/${id}`, route => {
Expand Down Expand Up @@ -350,7 +369,7 @@ for (const executionType of ["agent", "code"]) test(`Fly.io ${executionType} job
await page.route(/^https?:\/\/(?!127\.0\.0\.1:)/, route => { externalCalls.push(route.request().url()); return route.abort(); });
await page.route("**/api/v1/projects", route => route.fulfill({ json: [{ id: "00000000-0000-4000-8000-000000000010", name: "Project" }] }));
await page.route("**/api/v1/skills**", route => route.fulfill({ json: { items: [], nextCursor: null } }));
await page.route("**/api/v1/model-accounts", route => route.fulfill({ json: { accounts: [{ id: accountId, name: "Work ChatGPT", revision: 1, credentialConfigured: true }] } }));
await page.route("**/api/v1/model-accounts", route => route.fulfill({ json: { revision: 1, accounts: [{ id: accountId, name: "Work ChatGPT", revision: 1, credentialConfigured: true }] } }));
await page.route("**/api/v1/fly/connection", route => route.fulfill({ json: { connection: { organizationSlug: "test-org", organizationName: "Test org" } } }));
await page.route("**/api/v1/fly/execution-configurations", route => {
if (route.request().method() === "POST") {
Expand Down