Ling0925
/
buster
mirror of https://github.com/buster-so/buster.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update SlackHandler redirects to include '/app' in integration URLs

This commit is contained in:
dal 2025-07-09 15:13:13 -06:00
parent 6d0d119364
commit 75e011ac65
No known key found for this signature in database
GPG Key ID: 16F4B0E1E9F61122
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/server/src/api/v2/slack/handler.int.test.ts
View File

@ -287,7 +287,7 @@ describe.skipIf(skipIfNoEnv)('SlackHandler Integration Tests', () => {
});
expect(response.status).toBe(302);
expect(response.headers.get('Location')).toBe('/settings/integrations?status=cancelled');
expect(response.headers.get('Location')).toBe('/app/settings/integrations?status=cancelled');
});
it('should redirect on invalid parameters', async () => {
@ -297,7 +297,7 @@ describe.skipIf(skipIfNoEnv)('SlackHandler Integration Tests', () => {
expect(response.status).toBe(302);
expect(response.headers.get('Location')).toBe(
'/settings/integrations?status=error&error=invalid_parameters'
'/app/settings/integrations?status=error&error=invalid_parameters'
);
});
@ -355,7 +355,7 @@ describe.skipIf(skipIfNoEnv)('SlackHandler Integration Tests', () => {
expect(response.status).toBe(302);
expect(response.headers.get('Location')).toBe(
'/settings/integrations?status=error&error=Invalid%20or%20expired%20OAuth%20state'
'/app/settings/integrations?status=error&error=Invalid%20or%20expired%20OAuth%20state'
);
});
});

8
apps/server/src/api/v2/slack/handler.test.ts
View File

@ -132,7 +132,9 @@ describe('SlackHandler', () => {
await handler.handleOAuthCallback(mockContext);
expect(mockContext.redirect).toHaveBeenCalledWith('/settings/integrations?status=cancelled');
expect(mockContext.redirect).toHaveBeenCalledWith(
'/app/settings/integrations?status=cancelled'
);
});
it('should redirect on invalid parameters', async () => {
@ -141,7 +143,7 @@ describe('SlackHandler', () => {
await handler.handleOAuthCallback(mockContext);
expect(mockContext.redirect).toHaveBeenCalledWith(
'/settings/integrations?status=error&error=invalid_parameters'
'/app/settings/integrations?status=error&error=invalid_parameters'
);
});
@ -186,7 +188,7 @@ describe('SlackHandler', () => {
await handler.handleOAuthCallback(mockContext);
expect(mockContext.redirect).toHaveBeenCalledWith(
'/settings/integrations?status=error&error=invalid_state'
'/app/settings/integrations?status=error&error=invalid_state'
);
});
});

12
apps/server/src/api/v2/slack/handler.ts
View File

@ -136,7 +136,7 @@ export class SlackHandler {
// Check if service is available
if (!slackOAuthService) {
return c.redirect('/settings/integrations?status=error&error=not_configured');
return c.redirect('/app/settings/integrations?status=error&error=not_configured');
}
// Parse query parameters
@ -153,7 +153,7 @@ export class SlackHandler {
// Handle user denial
if (query.error === 'access_denied') {
console.info('OAuth flow cancelled by user');
return c.redirect('/settings/integrations?status=cancelled');
return c.redirect('/app/settings/integrations?status=cancelled');
}
console.error('Invalid OAuth callback parameters:', {
@ -161,7 +161,7 @@ export class SlackHandler {
providedKeys: Object.keys(query),
expectedKeys: ['code', 'state'],
});
return c.redirect('/settings/integrations?status=error&error=invalid_parameters');
return c.redirect('/app/settings/integrations?status=error&error=invalid_parameters');
}
// Handle OAuth callback
@ -178,11 +178,11 @@ export class SlackHandler {
resultKeys: Object.keys(result),
});
const errorParam = encodeURIComponent(result.error || 'unknown_error');
return c.redirect(`/settings/integrations?status=error&error=${errorParam}`);
return c.redirect(`/app/settings/integrations?status=error&error=${errorParam}`);
}
// Use metadata to determine return URL
const returnUrl = result.metadata?.returnUrl || '/settings/integrations';
const returnUrl = result.metadata?.returnUrl || '/app/settings/integrations';
const workspaceParam = result.teamName
? `&workspace=${encodeURIComponent(result.teamName)}`
: '';
@ -197,7 +197,7 @@ export class SlackHandler {
});
const errorMessage = error instanceof Error ? error.message : 'callback_failed';
return c.redirect(
`/settings/integrations?status=error&error=${encodeURIComponent(errorMessage)}`
`/app/settings/integrations?status=error&error=${encodeURIComponent(errorMessage)}`
);
}
}