From a9f59c98ee775f6fea3f5d163467cf5b95f284a3 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Thu, 11 Apr 2024 17:30:43 +0200 Subject: [PATCH] Few fixes --- frontend/src/router/index.js | 16 +++++++--------- requirements.txt | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index 5b6a263f2..4163a0df9 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -294,18 +294,16 @@ router.beforeEach((to, from, next) => { const authStore = useAuthStore() authStore.initialize().then(() => { authStore.validateAccess() - if (to.meta.requiresMailbox && !authStore.authUser.mailbox) { - next(false) - } else { - /* - if (to.meta.allowedRoles !== undefined) { + if (to.meta.allowedRoles !== undefined) { if (to.meta.allowedRoles.indexOf(authStore.authUser.role) === -1) { - next({ name: 'Dashboard' }) - return + next({ name: 'Dashboard' }) + return } - }*/ - next() } + if (to.meta.requiresMailbox && !authStore.authUser.mailbox) { + next({ name: 'Dashboard' }) + } + next() }) } else { next() diff --git a/requirements.txt b/requirements.txt index 9a7252f3e..41e113b60 100644 --- a/requirements.txt +++ b/requirements.txt @@ -51,4 +51,4 @@ rq>=1.13.0 django-rq # Sieve -sievelib>=1.3.0 +sievelib>=1.4