Fix regexp

kurierjs · Mar 22, 2019 · 14027ed · 14027ed
1 parent 70d23c0
commit 14027ed
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/middlewares/json-api-koa.ts b/src/middlewares/json-api-koa.ts
@@ -73,9 +73,9 @@ async function authenticate(app: Application, ctx: Context) {
 
 function urlData(app: Application, ctx: Context) {
   const urlRegexp = new RegExp(
-    `^\/?(?<namespace>${escapeStringRegexp(
+    `^(\/+)?((?<namespace>${escapeStringRegexp(
       app.namespace
-    )})(\/?(?<resource>[^\/]+))?(\/(?<id>\\S+))?`
+    )})(\/+|$))?(?<resource>[^\s\/?]+)?(\/+)?(?<id>[^\s\/?]+)?(\/+)?`
   );
 
   return (ctx.path.match(urlRegexp) || {})["groups"] || {};