Merge pull request #673 from doccano/enhancement/remove-repeated-middleware

Remove middleware duplication

frontend/layouts/project.vue

@@ -41,6 +41,8 @@ import TheSideBar from '~/components/organisms/layout/TheSideBar'
 import TheHeader from '~/components/organisms/layout/TheHeader'
 
 export default {
+  middleware: ['check-auth', 'auth', 'check-admin'],
+
   components: {
     TheSideBar,
     TheHeader

frontend/middleware/check-admin.js

@@ -1,6 +1,8 @@
 export default function ({ store, route, redirect }) {
   const role = store.getters['projects/getCurrentUserRole']
-  if (!role.is_project_admin) {
-    redirect('/projects/' + route.params.id)
+  const projectRoot = '/projects/' + route.params.id
+  const path = route.fullPath.replace(/\/$/g, '')
+  if (!role.is_project_admin && path !== projectRoot) {
+    return redirect(projectRoot)
   }
 }

frontend/pages/projects/_id/dataset/index.vue

@@ -16,8 +16,6 @@ import DocumentDeletionButton from '@/components/containers/documents/DocumentDe
 export default {
   layout: 'project',
 
-  middleware: ['check-auth', 'auth', 'check-admin'],
-
   components: {
     DocumentList,
     DocumentActionMenu,

frontend/pages/projects/_id/guideline/index.vue

@@ -17,8 +17,6 @@ import { mapState, mapActions } from 'vuex'
 export default {
   layout: 'project',
 
-  middleware: ['check-auth', 'auth', 'check-admin'],
-
   components: {
     Editor
   },

frontend/pages/projects/_id/index.vue

@@ -54,8 +54,6 @@
 export default {
   layout: 'project',
 
-  middleware: ['check-auth', 'auth'],
-
   data() {
     return {
       e6: 1,

frontend/pages/projects/_id/labels/index.vue

@@ -16,8 +16,6 @@ import LabelDeletionButton from '@/components/containers/labels/LabelDeletionBut
 export default {
   layout: 'project',
 
-  middleware: ['check-auth', 'auth', 'check-admin'],
-
   components: {
     LabelList,
     LabelActionMenu,

frontend/pages/projects/_id/members/index.vue

@@ -16,8 +16,6 @@ import MemberDeletionButton from '@/components/containers/members/MemberDeletion
 export default {
   layout: 'project',
 
-  middleware: ['check-auth', 'auth', 'check-admin'],
-
   components: {
     MemberList,
     MemberAdditionButton,

frontend/pages/projects/_id/statistics/index.vue

@@ -41,8 +41,6 @@ import BarChart from '@/components/molecules/BarChart'
 export default {
   layout: 'project',
 
-  middleware: ['check-auth', 'auth', 'check-admin'],
-
   components: {
     DoughnutChart,
     BarChart