release v2.0.0 #4

Merged
crimsen merged 481 commits from develop into master 2024-01-18 15:15:08 +00:00
4 changed files with 31 additions and 43 deletions
Showing only changes of commit 2425e6cf2f - Show all commits

View File

@ -26,7 +26,7 @@
"@capacitor/storage": "^1.2.3", "@capacitor/storage": "^1.2.3",
"@flaschengeist/types": "^1.0.0-alpha.10", "@flaschengeist/types": "^1.0.0-alpha.10",
"@quasar/app": "^3.2.4", "@quasar/app": "^3.2.4",
"@quasar/extras": "^1.12.1", "@quasar/extras": "^1.12.2",
"@types/node": "^14.18.0", "@types/node": "^14.18.0",
"@types/webpack": "^5.28.0", "@types/webpack": "^5.28.0",
"@types/webpack-env": "^1.16.3", "@types/webpack-env": "^1.16.3",

View File

@ -94,12 +94,11 @@ export default boot(({ router }) => {
query: { redirect: next }, query: { redirect: next },
}); });
} else if (e.response && e.response.status == 401) { } else if (e.response && e.response.status == 401) {
void store.handleLoggedOut(); store.handleLoggedOut();
if (current.name !== 'login') { if (current.name != 'login') {
await router.push({ await router.push({
name: 'login', name: 'login',
params: { logout: 'logout' }, query: { redirect: current.fullPath },
query: { redirect: current.path },
}); });
} }
} }

View File

@ -3,46 +3,31 @@
*/ */
import { useMainStore, hasPermissions } from '@flaschengeist/api'; import { useMainStore, hasPermissions } from '@flaschengeist/api';
import { boot } from 'quasar/wrappers'; import { boot } from 'quasar/wrappers';
import { RouteRecord } from 'vue-router';
export default boot(({ router }) => { export default boot(({ router }) => {
router.beforeResolve((to, from, next) => { /**
* Login guard
* Check if user tries to access the secured area and validates token
*/
router.beforeEach((to, from) => {
const store = useMainStore(); const store = useMainStore();
// Skip if same path // Skip loops
if (to.path == from.path) return next(); if (to.name == 'login' && from.name == 'login') return false;
// Check if secured area or public // Secured area '/in/...' requires to be authenticated
if (to.path.startsWith('/in')) { if (to.path.startsWith('/in') && (!store.session || store.session.expires <= new Date())) {
// Secured area (LOGIN REQUIRED) store.handleLoggedOut();
// Check login is ok return { name: 'login' };
if (!store.session || store.session.expires <= new Date()) {
void store.handleLoggedOut();
return next({ name: 'login', query: { redirect: to.fullPath } });
}
// Check if special permissions are required
if (
to.matched.every((record: RouteRecord) => {
if (!('meta' in record) || !('permissions' in record.meta)) return true;
if ((<{ permissions: FG.Permission[] }>record.meta).permissions) {
return hasPermissions((<{ permissions: FG.Permission[] }>record.meta).permissions);
}
})
) {
return next();
} else {
return next({ name: 'login', query: { redirect: to.fullPath } });
}
} else {
// Public space just handle login loops
if (to.name == 'login' && store.user && !to.params['logout']) {
// Called login while already logged in
return next({ name: 'dashboard' });
} else {
// We are on the non secured area
return next();
}
} }
}); });
/**
* Permission guard
* Check permissions for route, cancel navigation on errors
*/
router.beforeResolve((to) => {
if (!!to.meta.permissions && !hasPermissions(<FG.Permission[]>to.meta.permissions))
return false;
});
}); });

View File

@ -119,10 +119,14 @@ export default defineComponent({
if (status === true) { if (status === true) {
// On capacitor we set the lifetime to at least two weeks to not annoy users. // On capacitor we set the lifetime to at least two weeks to not annoy users.
if (quasar.platform.is.capacitor) if (quasar.platform.is.capacitor)
void sessionStore.updateSession(14 * 24 * 60 * 60, mainStore.currentSession.token); await sessionStore.updateSession(14 * 24 * 60 * 60, mainStore.currentSession.token);
// Redirect user to previous page, if any. // Redirect user to previous page, if any.
const x = router.currentRoute.value.query['redirect']; const redirect =
void router.push(!!x && typeof x === 'string' ? { path: x } : mainRoute); router.currentRoute.value.redirectedFrom || 'redirect' in router.currentRoute.value.query
? { path: router.currentRoute.value.query.redirect as string }
: mainRoute;
void router.push(redirect);
} else { } else {
// Login failed, notify and reset form // Login failed, notify and reset form
password.value = ''; password.value = '';