From 48291a08e53834c47dfb963ebe84d6719602cbf4 Mon Sep 17 00:00:00 2001
From: Sebastian Frank <frank@basiskonfiguration.de>
Date: Mon, 25 Sep 2017 13:03:17 +0200
Subject: [PATCH] use user credentials as given

---
 src/lib/baseui.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/lib/baseui.js b/src/lib/baseui.js
index 6d39fad..d4114fb 100644
--- a/src/lib/baseui.js
+++ b/src/lib/baseui.js
@@ -25,6 +25,7 @@ const globalConf = {
     loginEndpoint: 'login',
     loginRoute: '/login',
     authHeader: 'X-Auth-Token',
+    responseType: 'json',
     initUrl: 'conf/init.json',
     el: '#my-app'
 }
@@ -46,10 +47,7 @@ const Store = new Vuex.Store({
             state.ui = payload;
         },
         setCredentials(state, payload) {
-            state.persist.credentials = {
-                username: payload.username,
-                password: payload.password
-            };
+            state.persist.credentials = payload;
             objectToPersist(state.persist, 'persistantStore');
         },
         setLogin(state, payload) {
@@ -70,15 +68,16 @@ const Store = new Vuex.Store({
         apiRequest(context, payload) {
             let doRequest = () => {
                 return new Promise((resolve, reject) => {
-                    const authH = {};
-                    authH[globalConf.authHeader] = context.state.persist.authToken;
+                    const addHeader = {};
+                    addHeader[globalConf.authHeader] = context.state.persist.authToken;
                     Axios({
                         method: payload.method ? payload.method : 'get',
                         baseURL: context.state.ui.api.baseURL,
                         url: payload.endpoint,
                         params: payload.params,
                         data: payload.data,
-                        headers: authH
+                        headers: addHeader,
+                        responseType: globalConf.responseType
                     })
                         .then(response => {
                             console.log(response);
@@ -94,8 +93,7 @@ const Store = new Vuex.Store({
             if (payload.endpoint != globalConf.loginEndpoint) {
                 // no jwt check for login call
 
-                // empty username = not logged in
-                if (!context.state.persist.credentials.username) {
+                if (!context.state.persist.jwt.exp) {
                     return new Promise((resolve, reject) => {
                         // show login page
                         Router.push(globalConf.loginRoute);