panel/baseui
1
0
Fork 0
Code Issues8 Pull Requests Releases Wiki Activity

use user credentials as given

Browse Source
This commit is contained in:
Sebastian Frank 2017-09-25 13:03:17 +02:00
parent 92e756dbea
commit 48291a08e5
1 changed files with 7 additions and 9 deletions

16
src/lib/baseui.js

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