From 61138ff4faf0f4b3b9d61ac78ac5cabc882185cc Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Sun, 11 Nov 2018 21:17:03 -0800
Subject: [PATCH] Cleanup

---
 app/stores/AuthStore.js               | 1 -
 server/auth/index.js                  | 2 --
 server/middlewares/authentication.js  | 5 ++---
 server/models/Team.js                 | 6 ++++--
 server/pages/components/Navigation.js | 4 ++--
 server/presenters/team.js             | 2 +-
 server/routes.js                      | 1 -
 7 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/stores/AuthStore.js b/app/stores/AuthStore.js
index 6f9625dbc..bafe11b82 100644
--- a/app/stores/AuthStore.js
+++ b/app/stores/AuthStore.js
@@ -132,7 +132,6 @@ class AuthStore {
     this.user = data.user;
     this.team = data.team;
     this.token = Cookie.get('accessToken');
-    console.log('token', this.token);
 
     if (this.token) setImmediate(() => this.fetch());
 
diff --git a/server/auth/index.js b/server/auth/index.js
index 642877db2..37317c823 100644
--- a/server/auth/index.js
+++ b/server/auth/index.js
@@ -32,8 +32,6 @@ router.get('/redirect', auth(), async ctx => {
   });
 
   const team = await Team.findById(user.teamId);
-
-  console.log(`redirecting: ${team.url}/dashboard`);
   ctx.redirect(`${team.url}/dashboard`);
 });
 
diff --git a/server/middlewares/authentication.js b/server/middlewares/authentication.js
index a09ed0a2d..d1c2d3463 100644
--- a/server/middlewares/authentication.js
+++ b/server/middlewares/authentication.js
@@ -117,7 +117,7 @@ export default function auth(options?: { required?: boolean } = {}) {
           ...existing,
           [team.subdomain]: {
             name: team.name,
-            logo: team.logo,
+            logoUrl: team.logoUrl,
             url: team.url,
             expires,
           },
@@ -133,14 +133,13 @@ export default function auth(options?: { required?: boolean } = {}) {
           expires: addMinutes(new Date(), 1),
           domain,
         });
-        console.log(`redirecting: ${team.url}/auth/redirect`);
         ctx.redirect(`${team.url}/auth/redirect`);
       } else {
         ctx.cookies.set('accessToken', user.getJwtToken(), {
           httpOnly: false,
           expires,
         });
-        ctx.redirect(team.url);
+        ctx.redirect(`${team.url}/dashboard`);
       }
     };
 
diff --git a/server/models/Team.js b/server/models/Team.js
index 758352701..777bc145e 100644
--- a/server/models/Team.js
+++ b/server/models/Team.js
@@ -45,13 +45,15 @@ const Team = sequelize.define(
   {
     getterMethods: {
       url() {
-        if (!this.subdomain) return process.env.URL;
+        if (!this.subdomain || !process.env.SUBDOMAINS_ENABLED) {
+          return process.env.URL;
+        }
 
         const url = new URL(process.env.URL);
         url.host = `${this.subdomain}.${url.host}`;
         return url.href.replace(/\/$/, '');
       },
-      logo() {
+      logoUrl() {
         return (
           this.avatarUrl || (this.slackData ? this.slackData.image_88 : null)
         );
diff --git a/server/pages/components/Navigation.js b/server/pages/components/Navigation.js
index 280aa5a5c..a9e1784af 100644
--- a/server/pages/components/Navigation.js
+++ b/server/pages/components/Navigation.js
@@ -19,7 +19,7 @@ import {
 type Sessions = {
   [subdomain: string]: {
     name: string,
-    logo: string,
+    logoUrl: string,
     expires: string,
     url: string,
   },
@@ -54,7 +54,7 @@ function TopNavigation({ sessions }: { sessions: ?Sessions }) {
               {orderedSessions.map(session => (
                 <MenuItem key={session.url}>
                   <a href={`${session.url}/dashboard`}>
-                    <TeamLogo src={session.logo} width={20} height={20} />
+                    <TeamLogo src={session.logoUrl} width={20} height={20} />
                     {session.name}
                   </a>
                 </MenuItem>
diff --git a/server/presenters/team.js b/server/presenters/team.js
index fae6bb09b..7180d5aa6 100644
--- a/server/presenters/team.js
+++ b/server/presenters/team.js
@@ -7,7 +7,7 @@ function present(ctx: Object, team: Team) {
   return {
     id: team.id,
     name: team.name,
-    avatarUrl: team.logo,
+    avatarUrl: team.logoUrl,
     slackConnected: !!team.slackId,
     googleConnected: !!team.googleId,
     sharing: team.sharing,
diff --git a/server/routes.js b/server/routes.js
index 1e073d56f..cd979f125 100644
--- a/server/routes.js
+++ b/server/routes.js
@@ -70,7 +70,6 @@ router.get('/', async ctx => {
   const subdomain = domain ? domain.subdomain : undefined;
   const accessToken = ctx.cookies.get('accessToken');
 
-  console.log('accessToken', accessToken);
   ctx.set('Cache-Control', 'no-cache');
 
   if (accessToken) {