From 836f9a88a2c8711ad4a58dc95d292158ba2a91e9 Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Wed, 12 Dec 2018 10:31:08 -0800
Subject: [PATCH] Fixes: Teams with non-latin characters annot signin

---
 app/stores/AuthStore.js               |  2 +-
 server/middlewares/authentication.js  |  4 ++--
 server/pages/components/Navigation.js | 28 +++++++++++++++------------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/app/stores/AuthStore.js b/app/stores/AuthStore.js
index dffb85ad..5a9fdbfc 100644
--- a/app/stores/AuthStore.js
+++ b/app/stores/AuthStore.js
@@ -146,7 +146,7 @@ export default class AuthStore {
       const sessions = Cookie.getJSON('sessions') || {};
       delete sessions[team.id];
 
-      Cookie.set('sessions', sessions, {
+      Cookie.set('sessions', JSON.stringify(sessions), {
         domain: stripSubdomain(window.location.hostname),
       });
       this.team = null;
diff --git a/server/middlewares/authentication.js b/server/middlewares/authentication.js
index 8b95872d..dcb779ec 100644
--- a/server/middlewares/authentication.js
+++ b/server/middlewares/authentication.js
@@ -116,9 +116,9 @@ export default function auth(options?: { required?: boolean } = {}) {
         const sessions = JSON.stringify({
           ...existing,
           [team.id]: {
-            name: team.name,
+            name: encodeURIComponent(team.name),
             logoUrl: team.logoUrl,
-            url: team.url,
+            url: encodeURIComponent(team.url),
           },
         });
         ctx.cookies.set('sessions', sessions, {
diff --git a/server/pages/components/Navigation.js b/server/pages/components/Navigation.js
index 5fd16da2..6d263975 100644
--- a/server/pages/components/Navigation.js
+++ b/server/pages/components/Navigation.js
@@ -59,18 +59,22 @@ function TopNavigation({ sessions, loggedIn }: Props) {
               <MenuItem highlighted>
                 <a>Your Teams</a>
                 <ol>
-                  {orderedSessions.map(session => (
-                    <MenuItem key={session.url}>
-                      <a href={`${session.url}/dashboard`}>
-                        <TeamLogo
-                          src={session.logoUrl}
-                          width={20}
-                          height={20}
-                        />
-                        {session.name}
-                      </a>
-                    </MenuItem>
-                  ))}
+                  {orderedSessions.map(session => {
+                    const url = decodeURIComponent(session.url);
+
+                    return (
+                      <MenuItem key={url}>
+                        <a href={`${url}/dashboard`}>
+                          <TeamLogo
+                            src={session.logoUrl}
+                            width={20}
+                            height={20}
+                          />
+                          {decodeURIComponent(session.name)}
+                        </a>
+                      </MenuItem>
+                    );
+                  })}
                 </ol>
               </MenuItem>
             ) : (