Fix redirection to login on first run

SakiiR · Oct 28, 2021 · 61a85c7 · 61a85c7
1 parent 2eaf6cf
commit 61a85c7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/dockers/manager/front/src/apollo/apollo-client-hooks.js b/dockers/manager/front/src/apollo/apollo-client-hooks.js
@@ -24,7 +24,10 @@ const AuthLink = new ApolloLink((operation, forward) => {
 const ErrorLink = onError(({ graphQLErrors = [] }) => {
  graphQLErrors.forEach(({ message }) => {
  if (message === "Unauthorized") {
- router.push("/login");
+ const route = router.match(document.location.pathname)
+ if (!route.meta.public){
+ router.push("/login");
+ }
  }
  Notify.create({
  message,

diff --git a/dockers/manager/front/src/router/routes.js b/dockers/manager/front/src/router/routes.js
@@ -161,6 +161,7 @@ const routes = [
  name: "login",
  meta: {
  hideMenu: true,
+ public: true,
  },
  component: () => import("pages/Login.vue")
  },
@@ -169,6 +170,7 @@ const routes = [
  name: "firstRun",
  meta: {
  hideMenu: true,
+ public: true,
  },
  component: () => import("pages/FirstRun.vue")
  },