Commit 7a80a08d authored by Dannon Baker's avatar Dannon Baker
Browse files

Implement authentication guard for workflow landing routes, reusable for others.

parent 792913b3

client/src/entry/analysis/router.js

+2 −15
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ import CreateFileSourceInstance from "@/components/FileSources/Instances/CreateI 
import GridHistory from "@/components/Grid/GridHistory";

import GridPage from "@/components/Grid/GridPage";

import CreateObjectStoreInstance from "@/components/ObjectStore/Instances/CreateInstance";

import { useUserStore } from "@/stores/userStore";

import { requireAuth } from "@/router/guards";

import { parseBool } from "@/utils/utils";



import { patchRouterPush } from "./router-push";
@@ -524,20 +524,7 @@ export function getRouter(Galaxy) { 
                            public: route.query.public.toLowerCase() === "true",

                            secret: route.query.client_secret,

                        }),

                        beforeEnter: async (to, from, next) => {

                            const userStore = useUserStore();

                            await userStore.loadUser(false);

                            if (userStore.isAnonymous) {

                                next({

                                    path: "/login/start",

                                    query: {

                                        redirect: `/workflow_landings/${to.params.uuid}?public=${to.query.public}&client_secret=${to.query.client_secret}`,

                                    },

                                });

                                return;

                            }

                            next();

                        },

                        beforeEnter: requireAuth,

                    },

                    {

                        path: "user",

client/src/router/guards.ts

0 → 100644
+19 −0
Original line number Diff line number Diff line 
import type { NavigationGuardNext, Route } from "vue-router";



import { useUserStore } from "@/stores/userStore";



export async function requireAuth(to: Route, from: Route, next: NavigationGuardNext) {

    const userStore = useUserStore();

    await userStore.loadUser(false);



    if (userStore.isAnonymous) {

        next({

            path: "/login/start",

            query: {

                redirect: to.fullPath,

            },

        });

        return;

    }

    next();

}