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
Original file line number Diff line number Diff line change
Expand Up @@ -262,28 +262,30 @@ export class ConnectionsController {
}

/**
* List connections for an organization
* List connections for an organization (excludes soft-deleted/disconnected)
*/
@Get()
@RequirePermission('integration', 'read')
async listConnections(@OrganizationId() organizationId: string) {
const connections =
await this.connectionService.getOrganizationConnections(organizationId);

return connections.map((c) => ({
id: c.id,
providerId: c.providerId,
providerSlug: (c as any).provider?.slug,
providerName: (c as any).provider?.name,
status: c.status,
authStrategy: c.authStrategy,
lastSyncAt: c.lastSyncAt,
nextSyncAt: c.nextSyncAt,
errorMessage: c.errorMessage,
variables: c.variables,
metadata: c.metadata,
createdAt: c.createdAt,
}));
return connections
.filter((c) => c.status !== 'disconnected')
.map((c) => ({
id: c.id,
providerId: c.providerId,
providerSlug: (c as any).provider?.slug,
providerName: (c as any).provider?.name,
status: c.status,
authStrategy: c.authStrategy,
lastSyncAt: c.lastSyncAt,
nextSyncAt: c.nextSyncAt,
errorMessage: c.errorMessage,
variables: c.variables,
metadata: c.metadata,
createdAt: c.createdAt,
}));
}

/**
Expand Down Expand Up @@ -1178,6 +1180,10 @@ export class ConnectionsController {
if (Array.isArray(mergedCredentials.regions)) {
metaUpdates.regions = mergedCredentials.regions;
}
// Mark cloud credential updates as reconnections so reconnect banners clear
if (manifest.category === 'Cloud') {
metaUpdates.reconnectedAt = new Date().toISOString();
}
if (Object.keys(metaUpdates).length > 0) {
const existingMeta =
(connection.metadata as Record<string, unknown>) ?? {};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,13 @@ interface ProviderTabsProps {
onConnectionTabChange: (providerType: string, connectionId: string) => void;
onRunScan: (connectionId?: string) => Promise<string | null>;
onAddConnection: (providerType: string) => void;
onReconnect: (providerType: string) => void;
onConfigure: (provider: Provider) => void;
needsConfiguration: (provider: Provider) => boolean;
requiresReconnect: (provider: Provider) => boolean;
canRunScan?: boolean;
canAddConnection?: boolean;
isReconnecting?: boolean;
orgId: string;
}

Expand Down Expand Up @@ -235,11 +237,13 @@ export function ProviderTabs({
onConnectionTabChange,
onRunScan,
onAddConnection,
onReconnect,
onConfigure,
needsConfiguration,
requiresReconnect,
canRunScan,
canAddConnection,
isReconnecting,
orgId,
}: ProviderTabsProps) {
return (
Expand Down Expand Up @@ -328,7 +332,12 @@ export function ProviderTabs({
</p>
</div>
{canAddConnection !== false && (
<Button size="sm" onClick={() => onAddConnection(providerType)}>
<Button
size="sm"
onClick={() => onReconnect(providerType)}
disabled={isReconnecting}
loading={isReconnecting}
>
Reconnect
</Button>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import { ConnectIntegrationDialog } from '@/components/integrations/ConnectIntegrationDialog';
import { useApi } from '@/hooks/use-api';
import { useIntegrationMutations } from '@/hooks/use-integration-platform';
import { usePermissions } from '@/hooks/use-permissions';
import { ManageIntegrationDialog } from '@/components/integrations/ManageIntegrationDialog';
import { CLOUD_RECONNECT_CUTOFF_LABEL, requiresCloudReconnect } from '@/lib/cloud-reconnect-policy';
Expand All @@ -10,6 +11,7 @@ import { Add, Settings } from '@trycompai/design-system/icons';
import { useSearchParams, useRouter } from 'next/navigation';
import { useCallback, useMemo, useState } from 'react';
import { toast } from 'sonner';
import { mutate as globalMutate } from 'swr';
import { isCloudProviderSlug } from '../constants';
import type { Finding, Provider } from '../types';
import { CloudSettingsModal } from './CloudSettingsModal';
Expand Down Expand Up @@ -51,9 +53,11 @@ export function TestsLayout({ initialFindings, initialProviders, orgId }: TestsL
const canRunScan = hasPermission('integration', 'update');
const canCreateIntegration = hasPermission('integration', 'create');
const api = useApi();
const { deleteConnection } = useIntegrationMutations();
const [showSettings, setShowSettings] = useState(false);
const [viewingResults, setViewingResults] = useState(true);
const [isScanning, setIsScanning] = useState(false);
const [isReconnecting, setIsReconnecting] = useState(false);
const searchParams = useSearchParams();
const router = useRouter();
const [activeProviderTab, setActiveProviderTabState] = useState<string | null>(
Expand Down Expand Up @@ -217,6 +221,37 @@ export function TestsLayout({ initialFindings, initialProviders, orgId }: TestsL
setViewingResults(true);
};

const handleReconnect = async (providerType: string) => {
const providerName = PROVIDER_NAME[providerType] || providerType.toUpperCase();
if (
!confirm(
`This will disconnect all your ${providerName} connections and redirect you to set up a fresh connection. Continue?`,
)
) {
return;
}

setIsReconnecting(true);
try {
const connections = providerGroups[providerType] || [];
await Promise.all(
connections.map((connection) =>
connection.isLegacy
? api.delete(`/v1/cloud-security/legacy/${connection.id}`)
: deleteConnection(connection.id),
),
);
await Promise.all([mutateProviders(), mutateFindings()]);
// Clear integration connections cache so the target page doesn't flash stale data
await globalMutate(['integration-connections', orgId]);
router.push(`/${orgId}/integrations/${providerType}`);
} catch {
toast.error('Failed to disconnect connections. Please try again.');
} finally {
setIsReconnecting(false);
}
};

if (connectedProviders.length === 0 || !viewingResults) {
return (
<EmptyState
Expand Down Expand Up @@ -339,6 +374,8 @@ export function TestsLayout({ initialFindings, initialProviders, orgId }: TestsL
}
canRunScan={canRunScan}
canAddConnection={canCreateIntegration}
isReconnecting={isReconnecting}
onReconnect={handleReconnect}
orgId={orgId}
/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,11 @@ export function ConnectIntegrationDialog({
// since hooks return [] as fallback, not undefined
const isDataLoading = isProvidersLoading || isConnectionsLoading;

// Filter connections for this specific integration
// Filter connections for this specific integration (exclude soft-deleted)
const existingConnections: ExistingConnection[] = useMemo(() => {
if (!allConnections) return [];
return allConnections
.filter((conn) => conn.providerSlug === integrationId)
.filter((conn) => conn.providerSlug === integrationId && conn.status !== 'disconnected')
.map((conn) => {
const metadata = (conn.metadata || {}) as Record<string, unknown>;
return {
Expand Down
Loading