yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Closes #665 - Correctly handle user not granting auth permissions, display friendly error

Browse Source
This commit is contained in:
Tom Moor
2018-06-04 21:06:47 -07:00
parent 53a0f423c3
commit 22e823df9a
5 changed files with 49 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/auth/slack.js
View File

@@ -78,8 +78,13 @@ router.get('slack.callback', async ctx => {
});
router.get('slack.commands', async ctx => {
const { code } = ctx.request.query;
ctx.assertPresent(code, 'code is required');
const { code, error } = ctx.request.query;
ctx.assertPresent(code || error, 'code is required');
if (error) {
ctx.redirect(`/settings/integrations/slack?error=${error}`);
return;
}
const endpoint = `${process.env.URL || ''}/auth/slack.commands`;
const data = await Slack.oauthAccess(code, endpoint);
@@ -108,8 +113,13 @@ router.get('slack.commands', async ctx => {
});
router.get('slack.post', async ctx => {
const { code, state } = ctx.request.query;
ctx.assertPresent(code, 'code is required');
const { code, error, state } = ctx.request.query;
ctx.assertPresent(code || error, 'code is required');
if (error) {
ctx.redirect(`/settings/integrations/slack?error=${error}`);
return;
}
const collectionId = state;
ctx.assertUuid(collectionId, 'collectionId must be an uuid');