ODWRTW/canape
2
2
Fork 0
Code Issues 3 Pull Requests 1 Releases Activity

Better redirections while logged in

Browse Source 
* If the user is already logged in and tries to go to /users/login,
redirect him to the default page
* Add check on the /users/edit page, it was not secure
This commit is contained in:
Grégoire Delattre 2017-05-21 16:12:50 +02:00
parent 316a850eec
commit 638fc971b2
1 changed files with 41 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/public/js/app.js
View File

@ -81,8 +81,8 @@ export function startPollingTorrents() {
)
}
var pollingTorrentsId;
const loginCheck = function(nextState, replace, next, f) {
// This function returns true if the user is logged in, false otherwise
function isLoggedIn() {
const state = store.getState();
const isLogged = state.userStore.isLogged;
let token = localStorage.getItem('token');
@ -98,10 +98,23 @@ const loginCheck = function(nextState, replace, next, f) {
});
}
if (!isLogged && (!token || token === "")) {
if (isLogged || (token && token !== "")) {
return true
}
return false
}
var pollingTorrentsId;
const loginCheck = function(nextState, replace, next, f = null) {
const loggedIn = isLoggedIn();
if (!loggedIn) {
replace('/users/login');
} else {
f();
if (f) {
f();
}
// Poll torrents once logged
if (!pollingTorrentsId) {
// Fetch the torrents every 10s
@ -114,15 +127,34 @@ const loginCheck = function(nextState, replace, next, f) {
next();
}
const defaultRoute = '/movies/explore/yts/seeds';
const routes = {
path: '/',
component: App,
indexRoute: {onEnter: ({params}, replace) => replace('/movies/explore/yts/seeds')},
indexRoute: {onEnter: ({params}, replace) => replace(defaultRoute)},
childRoutes: [
{ path: '/users/login' , component: UserLoginForm },
{ path: '/users/signup' , component: UserSignUp },
{ path: '/users/edit' , component: UserEdit },
{ path: '/users/signup' , component: UserSignUp },
{
path: '/users/signup',
component: UserSignUp
},
{
path: '/users/login',
component: UserLoginForm,
onEnter: function(nextState, replace, next) {
if (isLoggedIn()) {
// User is already logged in, redirect him to the default route
replace(defaultRoute);
}
next();
},
},
{
path: '/users/edit',
component: UserEdit,
onEnter: function(nextState, replace, next) {
loginCheck(nextState, replace, next);
},
},
{
path: '/users/logout',
onEnter: function(nextState, replace, next) {