From 4070ca2b295cd420bc6e8dbfb1dfa0ef3db89957 Mon Sep 17 00:00:00 2001 From: GotPPay Date: Mon, 28 May 2018 15:44:44 +0200 Subject: [PATCH] use existing role checking system --- src/routes/login/components/Login.js | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/routes/login/components/Login.js b/src/routes/login/components/Login.js index fe362cb..2a93cc1 100644 --- a/src/routes/login/components/Login.js +++ b/src/routes/login/components/Login.js @@ -8,7 +8,10 @@ import Dialog from 'material-ui/Dialog'; import Instance from '../../../components/Connection'; -const visitReporterRoleKey = "VIRPT"; +import { + loggedUser, + visitReporter, +} from 'utils/authorization'; class Login extends React.Component { constructor(props) { @@ -77,23 +80,18 @@ class Login extends React.Component { let auth = res.data; state.setCookie('token', auth.token, auth.valid_time); localStorage.setItem('loggedUser', JSON.stringify(auth.user)); - console.log(auth.user); - let isAuthUserVisitReporter = false; - if (auth.user.profiles.length > 0){ - isAuthUserVisitReporter = (auth.user.profiles[0].key===visitReporterRoleKey); - } + console.log("...."); + console.log(loggedUser.anyOf(visitReporter)); - Instance.setToken(auth.token); - - if (isAuthUserVisitReporter) { + if (loggedUser.anyOf(visitReporter)){ location.href = '/#/app/form/visit/' + auth.user.useruuid; }else{ location.href = '/#/app/table/rides'; } + + }).catch(function (err) { - console.log("ERRR"); - console.log(err); state.setState(Object.assign(state.state, { message: (err.response.data.message), open: true,