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
8 changes: 8 additions & 0 deletions apps/api/src/cloud-security/cloud-security-query.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export interface CloudProvider {
status: string;
createdAt: Date;
updatedAt: Date;
reconnectedAt?: Date;
isLegacy: boolean;
variables: Record<string, unknown> | null;
requiredVariables: string[];
Expand Down Expand Up @@ -96,6 +97,12 @@ export class CloudSecurityQueryService {
const newProviders: CloudProvider[] = newConnections.map((conn) => {
const metadata = (conn.metadata || {}) as Record<string, unknown>;
const manifest = getManifest(conn.provider.slug);
const reconnectMarker = metadata.reconnectedAt;
const reconnectedAt =
typeof reconnectMarker === 'string' &&
!Number.isNaN(new Date(reconnectMarker).getTime())
? new Date(reconnectMarker)
: undefined;
return {
id: conn.id,
integrationId: conn.provider.slug,
Expand All @@ -109,6 +116,7 @@ export class CloudSecurityQueryService {
status: conn.status,
createdAt: conn.createdAt,
updatedAt: conn.updatedAt,
reconnectedAt,
isLegacy: false,
variables: (conn.variables as Record<string, unknown>) ?? null,
requiredVariables: getRequiredVariables(conn.provider.slug),
Expand Down
17 changes: 17 additions & 0 deletions apps/api/src/integration-platform/controllers/oauth.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,23 @@ export class OAuthController {

// Store tokens and mark connection as active
await this.credentialVaultService.storeOAuthTokens(connection.id, tokens);

// Mark cloud OAuth reconnect completion so reconnect banners clear after successful OAuth.
if (manifest.category === 'Cloud') {
const metadata =
connection.metadata &&
typeof connection.metadata === 'object' &&
!Array.isArray(connection.metadata)
? (connection.metadata as Record<string, unknown>)
: {};
connection = await this.connectionRepository.update(connection.id, {
metadata: {
...metadata,
reconnectedAt: new Date().toISOString(),
},
});
}

await this.connectionService.activateConnection(connection.id);

// Provider-specific post-OAuth actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ export function TestsLayout({ initialFindings, initialProviders, orgId }: TestsL
requiresCloudReconnect({
providerId: provider.integrationId,
createdAt: provider.createdAt,
reconnectedAt: provider.reconnectedAt,
isLegacy: provider.isLegacy,
status: provider.status,
}),
Expand Down Expand Up @@ -331,6 +332,7 @@ export function TestsLayout({ initialFindings, initialProviders, orgId }: TestsL
requiresCloudReconnect({
providerId: provider.integrationId,
createdAt: provider.createdAt,
reconnectedAt: provider.reconnectedAt,
isLegacy: provider.isLegacy,
status: provider.status,
})
Expand Down
1 change: 1 addition & 0 deletions apps/app/src/app/(app)/[orgId]/cloud-tests/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export interface Provider {
status: string;
createdAt: Date;
updatedAt: Date;
reconnectedAt?: Date | string | null;
isLegacy?: boolean;
variables?: Record<string, unknown> | null;
requiredVariables?: string[];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,12 @@ export function ProviderDetailView({ provider, initialConnections }: ProviderDet
const isCloudProvider = provider.category === 'Cloud';
const selectedConnectionRequiresReconnect = useMemo(() => {
if (!isCloudProvider || !selectedConnection) return false;
const metadata = (selectedConnection.metadata || {}) as Record<string, unknown>;
return requiresCloudReconnect({
providerId: provider.id,
createdAt: selectedConnection.createdAt,
reconnectedAt:
typeof metadata.reconnectedAt === 'string' ? metadata.reconnectedAt : null,
status: selectedConnection.status,
});
}, [isCloudProvider, provider.id, selectedConnection]);
Expand Down
22 changes: 22 additions & 0 deletions apps/app/src/lib/cloud-reconnect-policy.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,26 @@ describe('requiresCloudReconnect', () => {
}),
).toBe(true);
});

it('returns false when connection was reconnected after cutoff', () => {
expect(
requiresCloudReconnect({
providerId: 'gcp',
createdAt: '2026-04-12T12:00:00.000Z',
reconnectedAt: '2026-04-13T20:00:00.000Z',
status: 'active',
}),
).toBe(false);
});

it('returns true when reconnect marker is before cutoff', () => {
expect(
requiresCloudReconnect({
providerId: 'azure',
createdAt: '2026-04-10T12:00:00.000Z',
reconnectedAt: '2026-04-13T17:00:00.000Z',
status: 'active',
}),
).toBe(true);
});
});
8 changes: 8 additions & 0 deletions apps/app/src/lib/cloud-reconnect-policy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const CLOUD_RECONNECT_CUTOFF_MS = new Date(CLOUD_RECONNECT_CUTOFF_ISO_UTC).getTi
type ReconnectCandidate = {
providerId: string;
createdAt?: Date | string | null;
reconnectedAt?: Date | string | null;
isLegacy?: boolean;
status?: string | null;
};
Expand All @@ -26,6 +27,13 @@ export function requiresCloudReconnect(candidate: ReconnectCandidate): boolean {
// Legacy cloud connections come from the old integration table and should be re-added.
if (candidate.isLegacy) return true;

if (candidate.reconnectedAt) {
const reconnectedAt = new Date(candidate.reconnectedAt);
if (!Number.isNaN(reconnectedAt.getTime())) {
return reconnectedAt.getTime() < CLOUD_RECONNECT_CUTOFF_MS;
}
}

if (!candidate.createdAt) return false;

const createdAt = new Date(candidate.createdAt);
Expand Down
Loading