Skip to content

Beautiful Open-Source Form Builder

Fix middlewares

JhumanJ2b02667f348f
diff --git a/resources/js/router/index.js b/resources/js/router/index.js
index 51b321644..9953c0e9e 100644
--- a/resources/js/router/index.js
+++ b/resources/js/router/index.js
@@ -182,11 +182,19 @@ function resolveComponents (components) {
function getMiddleware (components) {
const middleware = [...globalMiddleware]
- components.filter(c => c.middleware).forEach(component => {
- if (Array.isArray(component.middleware)) {
- middleware.push(...component.middleware)
+ components.forEach(component => {
+
+ let compMiddleware
+ if (component.middleware) {
+ compMiddleware = component.middleware
+ } else if (component.default && component.default.middleware) {
+ compMiddleware = component.default.middleware
+ }
+
+ if (Array.isArray(compMiddleware)) {
+ middleware.push(...compMiddleware)
} else {
- middleware.push(component.middleware)
+ middleware.push(compMiddleware)
}
})