fix: middleware routing

ambiorix-web · Oct 10, 2024 · c186f4c · c186f4c
1 parent 26655cc
commit c186f4c
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 9 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -17,7 +17,7 @@ License: GPL (>= 3)
 Encoding: UTF-8
 LazyData: false
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.2
 Depends: R (>= 4.1.0)
 Imports:
   fs,

diff --git a/R/routing.R b/R/routing.R
@@ -361,12 +361,13 @@ Routing <- R6::R6Class(
         middlewares,
         private$.middleware |>
           lapply(\(fn) {
-            attr(fn, "basepath") <- parent
+            attr(fn, "basepath") <- paste0(parent, private$.basepath) 
             return(fn)
           })
       )
 
       if(!length(private$.routers)) return(middlewares)
+
       parent <- paste0(parent, private$.basepath)
 
       for(router in private$.routers) {
@@ -460,7 +461,6 @@ Routing <- R6::R6Class(
       if(length(private$.middleware) > 0L){
         for(i in seq_along(private$.middleware)) {
           mid_basepath <- attr(private$.middleware[[i]], "basepath")
-          mid_basepath <- sprintf("^%s", mid_basepath)
 
           mid_res <- NULL
           if(grepl(mid_basepath, req$PATH_INFO))

diff --git a/man/Ambiorix.Rd b/man/Ambiorix.Rd
diff --git a/man/Request.Rd b/man/Request.Rd
diff --git a/man/Router.Rd b/man/Router.Rd
diff --git a/man/Routing.Rd b/man/Routing.Rd