diff --git a/core-server/server/routes/delete-tiddler.js b/core-server/server/routes/delete-tiddler.js index f1b7d9d731..17db39848d 100644 --- a/core-server/server/routes/delete-tiddler.js +++ b/core-server/server/routes/delete-tiddler.js @@ -8,7 +8,7 @@ DELETE /recipes/default/tiddlers/:title \*/ "use strict"; -exports.method = "DELETE"; +exports.methods = ["DELETE"]; exports.path = /^\/bags\/default\/tiddlers\/(.+)$/; diff --git a/core-server/server/routes/get-favicon.js b/core-server/server/routes/get-favicon.js index 602b130e52..ce4bc55ed8 100644 --- a/core-server/server/routes/get-favicon.js +++ b/core-server/server/routes/get-favicon.js @@ -8,7 +8,7 @@ GET /favicon.ico \*/ "use strict"; -exports.method = "GET"; +exports.methods = ["GET"]; exports.path = /^\/favicon.ico$/; diff --git a/core-server/server/routes/get-file.js b/core-server/server/routes/get-file.js index 72c6d74ffb..e5727fac15 100644 --- a/core-server/server/routes/get-file.js +++ b/core-server/server/routes/get-file.js @@ -8,7 +8,7 @@ GET /files/:filepath \*/ "use strict"; -exports.method = "GET"; +exports.methods = ["GET"]; exports.path = /^\/files\/(.+)$/; diff --git a/core-server/server/routes/get-index.js b/core-server/server/routes/get-index.js index bc236c9f5e..f856bd511c 100644 --- a/core-server/server/routes/get-index.js +++ b/core-server/server/routes/get-index.js @@ -8,7 +8,7 @@ GET / \*/ "use strict"; -exports.method = "GET"; +exports.methods = ["GET"]; exports.path = /^\/$/; diff --git a/core-server/server/routes/get-login-basic.js b/core-server/server/routes/get-login-basic.js index 2066a0cfff..e9a73c856b 100644 --- a/core-server/server/routes/get-login-basic.js +++ b/core-server/server/routes/get-login-basic.js @@ -8,7 +8,7 @@ GET /login-basic -- force a Basic Authentication challenge \*/ "use strict"; -exports.method = "GET"; +exports.methods = ["GET"]; exports.path = /^\/login-basic$/; diff --git a/core-server/server/routes/get-status.js b/core-server/server/routes/get-status.js index e6394dc04d..ed2c528063 100644 --- a/core-server/server/routes/get-status.js +++ b/core-server/server/routes/get-status.js @@ -8,7 +8,7 @@ GET /status \*/ "use strict"; -exports.method = "GET"; +exports.methods = ["GET"]; exports.path = /^\/status$/; diff --git a/core-server/server/routes/get-tiddler-html.js b/core-server/server/routes/get-tiddler-html.js index fd96632407..b7a8aa8f62 100644 --- a/core-server/server/routes/get-tiddler-html.js +++ b/core-server/server/routes/get-tiddler-html.js @@ -8,7 +8,7 @@ GET /:title \*/ "use strict"; -exports.method = "GET"; +exports.methods = ["GET"]; exports.path = /^\/([^\/]+)$/; diff --git a/core-server/server/routes/get-tiddler.js b/core-server/server/routes/get-tiddler.js index 72b635978e..b5c4e11a06 100644 --- a/core-server/server/routes/get-tiddler.js +++ b/core-server/server/routes/get-tiddler.js @@ -8,7 +8,7 @@ GET /recipes/default/tiddlers/:title \*/ "use strict"; -exports.method = "GET"; +exports.methods = ["GET"]; exports.path = /^\/recipes\/default\/tiddlers\/(.+)$/; diff --git a/core-server/server/routes/get-tiddlers-json.js b/core-server/server/routes/get-tiddlers-json.js index c2d146150f..8c78dad9f4 100644 --- a/core-server/server/routes/get-tiddlers-json.js +++ b/core-server/server/routes/get-tiddlers-json.js @@ -10,7 +10,7 @@ GET /recipes/default/tiddlers.json?filter= var DEFAULT_FILTER = "[all[tiddlers]!is[system]sort[title]]"; -exports.method = "GET"; +exports.methods = ["GET"]; exports.path = /^\/recipes\/default\/tiddlers.json$/; diff --git a/core-server/server/routes/put-tiddler.js b/core-server/server/routes/put-tiddler.js index 3c0a4f537e..55479b5700 100644 --- a/core-server/server/routes/put-tiddler.js +++ b/core-server/server/routes/put-tiddler.js @@ -8,7 +8,7 @@ PUT /recipes/default/tiddlers/:title \*/ "use strict"; -exports.method = "PUT"; +exports.methods = ["PUT"]; exports.path = /^\/recipes\/default\/tiddlers\/(.+)$/; diff --git a/core-server/server/server.js b/core-server/server/server.js index a074e549fa..e1741d08bb 100644 --- a/core-server/server/server.js +++ b/core-server/server/server.js @@ -222,7 +222,7 @@ Server.prototype.findMatchingRoute = function(request,state) { } else { match = potentialRoute.path.exec(pathname); } - if(match && request.method === potentialRoute.method) { + if(match && (potentialRoute.methods?.includes(request.method) || potentialRoute.method === request.method)) { state.params = []; for(var p=1; p