Skip to content
This repository was archived by the owner on Sep 14, 2022. It is now read-only.

Fixes for REST Clients and Multiple HTTP Methods bound to the same Path #1

Merged
merged 1 commit into from
Aug 25, 2011
Merged

Fixes for REST Clients and Multiple HTTP Methods bound to the same Path #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions Common/node/swagger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,8 @@ function addMethod(app, callback, spec) {
if (root && root.apis) {
for ( var key in root.apis) {
var api = root.apis[key];
if (api && api.path == spec.path) {
// found matching path, add & return
if (api && api.path == spec.path && api.method == spec.method) {
// found matching path and method, add & return
appendToApi(root, api, spec);
return;
}
Expand All @@ -228,7 +228,7 @@ function addMethod(app, callback, spec) {
case "GET":
app.get(fullPath, function(req,resp){
resp.header("Access-Control-Allow-Origin", "*");
resp.header("Content-Type", "application/json");
resp.header("Content-Type", "application/json; charset=utf-8");
try{
callback(req,resp);
}
Expand All @@ -239,6 +239,7 @@ function addMethod(app, callback, spec) {
}
else{
// all others go 500
console.error("GET failed for path '" + fullPath + "': " + ex);
resp.send(JSON.stringify({"description":"unknown error","code":500}))
}
}
Expand All @@ -247,7 +248,7 @@ function addMethod(app, callback, spec) {
case "POST":
app.post(fullPath, function(req,resp){
resp.header("Access-Control-Allow-Origin", "*");
resp.header("Content-Type", "application/json");
resp.header("Content-Type", "application/json; charset=utf-8");
try{
callback(req,resp);
}
Expand All @@ -258,6 +259,7 @@ function addMethod(app, callback, spec) {
}
else{
// all others go 500
console.error("POST failed for path '" + fullPath + "': " + ex);
resp.send(JSON.stringify({"description":"unknown error","code":500}))
}
}
Expand All @@ -266,7 +268,7 @@ function addMethod(app, callback, spec) {
case "PUT":
app.put(fullPath, function(req,resp){
resp.header("Access-Control-Allow-Origin", "*");
resp.header("Content-Type", "application/json");
resp.header("Content-Type", "application/json; charset=utf-8");
try{
callback(req,resp);
}
Expand All @@ -277,6 +279,7 @@ function addMethod(app, callback, spec) {
}
else{
// all others go 500
console.error("PUT failed for path '" + fullPath + "': " + ex);
resp.send(JSON.stringify({"description":"unknown error","code":500}))
}
}
Expand All @@ -285,7 +288,7 @@ function addMethod(app, callback, spec) {
case "DELETE":
app.delete(fullPath, function(req,resp){
resp.header("Access-Control-Allow-Origin", "*");
resp.header("Content-Type", "application/json");
resp.header("Content-Type", "application/json; charset=utf-8");
try{
callback(req,resp);
}
Expand All @@ -296,6 +299,7 @@ function addMethod(app, callback, spec) {
}
else{
// all others go 500
console.error("DELETE failed for path '" + fullPath + "': " + ex);
resp.send(JSON.stringify({"description":"unknown error","code":500}))
}
}
Expand Down