Legwork for initial documents for atlases

server/api/auth.js

@@ -27,8 +27,6 @@ router.post('auth.slack', async (ctx) => {
     throw httpErrors.BadRequest();
   }
 
-  console.log(data);
-
   if (!data.ok) throw httpErrors.BadRequest(data.error);
 
   // Temp to block
@@ -40,13 +38,13 @@ router.post('auth.slack', async (ctx) => {
 
   // Team
   let team = await Team.findOne({ where: { slackId: data.team.id } });
+  let teamExisted = !!team;
   if (!team) {
     team = await Team.create({
       name: data.team.name,
       slackId: data.team.id,
       slackData: data.team,
     });
-    await team.createFirstAtlas();
   } else {
     team.name = data.team.name;
     team.slackData = data.team;
@@ -56,18 +54,23 @@ router.post('auth.slack', async (ctx) => {
   if (user) {
     user.slackAccessToken = data.access_token;
     user.slackData = data.user;
-    user = await user.save();
+    await user.save();
   } else {
-    user = await team.createUser({
+    user = await User.create({
       slackId: data.user.id,
       username: data.user.name,
       name: data.user.name,
       email: data.user.email,
+      teamId: team.id,
       slackData: data.user,
       slackAccessToken: data.access_token,
     });
   }
 
+  if (!teamExisted) {
+    await team.createFirstAtlas(user.id);
+  }
+
   ctx.body = { data: {
     user: await presentUser(user),
     team: await presentTeam(team),

server/api/collections.js

@@ -24,6 +24,7 @@ router.post('atlases.create', auth(), async (ctx) => {
     description,
     type: type || 'atlas',
     teamId: user.teamId,
+    creatorId: user.id,
   });
 
   ctx.body = {
@@ -66,8 +67,8 @@ router.post('atlases.list', auth(), pagination(), async (ctx) => {
 
   // Atlases
   let data = [];
-  await Promise.all(atlases.forEach(async (atlas) => {
-    data.push(await presentAtlas(atlas, true));
+  await Promise.all(atlases.map(async (atlas) => {
+    return data.push(await presentAtlas(atlas, true));
   }));
 
   data = _orderBy(data, ['updatedAt'], ['desc']);