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

Allow Slack integration setup for Google Auth accounts

Browse Source
This commit is contained in:
Tom Moor 2018-08-02 23:26:44 -07:00
parent cdd1fc4fb7
commit 662f908c76
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/auth/slack.js
View File

@ -1,5 +1,6 @@
// @flow
import Router from 'koa-router';
import auth from '../middlewares/authentication';
import addHours from 'date-fns/add_hours';
import addMonths from 'date-fns/add_months';
import { slackAuth } from '../../shared/utils/routeHelpers';
@ -77,7 +78,7 @@ router.get('slack.callback', async ctx => {
ctx.redirect('/');
});
router.get('slack.commands', async ctx => {
router.get('slack.commands', auth(), async ctx => {
const { code, error } = ctx.request.query;
ctx.assertPresent(code || error, 'code is required');
@ -88,12 +89,7 @@ router.get('slack.commands', async ctx => {
const endpoint = `${process.env.URL || ''}/auth/slack.commands`;
const data = await Slack.oauthAccess(code, endpoint);
const user = await User.find({
where: {
service: 'slack',
serviceId: data.user_id,
},
});
const user = ctx.state.user;
const authentication = await Authentication.create({
service: 'slack',
@ -114,7 +110,7 @@ router.get('slack.commands', async ctx => {
ctx.redirect('/settings/integrations/slack');
});
router.get('slack.post', async ctx => {
router.get('slack.post', auth(), async ctx => {
const { code, error, state } = ctx.request.query;
ctx.assertPresent(code || error, 'code is required');
@ -128,13 +124,7 @@ router.get('slack.post', async ctx => {
const endpoint = `${process.env.URL || ''}/auth/slack.post`;
const data = await Slack.oauthAccess(code, endpoint);
const user = await User.find({
where: {
service: 'slack',
serviceId: data.user_id,
},
});
const user = ctx.state.user;
const authentication = await Authentication.create({
service: 'slack',

6
server/middlewares/authentication.js
View File

@ -24,10 +24,12 @@ export default function auth(options?: { required?: boolean } = {}) {
);
}
// $FlowFixMe
} else if (ctx.body.token) {
} else if (ctx.body && ctx.body.token) {
token = ctx.body.token;
} else if (ctx.request.query.token) {
token = ctx.request.query.token;
} else if (ctx.cookies.get('accessToken')) {
token = ctx.cookies.get('accessToken');
}
if (!token && options.required !== false) {
@ -84,7 +86,7 @@ export default function auth(options?: { required?: boolean } = {}) {
ctx.state.token = token;
ctx.state.user = user;
// $FlowFixMe
if (!ctx.cache) ctx.cache = {};
ctx.cache[user.id] = user;
}