From 1feeb3a584e6d4ed9ad8fce9dd3cf6394389c53b Mon Sep 17 00:00:00 2001
From: Guillaume Vincent <guillaume@oslab.fr>
Date: Thu, 24 Mar 2016 09:58:51 +0100
Subject: [PATCH] update login workflow

---
 src/app/Login.vue                      | 10 ++++----
 src/landing-page/LoginBar/LoginBar.vue |  2 +-
 src/router.js                          | 22 ++++++++---------
 src/services/auth.js                   | 43 +++++++---------------------------
 4 files changed, 26 insertions(+), 51 deletions(-)

diff --git a/src/app/Login.vue b/src/app/Login.vue
index b830f16..73b49fa 100644
--- a/src/app/Login.vue
+++ b/src/app/Login.vue
@@ -52,12 +52,12 @@
           password: this.credentials.password,
         };
         auth.login(credentials)
-          .then(() => {
+          .then((data) => {
+            console.log('Request succeeded with JSON response', data);
             router.go('/app/');
-          })
-          .catch(() => {
-            logging.error(this.$t('login.credentials_invalids'));
-          });
+          }).catch((error) => {
+          console.log('Request failed', error);
+        });
       },
     },
   };
diff --git a/src/landing-page/LoginBar/LoginBar.vue b/src/landing-page/LoginBar/LoginBar.vue
index 42e9012..9e365b3 100644
--- a/src/landing-page/LoginBar/LoginBar.vue
+++ b/src/landing-page/LoginBar/LoginBar.vue
@@ -20,7 +20,7 @@
     <div class="container">
       <nav class="nav nav-inline pull-right">
         <a class="nav-link" v-bind:class="{ 'bg-primary': $route.path=='/login/'}"
-           v-link="{ path: '/login/' }">
+           v-link="{ path: '/app/' }">
           <i class="fa fa-lock"></i> {{ $t('login.login') }}
         </a>
         <a class="nav-link" v-bind:class="{ 'bg-primary': $route.path=='/register/' || $route.path=='/'}"
diff --git a/src/router.js b/src/router.js
index f64fc85..978581f 100644
--- a/src/router.js
+++ b/src/router.js
@@ -4,8 +4,10 @@ import App from './App';
 
 Vue.use(Router);
 
-const router = new Router();
-
+const router = new Router({
+  history: true,
+  hashbang: false,
+});
 
 import LandingPage from './landing-page/LandingPage';
 import LoginPage from './app/Login';
@@ -14,8 +16,7 @@ import LessPassConnected from './app/Index';
 
 router.map({
   '/': {
-    auth: true,
-    component: LessPassConnected,
+    component: LandingPage,
   },
   '/login/': {
     component: LoginPage,
@@ -23,8 +24,9 @@ router.map({
   '/register/': {
     component: RegisterPage,
   },
-  '/welcome/': {
-    component: LandingPage,
+  '/app/': {
+    auth_required: true,
+    component: LessPassConnected,
   },
 });
 
@@ -39,13 +41,11 @@ import Auth from './services/auth';
 Auth.checkAuth();
 
 router.beforeEach(transition => {
-  alert(transition.to.auth);
-  if (transition.to.auth && !Auth.user.authenticated) {
-    alert(Auth.user.authenticated);
-    transition.redirect('/welcome/');
+  if (transition.to.auth_required && !Auth.user.authenticated) {
+    transition.redirect('/login/');
   } else {
     transition.next();
   }
 });
 
-module.exports = router;
+export default router;
diff --git a/src/services/auth.js b/src/services/auth.js
index ce9814e..b4a7dd3 100644
--- a/src/services/auth.js
+++ b/src/services/auth.js
@@ -1,5 +1,3 @@
-import logging from './logging';
-
 function checkStatus(response) {
   if (response.status >= 200 && response.status < 300) {
     return response;
@@ -17,6 +15,7 @@ module.exports = {
   user: {
     authenticated: false,
   },
+
   login(credential) {
     return fetch('/api/sessions/', {
       method: 'post',
@@ -26,38 +25,12 @@ module.exports = {
       },
       body: JSON.stringify(credential),
     }).then(checkStatus)
-      .then(parseJSON);
-  },
-  login2(context, credentials, callback) {
-    const self = this;
-
-    fetch('/users.html');
-    context.$http.post('/api/sessions/', credentials).then(
-      response => {
-        localStorage.setItem('token', response.data.token);
-        self.user.authenticated = true;
-        logging.success(this.$t('login.welcome'));
-        if (callback) {
-          callback();
-        }
-      },
-      () => {
-        logging.error(this.$t('login.credentials_invalids'));
-      }
-    );
-  },
-
-  register(context, user, callback) {
-    context.$http.post('/api/users/', user).then(
-      () => {
-        if (callback) {
-          callback();
-        }
-      },
-      () => {
-        logging.warning(this.$t('register.beta'));
-      }
-    );
+      .then(parseJSON)
+      .then((data) => {
+        localStorage.setItem('token', data.token);
+        this.user.authenticated = true;
+        return data;
+      });
   },
 
   logout(callback) {
@@ -69,7 +42,9 @@ module.exports = {
   },
 
   checkAuth() {
+    console.log('check auth');
     const jwt = localStorage.getItem('token');
+    console.log(jwt);
     this.user.authenticated = !!jwt;
   },