From fd83328e28ea2f61fbf427509d48ab04a0c3a923 Mon Sep 17 00:00:00 2001 From: Loay Gewily Date: Sun, 17 Apr 2016 22:59:18 -0400 Subject: [PATCH 1/5] add strong-error-handler template --- package.json | 1 + server/config.json | 3 +++ server/middleware.json | 2 +- server/server.js | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e47880fc..783c94cc 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "cookie-parser": "^1.3.2", "debug": "~1.0.1", "errorhandler": "^1.1.1", + "strong-error-handler": "^1.0.0", "fs-extra": "~0.22.1", "glob": "~4.0.2", "lodash": "^3.0.0", diff --git a/server/config.json b/server/config.json index ac5e58c5..ae6f4b67 100644 --- a/server/config.json +++ b/server/config.json @@ -21,6 +21,9 @@ "cors": false, "errorHandler": { "disableStackTrace": false + }, + "strong-error-handlerrorHandler": { + "disableStackTrace": true } }, "legacyExplorer": false diff --git a/server/middleware.json b/server/middleware.json index 760cb084..73ac7108 100644 --- a/server/middleware.json +++ b/server/middleware.json @@ -17,6 +17,6 @@ "loopback#urlNotFound": {} }, "final:after": { - "errorhandler": {} + "strong-error-handler": {} } } diff --git a/server/server.js b/server/server.js index fac8d6ba..5c975ed6 100644 --- a/server/server.js +++ b/server/server.js @@ -103,7 +103,7 @@ app.use(loopback.urlNotFound()); */ // The ultimate error handler. -app.use(loopback.errorHandler()); +app.use(loopback.strongErrorHandlerrorHandler()); /* From fa6d0bc1e298cc461524ae16ef8cbb896aa1d1f1 Mon Sep 17 00:00:00 2001 From: Loay Gewily Date: Tue, 19 Apr 2016 17:24:07 -0400 Subject: [PATCH 2/5] edit project templates --- templates/projects/empty-server/data.js | 3 +++ .../projects/empty-server/files/server/middleware.json | 7 ++++--- .../empty-server/files/server/middleware.production.json | 5 +++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/templates/projects/empty-server/data.js b/templates/projects/empty-server/data.js index 4443d75a..44a70977 100644 --- a/templates/projects/empty-server/data.js +++ b/templates/projects/empty-server/data.js @@ -81,6 +81,9 @@ template.server = { cors: false, errorHandler: { disableStackTrace: false + }, + strongErrorHandler: { + disableStackTrace: true } }}, { name: 'legacyExplorer', value: false } diff --git a/templates/projects/empty-server/files/server/middleware.json b/templates/projects/empty-server/files/server/middleware.json index 9a5e5e32..9a474302 100644 --- a/templates/projects/empty-server/files/server/middleware.json +++ b/templates/projects/empty-server/files/server/middleware.json @@ -13,7 +13,7 @@ }, "helmet#xssFilter": {}, "helmet#frameguard": { - "params": [ + "params": [ "deny" ] }, @@ -26,7 +26,7 @@ "helmet#hidePoweredBy": {}, "helmet#ieNoOpen": {}, "helmet#noSniff": {}, - "helmet#noCache": { + "helmet#noCache": { "enabled": false } }, @@ -47,6 +47,7 @@ "loopback#urlNotFound": {} }, "final:after": { - "loopback#errorHandler": {} + "loopback#errorHandler": {}, + "loopback#strongErrorHandler": {} } } diff --git a/templates/projects/empty-server/files/server/middleware.production.json b/templates/projects/empty-server/files/server/middleware.production.json index 4572b0c0..7726d76f 100644 --- a/templates/projects/empty-server/files/server/middleware.production.json +++ b/templates/projects/empty-server/files/server/middleware.production.json @@ -4,6 +4,11 @@ "params": { "includeStack": false } + }, + "loopback#strongErrorHandler": { + "params": { + "includeStack": false + } } } } From 7a213709930b90d448a0282846956bf7b7b7ccca Mon Sep 17 00:00:00 2001 From: Loay Gewily Date: Tue, 26 Apr 2016 00:23:19 -0400 Subject: [PATCH 3/5] update strongErrorHandler Templates --- package.json | 1 - server/config.json | 7 ++----- server/server.js | 2 +- .../files/server/middleware.development.json | 9 +++++++++ .../empty-server/files/server/middleware.json | 1 - .../files/server/middleware.production.json | 14 -------------- 6 files changed, 12 insertions(+), 22 deletions(-) create mode 100644 templates/projects/empty-server/files/server/middleware.development.json delete mode 100644 templates/projects/empty-server/files/server/middleware.production.json diff --git a/package.json b/package.json index 783c94cc..25aed158 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,6 @@ "async": "^0.9.0", "cookie-parser": "^1.3.2", "debug": "~1.0.1", - "errorhandler": "^1.1.1", "strong-error-handler": "^1.0.0", "fs-extra": "~0.22.1", "glob": "~4.0.2", diff --git a/server/config.json b/server/config.json index ae6f4b67..99ab9676 100644 --- a/server/config.json +++ b/server/config.json @@ -19,11 +19,8 @@ "limit": "100kb" }, "cors": false, - "errorHandler": { - "disableStackTrace": false - }, - "strong-error-handlerrorHandler": { - "disableStackTrace": true + "strongErrorHandler": { + "debug": false } }, "legacyExplorer": false diff --git a/server/server.js b/server/server.js index 5c975ed6..d2aef0c9 100644 --- a/server/server.js +++ b/server/server.js @@ -103,7 +103,7 @@ app.use(loopback.urlNotFound()); */ // The ultimate error handler. -app.use(loopback.strongErrorHandlerrorHandler()); +app.use(loopback.strongErrorHandler()); /* diff --git a/templates/projects/empty-server/files/server/middleware.development.json b/templates/projects/empty-server/files/server/middleware.development.json new file mode 100644 index 00000000..0be1ac4e --- /dev/null +++ b/templates/projects/empty-server/files/server/middleware.development.json @@ -0,0 +1,9 @@ +{ + "final:after": { + "loopback#strongErrorHandler": { + "params": { + "debug": true + } + } + } +} diff --git a/templates/projects/empty-server/files/server/middleware.json b/templates/projects/empty-server/files/server/middleware.json index 9a474302..4d413369 100644 --- a/templates/projects/empty-server/files/server/middleware.json +++ b/templates/projects/empty-server/files/server/middleware.json @@ -47,7 +47,6 @@ "loopback#urlNotFound": {} }, "final:after": { - "loopback#errorHandler": {}, "loopback#strongErrorHandler": {} } } diff --git a/templates/projects/empty-server/files/server/middleware.production.json b/templates/projects/empty-server/files/server/middleware.production.json deleted file mode 100644 index 7726d76f..00000000 --- a/templates/projects/empty-server/files/server/middleware.production.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "final:after": { - "loopback#errorHandler": { - "params": { - "includeStack": false - } - }, - "loopback#strongErrorHandler": { - "params": { - "includeStack": false - } - } - } -} From 75cecdaefd69a404833f77005d1d901ef456b91b Mon Sep 17 00:00:00 2001 From: Loay Gewily Date: Tue, 26 Apr 2016 00:26:24 -0400 Subject: [PATCH 4/5] update data file --- templates/projects/empty-server/data.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/templates/projects/empty-server/data.js b/templates/projects/empty-server/data.js index 44a70977..0beccf21 100644 --- a/templates/projects/empty-server/data.js +++ b/templates/projects/empty-server/data.js @@ -79,11 +79,8 @@ template.server = { limit: '100kb' }, cors: false, - errorHandler: { - disableStackTrace: false - }, strongErrorHandler: { - disableStackTrace: true + debug: false } }}, { name: 'legacyExplorer', value: false } From 8e366f0ab0066b5adb296e4ef178077f180aff64 Mon Sep 17 00:00:00 2001 From: Loay Gewily Date: Tue, 3 May 2016 01:09:22 -0400 Subject: [PATCH 5/5] revert changes outside template --- server/server.js | 2 +- .../empty-server/files/server/middleware.development.json | 2 +- templates/projects/empty-server/files/server/middleware.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/server.js b/server/server.js index d2aef0c9..fac8d6ba 100644 --- a/server/server.js +++ b/server/server.js @@ -103,7 +103,7 @@ app.use(loopback.urlNotFound()); */ // The ultimate error handler. -app.use(loopback.strongErrorHandler()); +app.use(loopback.errorHandler()); /* diff --git a/templates/projects/empty-server/files/server/middleware.development.json b/templates/projects/empty-server/files/server/middleware.development.json index 0be1ac4e..71676ca0 100644 --- a/templates/projects/empty-server/files/server/middleware.development.json +++ b/templates/projects/empty-server/files/server/middleware.development.json @@ -1,6 +1,6 @@ { "final:after": { - "loopback#strongErrorHandler": { + "strongErrorHandler": { "params": { "debug": true } diff --git a/templates/projects/empty-server/files/server/middleware.json b/templates/projects/empty-server/files/server/middleware.json index 4d413369..2e4d09d9 100644 --- a/templates/projects/empty-server/files/server/middleware.json +++ b/templates/projects/empty-server/files/server/middleware.json @@ -47,6 +47,6 @@ "loopback#urlNotFound": {} }, "final:after": { - "loopback#strongErrorHandler": {} + "loopback#errorHandler": {} } }