From 2267d85b29e5a23a5cf00f47fbe79415c67f56e1 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 18 Dec 2023 15:53:58 +0530 Subject: [PATCH] refactor: move onboarding to dashboard routes Doing this ensures that login checks are run for this page, coz we want this page to be accessible only to individuals who are logged in --- .../dashboard/routes/dashboard/dashboard.routes.js | 3 +++ app/javascript/dashboard/routes/index.js | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/app/javascript/dashboard/routes/dashboard/dashboard.routes.js b/app/javascript/dashboard/routes/dashboard/dashboard.routes.js index 22fc11738..c4822fdfc 100644 --- a/app/javascript/dashboard/routes/dashboard/dashboard.routes.js +++ b/app/javascript/dashboard/routes/dashboard/dashboard.routes.js @@ -35,16 +35,19 @@ export default { { path: frontendURL('start/setup-profile'), name: 'onboarding_setup_profile', + roles: ['administrator'], component: SetupProfile, }, { path: frontendURL('start/setup-company'), name: 'onboarding_setup_company', + roles: ['administrator'], component: SetupCompany, }, { path: frontendURL('start/founders-note'), name: 'onboarding_founders_note', + roles: ['administrator'], component: FoundersNote, }, ], diff --git a/app/javascript/dashboard/routes/index.js b/app/javascript/dashboard/routes/index.js index e2245e20f..22f5ec0c6 100644 --- a/app/javascript/dashboard/routes/index.js +++ b/app/javascript/dashboard/routes/index.js @@ -45,11 +45,19 @@ export const validateAuthenticateRoutePermission = (to, next, { getters }) => { return next(frontendURL(`accounts/${user.account_id}/dashboard`)); } + // we can let them access onboarding routes + // we will eventually need guards as onboarding is done, but for now + // we can let them access onboarding routes + if (to.name.startsWith('onboarding')) { + return next(); + } + const nextRoute = validateLoggedInRoutes( to, getters.getCurrentUser, window.roleWiseRoutes ); + return nextRoute ? next(frontendURL(nextRoute)) : next(); };