coop-cloud-chaos-patchs/outline
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes: Oauth error on subdomains authenticating slack post

Browse Source
This commit is contained in:
Tom Moor
2018-12-20 20:25:13 -08:00
parent 3a9a5f5ed3
commit ac814abda4
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
server/auth/slack.js
View File

@ -4,7 +4,7 @@ import auth from '../middlewares/authentication';
import addHours from 'date-fns/add_hours';
import { stripSubdomain } from '../../shared/utils/domains';
import { slackAuth } from '../../shared/utils/routeHelpers';
import { Authentication, Integration, User, Team } from '../models';
import { Authentication, Collection, Integration, User, Team } from '../models';
import * as Slack from '../slack';
const router = new Router();
@ -121,21 +121,36 @@ router.get('slack.commands', auth({ required: false }), async ctx => {
ctx.redirect('/settings/integrations/slack');
});
router.get('slack.post', auth(), async ctx => {
router.get('slack.post', auth({ required: false }), async ctx => {
const { code, error, state } = ctx.request.query;
const user = ctx.state.user;
ctx.assertPresent(code || error, 'code is required');
const collectionId = state;
ctx.assertUuid(collectionId, 'collectionId must be an uuid');
if (error) {
ctx.redirect(`/settings/integrations/slack?error=${error}`);
return;
}
const collectionId = state;
ctx.assertUuid(collectionId, 'collectionId must be an uuid');
// this code block accounts for the root domain being unable to
// access authentcation for subdomains. We must forward to the
// appropriate subdomain to complete the oauth flow
if (!user) {
try {
const collection = await Collection.findById(state);
const team = await Team.findById(collection.teamId);
return ctx.redirect(
`${team.url}/auth${ctx.request.path}?${ctx.request.querystring}`
);
} catch (err) {
return ctx.redirect(`/settings/integrations/slack?error=unauthenticated`);
}
}
const endpoint = `${process.env.URL || ''}/auth/slack.post`;
const data = await Slack.oauthAccess(code, endpoint);
const user = ctx.state.user;
const authentication = await Authentication.create({
service: 'slack',