Merge branch 'master' into dashboard-improves

server/api/auth.js

@@ -1,11 +1,9 @@
 // @flow
 import Router from 'koa-router';
-import apiError, { httpErrors } from '../errors';
-import fetch from 'isomorphic-fetch';
-import querystring from 'querystring';
-
+import apiError from '../errors';
 import { presentUser, presentTeam } from '../presenters';
 import { User, Team } from '../models';
+import * as Slack from '../slack';
 
 const router = new Router();
 
@@ -88,24 +86,7 @@ router.post('auth.slack', async ctx => {
   const { code } = ctx.body;
   ctx.assertPresent(code, 'code is required');
 
-  const body = {
-    client_id: process.env.SLACK_KEY,
-    client_secret: process.env.SLACK_SECRET,
-    redirect_uri: `${process.env.URL || ''}/auth/slack`,
-    code,
-  };
-
-  let data;
-  try {
-    const response = await fetch(
-      `https://slack.com/api/oauth.access?${querystring.stringify(body)}`
-    );
-    data = await response.json();
-  } catch (e) {
-    throw httpErrors.BadRequest();
-  }
-
-  if (!data.ok) throw httpErrors.BadRequest(data.error);
+  const data = await Slack.oauthAccess(code);
 
   // Temp to block
   const allowedSlackDomains = (process.env.ALLOWED_SLACK_DOMAINS || '')
@@ -118,22 +99,20 @@ router.post('auth.slack', async ctx => {
     );
   }
 
-  // User
   let user = await User.findOne({ where: { slackId: data.user.id } });
-
-  // Team
   let team = await Team.findOne({ where: { slackId: data.team.id } });
   const teamExisted = !!team;
-  if (!team) {
+
+  if (team) {
+    team.name = data.team.name;
+    team.slackData = data.team;
+    await team.save();
+  } else {
     team = await Team.create({
       name: data.team.name,
       slackId: data.team.id,
       slackData: data.team,
     });
-  } else {
-    team.name = data.team.name;
-    team.slackData = data.team;
-    team = await team.save();
   }
 
   if (user) {
@@ -143,7 +122,6 @@ router.post('auth.slack', async ctx => {
   } else {
     user = await User.create({
       slackId: data.user.id,
-      username: data.user.name,
       name: data.user.name,
       email: data.user.email,
       teamId: team.id,
@@ -169,24 +147,7 @@ router.post('auth.slackCommands', async ctx => {
   const { code } = ctx.body;
   ctx.assertPresent(code, 'code is required');
 
-  const body = {
-    client_id: process.env.SLACK_KEY,
-    client_secret: process.env.SLACK_SECRET,
-    redirect_uri: `${process.env.URL || ''}/auth/slack/commands`,
-    code,
-  };
-
-  let data;
-  try {
-    const response = await fetch(
-      `https://slack.com/api/oauth.access?${querystring.stringify(body)}`
-    );
-    data = await response.json();
-  } catch (e) {
-    throw httpErrors.BadRequest();
-  }
-
-  if (!data.ok) throw httpErrors.BadRequest(data.error);
+  await Slack.oauthAccess(code, `${process.env.URL || ''}/auth/slack/commands`);
 });
 
 export default router;

server/migrations/20170904202454-allow-null-username.js

@@ -0,0 +1,15 @@
+module.exports = {
+  up: async function(queryInterface, Sequelize) {
+    await queryInterface.changeColumn('users', 'username', {
+      type: Sequelize.STRING,
+      allowNull: true,
+    });
+  },
+
+  down: async function(queryInterface, Sequelize) {
+    await queryInterface.changeColumn('users', 'username', {
+      type: Sequelize.STRING,
+      allowNull: false,
+    });
+  },
+};

server/slack.js

@@ -0,0 +1,34 @@
+// @flow
+import fetch from 'isomorphic-fetch';
+import querystring from 'querystring';
+import { httpErrors } from './errors';
+
+const SLACK_API_URL = 'https://slack.com/api';
+
+export async function request(endpoint: string, body: Object) {
+  let data;
+  try {
+    const response = await fetch(
+      `${SLACK_API_URL}/${endpoint}?${querystring.stringify(body)}`
+    );
+    data = await response.json();
+  } catch (e) {
+    throw httpErrors.BadRequest();
+  }
+  console.log('DATA', data);
+  if (!data.ok) throw httpErrors.BadRequest(data.error);
+
+  return data;
+}
+
+export async function oauthAccess(
+  code: string,
+  redirect_uri: string = `${process.env.URL || ''}/auth/slack`
+) {
+  return request('oauth.access', {
+    client_id: process.env.SLACK_KEY,
+    client_secret: process.env.SLACK_SECRET,
+    redirect_uri: `${process.env.URL || ''}/auth/slack`,
+    code,
+  });
+}

server/static/dev.html

@@ -20,7 +20,7 @@
 
   #root {
     flex: 1;
-    height: 100%;
+    min-height: 100vh;
   }
 </style>
 </head>
@@ -30,4 +30,4 @@
   <script src="/static/bundle.js"></script>
 </body>
 
-</html>
+</html>

server/static/index.html

@@ -18,7 +18,7 @@
 
     #root {
       flex: 1;
-      height: 100%;
+      min-height: 100vh;
     }
   </style>
 </head>
@@ -28,4 +28,4 @@
 </body>
 <script src="//d2wy8f7a9ursnm.cloudfront.net/bugsnag-3.min.js" data-apikey="8165e2069605bc20ccd0792dbbfae7bf"></script>
 
-</html>
+</html>