From e2b789cafe6537d3ef145740038a90182c49ae89 Mon Sep 17 00:00:00 2001
From: Sukchan Lee <acetcom@gmail.com>
Date: Fri, 19 May 2017 15:08:32 +0900
Subject: [PATCH] auth module is done

---
 webui/components/start.js | 12 ++++++++++++
 webui/pages/index.js      |  6 +++---
 webui/pages/login.js      |  3 +--
 3 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 webui/components/start.js

diff --git a/webui/components/start.js b/webui/components/start.js
new file mode 100644
index 000000000..f24d4550e
--- /dev/null
+++ b/webui/components/start.js
@@ -0,0 +1,12 @@
+import React from 'react'
+import Session from './session'
+
+export default class extends React.Component {
+
+  // Expose session to all pages
+  static async getInitialProps({req}) {
+    const session = new Session({req})
+    return {session: await session.getSession(true)}
+  }
+
+}
diff --git a/webui/pages/index.js b/webui/pages/index.js
index e1f423a4b..cdec1821f 100644
--- a/webui/pages/index.js
+++ b/webui/pages/index.js
@@ -3,11 +3,11 @@
  */
 import Link from 'next/link'
 import React from 'react'
-import Page from '../components/page'
+import Start from '../components/start'
 import Layout from '../components/layout'
+import Session from '../components/session'
 
-export default class extends Page {
-
+export default class extends Start {
   render() {
     return (
       <Layout session={this.props.session}>
diff --git a/webui/pages/login.js b/webui/pages/login.js
index 41507adc6..74a56b06f 100644
--- a/webui/pages/login.js
+++ b/webui/pages/login.js
@@ -59,8 +59,7 @@ export default class extends Page {
     const session = new Session()
     session.signin(this.state.username, this.state.password)
     .then(() => {
-      // @FIXME next/router not working reliably  so using window.location
-      window.location = '/'
+      this.props.url.push('/')
     })
     .catch(err => {
       // @FIXME Handle error