diff --git a/client/src/pages/GuestStartPage.vue b/client/src/pages/GuestStartPage.vue new file mode 100644 index 00000000..3dddd436 --- /dev/null +++ b/client/src/pages/GuestStartPage.vue @@ -0,0 +1,51 @@ + + + diff --git a/client/src/pages/UKStartPage.vue b/client/src/pages/UKStartPage.vue new file mode 100644 index 00000000..5421b45c --- /dev/null +++ b/client/src/pages/UKStartPage.vue @@ -0,0 +1,15 @@ + + + diff --git a/client/src/pages/VVStartPage.vue b/client/src/pages/VVStartPage.vue new file mode 100644 index 00000000..de73ac1c --- /dev/null +++ b/client/src/pages/VVStartPage.vue @@ -0,0 +1,15 @@ + + + diff --git a/client/src/router/guards.ts b/client/src/router/guards.ts index 27116000..72da59c8 100644 --- a/client/src/router/guards.ts +++ b/client/src/router/guards.ts @@ -12,14 +12,10 @@ export const updateLoggedIn: NavigationGuard = async () => { } }; -export const redirectToLoginIfRequired: NavigationGuard = (to) => { +export const redirectToStartIfRequired: NavigationGuard = (to) => { const userStore = useUserStore(); if (loginRequired(to) && !userStore.loggedIn) { - const appEnv = import.meta.env.VITE_APP_ENVIRONMENT || "local"; - const ssoLogin = appEnv.startsWith("prod") || appEnv.startsWith("stage"); - return ssoLogin - ? `/login?next=${encodeURIComponent(to.fullPath)}` - : `/login-local?next=${encodeURIComponent(to.fullPath)}`; + return "/start"; } }; diff --git a/client/src/router/index.ts b/client/src/router/index.ts index 1dabdf67..ea4a490e 100644 --- a/client/src/router/index.ts +++ b/client/src/router/index.ts @@ -1,9 +1,12 @@ +import GuestStartPage from "@/pages/GuestStartPage.vue"; import LoginPage from "@/pages/LoginPage.vue"; +import UKStartPage from "@/pages/UKStartPage.vue"; +import VVStartPage from "@/pages/VVStartPage.vue"; import DashboardPage from "@/pages/dashboard/DashboardPage.vue"; import { handleCourseSessionAsQueryParam, handleCurrentCourseSession, - redirectToLoginIfRequired, + redirectToStartIfRequired, updateLoggedIn, } from "@/router/guards"; import { addToHistory } from "@/router/history"; @@ -20,6 +23,29 @@ const router = createRouter({ } }, routes: [ + { + path: "/start", + component: GuestStartPage, + meta: { + public: true, + }, + }, + { + path: "/start/vv", + component: VVStartPage, + name: "vvStart", + meta: { + public: true, + }, + }, + { + path: "/start/uk", + component: UKStartPage, + name: "ukStart", + meta: { + public: true, + }, + }, { path: "/login", component: LoginPage, @@ -288,7 +314,7 @@ const router = createRouter({ }); router.beforeEach(updateLoggedIn); -router.beforeEach(redirectToLoginIfRequired); +router.beforeEach(redirectToStartIfRequired); // register after login hooks router.beforeEach(handleCurrentCourseSession);