Merge branch '793-add-route-permission-for-signup-page' into 'master'

Resolve "Add route permission for signup page"

Closes #793

See merge request !1168

aleksis/core/frontend/mixins/menus.js

@@ -19,12 +19,19 @@ const menusMixin = {
       let permArray = [];
 
       for (const route of this.$router.getRoutes()) {
-        if (
-          route.meta &&
-          route.meta["permission"] &&
-          !(route.meta["permission"] in permArray)
-        ) {
-          permArray.push(route.meta["permission"]);
+        if (route.meta) {
+          if (
+            route.meta["permission"] &&
+            !(route.meta["permission"] in permArray)
+          ) {
+            permArray.push(route.meta["permission"]);
+          }
+          if (
+            route.meta["menuPermission"] &&
+            !(route.meta["menuPermission"] in permArray)
+          ) {
+            permArray.push(route.meta["menuPermission"]);
+          }
         }
       }
 
@@ -41,9 +48,12 @@ const menusMixin = {
           route.meta &&
           route.meta[menuKey] &&
           !route.parent &&
-          (route.meta.permission
+          (route.meta.menuPermission
+            ? this.checkPermission(route.meta.menuPermission)
+            : route.meta.permission
             ? this.checkPermission(route.meta.permission)
-            : true) &&
+            : true
+          ) &&
           (route.meta.validators
             ? this.checkValidators(route.meta.validators)
             : true)
@@ -67,9 +77,12 @@ const menusMixin = {
           route.parent &&
           route.parent.name &&
           route.parent.name in menu &&
-          (route.meta.permission
+          (route.meta.menuPermission
+            ? this.checkPermission(route.meta.menuPermission)
+            : route.meta.permission
             ? this.checkPermission(route.meta.permission)
-            : true) &&
+            : true
+          ) &&
           (route.meta.validators
             ? this.checkValidators(route.meta.validators)
             : true)

aleksis/core/frontend/routes.js

@@ -37,6 +37,7 @@ const routes = [
       inMenu: true,
       icon: "mdi-account-plus-outline",
       titleKey: "accounts.signup.menu_title",
+      menuPermission: "core.signup_rule",
       validators: [notLoggedInValidator],
       invalidate: "leave",
     },