Skip to content

Automate browser based workflows with AI

feat(SKY-8576): filter credential selector by vault_type when source is selected (#5259)

Celal Zamanoğlu2a73abb84536
diff --git a/skyvern-frontend/src/routes/workflows/components/CredentialParameterSourceSelector.tsx b/skyvern-frontend/src/routes/workflows/components/CredentialParameterSourceSelector.tsx
index c8faf451c..fe1fecc55 100644
--- a/skyvern-frontend/src/routes/workflows/components/CredentialParameterSourceSelector.tsx
+++ b/skyvern-frontend/src/routes/workflows/components/CredentialParameterSourceSelector.tsx
@@ -17,11 +17,17 @@ import { useState } from "react";
type Props = {
value: string;
onChange: (value: string) => void;
+ vault_type?: string;
};
-function CredentialParameterSourceSelector({ value, onChange }: Props) {
+function CredentialParameterSourceSelector({
+ value,
+ onChange,
+ vault_type,
+}: Props) {
const { data: credentials, isLoading } = useCredentialsQuery({
page_size: 100, // Reasonable limit for dropdown selector
+ vault_type,
});
// Use local state for modal to avoid conflicts with other CredentialsModal instances
const [isModalOpen, setIsModalOpen] = useState(false);
diff --git a/skyvern-frontend/src/routes/workflows/editor/panels/WorkflowParameterEditPanel.tsx b/skyvern-frontend/src/routes/workflows/editor/panels/WorkflowParameterEditPanel.tsx
index aec199730..fc447d3ff 100644
--- a/skyvern-frontend/src/routes/workflows/editor/panels/WorkflowParameterEditPanel.tsx
+++ b/skyvern-frontend/src/routes/workflows/editor/panels/WorkflowParameterEditPanel.tsx
@@ -828,6 +828,7 @@ function WorkflowParameterEditPanel({
<CredentialParameterSourceSelector
value={credentialId}
onChange={(value) => setCredentialId(value)}
+ vault_type="custom"
/>
</div>
)}
diff --git a/skyvern-frontend/src/routes/workflows/hooks/useCredentialsQuery.ts b/skyvern-frontend/src/routes/workflows/hooks/useCredentialsQuery.ts
index 873a5ed75..5ac63d12a 100644
--- a/skyvern-frontend/src/routes/workflows/hooks/useCredentialsQuery.ts
+++ b/skyvern-frontend/src/routes/workflows/hooks/useCredentialsQuery.ts
@@ -12,19 +12,23 @@ type UseQueryOptions = Omit<
type Props = UseQueryOptions & {
page?: number;
page_size?: number;
+ vault_type?: string;
};
function useCredentialsQuery(props: Props = {}) {
- const { page = 1, page_size = 25, ...queryOptions } = props;
+ const { page = 1, page_size = 25, vault_type, ...queryOptions } = props;
const credentialGetter = useCredentialGetter();
return useQuery<Array<CredentialApiResponse>>({
- queryKey: ["credentials", page, page_size],
+ queryKey: ["credentials", page, page_size, vault_type],
queryFn: async () => {
const client = await getClient(credentialGetter);
const params = new URLSearchParams();
params.set("page", String(page));
params.set("page_size", String(page_size));
+ if (vault_type) {
+ params.set("vault_type", vault_type);
+ }
return client.get("/credentials", { params }).then((res) => res.data);
},
refetchOnMount: "always",
diff --git a/skyvern/forge/sdk/db/agent_db.py b/skyvern/forge/sdk/db/agent_db.py
index 6cc82060e..91c343a93 100644
--- a/skyvern/forge/sdk/db/agent_db.py
+++ b/skyvern/forge/sdk/db/agent_db.py
@@ -6293,18 +6293,23 @@ class AgentDB(BaseAlchemyDB):
return Credential.model_validate(credential)
return None
- async def get_credentials(self, organization_id: str, page: int = 1, page_size: int = 10) -> list[Credential]:
+ async def get_credentials(
+ self,
+ organization_id: str,
+ page: int = 1,
+ page_size: int = 10,
+ vault_type: str | None = None,
+ ) -> list[Credential]:
async with self.Session() as session:
- credentials = (
- await session.scalars(
- select(CredentialModel)
- .filter_by(organization_id=organization_id)
- .filter(CredentialModel.deleted_at.is_(None))
- .order_by(CredentialModel.created_at.desc())
- .offset((page - 1) * page_size)
- .limit(page_size)
- )
- ).all()
+ query = (
+ select(CredentialModel)
+ .filter_by(organization_id=organization_id)
+ .filter(CredentialModel.deleted_at.is_(None))
+ )
+ if vault_type is not None:
+ query = query.filter(CredentialModel.vault_type == vault_type)
+ query = query.order_by(CredentialModel.created_at.desc()).offset((page - 1) * page_size).limit(page_size)
+ credentials = (await session.scalars(query)).all()
return [Credential.model_validate(credential) for credential in credentials]
async def update_credential(
diff --git a/skyvern/forge/sdk/routes/credentials.py b/skyvern/forge/sdk/routes/credentials.py
index 8544e5102..2e249197a 100644
--- a/skyvern/forge/sdk/routes/credentials.py
+++ b/skyvern/forge/sdk/routes/credentials.py
@@ -1402,13 +1402,22 @@ async def get_credentials(
examples=[10],
openapi_extra={"x-fern-sdk-parameter-name": "page_size"},
),
+ vault_type: CredentialVaultType | None = Query(
+ default=None,
+ description="Filter credentials by vault type (e.g. 'custom', 'bitwarden', 'azure_vault')",
+ ),
) -> list[CredentialResponse]:
"""Return non-sensitive metadata for all credentials (paginated).
SECURITY: Like ``get_credential``, this endpoint never returns raw secret
material. See the module docstring for the full security invariant.
"""
- credentials = await app.DATABASE.get_credentials(current_org.organization_id, page=page, page_size=page_size)
+ credentials = await app.DATABASE.get_credentials(
+ current_org.organization_id,
+ page=page,
+ page_size=page_size,
+ vault_type=vault_type.value if isinstance(vault_type, CredentialVaultType) else None,
+ )
return [_convert_to_response(credential) for credential in credentials]